Skip to content

Commit 37f2c21

Browse files
severinbeauvaisSeverin Beauvais
andauthored
30088 Better handle error responses (bcgov#3498)
Co-authored-by: Severin Beauvais <severin.beauvais@gov.bc.ca>
1 parent eca2e34 commit 37f2c21

File tree

7 files changed

+34
-42
lines changed

7 files changed

+34
-42
lines changed

auth-web/.env.example

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,16 @@
1-
# Base Path Opensift: /business/auth/ Firebase: /
21
VUE_APP_PATH="/"
32

4-
#vaults Shared
3+
# vaults canadapost
54
VUE_APP_ADDRESS_COMPLETE_KEY=
65

7-
#vaults auth-web
6+
# vaults auth-web
87
VUE_APP_AFFIDAVIT_FILE_SIZE="73KB"
98
VUE_APP_PAYMENT_PAYEE_NAME="BC Registries"
109
VUE_APP_FILE_SERVER_URL="https://storage.googleapis.com/auth-static-resources-dev"
1110
VUE_APP_APPROVE_ACCOUNT_SLA_DAYS="3-5"
1211
VUE_APP_ONE_STOP_URL="https://dev.onestop.gov.bc.ca/"
13-
VUE_APP_SOCIETIES_URL="https://www.bcregistry.ca/societies/"
14-
VUE_APP_CORP_FORMS_URL="https://www2.gov.bc.ca/gov/content/employment-business/business/managing-a-business/permits-licences/businesses-incorporated-companies/forms-corporate-registry"
15-
VUE_APP_LLP_FORMS_URL="https://www2.gov.bc.ca/assets/gov/employment-business-and-economic-development/business-management/permits-licences-and-registration/registries-packages/pack_01_llp_-_registration_forms_package.pdf"
16-
VUE_APP_LP_FORMS_URL="https://www2.gov.bc.ca/assets/gov/employment-business-and-economic-development/business-management/permits-licences-and-registration/registries-forms/reg_791_-_declaration_for_bc_limited_partnership.pdf"
17-
VUE_APP_XLP_FORMS_URL="https://www2.gov.bc.ca/assets/gov/employment-business-and-economic-development/business-management/permits-licences-and-registration/registries-forms/reg_790_-_declaration_for_extraprovincial_limited_partnership.pdf"
1812

19-
#vaults web-url
13+
# vaults web-url
2014
VUE_APP_REGISTRY_HOME_URL="https://dev.bcregistry.gov.bc.ca/"
2115
VUE_APP_BUSINESS_DASH_URL="https://dev.business-dashboard.bcregistry.gov.bc.ca/"
2216
VUE_APP_DOCUMENTS_UI_URL="https://documents-ui-dev.firebaseapp.com"
@@ -33,15 +27,19 @@ VUE_APP_BUSINESS_CREATE_URL="https://dev.create.business.bcregistry.gov.bc.ca/"
3327
VUE_APP_CORPORATE_ONLINE_URL="https://www.corporateonline.gov.bc.ca"
3428
VUE_APP_NRO_URL="https://dev.bcregistrynames.gov.bc.ca/nro/"
3529
VUE_APP_REGISTRY_SEARCH_URL="https://dev.search.business.bcregistry.gov.bc.ca/"
30+
VUE_APP_SOCIETIES_URL="https://www.bcregistry.ca/societies/"
31+
VUE_APP_CORP_FORMS_URL="https://www2.gov.bc.ca/gov/content/employment-business/business/managing-a-business/permits-licences/businesses-incorporated-companies/forms-corporate-registry"
32+
VUE_APP_LLP_FORMS_URL="https://www2.gov.bc.ca/assets/gov/employment-business-and-economic-development/business-management/permits-licences-and-registration/registries-packages/pack_01_llp_-_registration_forms_package.pdf"
33+
VUE_APP_LP_FORMS_URL="https://www2.gov.bc.ca/assets/gov/employment-business-and-economic-development/business-management/permits-licences-and-registration/registries-forms/reg_791_-_declaration_for_bc_limited_partnership.pdf"
34+
VUE_APP_XLP_FORMS_URL="https://www2.gov.bc.ca/assets/gov/employment-business-and-economic-development/business-management/permits-licences-and-registration/registries-forms/reg_790_-_declaration_for_extraprovincial_limited_partnership.pdf"
3635
VUE_APP_NAMEX_WEB_URL="https://dev.namex.bcregistry.gov.bc.ca/"
3736
VUE_APP_BUSINESS_REGISTRY_URL="https://dev.business-registry-dashboard.bcregistry.gov.bc.ca/"
3837

39-
#vaults API
38+
# vaults API
4039
VUE_APP_AUTH_API_GW_URL="https://test.api.connect.gov.bc.ca/auth-dev"
4140
VUE_APP_AUTH_API_VERSION="/api/v1"
4241
VUE_APP_AUTH_API_KEY=
4342
VUE_APP_LEGAL_API_URL="https://legal-api-dev.apps.silver.devops.gov.bc.ca"
44-
VUE_APP_LEGAL_API_VERSION="/api/v1"
4543
VUE_APP_LEGAL_API_VERSION_2="/api/v2"
4644
VUE_APP_REGISTRIES_SEARCH_API_URL="https://bcregistry-dev.apigee.net/registry-search"
4745
VUE_APP_REGISTRIES_SEARCH_API_VERSION="/api/v1"
@@ -58,15 +56,15 @@ VUE_APP_MHR_API_URL="https://bcregistry-dev.apigee.net/mhr"
5856
VUE_APP_MHR_API_VERSION="/api/v1"
5957
VUE_APP_MHR_API_KEY=""
6058

61-
#vaults launchdarkly
59+
# vaults launchdarkly
6260
VUE_APP_AUTH_LD_CLIENT_ID=
6361

64-
#vaults keycloak
62+
# vaults keycloak
6563
VUE_APP_KEYCLOAK_AUTH_URL="https://dev.loginproxy.gov.bc.ca/auth"
6664
VUE_APP_KEYCLOAK_REALM="bcregistry"
6765
VUE_APP_KEYCLOAK_CLIENTID="connect-web"
6866

69-
#vaults hotjar
67+
# vaults hotjar
7068
VUE_APP_HOTJAR_ID=
7169

7270
# Google Analytics

auth-web/devops/vaults.env

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,17 @@
1-
# Base Path Opensift: /business/auth/ Firebase: /
21
VUE_APP_PATH=/
32

4-
#vaults Shared
3+
# vaults canadapost
54
VUE_APP_ADDRESS_COMPLETE_KEY="op://canadapost/$APP_ENV/address-key/ADDRESS_COMPLETE_KEY"
65

7-
#vaults auth-web
6+
# vaults relationship
87
VUE_APP_AFFIDAVIT_FILE_SIZE="op://relationship/$APP_ENV/auth-web/AFFIDAVIT_FILE_SIZE"
98
VUE_APP_PAYMENT_PAYEE_NAME="op://relationship/$APP_ENV/auth-web/PAYMENT_PAYEE_NAME"
109
VUE_APP_FILE_SERVER_URL="op://relationship/$APP_ENV/auth-web/FILE_SERVER_URL"
1110
VUE_APP_APPROVE_ACCOUNT_SLA_DAYS="op://relationship/$APP_ENV/auth-web/APPROVE_ACCOUNT_SLA_DAYS"
1211
VUE_APP_ONE_STOP_URL="op://relationship/$APP_ENV/auth-web/ONE_STOP_URL"
1312

14-
#vaults web-url
13+
# vaults web-url
1514
VUE_APP_REGISTRY_HOME_URL="op://web-url/$APP_ENV/registry/REGISTRY_HOME_URL"
16-
1715
VUE_APP_BUSINESS_DASH_URL="op://web-url/$APP_ENV/business-dash/BUSINESS_DASH_URL"
1816
VUE_APP_DOCUMENTS_UI_URL="op://web-url/$APP_ENV/documents-ui/DOCUMENTS_UI_URL"
1917
VUE_APP_ENTITY_SELECTOR_URL="op://web-url/$APP_ENV/entity-selector/ENTITY_SELECTOR_URL"
@@ -37,12 +35,11 @@ VUE_APP_XLP_FORMS_URL="op://web-url/$APP_ENV/bcregistry/XLP_FORMS_URL"
3735
VUE_APP_NAMEX_WEB_URL="op://web-url/$APP_ENV/auth-web/NAMEX_WEB_URL"
3836
VUE_APP_BUSINESS_REGISTRY_URL="op://web-url/$APP_ENV/business-registry-ui/BUSINESS_REGISTRY_URL"
3937

40-
#vaults API
38+
# vaults API
4139
VUE_APP_AUTH_API_GW_URL="op://API/$APP_ENV/auth-api/AUTH_API_GW_URL"
4240
VUE_APP_AUTH_API_KEY="op://API/$APP_ENV/auth-api/AUTH_API_KEY"
4341
VUE_APP_AUTH_API_VERSION="op://API/$APP_ENV/auth-api/AUTH_API_VERSION"
4442
VUE_APP_LEGAL_API_URL="op://API/$APP_ENV/legal-api/LEGAL_API_URL"
45-
VUE_APP_LEGAL_API_VERSION="op://API/$APP_ENV/legal-api/LEGAL_API_VERSION"
4643
VUE_APP_LEGAL_API_VERSION_2="op://API/$APP_ENV/legal-api/LEGAL_API_VERSION_2"
4744
VUE_APP_REGISTRIES_SEARCH_API_URL="op://API/$APP_ENV/registries-search-api/REGISTRIES_SEARCH_API_URL"
4845
VUE_APP_REGISTRIES_SEARCH_API_VERSION="op://API/$APP_ENV/registries-search-api/REGISTRIES_SEARCH_API_VERSION"
@@ -59,16 +56,16 @@ VUE_APP_MHR_API_URL="op://API/$APP_ENV/ppr-api/MHR_API_URL"
5956
VUE_APP_MHR_API_VERSION="op://API/$APP_ENV/ppr-api/MHR_API_VERSION"
6057
VUE_APP_MHR_API_KEY="op://API/$APP_ENV/ppr-api/MHR_API_KEY"
6158

62-
#vaults launchdarkly
59+
# vaults launchdarkly
6360
VUE_APP_AUTH_LD_CLIENT_ID="op://launchdarkly/$APP_ENV/auth/AUTH_LD_CLIENT_ID"
6461

65-
#vaults keycloak
62+
# vaults keycloak
6663
VUE_APP_KEYCLOAK_AUTH_URL="op://keycloak/$APP_ENV/base/KEYCLOAK_AUTH_BASE_URL"
6764
VUE_APP_KEYCLOAK_REALM="op://keycloak/$APP_ENV/base/KEYCLOAK_REALMNAME"
6865
VUE_APP_KEYCLOAK_CLIENTID="op://keycloak/$APP_ENV/account-web/UI_KEYCLOAK_RESOURCE_NAME"
6966

70-
#vaults hotjar
67+
#vaults hotjar
7168
VUE_APP_HOTJAR_ID="op://hotjar/$APP_ENV/auth-web/HOTJAR_ID"
7269

73-
# Google Analytics
70+
# vaults google-analytics
7471
VUE_APP_GTAG_ID="op://google-analytics/$APP_ENV/developer/GTAG"

auth-web/package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

auth-web/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "auth-web",
3-
"version": "2.10.20",
3+
"version": "2.10.21",
44
"appName": "Auth Web",
55
"sbcName": "SBC Common Components",
66
"private": true,

auth-web/src/stores/business.ts

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,8 @@ export const useBusinessStore = defineStore('business', () => {
273273
async function loadFiling () {
274274
const filingID = ConfigHelper.getFromSession(SessionStorageKeys.FilingIdentifierKey)
275275
state.filingID = filingID
276-
const response = await BusinessService.searchFiling(filingID).catch(() => null)
276+
const response = await BusinessService.searchFiling(filingID).catch(error => error)
277+
277278
if (response?.status === 200) {
278279
const businessIdentifier = response?.data.filing.business.identifier
279280
ConfigHelper.addToSession(SessionStorageKeys.BusinessIdentifierKey, businessIdentifier)
@@ -428,12 +429,13 @@ export const useBusinessStore = defineStore('business', () => {
428429

429430
// Following searchBusiness will search data from legal-api.
430431
async function searchBusiness (businessIdentifier: string): Promise<LearBusiness> {
431-
const response = await BusinessService.searchBusiness(businessIdentifier).catch(() => null)
432+
const response = await BusinessService.searchBusiness(businessIdentifier).catch(error => error)
433+
432434
if (response?.status === 200 && response?.data?.business?.legalName) {
433435
ConfigHelper.addToSession(SessionStorageKeys.BusinessIdentifierKey, businessIdentifier)
434436
return response.data.business
435437
} else if (response?.status === 404) {
436-
throw Error('No match found for Incorporation Number')
438+
throw Error('No match found for Business Number')
437439
} else {
438440
throw Error('Search failed')
439441
}

auth-web/src/util/config-helper.ts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -111,10 +111,6 @@ export default class ConfigHelper {
111111
return `${import.meta.env.VUE_APP_AUTH_API_GW_URL}` + '/test/reset'
112112
}
113113

114-
static getLegalAPIUrl () {
115-
return `${import.meta.env.VUE_APP_LEGAL_API_URL}` + `${import.meta.env.VUE_APP_LEGAL_API_VERSION}`
116-
}
117-
118114
static getLegalAPIV2Url () {
119115
return `${import.meta.env.VUE_APP_LEGAL_API_URL}` + `${import.meta.env.VUE_APP_LEGAL_API_VERSION_2}`
120116
}

auth-web/src/views/auth/staff/StaffDashboardView.vue

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -458,19 +458,17 @@ export default defineComponent({
458458
return identifier.charAt(0).toUpperCase() === 'T'
459459
}
460460
461-
const resetSearchState = () => {
462-
businessStore.resetCurrentBusiness()
463-
businessStore.resetFilingID()
464-
}
465-
466461
const updateCurrentBusiness = async () => {
467462
try {
468463
// Search for business, action will set session storage
469464
await businessStore.loadBusiness()
470465
localVars.affiliatedOrg = await orgStore.getOrganizationForAffiliate()
471466
localVars.canViewIncorporationSearchResult = true
472467
} catch (exception) {
473-
localVars.errorMessage = exception?.message
468+
localVars.errorMessage =
469+
exception?.response?.data?.rootCause?.message ||
470+
exception?.response?.data?.rootCause ||
471+
exception?.message
474472
localVars.canViewIncorporationSearchResult = false
475473
businessStore.resetCurrentBusiness()
476474
}
@@ -489,7 +487,8 @@ export default defineComponent({
489487
}
490488
491489
const search = async () => {
492-
resetSearchState()
490+
businessStore.resetCurrentBusiness()
491+
businessStore.resetFilingID()
493492
494493
if (isFormValid()) {
495494
localVars.searchActive = true

0 commit comments

Comments
 (0)