@igo2/auth 16.0.2 → 16.1.0

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.
Files changed (41) hide show
  1. package/esm2022/lib/auth-form/auth-facebook.component.mjs +9 -11
  2. package/esm2022/lib/auth-form/auth-form.component.mjs +21 -148
  3. package/esm2022/lib/auth-form/auth-google.component.mjs +9 -11
  4. package/esm2022/lib/auth-form/auth-intern.component.mjs +11 -75
  5. package/esm2022/lib/auth-form/auth-microsoft.component.mjs +12 -22
  6. package/esm2022/lib/auth-form/auth-microsoftb2c.component.mjs +12 -22
  7. package/esm2022/lib/auth-monitoring/auth-monitoring.provider.mjs +23 -0
  8. package/esm2022/lib/auth-monitoring/auth-monitoring.service.mjs +53 -0
  9. package/esm2022/lib/auth-routing.module.mjs +12 -13
  10. package/esm2022/lib/auth.module.mjs +43 -44
  11. package/esm2022/lib/shared/admin.guard.mjs +10 -11
  12. package/esm2022/lib/shared/auth-msalBroadcastServiceb2c.service.mjs +9 -9
  13. package/esm2022/lib/shared/auth-msalServiceb2c.service..mjs +9 -9
  14. package/esm2022/lib/shared/auth-storage.interface.mjs +2 -0
  15. package/esm2022/lib/shared/auth-storage.service.mjs +99 -0
  16. package/esm2022/lib/shared/auth.guard.mjs +9 -9
  17. package/esm2022/lib/shared/auth.interceptor.mjs +10 -13
  18. package/esm2022/lib/shared/auth.interface.mjs +1 -1
  19. package/esm2022/lib/shared/auth.service.mjs +18 -14
  20. package/esm2022/lib/shared/index.mjs +4 -3
  21. package/esm2022/lib/shared/logged.guard.mjs +9 -9
  22. package/esm2022/lib/shared/profils.guard.mjs +9 -9
  23. package/esm2022/lib/shared/protected.directive.mjs +9 -9
  24. package/esm2022/lib/shared/token.interface.mjs +2 -0
  25. package/esm2022/lib/shared/token.service.mjs +10 -10
  26. package/esm2022/public_api.mjs +6 -3
  27. package/fesm2022/igo2-auth.mjs +291 -441
  28. package/fesm2022/igo2-auth.mjs.map +1 -1
  29. package/lib/auth-monitoring/auth-monitoring.provider.d.ts +3 -0
  30. package/lib/auth-monitoring/auth-monitoring.service.d.ts +14 -0
  31. package/lib/shared/{storage.service.d.ts → auth-storage.service.d.ts} +1 -1
  32. package/lib/shared/auth.interface.d.ts +3 -5
  33. package/lib/shared/auth.service.d.ts +3 -1
  34. package/lib/shared/index.d.ts +3 -2
  35. package/lib/shared/token.interface.d.ts +5 -0
  36. package/lib/shared/token.service.d.ts +2 -1
  37. package/package.json +20 -22
  38. package/public_api.d.ts +5 -2
  39. package/esm2022/lib/shared/storage.interface.mjs +0 -2
  40. package/esm2022/lib/shared/storage.service.mjs +0 -99
  41. /package/lib/shared/{storage.interface.d.ts → auth-storage.interface.d.ts} +0 -0
@@ -1,7 +1,7 @@
1
1
  import { HttpClient } from '@angular/common/http';
2
2
  import { BaseStorage, ConfigService, StorageScope } from '@igo2/core';
3
3
  import { AuthService } from './auth.service';
4
- import { AuthStorageOptions } from './storage.interface';
4
+ import { AuthStorageOptions } from './auth-storage.interface';
5
5
  import { TokenService } from './token.service';
6
6
  import * as i0 from "@angular/core";
