diff --git a/app/.env.example b/app/.env.example index de5841f32..774e3d7b8 100644 --- a/app/.env.example +++ b/app/.env.example @@ -18,7 +18,7 @@ VUE_APP_LEGAL_API_URL="https://legal-api-dev.apps.silver.devops.gov.bc.ca" VUE_APP_LEGAL_API_VERSION_2="/api/v2" VUE_APP_NAMEX_API_URL="https://namex-dev.apps.silver.devops.gov.bc.ca" VUE_APP_NAMEX_API_VERSION="/api/v1" -VUE_APP_STATUS_API_URL="https://status-api-dev.apps.silver.devops.gov.bc.ca" +VUE_APP_STATUS_API_URL="https://status-api-dev.apps.gold.devops.gov.bc.ca" VUE_APP_STATUS_API_VERSION="/api/v1" VUE_APP_REGISTRIES_SEARCH_API_URL="https://bcregistry-dev.apigee.net/registry-search" VUE_APP_REGISTRIES_SEARCH_API_VERSION="/api/v1" diff --git a/app/package.json b/app/package.json index 72b0f3c2d..4020caff7 100644 --- a/app/package.json +++ b/app/package.json @@ -1,6 +1,6 @@ { "name": "name-request", - "version": "5.5.19", + "version": "5.5.20", "private": true, "appName": "Name Request UI", "sbcName": "SBC Common Components", diff --git a/app/src/mixins/update-user-mixin.ts b/app/src/mixins/update-user-mixin.ts index 0eb671e53..76471ebc4 100644 --- a/app/src/mixins/update-user-mixin.ts +++ b/app/src/mixins/update-user-mixin.ts @@ -16,7 +16,7 @@ export class UpdateUserMixin extends Vue { } } catch (err) { // just log the error -- no need to halt app - console.log('Launch Darkly update error =', err) // eslint-disable-line no-console + console.log('Error updating user =', err) // eslint-disable-line no-console } } diff --git a/app/src/services/auth-services.ts b/app/src/services/auth-services.ts index 935a87367..d265a2c82 100644 --- a/app/src/services/auth-services.ts +++ b/app/src/services/auth-services.ts @@ -53,24 +53,22 @@ export default class AuthServices { * Throws on error. */ static async fetchUserInfo (): Promise { - // PREVENT_STORAGE_SYNC flag is set during signout in sbc common components - // when session is state cleared, as a mechanism to prevent returning async - // functions to set tokens - if (sessionStorage.getItem('PREVENT_STORAGE_SYNC')) return null - const url = `${this.authApiUrl}/users/@me` + // don't fetch user info if session isn't synced (ie, user is not logged in) + // to pre-empt a console error and Sentry log + if (sessionStorage.getItem('SESSION_SYNCED') !== 'true') return null + + // don't fetch user info if there is no KC token (safety check) const token = sessionStorage.getItem('KEYCLOAK_TOKEN') - if (token) { - const headers = { - Authorization: `Bearer ${token}` - } - return axios.get(url, { headers: headers }) - .then(response => { - if (response?.data) return response.data - throw new Error('Invalid user info') - }) - } else { - return null - } + if (!token) return null + + const url = `${this.authApiUrl}/users/@me` + const headers = { Authorization: `Bearer ${token}` } + + return axios.get(url, { headers: headers }) + .then(response => { + if (response?.data) return response.data + throw new Error('Invalid user info') + }) } /**