@bnsights/bbsf-utilities 1.0.47 → 1.0.48
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 +4 -1
- package/bnsights-bbsf-utilities-1.0.48.tgz +0 -0
- package/esm2022/lib/bbsf-utilities.module.mjs +3 -3
- package/esm2022/lib/shared/authentication/auth.service.mjs +18 -5
- package/fesm2022/bnsights-bbsf-utilities.mjs +19 -6
- package/fesm2022/bnsights-bbsf-utilities.mjs.map +1 -1
- package/lib/shared/authentication/auth.service.d.ts +1 -1
- package/package.json +1 -1
- package/bnsights-bbsf-utilities-1.0.47.tgz +0 -0
package/README.md
CHANGED
|
@@ -5,7 +5,10 @@ BBSF Utilities package is part of BBSF 3 packages. It has all the common service
|
|
|
5
5
|
For more info please visit [BBSF Controls documenation](https://bbsfadmin.bnsights.com/controls) or [BBSF documentation](https://bnsightsprojects.visualstudio.com/BBSF%203/_wiki/wikis/BBSF-3.wiki/65/BBSF-Documentation)
|
|
6
6
|
|
|
7
7
|
# Change Log
|
|
8
|
-
## 1.0.
|
|
8
|
+
## 1.0.48 / 5-3-2024
|
|
9
|
+
===================
|
|
10
|
+
-Update AuthService To Handel Cookies
|
|
11
|
+
## 1.0.47 / 5-3-2024
|
|
9
12
|
===================
|
|
10
13
|
-Update AuthService To Fix Login Bug
|
|
11
14
|
## 1.0.46 / 8-2-2024
|
|
Binary file
|
|
@@ -24,7 +24,7 @@ export class BBSFUtilitiesModule {
|
|
|
24
24
|
ControlValidationService,
|
|
25
25
|
MasterLayoutService,
|
|
26
26
|
ConfigurationService,
|
|
27
|
-
CookieService
|
|
27
|
+
CookieService,
|
|
28
28
|
], imports: [CommonModule,
|
|
29
29
|
RouterModule,
|
|
30
30
|
BlockUIModule.forRoot(),
|
|
@@ -52,8 +52,8 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.0.6", ngImpor
|
|
|
52
52
|
ControlValidationService,
|
|
53
53
|
MasterLayoutService,
|
|
54
54
|
ConfigurationService,
|
|
55
|
-
CookieService
|
|
55
|
+
CookieService,
|
|
56
56
|
]
|
|
57
57
|
}]
|
|
58
58
|
}] });
|
|
59
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
59
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmJzZi11dGlsaXRpZXMubW9kdWxlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vcHJvamVjdHMvYmJzZi11dGlsaXRpZXMvc3JjL2xpYi9iYnNmLXV0aWxpdGllcy5tb2R1bGUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLGlCQUFpQixDQUFDO0FBQy9DLE9BQU8sRUFBRSxRQUFRLEVBQUUsTUFBTSxlQUFlLENBQUM7QUFDekMsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLGlCQUFpQixDQUFDO0FBQy9DLE9BQU8sRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBQ3ZELE9BQU8sRUFBRSxhQUFhLEVBQUUsTUFBTSxhQUFhLENBQUM7QUFDNUMsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLFlBQVksQ0FBQztBQUMxQyxPQUFPLEVBQUUsYUFBYSxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFDbkQsT0FBTyxFQUNMLGNBQWMsRUFBRSxrQkFBa0IsRUFBRSxxQkFBcUIsRUFBRSxtQkFBbUIsRUFBRSxvQkFBb0IsRUFDcEcsd0JBQXdCLEVBQUUsbUJBQW1CLEVBQUUsb0JBQW9CLEVBQUUsV0FBVyxFQUNqRixNQUFNLFVBQVUsQ0FBQzs7OztBQTRCbEIsTUFBTSxPQUFPLG1CQUFtQjs4R0FBbkIsbUJBQW1COytHQUFuQixtQkFBbUIsWUF0QjVCLFlBQVk7WUFDWixZQUFZOytHQXFCSCxtQkFBbUIsYUFmbkI7WUFDVCxjQUFjO1lBQ2Qsa0JBQWtCO1lBQ2xCLFdBQVc7WUFDWCxxQkFBcUI7WUFDckIsbUJBQW1CO1lBQ25CLGdCQUFnQjtZQUNoQixvQkFBb0I7WUFDcEIsd0JBQXdCO1lBQ3hCLG1CQUFtQjtZQUNuQixvQkFBb0I7WUFDcEIsYUFBYTtTQUVkLFlBcEJDLFlBQVk7WUFDWixZQUFZO1lBQ1osYUFBYSxDQUFDLE9BQU8sRUFBRTtZQUN2QixZQUFZLENBQUMsT0FBTyxFQUFFOzsyRkFtQmIsbUJBQW1CO2tCQTFCL0IsUUFBUTttQkFBQztvQkFDUixZQUFZLEVBQUUsRUFDYjtvQkFDRCxPQUFPLEVBQUU7d0JBQ1AsWUFBWTt3QkFDWixZQUFZO3dCQUNaLGFBQWEsQ0FBQyxPQUFPLEVBQUU7d0JBQ3ZCLFlBQVksQ0FBQyxPQUFPLEVBQUU7cUJBRXZCO29CQUNELE9BQU8sRUFBRSxFQUFFO29CQUNYLFNBQVMsRUFBRTt3QkFDVCxjQUFjO3dCQUNkLGtCQUFrQjt3QkFDbEIsV0FBVzt3QkFDWCxxQkFBcUI7d0JBQ3JCLG1CQUFtQjt3QkFDbkIsZ0JBQWdCO3dCQUNoQixvQkFBb0I7d0JBQ3BCLHdCQUF3Qjt3QkFDeEIsbUJBQW1CO3dCQUNuQixvQkFBb0I7d0JBQ3BCLGFBQWE7cUJBRWQ7aUJBQ0YiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBDb21tb25Nb2R1bGUgfSBmcm9tICdAYW5ndWxhci9jb21tb24nO1xyXG5pbXBvcnQgeyBOZ01vZHVsZSB9IGZyb20gJ0Bhbmd1bGFyL2NvcmUnO1xyXG5pbXBvcnQgeyBSb3V0ZXJNb2R1bGUgfSBmcm9tICdAYW5ndWxhci9yb3V0ZXInO1xyXG5pbXBvcnQgeyBUcmFuc2xhdGVTZXJ2aWNlIH0gZnJvbSAnQG5neC10cmFuc2xhdGUvY29yZSc7XHJcbmltcG9ydCB7IEJsb2NrVUlNb2R1bGUgfSBmcm9tICduZy1ibG9jay11aSc7XHJcbmltcG9ydCB7IFRvYXN0ck1vZHVsZSB9IGZyb20gJ25neC10b2FzdHInO1xyXG5pbXBvcnQgeyBDb29raWVTZXJ2aWNlIH0gZnJvbSAnbmd4LWNvb2tpZS1zZXJ2aWNlJztcclxuaW1wb3J0IHtcclxuICBVdGlsaXR5U2VydmljZSwgRW52aXJvbm1lbnRTZXJ2aWNlLCBSZXF1ZXN0SGFuZGxlclNlcnZpY2UsIFN0eWxlc0J1bmRsZVNlcnZpY2UsIEJCU0ZUcmFuc2xhdGVTZXJ2aWNlLFxyXG4gIENvbnRyb2xWYWxpZGF0aW9uU2VydmljZSwgTWFzdGVyTGF5b3V0U2VydmljZSwgQ29uZmlndXJhdGlvblNlcnZpY2UsIEF1dGhTZXJ2aWNlXHJcbn0gZnJvbSAnLi9zaGFyZWQnO1xyXG5cclxuQE5nTW9kdWxlKHtcclxuICBkZWNsYXJhdGlvbnM6IFtcclxuICBdLFxyXG4gIGltcG9ydHM6IFtcclxuICAgIENvbW1vbk1vZHVsZSxcclxuICAgIFJvdXRlck1vZHVsZSxcclxuICAgIEJsb2NrVUlNb2R1bGUuZm9yUm9vdCgpLFxyXG4gICAgVG9hc3RyTW9kdWxlLmZvclJvb3QoKSxcclxuXHJcbiAgXSxcclxuICBleHBvcnRzOiBbXSxcclxuICBwcm92aWRlcnM6IFtcclxuICAgIFV0aWxpdHlTZXJ2aWNlLFxyXG4gICAgRW52aXJvbm1lbnRTZXJ2aWNlLFxyXG4gICAgQXV0aFNlcnZpY2UsXHJcbiAgICBSZXF1ZXN0SGFuZGxlclNlcnZpY2UsXHJcbiAgICBTdHlsZXNCdW5kbGVTZXJ2aWNlLFxyXG4gICAgVHJhbnNsYXRlU2VydmljZSxcclxuICAgIEJCU0ZUcmFuc2xhdGVTZXJ2aWNlLFxyXG4gICAgQ29udHJvbFZhbGlkYXRpb25TZXJ2aWNlLFxyXG4gICAgTWFzdGVyTGF5b3V0U2VydmljZSxcclxuICAgIENvbmZpZ3VyYXRpb25TZXJ2aWNlLFxyXG4gICAgQ29va2llU2VydmljZSxcclxuICAgIFxyXG4gIF1cclxufSlcclxuZXhwb3J0IGNsYXNzIEJCU0ZVdGlsaXRpZXNNb2R1bGUge1xyXG5cclxufVxyXG4iXX0=
|
|
@@ -43,6 +43,13 @@ export class AuthService {
|
|
|
43
43
|
else
|
|
44
44
|
this.cookieService.delete(TOKEN_KEY);
|
|
45
45
|
}
|
|
46
|
+
else {
|
|
47
|
+
localStorage.clear();
|
|
48
|
+
AuthService.timers.map(t => clearInterval(t));
|
|
49
|
+
AuthService.timers = [];
|
|
50
|
+
AuthService.user = null;
|
|
51
|
+
this.user = null;
|
|
52
|
+
}
|
|
46
53
|
return AuthService.user;
|
|
47
54
|
}
|
|
48
55
|
getUser() {
|
|
@@ -77,6 +84,7 @@ export class AuthService {
|
|
|
77
84
|
}
|
|
78
85
|
signOut() {
|
|
79
86
|
this.cookieService.deleteAll();
|
|
87
|
+
localStorage.clear();
|
|
80
88
|
AuthService.timers.map(t => clearInterval(t));
|
|
81
89
|
AuthService.timers = [];
|
|
82
90
|
AuthService.user = null;
|
|
@@ -107,6 +115,7 @@ export class AuthService {
|
|
|
107
115
|
return this.http.get(this.environmentService.getBaseUrl() + ApiUrl + 'ClearCurrentUserSession', httpOptions);
|
|
108
116
|
}
|
|
109
117
|
async handleAccessToken(response) {
|
|
118
|
+
this.cookieService.deleteAll();
|
|
110
119
|
const token = response;
|
|
111
120
|
AuthService.user = null;
|
|
112
121
|
AuthService.user = new User();
|
|
@@ -115,13 +124,14 @@ export class AuthService {
|
|
|
115
124
|
AuthService.user.profile = this.jwtHelper.decodeToken(token);
|
|
116
125
|
AuthService.user.expires_at = this.jwtHelper.getTokenExpirationDate(token);
|
|
117
126
|
this.user = AuthService.user;
|
|
118
|
-
this.cookieService.set(TOKEN_KEY, token, AuthService.user.expires_at, "
|
|
127
|
+
this.cookieService.set(TOKEN_KEY, token, AuthService.user.expires_at, "/", null, true, 'Lax');
|
|
119
128
|
this.isAuthenticatedSubject.next(true);
|
|
120
129
|
this.setTokenSeconds();
|
|
121
130
|
AuthService.timers.push(this.checkRefreshToken());
|
|
122
131
|
await this.updateLanguage();
|
|
123
132
|
}
|
|
124
133
|
handleAccessTokenWithoutLanguage(response) {
|
|
134
|
+
this.cookieService.deleteAll();
|
|
125
135
|
const token = response;
|
|
126
136
|
AuthService.user = null;
|
|
127
137
|
AuthService.user = new User();
|
|
@@ -131,7 +141,7 @@ export class AuthService {
|
|
|
131
141
|
AuthService.user.expires_at = this.jwtHelper.getTokenExpirationDate(token);
|
|
132
142
|
this.setTokenSeconds();
|
|
133
143
|
this.user = AuthService.user;
|
|
134
|
-
this.cookieService.set(TOKEN_KEY, token, AuthService.user.expires_at, "
|
|
144
|
+
this.cookieService.set(TOKEN_KEY, token, AuthService.user.expires_at, "/", null, true, 'Lax');
|
|
135
145
|
this.isAuthenticatedSubject.next(true);
|
|
136
146
|
AuthService.timers.push(this.checkRefreshToken());
|
|
137
147
|
}
|
|
@@ -154,7 +164,10 @@ export class AuthService {
|
|
|
154
164
|
if (Math.floor(AuthService.seconds) < 120 && this.isAuthenticated()) {
|
|
155
165
|
AuthService.timers.map(t => clearInterval(t));
|
|
156
166
|
AuthService.timers = [];
|
|
157
|
-
this.
|
|
167
|
+
const token = this.cookieService.get(TOKEN_KEY);
|
|
168
|
+
if (token) {
|
|
169
|
+
this.refresh();
|
|
170
|
+
}
|
|
158
171
|
}
|
|
159
172
|
AuthService.seconds--;
|
|
160
173
|
}, 1000);
|
|
@@ -164,6 +177,7 @@ export class AuthService {
|
|
|
164
177
|
AuthService.seconds = (AuthService.user.expires_at - date) / 1000;
|
|
165
178
|
}
|
|
166
179
|
refresh() {
|
|
180
|
+
this.cookieService.deleteAll();
|
|
167
181
|
const httpOptions = {
|
|
168
182
|
headers: new HttpHeaders({
|
|
169
183
|
'Content-Type': 'application/json',
|
|
@@ -172,7 +186,6 @@ export class AuthService {
|
|
|
172
186
|
};
|
|
173
187
|
let ApiUrl = '/api/Home/';
|
|
174
188
|
this.http.get(this.environmentService.getApiUrl() + ApiUrl + 'RefreshAccessToken', httpOptions).subscribe((res) => {
|
|
175
|
-
this.cookieService.delete(TOKEN_KEY);
|
|
176
189
|
this.handleAccessTokenWithoutLanguage(res.val);
|
|
177
190
|
});
|
|
178
191
|
}
|
|
@@ -214,4 +227,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.0.6", ngImpor
|
|
|
214
227
|
providedIn: 'root',
|
|
215
228
|
}]
|
|
216
229
|
}], ctorParameters: () => [{ type: i0.Injector }, { type: i1.HttpClient }, { type: i2.EnvironmentService }, { type: i2.BBSFTranslateService }, { type: i3.Router }, { type: i4.CookieService }, { type: i5.UtilityService }] });
|
|
217
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"auth.service.js","sourceRoot":"","sources":["../../../../../../projects/bbsf-utilities/src/lib/shared/authentication/auth.service.ts"],"names":[],"mappings":"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","sourcesContent":["import { HttpClient, HttpHeaders } from '@angular/common/http';\r\nimport { Injectable, Injector } from '@angular/core';\r\nimport { BehaviorSubject } from 'rxjs';\r\nimport { Router } from '@angular/router';\r\nimport { JwtHelperService } from '@auth0/angular-jwt';\r\nimport { BBSFTranslateService, EnvironmentService } from '../services';\r\nimport { User } from '../models/UserModel';\r\nimport { CookieService } from 'ngx-cookie-service';\r\nimport { UtilityService } from '../services/utility.service';\r\nimport { AuthenticationModes } from '../enums/authentication-modes-enums';\r\nconst TOKEN_KEY = 'access_token';\r\n\r\n@Injectable({\r\n  providedIn: 'root',\r\n})\r\nexport class AuthService {\r\n  public redirectUrl: string = '';\r\n  static user: User | null = null;\r\n  user: User | null;\r\n  static UserClaims: any = null;\r\n  private jwtHelper: JwtHelperService = new JwtHelperService();\r\n  private isAuthenticatedSubject = new BehaviorSubject<boolean>(this.hasToken());\r\n  isAuthenticate$ = this.isAuthenticatedSubject.asObservable();\r\n  //refresh\r\n  static timers = [];\r\n  static seconds = 0;\r\n\r\n  constructor(private injector: Injector, private http: HttpClient, private environmentService: EnvironmentService, private translateService: BBSFTranslateService, private router: Router, private cookieService: CookieService, private utilityService: UtilityService) {\r\n    this.user = this.getUserManager()\r\n  }\r\n\r\n  private hasToken(): boolean {\r\n    const token = this.cookieService.get(TOKEN_KEY);\r\n    return token && !this.jwtHelper.isTokenExpired(token);\r\n  }\r\n\r\n  getUserManager() {\r\n    const token = this.cookieService.get(TOKEN_KEY);\r\n    if (token) {\r\n      if (!this.jwtHelper.isTokenExpired(token))\r\n        this.handleAccessTokenWithoutLanguage(token)\r\n      else\r\n        this.cookieService.delete(TOKEN_KEY);\r\n    }\r\n\r\n    return AuthService.user;\r\n  }\r\n\r\n\r\n\r\n  getUser() {\r\n    this.user = AuthService.user;\r\n  }\r\n  storUser(User: any) {\r\n    AuthService.user = this.user = this.user;\r\n  }\r\n\r\n  getCurrentUser() {\r\n    return AuthService.user\r\n  }\r\n\r\n  isAuthenticated(): boolean {\r\n    return AuthService.user != null && !this.jwtHelper.isTokenExpired(AuthService.user.access_token);\r\n  }\r\n  isUserInRole(allowedPermission: number[]) {\r\n    let selectedPermissionSetID: number = Number.parseInt(\r\n      AuthService.user.profile['selectedpermissionsetid']\r\n    );\r\n    return allowedPermission.includes(selectedPermissionSetID);\r\n  }\r\n\r\n  authorizationHeaderValue(): string {\r\n    return AuthService.user\r\n      ? `${AuthService.user.token_type} ${AuthService.user.access_token}`\r\n      : '';\r\n  }\r\n\r\n  name(): string {\r\n    return AuthService.user != null ? AuthService.user.profile.given_name : '';\r\n  }\r\n  setUrl(url) {\r\n    localStorage.setItem('redirectUrl', url);\r\n  }\r\n  getUrl() {\r\n    return localStorage.getItem('redirectUrl') ?? \"/\";\r\n  }\r\n\r\n  signOut() {\r\n    this.cookieService.deleteAll();\r\n    AuthService.timers.map(t => clearInterval(t));\r\n    AuthService.timers = [];\r\n    AuthService.user = null\r\n    this.user=null;\r\n    this.logout().subscribe(res => {\r\n      if (this.environmentService.getBBSFAuthenticationMode() == AuthenticationModes.UAEPass)\r\n        this.logoutFromUAEPass()\r\n      else\r\n        this.router.navigate(['/Admin/account/login'])\r\n    });\r\n  }\r\n\r\n  logout() {\r\n    const httpOptions = {\r\n      headers: new HttpHeaders({\r\n        'Content-Type': 'application/json',\r\n      }),\r\n    };\r\n    let ApiUrl = '/Account/';\r\n    return this.http.get(this.environmentService.getApiUrl() + ApiUrl + 'Logout', httpOptions);\r\n  }\r\n\r\n\r\n  clearUserSessionClaims() {\r\n    const httpOptions = {\r\n      headers: new HttpHeaders({\r\n        'Content-Type': 'application/json',\r\n      }),\r\n    };\r\n    let ApiUrl = '/api/Home/';\r\n    return this.http.get(this.environmentService.getBaseUrl() + ApiUrl + 'ClearCurrentUserSession', httpOptions);\r\n  }\r\n\r\n\r\n  async handleAccessToken(response: any): Promise<void> {\r\n    const token = response;\r\n    AuthService.user = null;\r\n    AuthService.user = new User();\r\n    AuthService.user.token_type = \"Bearer\"\r\n    AuthService.user.access_token = token;\r\n    AuthService.user.profile = this.jwtHelper.decodeToken(token);\r\n    AuthService.user.expires_at = this.jwtHelper.getTokenExpirationDate(token);\r\n    this.user = AuthService.user;\r\n    this.cookieService.set(TOKEN_KEY, token, AuthService.user.expires_at,\"account\", null, true, 'Strict');\r\n    this.isAuthenticatedSubject.next(true);\r\n    this.setTokenSeconds();\r\n    AuthService.timers.push(this.checkRefreshToken());\r\n    await this.updateLanguage();\r\n  }\r\n\r\n  handleAccessTokenWithoutLanguage(response: any) {\r\n    const token = response;\r\n    AuthService.user = null;\r\n    AuthService.user = new User();\r\n    AuthService.user.token_type = \"Bearer\"\r\n    AuthService.user.access_token = token;\r\n    AuthService.user.profile = this.jwtHelper.decodeToken(token);\r\n    AuthService.user.expires_at = this.jwtHelper.getTokenExpirationDate(token);\r\n    this.setTokenSeconds()\r\n    this.user = AuthService.user\r\n    this.cookieService.set(TOKEN_KEY, token, AuthService.user.expires_at,\"account\", null, true, 'Strict');\r\n    this.isAuthenticatedSubject.next(true);\r\n    AuthService.timers.push(this.checkRefreshToken());\r\n  }\r\n  async updateLanguage() {\r\n    if (\r\n      !localStorage.getItem('language') ||\r\n      localStorage.getItem('language') == this.user.profile.locale\r\n    )\r\n      localStorage.setItem('language', this.user.profile.locale);\r\n\r\n    if (this.translateService.currentLang != localStorage.getItem('language')) {\r\n      this.translateService.resetLang(this.translateService.currentLang);\r\n      await this.translateService\r\n        .reloadLang(localStorage.getItem('language'))\r\n        .subscribe((res) => {\r\n          console.log(res);\r\n        });\r\n    }\r\n  }\r\n\r\n  checkRefreshToken() {\r\n    let date = new Date() as any;\r\n    return setInterval(() => {\r\n      if (Math.floor(AuthService.seconds) < 120 && this.isAuthenticated()) {\r\n        AuthService.timers.map(t => clearInterval(t));\r\n        AuthService.timers = [];\r\n        this.refresh();\r\n      }\r\n      AuthService.seconds--;\r\n    }, 1000);\r\n  }\r\n  setTokenSeconds() {\r\n    let date = new Date() as any;\r\n    AuthService.seconds = (AuthService.user.expires_at - date) / 1000\r\n  }\r\n  refresh() {\r\n    const httpOptions = {\r\n      headers: new HttpHeaders({\r\n        'Content-Type': 'application/json',\r\n        'Authorization': this.authorizationHeaderValue(),\r\n      }),\r\n    };\r\n    let ApiUrl = '/api/Home/';\r\n    this.http.get(this.environmentService.getApiUrl() + ApiUrl + 'RefreshAccessToken', httpOptions).subscribe((res: any) => {\r\n      this.cookieService.delete(TOKEN_KEY);\r\n      this.handleAccessTokenWithoutLanguage(res.val)\r\n    })\r\n  }\r\n\r\n  loginWithUAEPass() {\r\n    const authEndpoint = `${this.environmentService.getUAEPassBaseUrl()}${this.environmentService.getUAEPassAuthorizationEndPoint()}`;\r\n    const queryParams = {\r\n      response_type: 'code',\r\n      client_id: `${this.environmentService.getUAEPassClientID()}`,\r\n      redirect_uri: `${this.environmentService.getBaseUrl()}${this.environmentService.getUAEPassRedirectUrl()}`,\r\n      scope: 'urn:uae:digitalid:profile:general urn:uae:digitalid:profile:general:profileType urn:uae:digitalid:profile:general:unifiedId',\r\n      state: 'pd3PgezRwk596u2yfRwqOgru',\r\n      acr_values: 'urn:safelayer:tws:policies:authentication:level:low'\r\n    }\r\n    const queryParamsString = Object.entries(queryParams)\r\n      .map(([key, value]) => `${key}=${encodeURIComponent(value)}`)\r\n      .join('&');\r\n    const loginUrl = `${authEndpoint}?${queryParamsString}`;\r\n    window.location.href = loginUrl;\r\n    return;\r\n  }\r\n\r\n  logoutFromUAEPass() {\r\n    const logoutEndpoint = `${this.environmentService.getUAEPassBaseUrl()}${this.environmentService.getUAEPassLogoutEndPoint()}`\r\n    const queryParams = {\r\n      redirect_uri: `${this.environmentService.getBaseUrl()}`,\r\n    }\r\n    const queryParamsString = Object.entries(queryParams)\r\n      .map(([key, value]) => `${key}=${encodeURIComponent(value)}`)\r\n      .join('&');\r\n\r\n    const logoutUrl = `${logoutEndpoint}?${queryParamsString}`;\r\n    window.location.href = logoutUrl;\r\n    return;\r\n  }\r\n}\r\n"]}
|
|
230
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"auth.service.js","sourceRoot":"","sources":["../../../../../../projects/bbsf-utilities/src/lib/shared/authentication/auth.service.ts"],"names":[],"mappings":"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","sourcesContent":["import { HttpClient, HttpHeaders } from '@angular/common/http';\r\nimport { Injectable, Injector } from '@angular/core';\r\nimport { BehaviorSubject } from 'rxjs';\r\nimport { Router } from '@angular/router';\r\nimport { JwtHelperService } from '@auth0/angular-jwt';\r\nimport { BBSFTranslateService, EnvironmentService } from '../services';\r\nimport { User } from '../models/UserModel';\r\nimport { CookieService } from 'ngx-cookie-service';\r\nimport { UtilityService } from '../services/utility.service';\r\nimport { AuthenticationModes } from '../enums/authentication-modes-enums';\r\nconst TOKEN_KEY = 'access_token';\r\n\r\n@Injectable({\r\n  providedIn: 'root',\r\n})\r\nexport class AuthService {\r\n  public redirectUrl: string = '';\r\n  static user: User | null = null;\r\n  user: User | null;\r\n  static UserClaims: any = null;\r\n  private jwtHelper: JwtHelperService = new JwtHelperService();\r\n  private isAuthenticatedSubject = new BehaviorSubject<boolean>(this.hasToken());\r\n  isAuthenticate$ = this.isAuthenticatedSubject.asObservable();\r\n  //refresh\r\n  static timers = [];\r\n  static seconds = 0;\r\n\r\n  constructor(private injector: Injector, private http: HttpClient, private environmentService: EnvironmentService, private translateService: BBSFTranslateService, private router: Router, private cookieService: CookieService, private utilityService: UtilityService) {\r\n    this.user = this.getUserManager()\r\n  }\r\n\r\n  private hasToken(): boolean {\r\n    const token = this.cookieService.get(TOKEN_KEY);\r\n    return token && !this.jwtHelper.isTokenExpired(token);\r\n  }\r\n\r\n  getUserManager() {\r\n    const token = this.cookieService.get(TOKEN_KEY);\r\n    if (token) {\r\n      if (!this.jwtHelper.isTokenExpired(token))\r\n        this.handleAccessTokenWithoutLanguage(token);\r\n      else\r\n        this.cookieService.delete(TOKEN_KEY);\r\n    }\r\n    else {\r\n      localStorage.clear();\r\n      AuthService.timers.map(t => clearInterval(t));\r\n      AuthService.timers = [];\r\n      AuthService.user = null;\r\n      this.user = null;\r\n    }\r\n    return AuthService.user;\r\n  }\r\n\r\n  getUser() {\r\n    this.user = AuthService.user;\r\n  }\r\n  storUser(User: any) {\r\n    AuthService.user = this.user = this.user;\r\n  }\r\n\r\n  getCurrentUser() {\r\n    return AuthService.user\r\n  }\r\n\r\n  isAuthenticated(): boolean {\r\n    return AuthService.user != null && !this.jwtHelper.isTokenExpired(AuthService.user.access_token);\r\n  }\r\n  isUserInRole(allowedPermission) {\r\n    let selectedPermissionSetID = Number.parseInt(AuthService.user.profile['selectedpermissionsetid']);\r\n    return allowedPermission.includes(selectedPermissionSetID);\r\n  }\r\n\r\n  authorizationHeaderValue(): string {\r\n    return AuthService.user\r\n      ? `${AuthService.user.token_type} ${AuthService.user.access_token}`\r\n      : '';\r\n  }\r\n\r\n  name(): string {\r\n    return AuthService.user != null ? AuthService.user.profile.given_name : '';\r\n  }\r\n  setUrl(url) {\r\n    localStorage.setItem('redirectUrl', url);\r\n  }\r\n  getUrl() {\r\n    return localStorage.getItem('redirectUrl') ?? \"/\";\r\n  }\r\n\r\n  signOut() {\r\n    this.cookieService.deleteAll();\r\n    localStorage.clear();\r\n    AuthService.timers.map(t => clearInterval(t));\r\n    AuthService.timers = [];\r\n    AuthService.user = null;\r\n    this.user = null;\r\n    this.logout().subscribe(res => {\r\n      if (this.environmentService.getBBSFAuthenticationMode() == AuthenticationModes.UAEPass)\r\n        this.logoutFromUAEPass()\r\n      else\r\n        this.router.navigate(['/Admin/account/login'])\r\n    });\r\n  }\r\n\r\n  logout() {\r\n    const httpOptions = {\r\n      headers: new HttpHeaders({\r\n        'Content-Type': 'application/json',\r\n      }),\r\n    };\r\n    let ApiUrl = '/Account/';\r\n    return this.http.get(this.environmentService.getApiUrl() + ApiUrl + 'Logout', httpOptions);\r\n  }\r\n\r\n\r\n  clearUserSessionClaims() {\r\n    const httpOptions = {\r\n      headers: new HttpHeaders({\r\n        'Content-Type': 'application/json',\r\n      }),\r\n    };\r\n    let ApiUrl = '/api/Home/';\r\n    return this.http.get(this.environmentService.getBaseUrl() + ApiUrl + 'ClearCurrentUserSession', httpOptions);\r\n  }\r\n\r\n  async handleAccessToken(response: any): Promise<void> {\r\n    this.cookieService.deleteAll();\r\n    const token = response;\r\n    AuthService.user = null;\r\n    AuthService.user = new User();\r\n    AuthService.user.token_type = \"Bearer\"\r\n    AuthService.user.access_token = token;\r\n    AuthService.user.profile = this.jwtHelper.decodeToken(token);\r\n    AuthService.user.expires_at = this.jwtHelper.getTokenExpirationDate(token);\r\n    this.user = AuthService.user;\r\n    this.cookieService.set(TOKEN_KEY, token, AuthService.user.expires_at, \"/\", null, true, 'Lax');\r\n    this.isAuthenticatedSubject.next(true);\r\n    this.setTokenSeconds();\r\n    AuthService.timers.push(this.checkRefreshToken());\r\n    await this.updateLanguage();\r\n  }\r\n\r\n  handleAccessTokenWithoutLanguage(response: any) {\r\n    this.cookieService.deleteAll();\r\n    const token = response;\r\n    AuthService.user = null;\r\n    AuthService.user = new User();\r\n    AuthService.user.token_type = \"Bearer\"\r\n    AuthService.user.access_token = token;\r\n    AuthService.user.profile = this.jwtHelper.decodeToken(token);\r\n    AuthService.user.expires_at = this.jwtHelper.getTokenExpirationDate(token);\r\n    this.setTokenSeconds()\r\n    this.user = AuthService.user\r\n    this.cookieService.set(TOKEN_KEY, token, AuthService.user.expires_at, \"/\", null, true, 'Lax');\r\n    this.isAuthenticatedSubject.next(true);\r\n    AuthService.timers.push(this.checkRefreshToken());\r\n  }\r\n  async updateLanguage() {\r\n    if (\r\n      !localStorage.getItem('language') ||\r\n      localStorage.getItem('language') == this.user.profile.locale\r\n    )\r\n      localStorage.setItem('language', this.user.profile.locale);\r\n\r\n    if (this.translateService.currentLang != localStorage.getItem('language')) {\r\n      this.translateService.resetLang(this.translateService.currentLang);\r\n      await this.translateService\r\n        .reloadLang(localStorage.getItem('language'))\r\n        .subscribe((res) => {\r\n          console.log(res);\r\n        });\r\n    }\r\n  }\r\n\r\n  checkRefreshToken() {\r\n    let date = new Date() as any;\r\n    return setInterval(() => {\r\n      if (Math.floor(AuthService.seconds) < 120 && this.isAuthenticated()) {\r\n        AuthService.timers.map(t => clearInterval(t));\r\n        AuthService.timers = [];\r\n        const token = this.cookieService.get(TOKEN_KEY);\r\n        if (token){\r\n          this.refresh();\r\n        }\r\n      }\r\n      AuthService.seconds--;\r\n    }, 1000);\r\n  }\r\n  setTokenSeconds() {\r\n    let date = new Date() as any;\r\n    AuthService.seconds = (AuthService.user.expires_at - date) / 1000\r\n  }\r\n  refresh() {\r\n    this.cookieService.deleteAll();\r\n    const httpOptions = {\r\n      headers: new HttpHeaders({\r\n        'Content-Type': 'application/json',\r\n        'Authorization': this.authorizationHeaderValue(),\r\n      }),\r\n    };\r\n    let ApiUrl = '/api/Home/';\r\n    this.http.get(this.environmentService.getApiUrl() + ApiUrl + 'RefreshAccessToken', httpOptions).subscribe((res: any) => {\r\n      this.handleAccessTokenWithoutLanguage(res.val)\r\n    })\r\n  }\r\n\r\n  loginWithUAEPass() {\r\n    const authEndpoint = `${this.environmentService.getUAEPassBaseUrl()}${this.environmentService.getUAEPassAuthorizationEndPoint()}`;\r\n    const queryParams = {\r\n      response_type: 'code',\r\n      client_id: `${this.environmentService.getUAEPassClientID()}`,\r\n      redirect_uri: `${this.environmentService.getBaseUrl()}${this.environmentService.getUAEPassRedirectUrl()}`,\r\n      scope: 'urn:uae:digitalid:profile:general urn:uae:digitalid:profile:general:profileType urn:uae:digitalid:profile:general:unifiedId',\r\n      state: 'pd3PgezRwk596u2yfRwqOgru',\r\n      acr_values: 'urn:safelayer:tws:policies:authentication:level:low'\r\n    }\r\n    const queryParamsString = Object.entries(queryParams)\r\n      .map(([key, value]) => `${key}=${encodeURIComponent(value)}`)\r\n      .join('&');\r\n    const loginUrl = `${authEndpoint}?${queryParamsString}`;\r\n    window.location.href = loginUrl;\r\n    return;\r\n  }\r\n\r\n  logoutFromUAEPass() {\r\n    const logoutEndpoint = `${this.environmentService.getUAEPassBaseUrl()}${this.environmentService.getUAEPassLogoutEndPoint()}`\r\n    const queryParams = {\r\n      redirect_uri: `${this.environmentService.getBaseUrl()}`,\r\n    }\r\n    const queryParamsString = Object.entries(queryParams)\r\n      .map(([key, value]) => `${key}=${encodeURIComponent(value)}`)\r\n      .join('&');\r\n\r\n    const logoutUrl = `${logoutEndpoint}?${queryParamsString}`;\r\n    window.location.href = logoutUrl;\r\n    return;\r\n  }\r\n}\r\n"]}
|
|
@@ -4381,6 +4381,13 @@ class AuthService {
|
|
|
4381
4381
|
else
|
|
4382
4382
|
this.cookieService.delete(TOKEN_KEY);
|
|
4383
4383
|
}
|
|
4384
|
+
else {
|
|
4385
|
+
localStorage.clear();
|
|
4386
|
+
AuthService.timers.map(t => clearInterval(t));
|
|
4387
|
+
AuthService.timers = [];
|
|
4388
|
+
AuthService.user = null;
|
|
4389
|
+
this.user = null;
|
|
4390
|
+
}
|
|
4384
4391
|
return AuthService.user;
|
|
4385
4392
|
}
|
|
4386
4393
|
getUser() {
|
|
@@ -4415,6 +4422,7 @@ class AuthService {
|
|
|
4415
4422
|
}
|
|
4416
4423
|
signOut() {
|
|
4417
4424
|
this.cookieService.deleteAll();
|
|
4425
|
+
localStorage.clear();
|
|
4418
4426
|
AuthService.timers.map(t => clearInterval(t));
|
|
4419
4427
|
AuthService.timers = [];
|
|
4420
4428
|
AuthService.user = null;
|
|
@@ -4445,6 +4453,7 @@ class AuthService {
|
|
|
4445
4453
|
return this.http.get(this.environmentService.getBaseUrl() + ApiUrl + 'ClearCurrentUserSession', httpOptions);
|
|
4446
4454
|
}
|
|
4447
4455
|
async handleAccessToken(response) {
|
|
4456
|
+
this.cookieService.deleteAll();
|
|
4448
4457
|
const token = response;
|
|
4449
4458
|
AuthService.user = null;
|
|
4450
4459
|
AuthService.user = new User();
|
|
@@ -4453,13 +4462,14 @@ class AuthService {
|
|
|
4453
4462
|
AuthService.user.profile = this.jwtHelper.decodeToken(token);
|
|
4454
4463
|
AuthService.user.expires_at = this.jwtHelper.getTokenExpirationDate(token);
|
|
4455
4464
|
this.user = AuthService.user;
|
|
4456
|
-
this.cookieService.set(TOKEN_KEY, token, AuthService.user.expires_at, "
|
|
4465
|
+
this.cookieService.set(TOKEN_KEY, token, AuthService.user.expires_at, "/", null, true, 'Lax');
|
|
4457
4466
|
this.isAuthenticatedSubject.next(true);
|
|
4458
4467
|
this.setTokenSeconds();
|
|
4459
4468
|
AuthService.timers.push(this.checkRefreshToken());
|
|
4460
4469
|
await this.updateLanguage();
|
|
4461
4470
|
}
|
|
4462
4471
|
handleAccessTokenWithoutLanguage(response) {
|
|
4472
|
+
this.cookieService.deleteAll();
|
|
4463
4473
|
const token = response;
|
|
4464
4474
|
AuthService.user = null;
|
|
4465
4475
|
AuthService.user = new User();
|
|
@@ -4469,7 +4479,7 @@ class AuthService {
|
|
|
4469
4479
|
AuthService.user.expires_at = this.jwtHelper.getTokenExpirationDate(token);
|
|
4470
4480
|
this.setTokenSeconds();
|
|
4471
4481
|
this.user = AuthService.user;
|
|
4472
|
-
this.cookieService.set(TOKEN_KEY, token, AuthService.user.expires_at, "
|
|
4482
|
+
this.cookieService.set(TOKEN_KEY, token, AuthService.user.expires_at, "/", null, true, 'Lax');
|
|
4473
4483
|
this.isAuthenticatedSubject.next(true);
|
|
4474
4484
|
AuthService.timers.push(this.checkRefreshToken());
|
|
4475
4485
|
}
|
|
@@ -4492,7 +4502,10 @@ class AuthService {
|
|
|
4492
4502
|
if (Math.floor(AuthService.seconds) < 120 && this.isAuthenticated()) {
|
|
4493
4503
|
AuthService.timers.map(t => clearInterval(t));
|
|
4494
4504
|
AuthService.timers = [];
|
|
4495
|
-
this.
|
|
4505
|
+
const token = this.cookieService.get(TOKEN_KEY);
|
|
4506
|
+
if (token) {
|
|
4507
|
+
this.refresh();
|
|
4508
|
+
}
|
|
4496
4509
|
}
|
|
4497
4510
|
AuthService.seconds--;
|
|
4498
4511
|
}, 1000);
|
|
@@ -4502,6 +4515,7 @@ class AuthService {
|
|
|
4502
4515
|
AuthService.seconds = (AuthService.user.expires_at - date) / 1000;
|
|
4503
4516
|
}
|
|
4504
4517
|
refresh() {
|
|
4518
|
+
this.cookieService.deleteAll();
|
|
4505
4519
|
const httpOptions = {
|
|
4506
4520
|
headers: new HttpHeaders({
|
|
4507
4521
|
'Content-Type': 'application/json',
|
|
@@ -4510,7 +4524,6 @@ class AuthService {
|
|
|
4510
4524
|
};
|
|
4511
4525
|
let ApiUrl = '/api/Home/';
|
|
4512
4526
|
this.http.get(this.environmentService.getApiUrl() + ApiUrl + 'RefreshAccessToken', httpOptions).subscribe((res) => {
|
|
4513
|
-
this.cookieService.delete(TOKEN_KEY);
|
|
4514
4527
|
this.handleAccessTokenWithoutLanguage(res.val);
|
|
4515
4528
|
});
|
|
4516
4529
|
}
|
|
@@ -4568,7 +4581,7 @@ class BBSFUtilitiesModule {
|
|
|
4568
4581
|
ControlValidationService,
|
|
4569
4582
|
MasterLayoutService,
|
|
4570
4583
|
ConfigurationService,
|
|
4571
|
-
CookieService
|
|
4584
|
+
CookieService,
|
|
4572
4585
|
], imports: [CommonModule,
|
|
4573
4586
|
RouterModule,
|
|
4574
4587
|
BlockUIModule.forRoot(),
|
|
@@ -4596,7 +4609,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.0.6", ngImpor
|
|
|
4596
4609
|
ControlValidationService,
|
|
4597
4610
|
MasterLayoutService,
|
|
4598
4611
|
ConfigurationService,
|
|
4599
|
-
CookieService
|
|
4612
|
+
CookieService,
|
|
4600
4613
|
]
|
|
4601
4614
|
}]
|
|
4602
4615
|
}] });
|