@memberjunction/ng-auth-services 2.48.0 → 2.50.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.
- package/dist/lib/auth-services.module.js +3 -3
- package/dist/lib/auth-services.module.js.map +1 -1
- package/dist/lib/mjexplorer-auth-base.service.js +4 -5
- package/dist/lib/mjexplorer-auth-base.service.js.map +1 -1
- package/dist/lib/mjexplorer-auth0-provider.service.js +15 -33
- package/dist/lib/mjexplorer-auth0-provider.service.js.map +1 -1
- package/dist/lib/mjexplorer-msal-provider.service.js +71 -94
- package/dist/lib/mjexplorer-msal-provider.service.js.map +1 -1
- package/package.json +2 -2
|
@@ -79,10 +79,10 @@ export class AuthServicesModule {
|
|
|
79
79
|
],
|
|
80
80
|
};
|
|
81
81
|
}
|
|
82
|
+
static ɵfac = function AuthServicesModule_Factory(t) { return new (t || AuthServicesModule)(); };
|
|
83
|
+
static ɵmod = /*@__PURE__*/ i0.ɵɵdefineNgModule({ type: AuthServicesModule });
|
|
84
|
+
static ɵinj = /*@__PURE__*/ i0.ɵɵdefineInjector({});
|
|
82
85
|
}
|
|
83
|
-
AuthServicesModule.ɵfac = function AuthServicesModule_Factory(t) { return new (t || AuthServicesModule)(); };
|
|
84
|
-
AuthServicesModule.ɵmod = /*@__PURE__*/ i0.ɵɵdefineNgModule({ type: AuthServicesModule });
|
|
85
|
-
AuthServicesModule.ɵinj = /*@__PURE__*/ i0.ɵɵdefineInjector({});
|
|
86
86
|
(() => { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassMetadata(AuthServicesModule, [{
|
|
87
87
|
type: NgModule
|
|
88
88
|
}], null, null); })();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth-services.module.js","sourceRoot":"","sources":["../../src/lib/auth-services.module.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAuB,MAAM,eAAe,CAAC;AAE9D,mBAAmB;AACnB,OAAO,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AAC5D,OAAO,EAAE,eAAe,EAAE,MAAM,qCAAqC,CAAC;AACtE,OAAO,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AAEpE,6DAA6D;AAC7D,QAAQ;AACR,6DAA6D;AAC7D,OAAO,EACL,kBAAkB,EAClB,kBAAkB,EAClB,gBAAgB,EAChB,iBAAiB,EACjB,SAAS,EAET,WAAW,GACZ,MAAM,sBAAsB,CAAC;AAE9B,6DAA6D;AAC7D,MAAM;AACN,6DAA6D;AAC7D,OAAO,EACL,iBAAiB,EACjB,aAAa,EACb,uBAAuB,EACvB,oBAAoB,EACpB,SAAS,EACT,qBAAqB,EACrB,WAAW,GACZ,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,eAAe,EAAE,uBAAuB,EAAE,MAAM,qBAAqB,CAAC;;AAU/E,MAAM,CAAC,MAAM,iBAAiB,GAAG,qBAAqB,CAAC;AAGvD,MAAM,OAAO,kBAAkB;IAC7B,MAAM,CAAC,OAAO,CAAC,WAA4B;QACzC,OAAO;YACL,QAAQ,EAAE,kBAAkB;YAC5B,SAAS,EAAE;gBACT,WAAW,CAAC,SAAS,KAAK,OAAO;oBAC/B,CAAC,CAAC;wBACE,WAAW;wBACX,SAAS;wBACT;4BACE,OAAO,EAAE,iBAAiB;4BAC1B,QAAQ,EAAE;gCACR,MAAM,EAAE,WAAW,CAAC,YAAY;gCAChC,QAAQ,EAAE,WAAW,CAAC,cAAc;gCACpC,mBAAmB,EAAE;oCACnB,YAAY,EAAE,MAAM,CAAC,QAAQ,CAAC,MAAM;iCACrC;gCACD,aAAa,EAAE,cAAc;6BAC9B;yBACF;wBACD;4BACE,OAAO,EAAE,kBAAkB;4BAC3B,UAAU,EAAE,kBAAkB,CAAC,YAAY;4BAC3C,IAAI,EAAE,CAAC,gBAAgB,CAAC;yBACzB;qBACF;oBACH,CAAC,CAAC;wBACE;4BACE,OAAO,EAAE,aAAa;4BACtB,QAAQ,EAAE,IAAI,uBAAuB,CAAC;gCACpC,IAAI,EAAE;oCACJ,QAAQ,EAAE,WAAW,CAAC,SAAS;oCAC/B,SAAS,EAAE,WAAW,CAAC,gBAAgB;oCACvC,WAAW,EAAE,MAAM,CAAC,QAAQ,CAAC,MAAM;iCACpC;gCACD,KAAK,EAAE;oCACL,aAAa,EAAE,cAAc;oCAC7B,sBAAsB,EAAE,KAAK,EAAE,+EAA+E;iCAC/G;6BACF,CAAC;yBACH;wBACD;4BACE,OAAO,EAAE,iBAAiB;4BAC1B,QAAQ,EAAE;gCACR,eAAe,EAAE,eAAe,CAAC,QAAQ,EAAE,2BAA2B;gCACtE,WAAW,EAAE;oCACX,MAAM,EAAE,CAAC,WAAW,CAAC;iCACtB;6BACF;yBACF;wBACD;4BACE,OAAO,EAAE,uBAAuB;4BAChC,QAAQ,EAAE;gCACR,eAAe,EAAE,eAAe,CAAC,QAAQ,EAAE,iCAAiC;gCAC5E,oBAAoB,EAAE,IAAI,GAAG,CAAC,CAAC,CAAC,qCAAqC,EAAE,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;6BACxF;yBACF;wBACD,WAAW;wBACX,SAAS;wBACT,oBAAoB;qBACrB;gBACL,EAAE,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,WAAW,CAAC,SAAS,KAAK,OAAO,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,cAAc,EAAE;aACxG;SACF,CAAC;IACJ,CAAC
|
|
1
|
+
{"version":3,"file":"auth-services.module.js","sourceRoot":"","sources":["../../src/lib/auth-services.module.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAuB,MAAM,eAAe,CAAC;AAE9D,mBAAmB;AACnB,OAAO,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AAC5D,OAAO,EAAE,eAAe,EAAE,MAAM,qCAAqC,CAAC;AACtE,OAAO,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AAEpE,6DAA6D;AAC7D,QAAQ;AACR,6DAA6D;AAC7D,OAAO,EACL,kBAAkB,EAClB,kBAAkB,EAClB,gBAAgB,EAChB,iBAAiB,EACjB,SAAS,EAET,WAAW,GACZ,MAAM,sBAAsB,CAAC;AAE9B,6DAA6D;AAC7D,MAAM;AACN,6DAA6D;AAC7D,OAAO,EACL,iBAAiB,EACjB,aAAa,EACb,uBAAuB,EACvB,oBAAoB,EACpB,SAAS,EACT,qBAAqB,EACrB,WAAW,GACZ,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,eAAe,EAAE,uBAAuB,EAAE,MAAM,qBAAqB,CAAC;;AAU/E,MAAM,CAAC,MAAM,iBAAiB,GAAG,qBAAqB,CAAC;AAGvD,MAAM,OAAO,kBAAkB;IAC7B,MAAM,CAAC,OAAO,CAAC,WAA4B;QACzC,OAAO;YACL,QAAQ,EAAE,kBAAkB;YAC5B,SAAS,EAAE;gBACT,WAAW,CAAC,SAAS,KAAK,OAAO;oBAC/B,CAAC,CAAC;wBACE,WAAW;wBACX,SAAS;wBACT;4BACE,OAAO,EAAE,iBAAiB;4BAC1B,QAAQ,EAAE;gCACR,MAAM,EAAE,WAAW,CAAC,YAAY;gCAChC,QAAQ,EAAE,WAAW,CAAC,cAAc;gCACpC,mBAAmB,EAAE;oCACnB,YAAY,EAAE,MAAM,CAAC,QAAQ,CAAC,MAAM;iCACrC;gCACD,aAAa,EAAE,cAAc;6BAC9B;yBACF;wBACD;4BACE,OAAO,EAAE,kBAAkB;4BAC3B,UAAU,EAAE,kBAAkB,CAAC,YAAY;4BAC3C,IAAI,EAAE,CAAC,gBAAgB,CAAC;yBACzB;qBACF;oBACH,CAAC,CAAC;wBACE;4BACE,OAAO,EAAE,aAAa;4BACtB,QAAQ,EAAE,IAAI,uBAAuB,CAAC;gCACpC,IAAI,EAAE;oCACJ,QAAQ,EAAE,WAAW,CAAC,SAAS;oCAC/B,SAAS,EAAE,WAAW,CAAC,gBAAgB;oCACvC,WAAW,EAAE,MAAM,CAAC,QAAQ,CAAC,MAAM;iCACpC;gCACD,KAAK,EAAE;oCACL,aAAa,EAAE,cAAc;oCAC7B,sBAAsB,EAAE,KAAK,EAAE,+EAA+E;iCAC/G;6BACF,CAAC;yBACH;wBACD;4BACE,OAAO,EAAE,iBAAiB;4BAC1B,QAAQ,EAAE;gCACR,eAAe,EAAE,eAAe,CAAC,QAAQ,EAAE,2BAA2B;gCACtE,WAAW,EAAE;oCACX,MAAM,EAAE,CAAC,WAAW,CAAC;iCACtB;6BACF;yBACF;wBACD;4BACE,OAAO,EAAE,uBAAuB;4BAChC,QAAQ,EAAE;gCACR,eAAe,EAAE,eAAe,CAAC,QAAQ,EAAE,iCAAiC;gCAC5E,oBAAoB,EAAE,IAAI,GAAG,CAAC,CAAC,CAAC,qCAAqC,EAAE,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;6BACxF;yBACF;wBACD,WAAW;wBACX,SAAS;wBACT,oBAAoB;qBACrB;gBACL,EAAE,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,WAAW,CAAC,SAAS,KAAK,OAAO,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,cAAc,EAAE;aACxG;SACF,CAAC;IACJ,CAAC;4EAhEU,kBAAkB;4DAAlB,kBAAkB;;;iFAAlB,kBAAkB;cAD9B,QAAQ"}
|
|
@@ -1,15 +1,14 @@
|
|
|
1
1
|
import { Injectable } from '@angular/core';
|
|
2
2
|
import * as i0 from "@angular/core";
|
|
3
3
|
export class MJAuthBase {
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
}
|
|
4
|
+
authenticated = false;
|
|
5
|
+
constructor() { }
|
|
7
6
|
setAuthenticated(value) {
|
|
8
7
|
this.authenticated = value;
|
|
9
8
|
}
|
|
9
|
+
static ɵfac = function MJAuthBase_Factory(t) { return new (t || MJAuthBase)(); };
|
|
10
|
+
static ɵprov = /*@__PURE__*/ i0.ɵɵdefineInjectable({ token: MJAuthBase, factory: MJAuthBase.ɵfac, providedIn: 'root' });
|
|
10
11
|
}
|
|
11
|
-
MJAuthBase.ɵfac = function MJAuthBase_Factory(t) { return new (t || MJAuthBase)(); };
|
|
12
|
-
MJAuthBase.ɵprov = /*@__PURE__*/ i0.ɵɵdefineInjectable({ token: MJAuthBase, factory: MJAuthBase.ɵfac, providedIn: 'root' });
|
|
13
12
|
(() => { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassMetadata(MJAuthBase, [{
|
|
14
13
|
type: Injectable,
|
|
15
14
|
args: [{
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mjexplorer-auth-base.service.js","sourceRoot":"","sources":["../../src/lib/mjexplorer-auth-base.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;;AAM3C,MAAM,OAAgB,UAAU;
|
|
1
|
+
{"version":3,"file":"mjexplorer-auth-base.service.js","sourceRoot":"","sources":["../../src/lib/mjexplorer-auth-base.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;;AAM3C,MAAM,OAAgB,UAAU;IAC9B,aAAa,GAAY,KAAK,CAAC;IAE/B,gBAAgB,CAAC;IASP,gBAAgB,CAAC,KAAc;QACvC,IAAI,CAAC,aAAa,GAAG,KAAK,CAAC;IAC7B,CAAC;oEAdmB,UAAU;gEAAV,UAAU,WAAV,UAAU,mBAFlB,MAAM;;iFAEE,UAAU;cAH/B,UAAU;eAAC;gBACV,UAAU,EAAE,MAAM;aACnB"}
|
|
@@ -1,17 +1,9 @@
|
|
|
1
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
2
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
3
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
4
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
5
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
6
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
7
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
8
|
-
});
|
|
9
|
-
};
|
|
10
1
|
import { Injectable } from '@angular/core';
|
|
11
2
|
import { MJAuthBase } from './mjexplorer-auth-base.service';
|
|
12
3
|
import * as i0 from "@angular/core";
|
|
13
4
|
import * as i1 from "@auth0/auth0-angular";
|
|
14
5
|
export class MJAuth0Provider extends MJAuthBase {
|
|
6
|
+
auth;
|
|
15
7
|
constructor(auth) {
|
|
16
8
|
super();
|
|
17
9
|
this.auth = auth;
|
|
@@ -22,38 +14,28 @@ export class MJAuth0Provider extends MJAuthBase {
|
|
|
22
14
|
login(options) {
|
|
23
15
|
this.auth.loginWithRedirect(options);
|
|
24
16
|
}
|
|
25
|
-
logout() {
|
|
26
|
-
|
|
27
|
-
this.auth.logout({ logoutParams: { returnTo: document.location.origin } });
|
|
28
|
-
});
|
|
17
|
+
async logout() {
|
|
18
|
+
this.auth.logout({ logoutParams: { returnTo: document.location.origin } });
|
|
29
19
|
}
|
|
30
|
-
refresh() {
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
return this.auth.idTokenClaims$;
|
|
34
|
-
});
|
|
20
|
+
async refresh() {
|
|
21
|
+
await this.auth.getAccessTokenSilently();
|
|
22
|
+
return this.auth.idTokenClaims$;
|
|
35
23
|
}
|
|
36
|
-
getUser() {
|
|
37
|
-
return
|
|
38
|
-
return this.auth.user$;
|
|
39
|
-
});
|
|
24
|
+
async getUser() {
|
|
25
|
+
return this.auth.user$;
|
|
40
26
|
}
|
|
41
|
-
isAuthenticated() {
|
|
42
|
-
return
|
|
43
|
-
return this.auth.isAuthenticated$;
|
|
44
|
-
});
|
|
27
|
+
async isAuthenticated() {
|
|
28
|
+
return this.auth.isAuthenticated$;
|
|
45
29
|
}
|
|
46
|
-
getUserClaims() {
|
|
47
|
-
return
|
|
48
|
-
return this.auth.idTokenClaims$;
|
|
49
|
-
});
|
|
30
|
+
async getUserClaims() {
|
|
31
|
+
return this.auth.idTokenClaims$;
|
|
50
32
|
}
|
|
51
33
|
checkExpiredTokenError(error) {
|
|
52
|
-
return error
|
|
34
|
+
return error?.includes('jwt expired');
|
|
53
35
|
}
|
|
36
|
+
static ɵfac = function MJAuth0Provider_Factory(t) { return new (t || MJAuth0Provider)(i0.ɵɵinject(i1.AuthService)); };
|
|
37
|
+
static ɵprov = /*@__PURE__*/ i0.ɵɵdefineInjectable({ token: MJAuth0Provider, factory: MJAuth0Provider.ɵfac, providedIn: 'root' });
|
|
54
38
|
}
|
|
55
|
-
MJAuth0Provider.ɵfac = function MJAuth0Provider_Factory(t) { return new (t || MJAuth0Provider)(i0.ɵɵinject(i1.AuthService)); };
|
|
56
|
-
MJAuth0Provider.ɵprov = /*@__PURE__*/ i0.ɵɵdefineInjectable({ token: MJAuth0Provider, factory: MJAuth0Provider.ɵfac, providedIn: 'root' });
|
|
57
39
|
(() => { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassMetadata(MJAuth0Provider, [{
|
|
58
40
|
type: Injectable,
|
|
59
41
|
args: [{
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mjexplorer-auth0-provider.service.js","sourceRoot":"","sources":["../../src/lib/mjexplorer-auth0-provider.service.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"mjexplorer-auth0-provider.service.js","sourceRoot":"","sources":["../../src/lib/mjexplorer-auth0-provider.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;;;AAO5D,MAAM,OAAO,eAAgB,SAAQ,UAAU;IAE1B;IAAnB,YAAmB,IAAiB;QAClC,KAAK,EAAE,CAAC;QADS,SAAI,GAAJ,IAAI,CAAa;QAElC,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,SAAS,CAAC,CAAC,QAAQ,EAAE,EAAE;YAChD,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC;QAClC,CAAC,CAAC,CAAC;IACL,CAAC;IAEQ,KAAK,CAAC,OAAa;QAC1B,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC;IACvC,CAAC;IAEM,KAAK,CAAC,MAAM;QACjB,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,YAAY,EAAE,EAAE,QAAQ,EAAE,QAAQ,CAAC,QAAQ,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;IAC7E,CAAC;IAEM,KAAK,CAAC,OAAO;QAClB,MAAM,IAAI,CAAC,IAAI,CAAC,sBAAsB,EAAE,CAAC;QACzC,OAAO,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC;IAClC,CAAC;IAED,KAAK,CAAC,OAAO;QACX,OAAO,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC;IACzB,CAAC;IAED,KAAK,CAAC,eAAe;QACnB,OAAO,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC;IACpC,CAAC;IAED,KAAK,CAAC,aAAa;QACjB,OAAO,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC;IAClC,CAAC;IAED,sBAAsB,CAAC,KAAa;QAClC,OAAO,KAAK,EAAE,QAAQ,CAAC,aAAa,CAAC,CAAC;IACxC,CAAC;yEApCU,eAAe;gEAAf,eAAe,WAAf,eAAe,mBAFd,MAAM;;iFAEP,eAAe;cAH3B,UAAU;eAAC;gBACV,UAAU,EAAE,MAAM;aACnB"}
|
|
@@ -1,12 +1,3 @@
|
|
|
1
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
2
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
3
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
4
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
5
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
6
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
7
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
8
|
-
});
|
|
9
|
-
};
|
|
10
1
|
import { Injectable } from '@angular/core';
|
|
11
2
|
import { MJAuthBase } from './mjexplorer-auth-base.service';
|
|
12
3
|
import { BehaviorSubject, Subject, catchError, filter, from, map, of, throwError, takeUntil, take, firstValueFrom } from 'rxjs';
|
|
@@ -15,113 +6,99 @@ import { LogError } from '@memberjunction/core';
|
|
|
15
6
|
import * as i0 from "@angular/core";
|
|
16
7
|
import * as i1 from "@azure/msal-angular";
|
|
17
8
|
export class MJMSALProvider extends MJAuthBase {
|
|
9
|
+
auth;
|
|
10
|
+
msalBroadcastService;
|
|
11
|
+
_destroying$ = new Subject();
|
|
12
|
+
_initializationCompleted$ = new BehaviorSubject(false);
|
|
18
13
|
constructor(auth, msalBroadcastService) {
|
|
19
14
|
super();
|
|
20
15
|
this.auth = auth;
|
|
21
16
|
this.msalBroadcastService = msalBroadcastService;
|
|
22
|
-
this._destroying$ = new Subject();
|
|
23
|
-
this._initializationCompleted$ = new BehaviorSubject(false);
|
|
24
17
|
this.initializeMSAL();
|
|
25
18
|
}
|
|
26
|
-
initializeMSAL() {
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
19
|
+
async initializeMSAL() {
|
|
20
|
+
await this.auth.instance.initialize();
|
|
21
|
+
// After initialization logic
|
|
22
|
+
this.auth.instance.setActiveAccount(this.auth.instance.getAllAccounts()[0] || null);
|
|
23
|
+
this.msalBroadcastService.inProgress$
|
|
24
|
+
.pipe(filter((status) => status === InteractionStatus.None), takeUntil(this._destroying$))
|
|
25
|
+
.subscribe(() => {
|
|
26
|
+
this.setAuthenticated(this.auth.instance.getAllAccounts().length > 0);
|
|
30
27
|
this.auth.instance.setActiveAccount(this.auth.instance.getAllAccounts()[0] || null);
|
|
31
|
-
this.
|
|
32
|
-
.pipe(filter((status) => status === InteractionStatus.None), takeUntil(this._destroying$))
|
|
33
|
-
.subscribe(() => {
|
|
34
|
-
this.setAuthenticated(this.auth.instance.getAllAccounts().length > 0);
|
|
35
|
-
this.auth.instance.setActiveAccount(this.auth.instance.getAllAccounts()[0] || null);
|
|
36
|
-
this._initializationCompleted$.next(true); // Signal initialization complete
|
|
37
|
-
});
|
|
28
|
+
this._initializationCompleted$.next(true); // Signal initialization complete
|
|
38
29
|
});
|
|
39
30
|
}
|
|
40
31
|
// Ensure methods wait for initialization
|
|
41
|
-
ensureInitialized() {
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
}
|
|
46
|
-
});
|
|
32
|
+
async ensureInitialized() {
|
|
33
|
+
if (!this._initializationCompleted$.value) {
|
|
34
|
+
await firstValueFrom(this._initializationCompleted$.pipe(filter(done => done), take(1)));
|
|
35
|
+
}
|
|
47
36
|
}
|
|
48
|
-
login(options) {
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
this.auth.instance.setActiveAccount(this.auth.instance.getAllAccounts()[0] || null);
|
|
57
|
-
window.location.reload();
|
|
58
|
-
},
|
|
59
|
-
error: (error) => {
|
|
60
|
-
LogError(error);
|
|
61
|
-
}
|
|
62
|
-
});
|
|
63
|
-
});
|
|
64
|
-
}
|
|
65
|
-
logout() {
|
|
66
|
-
return __awaiter(this, void 0, void 0, function* () {
|
|
67
|
-
yield this.ensureInitialized();
|
|
68
|
-
this.auth.logoutRedirect().subscribe(() => {
|
|
37
|
+
async login(options) {
|
|
38
|
+
await this.ensureInitialized();
|
|
39
|
+
const silentRequest = {
|
|
40
|
+
scopes: ['User.Read', 'email', 'profile']
|
|
41
|
+
};
|
|
42
|
+
this.auth.loginRedirect(silentRequest).subscribe({
|
|
43
|
+
next: () => {
|
|
44
|
+
this.auth.instance.setActiveAccount(this.auth.instance.getAllAccounts()[0] || null);
|
|
69
45
|
window.location.reload();
|
|
70
|
-
}
|
|
46
|
+
},
|
|
47
|
+
error: (error) => {
|
|
48
|
+
LogError(error);
|
|
49
|
+
}
|
|
71
50
|
});
|
|
72
51
|
}
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
scopes: ['User.Read', 'email', 'profile'],
|
|
78
|
-
cacheLookupPolicy: CacheLookupPolicy.RefreshTokenAndNetwork,
|
|
79
|
-
};
|
|
80
|
-
return from(this.auth.instance.acquireTokenSilent(silentRequest));
|
|
52
|
+
async logout() {
|
|
53
|
+
await this.ensureInitialized();
|
|
54
|
+
this.auth.logoutRedirect().subscribe(() => {
|
|
55
|
+
window.location.reload();
|
|
81
56
|
});
|
|
82
57
|
}
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
58
|
+
async refresh() {
|
|
59
|
+
await this.ensureInitialized();
|
|
60
|
+
const silentRequest = {
|
|
61
|
+
scopes: ['User.Read', 'email', 'profile'],
|
|
62
|
+
cacheLookupPolicy: CacheLookupPolicy.RefreshTokenAndNetwork,
|
|
63
|
+
};
|
|
64
|
+
return from(this.auth.instance.acquireTokenSilent(silentRequest));
|
|
88
65
|
}
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
return of(this.auth.instance.getActiveAccount() != null);
|
|
93
|
-
});
|
|
66
|
+
async getUser() {
|
|
67
|
+
await this.ensureInitialized();
|
|
68
|
+
return this.auth.instance.getActiveAccount();
|
|
94
69
|
}
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
return
|
|
112
|
-
}
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
70
|
+
async isAuthenticated() {
|
|
71
|
+
await this.ensureInitialized();
|
|
72
|
+
return of(this.auth.instance.getActiveAccount() != null);
|
|
73
|
+
}
|
|
74
|
+
async getUserClaims() {
|
|
75
|
+
await this.ensureInitialized();
|
|
76
|
+
const account = this.auth.instance.getActiveAccount();
|
|
77
|
+
const silentRequest = {
|
|
78
|
+
scopes: ['User.Read', 'email', 'profile'],
|
|
79
|
+
account: account,
|
|
80
|
+
cacheLookupPolicy: CacheLookupPolicy.RefreshTokenAndNetwork
|
|
81
|
+
};
|
|
82
|
+
if (account) {
|
|
83
|
+
return from(this.auth.instance.acquireTokenSilent(silentRequest)).pipe(map((response) => response), catchError((error) => {
|
|
84
|
+
LogError(error);
|
|
85
|
+
if (error instanceof InteractionRequiredAuthError) {
|
|
86
|
+
return from(this.auth.instance.acquireTokenSilent(silentRequest));
|
|
87
|
+
}
|
|
88
|
+
this.authenticated = false;
|
|
89
|
+
return throwError(error);
|
|
90
|
+
}));
|
|
91
|
+
}
|
|
92
|
+
else {
|
|
93
|
+
return from(this.auth.instance.acquireTokenSilent(silentRequest));
|
|
94
|
+
}
|
|
118
95
|
}
|
|
119
96
|
checkExpiredTokenError(error) {
|
|
120
|
-
return error
|
|
97
|
+
return error?.trim().toLowerCase().includes('you need to be authorized to perform');
|
|
121
98
|
}
|
|
99
|
+
static ɵfac = function MJMSALProvider_Factory(t) { return new (t || MJMSALProvider)(i0.ɵɵinject(i1.MsalService), i0.ɵɵinject(i1.MsalBroadcastService)); };
|
|
100
|
+
static ɵprov = /*@__PURE__*/ i0.ɵɵdefineInjectable({ token: MJMSALProvider, factory: MJMSALProvider.ɵfac, providedIn: 'root' });
|
|
122
101
|
}
|
|
123
|
-
MJMSALProvider.ɵfac = function MJMSALProvider_Factory(t) { return new (t || MJMSALProvider)(i0.ɵɵinject(i1.MsalService), i0.ɵɵinject(i1.MsalBroadcastService)); };
|
|
124
|
-
MJMSALProvider.ɵprov = /*@__PURE__*/ i0.ɵɵdefineInjectable({ token: MJMSALProvider, factory: MJMSALProvider.ɵfac, providedIn: 'root' });
|
|
125
102
|
(() => { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassMetadata(MJMSALProvider, [{
|
|
126
103
|
type: Injectable,
|
|
127
104
|
args: [{
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mjexplorer-msal-provider.service.js","sourceRoot":"","sources":["../../src/lib/mjexplorer-msal-provider.service.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"mjexplorer-msal-provider.service.js","sourceRoot":"","sources":["../../src/lib/mjexplorer-msal-provider.service.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@memberjunction/ng-auth-services",
|
|
3
|
-
"version": "2.
|
|
3
|
+
"version": "2.50.0",
|
|
4
4
|
"description": "MemberJunction Explorer: Authentication Services",
|
|
5
5
|
"main": "./dist/public-api.js",
|
|
6
6
|
"typings": "./dist/public-api.d.ts",
|
|
@@ -27,7 +27,7 @@
|
|
|
27
27
|
"@azure/msal-angular": "^3.0.11"
|
|
28
28
|
},
|
|
29
29
|
"dependencies": {
|
|
30
|
-
"@memberjunction/core": "2.
|
|
30
|
+
"@memberjunction/core": "2.50.0",
|
|
31
31
|
"tslib": "^2.3.0"
|
|
32
32
|
},
|
|
33
33
|
"sideEffects": false
|