Merge branch 'main' of https://github.com/Jxio/sbc-auth into 21131_2

Author: Jxio

auth-api/migrations/README

@@ -1,3 +1,3 @@
 Generic single-database configuration.
 
-1. Proper usage of migrations: python manage.py db migrate
+1. Add a new migration: /migrations  poetry run alembic revision --autogenerate -m "migration message"

auth-api/migrations/alembic.ini

@@ -2,6 +2,7 @@
 
 [alembic]
 # template used to generate migration files
+script_location = .
 file_template = %%(year)d_%%(month).2d_%%(day).2d_%%(rev)s_%%(slug)s
 
 # set to 'true' to run the environment during

auth-api/src/auth_api/utils/util.py

@@ -74,11 +74,15 @@ def mask_email(email: str) -> str:
 
 def get_request_environment():
     """Return the environment corresponding to the user request."""
-    env = None
-    sandbox_host = current_app.config["AUTH_WEB_SANDBOX_HOST"]
-    if os.getenv("FLASK_ENV") == "production" and sandbox_host in request.host_url:
-        env = "sandbox"
-    return env
+    env_override = request.headers.get("Environment-Override")
+    sandbox_host = current_app.config.get("AUTH_WEB_SANDBOX_HOST")
+    is_production = os.getenv("FLASK_ENV") == "production"
+
+    if env_override:
+        return env_override
+    if is_production and sandbox_host in request.host_url:
+        return "sandbox"
+    return None
 
 
 def extract_numbers(input_string: str):

auth-web/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "auth-web",
-  "version": "2.6.127",
+  "version": "2.6.128",
   "appName": "Auth Web",
   "sbcName": "SBC Common Components",
   "private": true,

auth-web/package.json

@@ -10,5 +10,6 @@ export const productDisplay = {
   [Product.PPR]: 'Personal Property Registry',
   [Product.RPPR]: 'Restricted Personal Property Registry',
   [Product.RPT]: 'Rural Property Tax',
+  [Product.STRR]: 'Short-Term Rental Registry',
   [Product.VS]: 'Vital Statistics'
 }

auth-web/src/resources/display-mappers/product-display.ts

@@ -33,6 +33,7 @@ export const TransactionTableHeaders: BaseTableHeaderI[] = [
         { text: productDisplay[Product.PPR], value: Product.PPR },
         { text: productDisplay[Product.RPPR], value: Product.RPPR },
         { text: productDisplay[Product.RPT], value: Product.RPT },
+        { text: productDisplay[Product.STRR], value: Product.STRR },
         { text: productDisplay[Product.VS], value: Product.VS }
       ],
       label: 'Application Type',

auth-web/src/resources/table-headers/transactions-table/headers.ts

@@ -48,6 +48,10 @@ export default class BusinessService {
     return axios.get(`${ConfigHelper.getLegalAPIV2Url()}/businesses/${businessRegNumber}/filings`)
   }
 
+  static async searchFiling (filingID: string): Promise<AxiosResponse<any>> {
+    return axios.get(`${ConfigHelper.getLegalAPIV2Url()}/businesses/filings/search/${filingID}`)
+  }
+
   static async updateFolioNumber (folioNumber: FolioNumberload): Promise<AxiosResponse<any>> {
     return axios.patch(`${ConfigHelper.getAuthAPIUrl()}/entities/${folioNumber.businessIdentifier}`, folioNumber)
   }

auth-web/src/services/business.services.ts

