ms guard updation (#523)

* ms guard updation
fylein · Feb 7, 2024 · 5d3cd12 · 5d3cd12
1 parent 7225b83
commit 5d3cd12
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 7 deletions.
diff --git a/src/app/core/guard/business-central-token.guard.ts b/src/app/core/guard/business-central-token.guard.ts
@@ -30,7 +30,8 @@ export class BusinessCentralTokenGuard implements CanActivate {
 
       return forkJoin(
         [
-          this.businessCentralConnectorService.getBusinessCentralCredentials()
+          this.businessCentralConnectorService.getBusinessCentralCredentials(),
+          this.businessCentralConnectorService.getBusinessCentralConnection()
         ]
       ).pipe(
         map(response => !!response),

diff --git a/...ces/business-central/business-central-configuration/business-central-connector.service.ts b/...ces/business-central/business-central-configuration/business-central-connector.service.ts
@@ -40,4 +40,11 @@ export class BusinessCentralConnectorService {
     return this.apiService.post(`/workspaces/${this.workspaceId}/business_central/company/`, companyPayload);
   }
 
+  @Cacheable({
+    cacheBusterObserver: businessCentralCredentialsCache$
+  })
+  getBusinessCentralConnection() {
+    return this.apiService.get(`/workspaces/${this.workspaceService.getWorkspaceId()}/business_central/connection`, {});
+  }
+
 }
diff --git a/...usiness-central/business-central-onboarding/business-central-onboarding-routing.module.ts b/...usiness-central/business-central-onboarding/business-central-onboarding-routing.module.ts
@@ -7,6 +7,7 @@ import { BusinessCentralOnboardingExportSettingsComponent } from './business-cen
 import { BusinessCentralOnboardingImportSettingsComponent } from './business-central-onboarding-import-settings/business-central-onboarding-import-settings.component';
 import { BusinessCentralOnboardingDoneComponent } from './business-central-onboarding-done/business-central-onboarding-done.component';
 import { BusinessCentralOnboardingAdvancedSettingsComponent } from './business-central-onboarding-advanced-settings/business-central-onboarding-advanced-settings.component';
+import { BusinessCentralTokenGuard } from 'src/app/core/guard/business-central-token.guard';
 
 const routes: Routes = [
   {
@@ -23,19 +24,23 @@ const routes: Routes = [
       },
       {
         path: 'export_settings',
-        component: BusinessCentralOnboardingExportSettingsComponent
+        component: BusinessCentralOnboardingExportSettingsComponent,
+        canActivate: [BusinessCentralTokenGuard]
       },
       {
         path: 'import_settings',
-        component: BusinessCentralOnboardingImportSettingsComponent
+        component: BusinessCentralOnboardingImportSettingsComponent,
+        canActivate: [BusinessCentralTokenGuard]
       },
       {
         path: 'advanced_settings',
-        component: BusinessCentralOnboardingAdvancedSettingsComponent
+        component: BusinessCentralOnboardingAdvancedSettingsComponent,
+        canActivate: [BusinessCentralTokenGuard]
       },
       {
         path: 'done',
-        component: BusinessCentralOnboardingDoneComponent
+        component: BusinessCentralOnboardingDoneComponent,
+        canActivate: [BusinessCentralTokenGuard]
       }
     ]
   }

diff --git a/src/app/integrations/business-central/business-central-routing.module.ts b/src/app/integrations/business-central/business-central-routing.module.ts
@@ -1,6 +1,7 @@
 import { NgModule } from '@angular/core';
 import { RouterModule, Routes } from '@angular/router';
 import { BusinessCentralComponent } from './business-central.component';
+import { BusinessCentralTokenGuard } from 'src/app/core/guard/business-central-token.guard';
 
 const routes: Routes = [
   {
@@ -13,7 +14,8 @@ const routes: Routes = [
       },
       {
         path: 'main',
-        loadChildren: () => import('./business-central-main/business-central-main.module').then(m => m.BusinessCentralMainModule)
+        loadChildren: () => import('./business-central-main/business-central-main.module').then(m => m.BusinessCentralMainModule),
+        canActivate: [BusinessCentralTokenGuard]
       }
     ]
   }

diff --git a/...l-shared/business-central-export-settings/business-central-export-settings.component.html b/...l-shared/business-central-export-settings/business-central-export-settings.component.html
@@ -187,7 +187,7 @@
                             [isFieldMandatory]="true"
                             [mandatoryErrorListName]="'Default Vendor Name'"
                             [label]="'Set the Default Vendor as?'"
-                            [subLabel]="'The integration will assign the Corporate Card Expenses that is exported as Purchase invoice to the Vendor selected here.'"
+                            [subLabel]="'The integration will assign the Corporate Card Expenses that is exported as Journal Entry to the Vendor selected here.'"
                             [destinationAttributes]="vendorOptions"
                             [iconPath]="'list'"
                             [placeholder]="'Select default Vendor'"