fix: fix for integrations on admin dashboard when multiple admins are present (#996)

Author: div360

src/app/auth/login/login.component.ts

@@ -47,9 +47,9 @@ export class LoginComponent implements OnInit {
     private userService: UserService
   ) { }
 
-  private redirect(redirectUri: string | undefined): void {
+  private redirect(redirectUri: string | undefined, code:string): void {
     if (redirectUri) {
-      this.router.navigate([redirectUri]);
+      brandingConfig.brandId === 'co' ? this.router.navigate([redirectUri], { queryParams: { code: code } }) : this.router.navigate([redirectUri]);
     } else {
       this.router.navigate(['/integrations']);
     }
@@ -106,9 +106,9 @@ export class LoginComponent implements OnInit {
             this.helperService.setBaseApiURL(AppUrl.XERO);
             this.xeroAuthService.loginWithRefreshToken(clusterDomainWithToken.tokens.refresh_token).subscribe();
           }
-          this.redirect(redirectUri);
+          this.redirect(redirectUri, code);
         } else {
-          this.redirect(redirectUri);
+          this.redirect(redirectUri, code);
         }
       });
     });

src/app/integrations/intacct/intacct.component.ts

@@ -1,5 +1,5 @@
 import { Component, Inject, OnInit } from '@angular/core';
-import { NavigationEnd, Router } from '@angular/router';
+import { NavigationEnd, Router, ActivatedRoute } from '@angular/router';
 import { MinimalUser } from 'src/app/core/models/db/user.model';
 import { AppName, AppUrl, IntacctOnboardingState } from 'src/app/core/models/enum/enum.model';
 import { IntacctWorkspace } from 'src/app/core/models/intacct/db/workspaces.model';
@@ -9,6 +9,7 @@ import { WindowService } from 'src/app/core/services/common/window.service';
 import { AppcuesService } from 'src/app/core/services/integration/appcues.service';
 import { UserService } from 'src/app/core/services/misc/user.service';
 import { SiWorkspaceService } from 'src/app/core/services/si/si-core/si-workspace.service';
+import { SiAuthService } from 'src/app/core/services/si/si-core/si-auth.service';
 
 @Component({
   selector: 'app-intacct',
@@ -29,10 +30,12 @@ export class IntacctComponent implements OnInit {
     private appcuesService: AppcuesService,
     private helperService: HelperService,
     private router: Router,
+    private route: ActivatedRoute,
     private storageService: StorageService,
     private userService: UserService,
     private windowService: WindowService,
-    private workspaceService: SiWorkspaceService
+    private workspaceService: SiWorkspaceService,
+    private siAuthService: SiAuthService
   ) {
     this.windowReference = this.windowService.nativeWindow;
   }
@@ -77,13 +80,26 @@ export class IntacctComponent implements OnInit {
     );
   }
 
+  private handleAuthParameters(): void {
+    this.route.queryParams.subscribe(params => {
+      const authCode = params.code;
+      if (authCode) {
+        this.siAuthService.loginWithAuthCode(authCode).subscribe(
+          () => this.getOrCreateWorkspace()
+        );
+      } else {
+        this.getOrCreateWorkspace();
+      }
+    });
+  }
+
   ngOnInit(): void {
     this.router.events.subscribe((event) => {
       if (event instanceof NavigationEnd) {
         (window as any).Appcues && (window as any).Appcues.page();
       }
     });
-    this.getOrCreateWorkspace();
+    this.handleAuthParameters();
   }
 
 }

src/app/integrations/netsuite/netsuite.component.ts

@@ -1,5 +1,5 @@
 import { Component, Inject, OnInit } from '@angular/core';
-import { Router } from '@angular/router';
+import { Router, ActivatedRoute } from '@angular/router';
 import { MinimalUser } from 'src/app/core/models/db/user.model';
 import { NetsuiteOnboardingState } from 'src/app/core/models/enum/enum.model';
 import { NetsuiteWorkspace } from 'src/app/core/models/netsuite/db/netsuite-workspace.model';
@@ -8,7 +8,7 @@ import { StorageService } from 'src/app/core/services/common/storage.service';
 import { WindowService } from 'src/app/core/services/common/window.service';
 import { WorkspaceService } from 'src/app/core/services/common/workspace.service';
 import { NetsuiteHelperService } from 'src/app/core/services/netsuite/netsuite-core/netsuite-helper.service';