@@ -37,7 +37,8 @@ export const useBusinessStore = defineStore('business', () => {
   const state = reactive({
     currentBusiness: undefined as Business,
     businesses: [] as Business[],
-    removeExistingAffiliationInvitation: false
+    removeExistingAffiliationInvitation: false,
+    filingID: ''
   })
 
   function $reset () {
@@ -268,6 +269,26 @@ export const useBusinessStore = defineStore('business', () => {
     }
   }
 
+  async function loadFiling () {
+    const filingID = ConfigHelper.getFromSession(SessionStorageKeys.FilingIdentifierKey)
+    state.filingID = filingID
+    const response = await BusinessService.searchFiling(filingID).catch(() => null)
+    if (response?.status === 200) {
+      const businessIdentifier = response?.data.filing.business.identifier
+      ConfigHelper.addToSession(SessionStorageKeys.BusinessIdentifierKey, businessIdentifier)
+
+      if (!state.currentBusiness) {
+        state.currentBusiness = {} as Business
+      }
+
+      state.currentBusiness.businessIdentifier = businessIdentifier
+    } else if (response?.status === 404) {
+      throw Error('No match found for Filing Number')
+    } else {
+      throw Error('Search failed')
+    }
+  }
+
   async function addBusiness (payload: LoginPayload) {
     const requestBody: CreateAffiliationRequestBody = {
       businessIdentifier: payload.businessIdentifier,
@@ -558,6 +579,11 @@ export const useBusinessStore = defineStore('business', () => {
     ConfigHelper.removeFromSession(SessionStorageKeys.BusinessIdentifierKey)
   }
 
+  function resetFilingID (): void {
+    state.filingID = ''
+    ConfigHelper.removeFromSession(SessionStorageKeys.FilingIdentifierKey)
+  }
+
   async function resetBusinessPasscode (passCodeResetLoad: PasscodeResetLoad) {
     await BusinessService.resetBusinessPasscode(passCodeResetLoad)
   }
@@ -571,6 +597,7 @@ export const useBusinessStore = defineStore('business', () => {
     currentOrganization,
     syncBusinesses,
     loadBusiness,
+    loadFiling,
     addBusiness,
     addNameRequest,
     createNamedBusiness,
@@ -589,6 +616,7 @@ export const useBusinessStore = defineStore('business', () => {
     saveContact,
     updateFolioNumber,
     resetCurrentBusiness,
+    resetFilingID,
     resetBusinessPasscode,
     searchNRIndex,
     setRemoveExistingAffiliationInvitation,

auth-web/src/stores/business.ts

@@ -3,6 +3,7 @@ export enum SessionStorageKeys {
     KeyCloakToken = 'KEYCLOAK_TOKEN',
     ApiConfigKey = 'AUTH_API_CONFIG',
     BusinessIdentifierKey = 'BUSINESS_ID',
+    FilingIdentifierKey = 'FILING_ID',
     CurrentAccount = 'CURRENT_ACCOUNT',
     LaunchDarklyFlags = 'LD_FLAGS',
     ExtraProvincialUser = 'EXTRAPROVINCIAL_USER',
@@ -640,6 +641,7 @@ export enum Product {
     PPR = 'PPR',
     RPPR = 'RPPR',
     RPT = 'RPT',
+    STRR = 'STRR',
     VS = 'VS'
 }
 

auth-web/src/util/constants.ts

@@ -83,6 +83,7 @@ export default class IncorporationSearchResultView extends Vue {
   @Action(useOrgStore) readonly syncMembership!: (affiliatedOrganizationId: number) => Promise<Member>
   @Action(useOrgStore) readonly setCurrentAccountSettings!: (accountSettings: AccountSettings) => void
   @State(useBusinessStore) currentBusiness!: Business
+  @State(useBusinessStore) filingID!: string
 
   @Prop({ default: false }) isVisible: boolean
   @Prop() affiliatedOrg: Organization
@@ -94,9 +95,9 @@ export default class IncorporationSearchResultView extends Vue {
   get actions (): object[] {
     if (this.isThereAnAffiliatedAccount) {
       return [
-        { title: 'Entity Dashboard',
+        { title: 'Manage Business',
           icon: 'mdi-view-dashboard',
-          event: this.entityDashboardEvent
+          event: this.manageBusinessEvent
         },
         { title: 'Manage Account',
           icon: 'mdi-domain',
@@ -105,9 +106,9 @@ export default class IncorporationSearchResultView extends Vue {
       ]
     } else {
       return [
-        { title: 'Entity Dashboard',
+        { title: 'Manage Business',
           icon: 'mdi-view-dashboard',
-          event: this.entityDashboardEvent
+          event: this.manageBusinessEvent
         },
         { title: 'Generate Passcode',
           icon: 'mdi-lock-outline',
@@ -122,7 +123,7 @@ export default class IncorporationSearchResultView extends Vue {
       name: this.currentBusiness?.name,
       orgType: this.affiliatedOrg?.orgType,
       account: this.affiliatedOrg?.name || 'No Affiliation',
-      businessIdentifier: this.currentBusiness?.businessIdentifier,
+      businessIdentifier: this.filingID || this.currentBusiness?.businessIdentifier,
       businessNumber: this.currentBusiness?.businessNumber,
       accessType: this.affiliatedOrg?.accessType,
       statusCode: this.affiliatedOrg?.statusCode
@@ -137,7 +138,7 @@ export default class IncorporationSearchResultView extends Vue {
       width: '25%'
     },
     {
-      text: 'Entity#',
+      text: 'Number',
       align: 'left',
       sortable: false,
       value: 'businessIdentifier',
@@ -176,8 +177,17 @@ export default class IncorporationSearchResultView extends Vue {
     return orgTypeDisplay
   }
 
-  async entityDashboardEvent () {
-    window.location.href = `${ConfigHelper.getBusinessURL()}${this.currentBusiness.businessIdentifier}`
+  async manageBusinessEvent () {
+    const businessIdentifier = this.currentBusiness.businessIdentifier
+    const filingId = this.filingID
+
+    let url = `${ConfigHelper.getBusinessURL()}${businessIdentifier}`
+
+    if (filingId) {
+      url += `?filing_id=${filingId}`
+    }
+
+    window.location.href = url
   }
 
   async manageAccountEvent () {
@@ -188,7 +198,7 @@ export default class IncorporationSearchResultView extends Vue {
       this.$router.push(`/account/${this.currentOrganization.id}/business`)
     } catch (error) {
       // eslint-disable-next-line no-console
-      console.log('Error during entity dashboard click event!')
+      console.log('Error during manage business click event!')
     }
   }