7
7
  export declare class AuthStorageService extends BaseStorage<AuthStorageOptions> {
@@ -1,3 +1,4 @@
1
+ import { BaseUser } from '@igo2/core';
1
2
  import { MsalGuardConfiguration } from '@azure/msal-angular';
2
3
  import { BrowserAuthOptions } from '@azure/msal-browser';
3
4
  export interface AuthInternOptions {
@@ -80,15 +81,12 @@ export interface MSPMsalGuardConfiguration extends MsalGuardConfiguration {
80
81
  export interface MSPMsalGuardConfiguration extends MsalGuardConfiguration {
81
82
  type: string;
82
83
  }
83
- export interface User {
84
+ export interface User extends BaseUser {
84
85
  source?: string;
85
86
  sourceId?: string;
86
- email?: string;
87
- firstName?: string;
88
- lastName?: string;
89
87
  locale?: string;
90
88
  isExpired?: boolean;
91
- admin?: boolean;
89
+ isAdmin?: boolean;
92
90
  defaultContextId?: string;
93
91
  }
94
92
  export interface IInfosUser {
@@ -3,6 +3,7 @@ import { Router } from '@angular/router';
3
3
  import { ConfigService, LanguageService, MessageService } from '@igo2/core';
4
4
  import { BehaviorSubject, Observable } from 'rxjs';
5
5
  import { IInfosUser, User } from './auth.interface';
6
+ import { IgoJwtPayload } from './token.interface';
6
7
  import { TokenService } from './token.service';
7
8
  import * as i0 from "@angular/core";
8
9
  export declare class AuthService {
@@ -19,6 +20,7 @@ export declare class AuthService {
19
20
  private anonymous;
20
21
  private authOptions;
21
22
  get hasAuthService(): boolean;
23
+ get user(): User | null;
22
24
  constructor(http: HttpClient, tokenService: TokenService, config: ConfigService, languageService: LanguageService, messageService: MessageService, router: Router);
23
25
  login(username: string, password: string): Observable<void>;
24
26
  loginWithToken(token: string, type: string, infosUser?: IInfosUser): Observable<void>;
@@ -27,7 +29,7 @@ export declare class AuthService {
27
29
  logout(): Observable<boolean>;
28
30
  isAuthenticated(): boolean;
29
31
  getToken(): string;
30
- decodeToken(): any;
32
+ decodeToken(): IgoJwtPayload | null;
31
33
  goToRedirectUrl(): void;
32
34
  getUserInfo(): Observable<User>;
33
35
  getProfils(): Observable<{
@@ -1,4 +1,5 @@
1
1
  export * from './token.service';
2
+ export * from './token.interface';
2
3
  export * from './auth.service';
3
4
  export * from './auth.interface';
4
5
  export * from './auth.interceptor';
@@ -8,5 +9,5 @@ export * from './auth.guard';
8
9
  export * from './admin.guard';
9
10
  export * from './profils.guard';
10
11
  export * from './protected.directive';
11
- export * from './storage.interface';
12
- export * from './storage.service';
12
+ export * from './auth-storage.interface';
13
+ export * from './auth-storage.service';
@@ -0,0 +1,5 @@
1
+ import { JwtPayload } from 'jwt-decode';
2
+ import { User } from './auth.interface';
3
+ export interface IgoJwtPayload extends JwtPayload {
4
+ user: User;
5
+ }
@@ -1,4 +1,5 @@
1
1
  import { Injector } from '@angular/core';
2
+ import { IgoJwtPayload } from './token.interface';
2
3
  import * as i0 from "@angular/core";
3
4
  export declare class TokenService {
4
5
  private injector;
@@ -8,7 +9,7 @@ export declare class TokenService {
8
9
  set(token: string): void;
9
10
  remove(): void;
10
11
  get(): string;
11
- decode(): any;
12
+ decode(): IgoJwtPayload | null;
12
13
  isExpired(): boolean;
13
14
  static ɵfac: i0.ɵɵFactoryDeclaration<TokenService, never>;
14
15
  static ɵprov: i0.ɵɵInjectableDeclaration<TokenService>;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@igo2/auth",
3
- "version": "16.0.2",
3
+ "version": "16.1.0",
4
4
  "description": "IGO Library",
5
5
  "author": "IGO Community",
6
6
  "keywords": [
@@ -15,8 +15,19 @@
15
15
  "bugs": {
16
16
  "url": "https://github.com/infra-geo-ouverte/igo2-lib/issues"
17
17
  },
18
+ "exports": {
19
+ ".": {
20
+ "types": "./index.d.ts",
21
+ "esm2022": "./esm2022/igo2-auth.mjs",
22
+ "esm": "./esm2022/igo2-auth.mjs",
23
+ "default": "./fesm2022/igo2-auth.mjs"
24
+ },
25
+ "./package.json": {
26
+ "default": "./package.json"
27
+ }
28
+ },
18
29
  "dependencies": {
19
- "jwt-decode": "^2.2.0",
30
+ "jwt-decode": "^4.0.0",
20
31
  "ts-cacheable": "^1.0.6",
21
32
  "ts-md5": "^1.3.0",
22
33
  "tslib": "^2.6.0"
@@ -28,29 +39,16 @@
28
39
  "@angular/forms": "^16.2.5",
29
40
  "@angular/material": "^16.2.4",
30
41
  "@angular/router": "^16.2.5",
31
- "@igo2/core": "^16.0.2",
32
- "@igo2/utils": "^16.0.2",
33
- "rxjs": "^7.5.6",
34
- "@azure/msal-angular": "^3.0.4"
42
+ "@azure/msal-angular": "^3.0.4",
43
+ "@azure/msal-browser": "^3.0.4",
44
+ "@igo2/core": "^16.1.0",
45
+ "@igo2/utils": "^16.1.0",
46
+ "rxjs": "^7.8.0"
35
47
  },
36
48
  "engines": {
37
49
  "node": ">=18.10.0"
38
50
  },
39
51
  "module": "fesm2022/igo2-auth.mjs",
40
52
  "typings": "index.d.ts",
41
- "exports": {
42
- "./package.json": {
43
- "default": "./package.json"
44
- },
45
- ".": {
46
- "types": "./index.d.ts",
47
- "esm2022": "./esm2022/igo2-auth.mjs",
48
- "esm": "./esm2022/igo2-auth.mjs",
49
- "default": "./fesm2022/igo2-auth.mjs"
50
- }
51
- },
52
- "sideEffects": false,
53
- "scripts": {
54
-
55
- }
56
- }
53
+ "sideEffects": false
54
+ }
package/public_api.d.ts CHANGED
@@ -9,8 +9,11 @@ export * from './lib/shared/auth.interceptor';
9
9
  export * from './lib/shared/auth.interface';
10
10
  export * from './lib/shared/auth-microsoft.provider';
11
11
  export * from './lib/shared/protected.directive';
12
+ export * from './lib/shared/token.interface';
12
13
  export * from './lib/shared/token.service';
13
- export * from './lib/shared/storage.interface';
14
- export * from './lib/shared/storage.service';
14
+ export * from './lib/shared/auth-storage.interface';
15
+ export * from './lib/shared/auth-storage.service';
16
+ export * from './lib/auth-monitoring/auth-monitoring.provider';
17
+ export * from './lib/auth-monitoring/auth-monitoring.service';
15
18
  export * from './lib/auth-routing.module';
16
19
  export * from './lib/auth.module';
@@ -1,2 +0,0 @@
1
- export {};
2
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3RvcmFnZS5pbnRlcmZhY2UuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi9wYWNrYWdlcy9hdXRoL3NyYy9saWIvc2hhcmVkL3N0b3JhZ2UuaW50ZXJmYWNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiIiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBTdG9yYWdlT3B0aW9ucyB9IGZyb20gJ0BpZ28yL2NvcmUnO1xyXG5cclxuZXhwb3J0IGludGVyZmFjZSBBdXRoU3RvcmFnZU9wdGlvbnMgZXh0ZW5kcyBTdG9yYWdlT3B0aW9ucyB7XHJcbiAgdXJsOiBzdHJpbmc7XHJcbn1cclxuIl19
@@ -1,99 +0,0 @@
1
- import { HttpClient } from '@angular/common/http';
2
- import { Injectable } from '@angular/core';
3
- import { BaseStorage, ConfigService, StorageScope } from '@igo2/core';
4
- import { AuthService } from './auth.service';
5
- import { TokenService } from './token.service';
6
- import * as i0 from "@angular/core";
7
- import * as i1 from "@igo2/core";
8
- import * as i2 from "@angular/common/http";
9
- import * as i3 from "./auth.service";
10
- import * as i4 from "./token.service";
11
- export class AuthStorageService extends BaseStorage {
12
- http;
13
- authService;
14
- tokenService;
15
- constructor(config, http, authService, tokenService) {
16
- super(config);
17
- this.http = http;
18
- this.authService = authService;
19
- this.tokenService = tokenService;
20
- this.authService.authenticate$.subscribe((isAuthenticated) => {
21
- if (isAuthenticated && this.options.url) {
22
- this.http
23
- .get(this.options.url)
24
- .subscribe((userIgo) => {
25
- if (userIgo && userIgo.preference) {
26
- for (const key of Object.keys(userIgo.preference)) {
27
- const value = userIgo.preference[key];
28
- super.set(key, value);
29
- }
30
- }
31
- });
32
- }
33
- });
34
- }
35
- set(key, value, scope = StorageScope.LOCAL) {
36
- if (scope === StorageScope.LOCAL &&
37
- this.authService.authenticated &&
38
- this.options.url) {
39
- const preference = {};
40
- preference[key] = value;
41
- this.http.patch(this.options.url, { preference }).subscribe();
42
- }
43
- super.set(key, value, scope);
44
- }
45
- remove(key, scope = StorageScope.LOCAL) {
46
- if (scope === StorageScope.LOCAL &&
47
- this.authService.authenticated &&
48
- this.options.url) {
49
- const preference = {};
50
- preference[key] = undefined;
51
- this.http.patch(this.options.url, { preference }).subscribe();
52
- }
53
- super.remove(key, scope);
54
- }
55
- clear(scope = StorageScope.LOCAL) {
56
- if (scope === StorageScope.LOCAL &&
57
- this.authService.authenticated &&
58
- this.options.url) {
59
- this.http
60
- .patch(this.options.url, { preference: {} }, {
61
- params: {
62
- mergePreference: 'false'
63
- }
64
- })
65
- .subscribe();
66
- }
67
- let token;
68
- if (scope === StorageScope.LOCAL) {
69
- token = this.tokenService.get();
70
- }
71
- super.clear(scope);
72
- if (token) {
73
- this.tokenService.set(token);
74
- }
75
- if (scope === StorageScope.LOCAL &&
76
- this.authService.authenticated &&
77
- this.options.url) {
78
- this.http
79
- .get(this.options.url)
80
- .subscribe((userIgo) => {
81
- if (userIgo && userIgo.preference) {
82
- for (const key of Object.keys(userIgo.preference)) {
83
- const value = userIgo.preference[key];
84
- super.set(key, value);
85
- }
86
- }
87
- });
88
- }
89
- }
90
- static ɵfac = function AuthStorageService_Factory(t) { return new (t || AuthStorageService)(i0.ɵɵinject(i1.ConfigService), i0.ɵɵinject(i2.HttpClient), i0.ɵɵinject(i3.AuthService), i0.ɵɵinject(i4.TokenService)); };
91
- static ɵprov = /*@__PURE__*/ i0.ɵɵdefineInjectable({ token: AuthStorageService, factory: AuthStorageService.ɵfac, providedIn: 'root' });
92
- }
93
- (function () { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassMetadata(AuthStorageService, [{
94
- type: Injectable,
95
- args: [{
96
- providedIn: 'root'
97
- }]
98
- }], function () { return [{ type: i1.ConfigService }, { type: i2.HttpClient }, { type: i3.AuthService }, { type: i4.TokenService }]; }, null); })();
99
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"storage.service.js","sourceRoot":"","sources":["../../../../../packages/auth/src/lib/shared/storage.service.ts"],"names":[],"mappings":"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","sourcesContent":["import { HttpClient } from '@angular/common/http';\r\nimport { Injectable } from '@angular/core';\r\n\r\nimport { BaseStorage, ConfigService, StorageScope } from '@igo2/core';\r\n\r\nimport { AuthService } from './auth.service';\r\nimport { AuthStorageOptions } from './storage.interface';\r\nimport { TokenService } from './token.service';\r\n\r\n@Injectable({\r\n  providedIn: 'root'\r\n})\r\nexport class AuthStorageService extends BaseStorage<AuthStorageOptions> {\r\n  constructor(\r\n    config: ConfigService,\r\n    private http: HttpClient,\r\n    private authService: AuthService,\r\n    private tokenService: TokenService\r\n  ) {\r\n    super(config);\r\n\r\n    this.authService.authenticate$.subscribe((isAuthenticated) => {\r\n      if (isAuthenticated && this.options.url) {\r\n        this.http\r\n          .get(this.options.url)\r\n          .subscribe((userIgo: { preference: object }) => {\r\n            if (userIgo && userIgo.preference) {\r\n              for (const key of Object.keys(userIgo.preference)) {\r\n                const value = userIgo.preference[key];\r\n                super.set(key, value);\r\n              }\r\n            }\r\n          });\r\n      }\r\n    });\r\n  }\r\n\r\n  set(\r\n    key: string,\r\n    value: string | object | boolean | number,\r\n    scope: StorageScope = StorageScope.LOCAL\r\n  ) {\r\n    if (\r\n      scope === StorageScope.LOCAL &&\r\n      this.authService.authenticated &&\r\n      this.options.url\r\n    ) {\r\n      const preference = {};\r\n      preference[key] = value;\r\n      this.http.patch(this.options.url, { preference }).subscribe();\r\n    }\r\n    super.set(key, value, scope);\r\n  }\r\n\r\n  remove(key: string, scope: StorageScope = StorageScope.LOCAL) {\r\n    if (\r\n      scope === StorageScope.LOCAL &&\r\n      this.authService.authenticated &&\r\n      this.options.url\r\n    ) {\r\n      const preference = {};\r\n      preference[key] = undefined;\r\n      this.http.patch(this.options.url, { preference }).subscribe();\r\n    }\r\n    super.remove(key, scope);\r\n  }\r\n\r\n  clear(scope: StorageScope = StorageScope.LOCAL) {\r\n    if (\r\n      scope === StorageScope.LOCAL &&\r\n      this.authService.authenticated &&\r\n      this.options.url\r\n    ) {\r\n      this.http\r\n        .patch(\r\n          this.options.url,\r\n          { preference: {} },\r\n          {\r\n            params: {\r\n              mergePreference: 'false'\r\n            }\r\n          }\r\n        )\r\n        .subscribe();\r\n    }\r\n\r\n    let token: string;\r\n    if (scope === StorageScope.LOCAL) {\r\n      token = this.tokenService.get();\r\n    }\r\n\r\n    super.clear(scope);\r\n\r\n    if (token) {\r\n      this.tokenService.set(token);\r\n    }\r\n\r\n    if (\r\n      scope === StorageScope.LOCAL &&\r\n      this.authService.authenticated &&\r\n      this.options.url\r\n    ) {\r\n      this.http\r\n        .get(this.options.url)\r\n        .subscribe((userIgo: { preference: object }) => {\r\n          if (userIgo && userIgo.preference) {\r\n            for (const key of Object.keys(userIgo.preference)) {\r\n              const value = userIgo.preference[key];\r\n              super.set(key, value);\r\n            }\r\n          }\r\n        });\r\n    }\r\n  }\r\n}\r\n"]}