diff --git a/src/app/auth/login/login.component.ts b/src/app/auth/login/login.component.ts index f6c00d2ee..1d10e5e43 100644 --- a/src/app/auth/login/login.component.ts +++ b/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]); + this.router.navigate([redirectUri + `?code=${code}`] ); } 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); } }); }); diff --git a/src/app/integrations/intacct/intacct.component.ts b/src/app/integrations/intacct/intacct.component.ts index 1bbdb3437..8f52edf9b 100644 --- a/src/app/integrations/intacct/intacct.component.ts +++ b/src/app/integrations/intacct/intacct.component.ts @@ -82,10 +82,9 @@ export class IntacctComponent implements OnInit { private handleAuthParameters(): void { this.route.queryParams.subscribe(params => { - const loginRequired = params.login_required === 'true'; const authCode = params.authCode; - if (loginRequired && authCode) { + if ( authCode) { this.siAuthService.loginWithAuthCode(authCode).subscribe( () => this.getOrCreateWorkspace() ); diff --git a/src/app/integrations/xero/xero.component.ts b/src/app/integrations/xero/xero.component.ts index 32c897199..b9893baff 100644 --- a/src/app/integrations/xero/xero.component.ts +++ b/src/app/integrations/xero/xero.component.ts @@ -91,10 +91,9 @@ export class XeroComponent implements OnInit { private handleAuthParameters(): void { this.route.queryParams.subscribe(params => { - const loginRequired = params.login_required === 'true'; const authCode = params.code; - if (loginRequired && authCode) { + if (authCode) { this.xeroAuthService.login(authCode).subscribe( () => this.setupWorkspace() );