@bnsights/bbsf-admin-portal 1.1.43 → 1.1.45
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/README.md
CHANGED
|
@@ -5,7 +5,15 @@ BBSF Admin Portal package is part of BBSF 3 packages. It hosts all the angular m
|
|
|
5
5
|
For more info please visit [BBSF documentation](https://bnsightsprojects.visualstudio.com/BBSF%203/_wiki/wikis/BBSF-3.wiki/65/BBSF-Documentation)
|
|
6
6
|
|
|
7
7
|
# Change Log
|
|
8
|
-
## 1.1.
|
|
8
|
+
## 1.1.45 / 12-06-2024
|
|
9
|
+
===================
|
|
10
|
+
* hot fix callback error from uaepass redirection
|
|
11
|
+
|
|
12
|
+
## 1.1.44 / 11-06-2024
|
|
13
|
+
===================
|
|
14
|
+
* hot fix after uae pass authenticated with 'ar' user redirect to 'en' site
|
|
15
|
+
|
|
16
|
+
## 1.1.43 / 11-06-2024
|
|
9
17
|
===================
|
|
10
18
|
* Update login screen when is auth with uae pass enabled.
|
|
11
19
|
|
|
@@ -20,10 +20,10 @@ export class AuthCallbackComponent {
|
|
|
20
20
|
}
|
|
21
21
|
loginCallback() {
|
|
22
22
|
let redirectURL = `${this.environmentService.getBaseUrl()}${this.environmentService.getUAEPassRedirectUrl()}`;
|
|
23
|
-
if (this.route.snapshot.queryParamMap.get('
|
|
23
|
+
if (this.route.snapshot.queryParamMap.get('error')) {
|
|
24
24
|
this.error = true;
|
|
25
|
-
let urlError = this.route.snapshot.queryParamMap.get('
|
|
26
|
-
this.errorString = urlError
|
|
25
|
+
let urlError = this.route.snapshot.queryParamMap.get('error');
|
|
26
|
+
this.errorString = urlError === 'null' ? "SomethingWentWrong" : urlError;
|
|
27
27
|
setTimeout(() => {
|
|
28
28
|
this.router.navigate(['/Admin/account/login']);
|
|
29
29
|
}, this.logoutTimeout);
|
|
@@ -40,6 +40,7 @@ export class AuthCallbackComponent {
|
|
|
40
40
|
next: async (res) => {
|
|
41
41
|
if (!res.hasError) {
|
|
42
42
|
await this.authService.handleAccessToken(res.result);
|
|
43
|
+
localStorage.setItem('language', this.state);
|
|
43
44
|
this.router.navigate([this.authService.getUrl()]);
|
|
44
45
|
return;
|
|
45
46
|
}
|
|
@@ -69,4 +70,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.0.6", ngImpor
|
|
|
69
70
|
type: Component,
|
|
70
71
|
args: [{ selector: 'app-auth-callback', template: "<div class=\"w-100\">\r\n <div *ngIf=\"error\" class=\"row justify-content-center\">\r\n <div class=\"col-12 text-center\">\r\n <div class=\"alert alert-warning\" role=\"alert\">\r\n {{utilityService.getResourceValue(errorString)}}\r\n </div>\r\n </div>\r\n </div>\r\n</div>", styles: [".alert{margin:0;font-size:19px;word-wrap:break-word;white-space:pre-line}\n"] }]
|
|
71
72
|
}], ctorParameters: () => [{ type: i1.AuthService }, { type: i2.AccountService }, { type: i3.Router }, { type: i3.ActivatedRoute }, { type: i1.EnvironmentService }, { type: i1.UtilityService }] });
|
|
72
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
73
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"auth-callback.component.js","sourceRoot":"","sources":["../../../../../../../projects/bbsf-admin-portal/src/lib/Pages/authentication/auth-callback/auth-callback.component.ts","../../../../../../../projects/bbsf-admin-portal/src/lib/Pages/authentication/auth-callback/auth-callback.component.html"],"names":[],"mappings":"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","sourcesContent":["import { Component, OnInit } from '@angular/core';\r\nimport { ActivatedRoute, Router } from '@angular/router';\r\nimport { AuthService, EnvironmentService, UtilityService } from '@bnsights/bbsf-utilities';\r\nimport { AccountService } from '../../shared/Services/AccountService.service';\r\n\r\n@Component({\r\n  selector: 'app-auth-callback',\r\n  templateUrl: './auth-callback.component.html',\r\n  styleUrls: ['./auth-callback.component.css']\r\n})\r\nexport class AuthCallbackComponent implements OnInit {\r\n\r\n  error: boolean;\r\n  code: string;\r\n  state: string;\r\n  errorString: string = undefined;\r\n  logoutTimeout = parseInt(this.environmentService.getEnvironmentObject()[\"BBSF_UAEPass_ErrorTimeoutInSec\"] ?? \"20\") * 1000;\r\n\r\n  constructor(\r\n    private authService: AuthService,\r\n    private accountService: AccountService,\r\n    private router: Router,\r\n    private route: ActivatedRoute,\r\n    private environmentService: EnvironmentService,\r\n    public utilityService: UtilityService) { }\r\n\r\n  async ngOnInit() {\r\n    this.loginCallback();\r\n  }\r\n\r\n  loginCallback() {\r\n    let redirectURL = `${this.environmentService.getBaseUrl()}${this.environmentService.getUAEPassRedirectUrl()}`;\r\n\r\n    if (this.route.snapshot.queryParamMap.get('error')) {\r\n      this.error = true;\r\n      let urlError = this.route.snapshot.queryParamMap.get('error');\r\n      this.errorString = urlError === 'null' ? \"SomethingWentWrong\" : urlError;\r\n\r\n      setTimeout(() => {\r\n        this.router.navigate(['/Admin/account/login']);\r\n      }, this.logoutTimeout);\r\n      return;\r\n    }\r\n\r\n    this.code = this.route.snapshot.queryParamMap.get('code');\r\n    this.state = this.route.snapshot.queryParamMap.get('state');\r\n\r\n    let lang = localStorage.getItem('language');\r\n\r\n    if (!lang)\r\n      localStorage.setItem('language', this.state);\r\n\r\n    this.accountService\r\n      .UAEPassLogin({ accessCode: this.code, redirectUrl: redirectURL, organizationID_GUID: '4A4F22F9-97BA-4928-82A3-B689B413BCAC' })\r\n      .subscribe({\r\n        next: async res => {\r\n          if (!res.hasError) {\r\n            await this.authService.handleAccessToken(res.result);\r\n            localStorage.setItem('language', this.state);\r\n            this.router.navigate([this.authService.getUrl()]);\r\n            return;\r\n          } else {\r\n            this.error = res.hasError;\r\n            this.errorString = res.errorMsg;\r\n            setTimeout(() => {\r\n              this.authService.logoutFromUAEPass();\r\n            }, this.logoutTimeout);\r\n            return;\r\n          }\r\n        },\r\n        error: err => {\r\n          this.error = true;\r\n          this.errorString = \"SomethingWentWrong\";\r\n          setTimeout(() => {\r\n            this.authService.logoutFromUAEPass();\r\n          }, this.logoutTimeout);\r\n          return;\r\n        }\r\n      });\r\n  }\r\n}\r\n","<div class=\"w-100\">\r\n  <div *ngIf=\"error\" class=\"row justify-content-center\">\r\n    <div class=\"col-12 text-center\">\r\n      <div class=\"alert alert-warning\" role=\"alert\">\r\n        {{utilityService.getResourceValue(errorString)}}\r\n      </div>\r\n    </div>\r\n  </div>\r\n</div>"]}
|
|
@@ -17659,10 +17659,10 @@ class AuthCallbackComponent {
|
|
|
17659
17659
|
}
|
|
17660
17660
|
loginCallback() {
|
|
17661
17661
|
let redirectURL = `${this.environmentService.getBaseUrl()}${this.environmentService.getUAEPassRedirectUrl()}`;
|
|
17662
|
-
if (this.route.snapshot.queryParamMap.get('
|
|
17662
|
+
if (this.route.snapshot.queryParamMap.get('error')) {
|
|
17663
17663
|
this.error = true;
|
|
17664
|
-
let urlError = this.route.snapshot.queryParamMap.get('
|
|
17665
|
-
this.errorString = urlError
|
|
17664
|
+
let urlError = this.route.snapshot.queryParamMap.get('error');
|
|
17665
|
+
this.errorString = urlError === 'null' ? "SomethingWentWrong" : urlError;
|
|
17666
17666
|
setTimeout(() => {
|
|
17667
17667
|
this.router.navigate(['/Admin/account/login']);
|
|
17668
17668
|
}, this.logoutTimeout);
|
|
@@ -17679,6 +17679,7 @@ class AuthCallbackComponent {
|
|
|
17679
17679
|
next: async (res) => {
|
|
17680
17680
|
if (!res.hasError) {
|
|
17681
17681
|
await this.authService.handleAccessToken(res.result);
|
|
17682
|
+
localStorage.setItem('language', this.state);
|
|
17682
17683
|
this.router.navigate([this.authService.getUrl()]);
|
|
17683
17684
|
return;
|
|
17684
17685
|
}
|