From 4973a8a6b8f405d65ec8973d8ba91a4bb9724f32 Mon Sep 17 00:00:00 2001
From: Viswas Haridas
 <37623357+JustARatherRidiculouslyLongUsername@users.noreply.github.com>
Date: Thu, 12 Dec 2024 13:03:28 +0530
Subject: [PATCH] fix: update login error flow and fix redirect url (#1117)

---
 .../business-central-onboarding-landing.component.html    | 6 +++---
 .../business-central-onboarding-landing.component.ts      | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/app/integrations/business-central/business-central-onboarding/business-central-onboarding-landing/business-central-onboarding-landing.component.html b/src/app/integrations/business-central/business-central-onboarding/business-central-onboarding-landing/business-central-onboarding-landing.component.html
index a8428cf09..264ebdc7a 100644
--- a/src/app/integrations/business-central/business-central-onboarding/business-central-onboarding-landing/business-central-onboarding-landing.component.html
+++ b/src/app/integrations/business-central/business-central-onboarding/business-central-onboarding-landing/business-central-onboarding-landing.component.html
@@ -1,4 +1,4 @@
-<div *ngIf="!isIncorrectQBOConnectedDialogVisible">
+<div *ngIf="!isIncorrectBCConnectedDialogVisible">
     <div>
         <app-landing-page-header [logoWidth]="'65px'" [logoStyleClasses]="'tw-p-0'" [logoSectionStyleClasses]="''" [iconPath]="'assets/logos/BusinessCentral-logo.svg'" [appName]="'Dynamics 365 Business Central'" [appDescription]="'Import data from Dynamics 365 Business Central to ' + brandingConfig.brandName + ' and Export expenses from ' + brandingConfig.brandName + ' to Dynamics 365 Business Central. '" [isLoading]="false" [isIntegrationSetupInProgress]="businessCentralConnectionInProgress" [isIntegrationConnected]="isIntegrationConnected" [redirectLink]="redirectLink" [buttonText]="'Connect'" [postConnectionRoute]="'business_central/onboarding/connector'" (connectIntegration)="connectBusinessCentral()"></app-landing-page-header>
     </div>
@@ -6,9 +6,9 @@
         <app-landing-page-body [headlineText]="'Guide to setup your Integrations'" [headerText]="'A quick guide to help you set up the integration quick and easy.'" [svgPath]="'assets/flow-charts/ms-dynamics-flow-chart.svg'" [appName]="appName"></app-landing-page-body>
     </div>
 </div>
-<app-configuration-confirmation-dialog *ngIf="isIncorrectQBOConnectedDialogVisible"
+<app-configuration-confirmation-dialog *ngIf="isIncorrectBCConnectedDialogVisible"
     (warningAccepted)="acceptWarning($event)"
-    [isWarningVisible]="isIncorrectQBOConnectedDialogVisible"
+    [isWarningVisible]="isIncorrectBCConnectedDialogVisible"
     [headerText]="'Incorrect account selected'"
     [contextText]="'You had previously set up the integration with a different Dynamic 365 Business Central account. Please choose the same to restore the settings'"
     [confirmBtnText]="'Re connect'"
diff --git a/src/app/integrations/business-central/business-central-onboarding/business-central-onboarding-landing/business-central-onboarding-landing.component.ts b/src/app/integrations/business-central/business-central-onboarding/business-central-onboarding-landing/business-central-onboarding-landing.component.ts
index c06032099..0c47dfdea 100644
--- a/src/app/integrations/business-central/business-central-onboarding/business-central-onboarding-landing/business-central-onboarding-landing.component.ts
+++ b/src/app/integrations/business-central/business-central-onboarding/business-central-onboarding-landing/business-central-onboarding-landing.component.ts
@@ -33,7 +33,7 @@ export class BusinessCentralOnboardingLandingComponent implements OnInit, OnDest
 
   private oauthCallbackSubscription: Subscription;
 
-  isIncorrectQBOConnectedDialogVisible: boolean;
+  isIncorrectBCConnectedDialogVisible: boolean;
 
   constructor(
     private helperService: HelperService,
@@ -45,9 +45,9 @@ export class BusinessCentralOnboardingLandingComponent implements OnInit, OnDest
   ) { }
 
   acceptWarning(data: ConfigurationWarningOut): void {
-    this.isIncorrectQBOConnectedDialogVisible = false;
+    this.isIncorrectBCConnectedDialogVisible = false;
     if (data.hasAccepted) {
-      this.router.navigate([`/integrations/qbo/onboarding/landing`]);
+      this.router.navigate([`/integrations/business_central/onboarding/landing`]);
     }
   }
 
@@ -72,7 +72,7 @@ export class BusinessCentralOnboardingLandingComponent implements OnInit, OnDest
     }, (error) => {
       const errorMessage = 'message' in error.error ? error.error.message : 'Failed to connect to Dynamic 365 Business Central. Please try again';
       if (errorMessage === 'Please choose the correct Dynamic 365 Business Central account') {
-        this.isIncorrectQBOConnectedDialogVisible = false;
+        this.isIncorrectBCConnectedDialogVisible = true;
       } else {
         this.toastService.displayToastMessage(ToastSeverity.ERROR, errorMessage);
         this.router.navigate([`/integrations/business_central/onboarding/landing`]);