-
+import { NetsuiteAuthService } from 'src/app/core/services/netsuite/netsuite-core/netsuite-auth.service';
 
 @Component({
   selector: 'app-netsuite',
@@ -29,10 +29,12 @@ export class NetsuiteComponent implements OnInit {
   constructor(
     private netsuiteHelperService: NetsuiteHelperService,
     private router: Router,
+    private route: ActivatedRoute,
     private storageService: StorageService,
     private userService: IntegrationsUserService,
     private workspaceService: WorkspaceService,
-    private windowService: WindowService
+    private windowService: WindowService,
+    private nsAuthService: NetsuiteAuthService
   ) {
     this.windowReference = this.windowService.nativeWindow;
   }
@@ -77,7 +79,21 @@ export class NetsuiteComponent implements OnInit {
     );
   }
 
+  private handleAuthParameters(): void {
+    this.route.queryParams.subscribe(params => {
+      const authCode = params.code;
+
+      if (authCode) {
+        this.nsAuthService.loginWithAuthCode(authCode).subscribe(
+          () => this.setupWorkspace()
+        );
+      } else {
+        this.setupWorkspace();
+      }
+    });
+  }
+
   ngOnInit(): void {
-    this.setupWorkspace();
+    this.handleAuthParameters();
   }
 }

src/app/integrations/qbo/qbo.component.ts

@@ -1,5 +1,5 @@
 import { Component, Inject, OnInit } from '@angular/core';
-import { Router } from '@angular/router';
+import { Router, ActivatedRoute } from '@angular/router';
 import { MinimalUser } from 'src/app/core/models/db/user.model';
 import { AppUrl, QBOOnboardingState } from 'src/app/core/models/enum/enum.model';
 import { QBOWorkspace } from 'src/app/core/models/qbo/db/qbo-workspace.model';
@@ -9,6 +9,7 @@ import { StorageService } from 'src/app/core/services/common/storage.service';
 import { WindowService } from 'src/app/core/services/common/window.service';
 import { WorkspaceService } from 'src/app/core/services/common/workspace.service';
 import { QboHelperService } from 'src/app/core/services/qbo/qbo-core/qbo-helper.service';
+import { QboAuthService } from 'src/app/core/services/qbo/qbo-core/qbo-auth.service';
 
 @Component({
   selector: 'app-qbo',
@@ -29,6 +30,8 @@ export class QboComponent implements OnInit {
     private helperService: HelperService,
     private qboHelperService: QboHelperService,
     private router: Router,
+    private route: ActivatedRoute,
+    private qboAuthService: QboAuthService,
     private storageService: StorageService,
     private userService: IntegrationsUserService,
     private workspaceService: WorkspaceService,
@@ -77,8 +80,22 @@ export class QboComponent implements OnInit {
     );
   }
 
+  private handleAuthParameters(): void {
+    this.route.queryParams.subscribe(params => {
+      const authCode = params.code;
+
+      if (authCode) {
+        this.qboAuthService.loginWithAuthCode(authCode).subscribe(
+          () => this.setupWorkspace()
+        );
+      } else {
+        this.setupWorkspace();
+      }
+    });
+  }
+
   ngOnInit(): void {
-    this.setupWorkspace();
+    this.handleAuthParameters();
   }
 
 }

src/app/integrations/xero/xero.component.ts

@@ -1,5 +1,5 @@
 import { Component, Inject, OnInit } from '@angular/core';
-import { Router } from '@angular/router';
+import { Router, ActivatedRoute } from '@angular/router';
 import { MinimalUser } from 'src/app/core/models/db/user.model';
 import { AppUrl, XeroOnboardingState } from 'src/app/core/models/enum/enum.model';
 import { XeroWorkspace } from 'src/app/core/models/xero/db/xero-workspace.model';
@@ -9,6 +9,7 @@ import { WindowService } from 'src/app/core/services/common/window.service';
 import { WorkspaceService } from 'src/app/core/services/common/workspace.service';
 import { UserService } from 'src/app/core/services/misc/user.service';
 import { XeroHelperService } from 'src/app/core/services/xero/xero-core/xero-helper.service';
+import { XeroAuthService } from 'src/app/core/services/xero/xero-core/xero-auth.service';
 
 @Component({
   selector: 'app-xero',
@@ -27,12 +28,14 @@ export class XeroComponent implements OnInit {
 
   constructor(
     private router: Router,
+    private route: ActivatedRoute,
     private storageService: StorageService,
     private xeroHelperService: XeroHelperService,
     private userService: UserService,
     private windowService: WindowService,
     private workspaceService: WorkspaceService,
-    private helperService: HelperService
+    private helperService: HelperService,
+    private xeroAuthService: XeroAuthService
   ) {
     this.windowReference = this.windowService.nativeWindow;
   }
@@ -86,8 +89,22 @@ export class XeroComponent implements OnInit {
     });
   }
 
+  private handleAuthParameters(): void {
+    this.route.queryParams.subscribe(params => {
+      const authCode = params.code;
+
+      if (authCode) {
+        this.xeroAuthService.login(authCode).subscribe(
+          () => this.setupWorkspace()
+        );
+      } else {
+        this.setupWorkspace();
+      }
+    });
+  }
+
   ngOnInit(): void {
-    this.setupWorkspace();
+    this.handleAuthParameters();
   }