@progress-chef/platform-http-interceptor 0.0.29 → 0.0.30
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.
|
@@ -30,41 +30,63 @@ export class HttpAuthInterceptor {
|
|
|
30
30
|
this.authTokenSet.add(authToken);
|
|
31
31
|
}
|
|
32
32
|
return next.handle(authReq).pipe(catchError((error) => {
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
33
|
+
const loginType = LocalStorageService.getItem(StorageKeys.LOGIN_TYPE);
|
|
34
|
+
switch (error.status) {
|
|
35
|
+
case 401:
|
|
36
|
+
if (loginType === 'saml' || loginType === 'oauth') {
|
|
37
|
+
LocalStorageService.removeItem(StorageKeys.USER_NAME);
|
|
38
|
+
LocalStorageService.removeItem(StorageKeys.IS_REMEMBER_ME);
|
|
39
|
+
}
|
|
40
|
+
LocalStorageService.setItem(StorageKeys.IS_USER_ORG_AND_ROLE_SET, false);
|
|
41
|
+
LocalStorageService.setItem(StorageKeys.IS_USER_AUTHENTICATED, false);
|
|
42
|
+
LocalStorageService.removeItem(StorageKeys.AUTH_TOKEN);
|
|
43
|
+
LocalStorageService.removeItem(StorageKeys.LOGIN_TYPE);
|
|
44
|
+
LocalStorageService.removeItem(StorageKeys.IDENTITY_TOKEN);
|
|
45
|
+
LocalStorageService.removeItem(StorageKeys.USER_ORG_AND_ROLE_TOKEN);
|
|
46
|
+
this.refreshTokenService.reset();
|
|
47
|
+
// call logout action
|
|
48
|
+
if (!this.isSessionExpired) {
|
|
49
|
+
this.toastNotificationService.showToastNotification({
|
|
50
|
+
content: 'The session has ended.'
|
|
51
|
+
});
|
|
52
|
+
this.isSessionExpired = true;
|
|
53
|
+
}
|
|
54
|
+
this.router.navigate(['/login']);
|
|
55
|
+
break;
|
|
56
|
+
case 403:
|
|
57
|
+
try {
|
|
58
|
+
for (let err of error.error.errors) {
|
|
59
|
+
this.toastNotificationService.showToastNotification({
|
|
60
|
+
content: err?.reason || `Forbidden to access this resource. Access denied.`,
|
|
61
|
+
type: { style: 'error', icon: true },
|
|
62
|
+
closable: true
|
|
63
|
+
});
|
|
64
|
+
}
|
|
65
|
+
}
|
|
66
|
+
catch (e) {
|
|
67
|
+
console.log("HttpAuthInterceptor: Exception occurred at 403", e);
|
|
68
|
+
this.toastNotificationService.showToastNotification({
|
|
69
|
+
content: `Forbidden to access this resource. Access denied.`,
|
|
70
|
+
type: { style: 'error', icon: true },
|
|
71
|
+
closable: true
|
|
72
|
+
});
|
|
73
|
+
}
|
|
74
|
+
break;
|
|
75
|
+
case 500:
|
|
48
76
|
this.toastNotificationService.showToastNotification({
|
|
49
|
-
content:
|
|
77
|
+
content: `Something went wrong. Please try again.`,
|
|
78
|
+
type: { style: 'error', icon: true },
|
|
79
|
+
closable: true
|
|
50
80
|
});
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
});
|
|
61
|
-
}
|
|
62
|
-
if (error.status === 500) {
|
|
63
|
-
this.toastNotificationService.showToastNotification({
|
|
64
|
-
content: `Something went wrong. Please try again.`,
|
|
65
|
-
type: { style: 'error', icon: true },
|
|
66
|
-
closable: true
|
|
67
|
-
});
|
|
81
|
+
break;
|
|
82
|
+
case 0:
|
|
83
|
+
case 504:
|
|
84
|
+
this.toastNotificationService.showToastNotification({
|
|
85
|
+
content: `Unable to reach server. Please try again.`,
|
|
86
|
+
type: { style: 'error', icon: true },
|
|
87
|
+
closable: true
|
|
88
|
+
});
|
|
89
|
+
break;
|
|
68
90
|
}
|
|
69
91
|
return throwError(() => error);
|
|
70
92
|
}));
|
|
@@ -78,4 +100,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImpo
|
|
|
78
100
|
providedIn: 'root'
|
|
79
101
|
}]
|
|
80
102
|
}], ctorParameters: function () { return [{ type: i1.Router }, { type: i2.ToastNotificationService }, { type: i3.RefreshTokenService }]; } });
|
|
81
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"http-auth.interceptor.js","sourceRoot":"","sources":["../../../../projects/platform-http-interceptor/src/lib/http-auth.interceptor.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  HttpErrorResponse,\n  HttpEvent,\n  HttpHandler,\n  HttpInterceptor,\n  HttpRequest\n} from '@angular/common/http';\nimport { Router } from '@angular/router';\nimport { ToastNotificationService } from '@progress-chef/platform-shared-components';\nimport { LocalStorageService, StorageKeys } from '@progress-chef/platform-storage-service';\nimport { RefreshTokenService } from '@progress-chef/platform-refresh-token-service'\nimport { Observable, catchError, throwError, timer } from 'rxjs';\nimport { Injectable } from '@angular/core';\n\n@Injectable({\n  providedIn: 'root'\n})\n\nexport class HttpAuthInterceptor implements HttpInterceptor {\n  authTokenSet = new Set();\n  isSessionExpired = false;\n  constructor(\n    private router: Router,\n    private toastNotificationService: ToastNotificationService, \n    private refreshTokenService: RefreshTokenService\n  ) { }\n\n  intercept(request: HttpRequest<unknown>, next: HttpHandler): Observable<HttpEvent<unknown>> {\n    // function to check for the refresh token using referesh token service\n      this.refreshTokenService?.checkForRefresh(request);\n\n    let authToken = LocalStorageService.getItem(StorageKeys.AUTH_TOKEN);\n    let authReq =  request;\n    if (authToken) {\n      authReq = request.clone({\n        setHeaders: {\n          Authorization: `Bearer ${authToken}`\n        }\n      })\n      if (!this.authTokenSet.has(authToken)) {\n        this.isSessionExpired = false;\n      }\n      this.authTokenSet.add(authToken);\n    }\n    return next.handle(authReq).pipe(\n      catchError((error: HttpErrorResponse) => {\n        if (error.status === 401) {\n          const loginType = LocalStorageService.getItem(StorageKeys.LOGIN_TYPE);\n          if (loginType === 'saml' || loginType === 'oauth') {\n            LocalStorageService.removeItem(StorageKeys.USER_NAME);\n            LocalStorageService.removeItem(StorageKeys.IS_REMEMBER_ME); \n          }\n          LocalStorageService.setItem(StorageKeys.IS_USER_ORG_AND_ROLE_SET, false);\n          LocalStorageService.setItem(StorageKeys.IS_USER_AUTHENTICATED, false);\n          LocalStorageService.removeItem(StorageKeys.AUTH_TOKEN);\n          LocalStorageService.removeItem(StorageKeys.LOGIN_TYPE);\n          LocalStorageService.removeItem(StorageKeys.IDENTITY_TOKEN);\n          LocalStorageService.removeItem(StorageKeys.USER_ORG_AND_ROLE_TOKEN);\n          this.refreshTokenService.reset();\n          // call logout action\n          if (!this.isSessionExpired) {\n            this.toastNotificationService.showToastNotification({\n              content: 'The session has ended.'\n            });\n            this.isSessionExpired = true;\n          }\n          \n          this.router.navigate(['/login'])\n        }\n        if (error.status === 0 || error.status === 504) {\n          this.toastNotificationService.showToastNotification({\n            content: `Unable to reach server. Please try again.`,\n            type: { style: 'error', icon: true },\n            closable: true\n          })\n        }\n        if (error.status === 500) {\n          this.toastNotificationService.showToastNotification({\n            content: `Something went wrong. Please try again.`,\n            type: { style: 'error', icon: true },\n            closable: true\n          })\n        }\n        return throwError(() => error)\n      })\n    );\n  }\n}\n"]}
|
|
103
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"http-auth.interceptor.js","sourceRoot":"","sources":["../../../../projects/platform-http-interceptor/src/lib/http-auth.interceptor.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  HttpErrorResponse,\n  HttpEvent,\n  HttpHandler,\n  HttpInterceptor,\n  HttpRequest\n} from '@angular/common/http';\nimport { Router } from '@angular/router';\nimport { ToastNotificationService } from '@progress-chef/platform-shared-components';\nimport { LocalStorageService, StorageKeys } from '@progress-chef/platform-storage-service';\nimport { RefreshTokenService } from '@progress-chef/platform-refresh-token-service'\nimport { Observable, catchError, throwError } from 'rxjs';\nimport { Injectable } from '@angular/core';\n\n@Injectable({\n  providedIn: 'root'\n})\n\nexport class HttpAuthInterceptor implements HttpInterceptor {\n  authTokenSet = new Set();\n  isSessionExpired = false;\n  constructor(\n    private router: Router,\n    private toastNotificationService: ToastNotificationService,\n    private refreshTokenService: RefreshTokenService\n  ) { }\n\n  intercept(request: HttpRequest<unknown>, next: HttpHandler): Observable<HttpEvent<unknown>> {\n    // function to check for the refresh token using referesh token service\n    this.refreshTokenService?.checkForRefresh(request);\n\n    let authToken = LocalStorageService.getItem(StorageKeys.AUTH_TOKEN);\n    let authReq = request;\n    if (authToken) {\n      authReq = request.clone({\n        setHeaders: {\n          Authorization: `Bearer ${authToken}`\n        }\n      })\n      if (!this.authTokenSet.has(authToken)) {\n        this.isSessionExpired = false;\n      }\n      this.authTokenSet.add(authToken);\n    }\n    return next.handle(authReq).pipe(\n      catchError((error: HttpErrorResponse) => {\n\n        const loginType = LocalStorageService.getItem(StorageKeys.LOGIN_TYPE);\n\n        switch (error.status) {\n          case 401:\n            if (loginType === 'saml' || loginType === 'oauth') {\n              LocalStorageService.removeItem(StorageKeys.USER_NAME);\n              LocalStorageService.removeItem(StorageKeys.IS_REMEMBER_ME);\n            }\n            LocalStorageService.setItem(StorageKeys.IS_USER_ORG_AND_ROLE_SET, false);\n            LocalStorageService.setItem(StorageKeys.IS_USER_AUTHENTICATED, false);\n            LocalStorageService.removeItem(StorageKeys.AUTH_TOKEN);\n            LocalStorageService.removeItem(StorageKeys.LOGIN_TYPE);\n            LocalStorageService.removeItem(StorageKeys.IDENTITY_TOKEN);\n            LocalStorageService.removeItem(StorageKeys.USER_ORG_AND_ROLE_TOKEN);\n            this.refreshTokenService.reset();\n            // call logout action\n            if (!this.isSessionExpired) {\n              this.toastNotificationService.showToastNotification({\n                content: 'The session has ended.'\n              });\n              this.isSessionExpired = true;\n            }\n\n            this.router.navigate(['/login']);\n            break;\n          case 403:\n            try {\n              for (let err of error.error.errors) {\n                this.toastNotificationService.showToastNotification({\n                  content: err?.reason || `Forbidden to access this resource. Access denied.`,\n                  type: { style: 'error', icon: true },\n                  closable: true\n                });\n              }\n            } catch (e) {\n              console.log(\"HttpAuthInterceptor: Exception occurred at 403\", e);\n              this.toastNotificationService.showToastNotification({\n                content: `Forbidden to access this resource. Access denied.`,\n                type: { style: 'error', icon: true },\n                closable: true\n              });\n            }\n\n            break;\n          case 500:\n            this.toastNotificationService.showToastNotification({\n              content: `Something went wrong. Please try again.`,\n              type: { style: 'error', icon: true },\n              closable: true\n            });\n            break;\n          case 0:\n          case 504:\n            this.toastNotificationService.showToastNotification({\n              content: `Unable to reach server. Please try again.`,\n              type: { style: 'error', icon: true },\n              closable: true\n            });\n            break;\n\n        }\n        return throwError(() => error)\n      })\n    );\n  }\n}\n"]}
|
|
@@ -31,41 +31,63 @@ class HttpAuthInterceptor {
|
|
|
31
31
|
this.authTokenSet.add(authToken);
|
|
32
32
|
}
|
|
33
33
|
return next.handle(authReq).pipe(catchError((error) => {
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
34
|
+
const loginType = LocalStorageService.getItem(StorageKeys.LOGIN_TYPE);
|
|
35
|
+
switch (error.status) {
|
|
36
|
+
case 401:
|
|
37
|
+
if (loginType === 'saml' || loginType === 'oauth') {
|
|
38
|
+
LocalStorageService.removeItem(StorageKeys.USER_NAME);
|
|
39
|
+
LocalStorageService.removeItem(StorageKeys.IS_REMEMBER_ME);
|
|
40
|
+
}
|
|
41
|
+
LocalStorageService.setItem(StorageKeys.IS_USER_ORG_AND_ROLE_SET, false);
|
|
42
|
+
LocalStorageService.setItem(StorageKeys.IS_USER_AUTHENTICATED, false);
|
|
43
|
+
LocalStorageService.removeItem(StorageKeys.AUTH_TOKEN);
|
|
44
|
+
LocalStorageService.removeItem(StorageKeys.LOGIN_TYPE);
|
|
45
|
+
LocalStorageService.removeItem(StorageKeys.IDENTITY_TOKEN);
|
|
46
|
+
LocalStorageService.removeItem(StorageKeys.USER_ORG_AND_ROLE_TOKEN);
|
|
47
|
+
this.refreshTokenService.reset();
|
|
48
|
+
// call logout action
|
|
49
|
+
if (!this.isSessionExpired) {
|
|
50
|
+
this.toastNotificationService.showToastNotification({
|
|
51
|
+
content: 'The session has ended.'
|
|
52
|
+
});
|
|
53
|
+
this.isSessionExpired = true;
|
|
54
|
+
}
|
|
55
|
+
this.router.navigate(['/login']);
|
|
56
|
+
break;
|
|
57
|
+
case 403:
|
|
58
|
+
try {
|
|
59
|
+
for (let err of error.error.errors) {
|
|
60
|
+
this.toastNotificationService.showToastNotification({
|
|
61
|
+
content: err?.reason || `Forbidden to access this resource. Access denied.`,
|
|
62
|
+
type: { style: 'error', icon: true },
|
|
63
|
+
closable: true
|
|
64
|
+
});
|
|
65
|
+
}
|
|
66
|
+
}
|
|
67
|
+
catch (e) {
|
|
68
|
+
console.log("HttpAuthInterceptor: Exception occurred at 403", e);
|
|
69
|
+
this.toastNotificationService.showToastNotification({
|
|
70
|
+
content: `Forbidden to access this resource. Access denied.`,
|
|
71
|
+
type: { style: 'error', icon: true },
|
|
72
|
+
closable: true
|
|
73
|
+
});
|
|
74
|
+
}
|
|
75
|
+
break;
|
|
76
|
+
case 500:
|
|
49
77
|
this.toastNotificationService.showToastNotification({
|
|
50
|
-
content:
|
|
78
|
+
content: `Something went wrong. Please try again.`,
|
|
79
|
+
type: { style: 'error', icon: true },
|
|
80
|
+
closable: true
|
|
51
81
|
});
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
});
|
|
62
|
-
}
|
|
63
|
-
if (error.status === 500) {
|
|
64
|
-
this.toastNotificationService.showToastNotification({
|
|
65
|
-
content: `Something went wrong. Please try again.`,
|
|
66
|
-
type: { style: 'error', icon: true },
|
|
67
|
-
closable: true
|
|
68
|
-
});
|
|
82
|
+
break;
|
|
83
|
+
case 0:
|
|
84
|
+
case 504:
|
|
85
|
+
this.toastNotificationService.showToastNotification({
|
|
86
|
+
content: `Unable to reach server. Please try again.`,
|
|
87
|
+
type: { style: 'error', icon: true },
|
|
88
|
+
closable: true
|
|
89
|
+
});
|
|
90
|
+
break;
|
|
69
91
|
}
|
|
70
92
|
return throwError(() => error);
|
|
71
93
|
}));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"progress-chef-platform-http-interceptor.mjs","sources":["../../../projects/platform-http-interceptor/src/lib/http-auth.interceptor.ts","../../../projects/platform-http-interceptor/src/public-api.ts","../../../projects/platform-http-interceptor/src/progress-chef-platform-http-interceptor.ts"],"sourcesContent":["import {\n HttpErrorResponse,\n HttpEvent,\n HttpHandler,\n HttpInterceptor,\n HttpRequest\n} from '@angular/common/http';\nimport { Router } from '@angular/router';\nimport { ToastNotificationService } from '@progress-chef/platform-shared-components';\nimport { LocalStorageService, StorageKeys } from '@progress-chef/platform-storage-service';\nimport { RefreshTokenService } from '@progress-chef/platform-refresh-token-service'\nimport { Observable, catchError, throwError
|
|
1
|
+
{"version":3,"file":"progress-chef-platform-http-interceptor.mjs","sources":["../../../projects/platform-http-interceptor/src/lib/http-auth.interceptor.ts","../../../projects/platform-http-interceptor/src/public-api.ts","../../../projects/platform-http-interceptor/src/progress-chef-platform-http-interceptor.ts"],"sourcesContent":["import {\n HttpErrorResponse,\n HttpEvent,\n HttpHandler,\n HttpInterceptor,\n HttpRequest\n} from '@angular/common/http';\nimport { Router } from '@angular/router';\nimport { ToastNotificationService } from '@progress-chef/platform-shared-components';\nimport { LocalStorageService, StorageKeys } from '@progress-chef/platform-storage-service';\nimport { RefreshTokenService } from '@progress-chef/platform-refresh-token-service'\nimport { Observable, catchError, throwError } from 'rxjs';\nimport { Injectable } from '@angular/core';\n\n@Injectable({\n providedIn: 'root'\n})\n\nexport class HttpAuthInterceptor implements HttpInterceptor {\n authTokenSet = new Set();\n isSessionExpired = false;\n constructor(\n private router: Router,\n private toastNotificationService: ToastNotificationService,\n private refreshTokenService: RefreshTokenService\n ) { }\n\n intercept(request: HttpRequest<unknown>, next: HttpHandler): Observable<HttpEvent<unknown>> {\n // function to check for the refresh token using referesh token service\n this.refreshTokenService?.checkForRefresh(request);\n\n let authToken = LocalStorageService.getItem(StorageKeys.AUTH_TOKEN);\n let authReq = request;\n if (authToken) {\n authReq = request.clone({\n setHeaders: {\n Authorization: `Bearer ${authToken}`\n }\n })\n if (!this.authTokenSet.has(authToken)) {\n this.isSessionExpired = false;\n }\n this.authTokenSet.add(authToken);\n }\n return next.handle(authReq).pipe(\n catchError((error: HttpErrorResponse) => {\n\n const loginType = LocalStorageService.getItem(StorageKeys.LOGIN_TYPE);\n\n switch (error.status) {\n case 401:\n if (loginType === 'saml' || loginType === 'oauth') {\n LocalStorageService.removeItem(StorageKeys.USER_NAME);\n LocalStorageService.removeItem(StorageKeys.IS_REMEMBER_ME);\n }\n LocalStorageService.setItem(StorageKeys.IS_USER_ORG_AND_ROLE_SET, false);\n LocalStorageService.setItem(StorageKeys.IS_USER_AUTHENTICATED, false);\n LocalStorageService.removeItem(StorageKeys.AUTH_TOKEN);\n LocalStorageService.removeItem(StorageKeys.LOGIN_TYPE);\n LocalStorageService.removeItem(StorageKeys.IDENTITY_TOKEN);\n LocalStorageService.removeItem(StorageKeys.USER_ORG_AND_ROLE_TOKEN);\n this.refreshTokenService.reset();\n // call logout action\n if (!this.isSessionExpired) {\n this.toastNotificationService.showToastNotification({\n content: 'The session has ended.'\n });\n this.isSessionExpired = true;\n }\n\n this.router.navigate(['/login']);\n break;\n case 403:\n try {\n for (let err of error.error.errors) {\n this.toastNotificationService.showToastNotification({\n content: err?.reason || `Forbidden to access this resource. Access denied.`,\n type: { style: 'error', icon: true },\n closable: true\n });\n }\n } catch (e) {\n console.log(\"HttpAuthInterceptor: Exception occurred at 403\", e);\n this.toastNotificationService.showToastNotification({\n content: `Forbidden to access this resource. Access denied.`,\n type: { style: 'error', icon: true },\n closable: true\n });\n }\n\n break;\n case 500:\n this.toastNotificationService.showToastNotification({\n content: `Something went wrong. Please try again.`,\n type: { style: 'error', icon: true },\n closable: true\n });\n break;\n case 0:\n case 504:\n this.toastNotificationService.showToastNotification({\n content: `Unable to reach server. Please try again.`,\n type: { style: 'error', icon: true },\n closable: true\n });\n break;\n\n }\n return throwError(() => error)\n })\n );\n }\n}\n","/*\n * Public API Surface of platform-http-interceptor\n */\n\nexport * from './lib/http-auth.interceptor';\n","/**\n * Generated bundle index. Do not edit.\n */\n\nexport * from './public-api';\n"],"names":[],"mappings":"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"}
|