@axa-fr/react-oidc 6.5.0-beta0 → 6.5.1
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/OidcSecure.js +3 -3
- package/dist/OidcSecure.js.map +1 -1
- package/dist/OidcServiceWorker.js +11 -2
- package/dist/ReactOidc.d.ts +2 -2
- package/dist/ReactOidc.d.ts.map +1 -1
- package/dist/ReactOidc.js +5 -5
- package/dist/ReactOidc.js.map +1 -1
- package/dist/core/default-component/SilentLogin.component.js +1 -1
- package/dist/core/default-component/SilentLogin.component.js.map +1 -1
- package/dist/vanilla/initWorker.js +1 -1
- package/dist/vanilla/initWorker.js.map +1 -1
- package/dist/vanilla/oidc.d.ts +3 -3
- package/dist/vanilla/oidc.d.ts.map +1 -1
- package/dist/vanilla/oidc.js +46 -49
- package/dist/vanilla/oidc.js.map +1 -1
- package/dist/vanilla/parseTokens.d.ts +2 -2
- package/dist/vanilla/parseTokens.d.ts.map +1 -1
- package/dist/vanilla/parseTokens.js +15 -5
- package/dist/vanilla/parseTokens.js.map +1 -1
- package/package.json +10 -10
- package/src/oidc/OidcSecure.tsx +3 -3
- package/src/oidc/ReactOidc.tsx +4 -4
- package/src/oidc/core/default-component/SilentLogin.component.tsx +1 -1
- package/src/oidc/vanilla/OidcServiceWorker.js +11 -2
- package/src/oidc/vanilla/initWorker.ts +1 -1
- package/src/oidc/vanilla/oidc.ts +28 -33
- package/src/oidc/vanilla/parseTokens.ts +16 -5
package/dist/OidcSecure.js
CHANGED
|
@@ -41,16 +41,16 @@ exports.withOidcSecure = exports.OidcSecure = void 0;
|
|
|
41
41
|
var react_1 = __importStar(require("react"));
|
|
42
42
|
var oidc_1 = __importDefault(require("./vanilla/oidc"));
|
|
43
43
|
var OidcSecure = function (_a) {
|
|
44
|
-
var children = _a.children, _b = _a.callbackPath, callbackPath = _b === void 0 ? null : _b, _c = _a.extras, extras = _c === void 0 ? null : _c, _d = _a.configurationName, configurationName = _d === void 0 ? "default" : _d
|
|
44
|
+
var children = _a.children, _b = _a.callbackPath, callbackPath = _b === void 0 ? null : _b, _c = _a.extras, extras = _c === void 0 ? null : _c, _d = _a.configurationName, configurationName = _d === void 0 ? "default" : _d;
|
|
45
45
|
var getOidc = oidc_1.default.get;
|
|
46
46
|
var oidc = getOidc(configurationName);
|
|
47
47
|
(0, react_1.useEffect)(function () {
|
|
48
48
|
if (!oidc.tokens) {
|
|
49
|
-
oidc.loginAsync(callbackPath, extras
|
|
49
|
+
oidc.loginAsync(callbackPath, extras);
|
|
50
50
|
}
|
|
51
51
|
return function () {
|
|
52
52
|
};
|
|
53
|
-
}, [configurationName, callbackPath, extras
|
|
53
|
+
}, [configurationName, callbackPath, extras]);
|
|
54
54
|
if (!oidc.tokens) {
|
|
55
55
|
return null;
|
|
56
56
|
}
|
package/dist/OidcSecure.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OidcSecure.js","sourceRoot":"","sources":["../src/oidc/OidcSecure.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6CAA8D;AAE9D,wDAA+C;AASxC,IAAM,UAAU,GAA2C,UAAC,
|
|
1
|
+
{"version":3,"file":"OidcSecure.js","sourceRoot":"","sources":["../src/oidc/OidcSecure.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6CAA8D;AAE9D,wDAA+C;AASxC,IAAM,UAAU,GAA2C,UAAC,EAAuE;QAAtE,QAAQ,cAAA,EAAE,oBAAiB,EAAjB,YAAY,mBAAC,IAAI,KAAA,EAAE,cAAW,EAAX,MAAM,mBAAC,IAAI,KAAA,EAAE,yBAA2B,EAA3B,iBAAiB,mBAAC,SAAS,KAAA;IACrI,IAAM,OAAO,GAAI,cAAI,CAAC,GAAG,CAAC;IAC1B,IAAM,IAAI,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC;IACxC,IAAA,iBAAS,EAAC;QACN,IAAG,CAAC,IAAI,CAAC,MAAM,EAAC;YACZ,IAAI,CAAC,UAAU,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC;SACzC;QACD,OAAO;QACP,CAAC,CAAA;IACL,CAAC,EAAE,CAAC,iBAAiB,EAAE,YAAY,EAAE,MAAM,CAAC,CAAC,CAAA;IAE7C,IAAG,CAAC,IAAI,CAAC,MAAM,EAAC;QACd,OAAO,IAAI,CAAC;KACb;IACD,OAAO,8DAAG,QAAQ,CAAI,CAAA;AAC1B,CAAC,CAAA;AAfY,QAAA,UAAU,cAetB;AAEM,IAAM,cAAc,GAAG,UAC5B,gBAAwD,EACxD,YAAiB,EACjB,MAAW,EACX,iBAA2B,EAC3B,KAAiC;IAHjC,6BAAA,EAAA,mBAAiB;IACjB,uBAAA,EAAA,aAAW;IACX,kCAAA,EAAA,6BAA2B;IAC3B,sBAAA,EAAA,iBAAiC;IAC9B,OAAA,UAAC,KAAK;QACT,OAAO,8BAAC,kBAAU,IAAC,KAAK,EAAE,KAAK,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,EAAE,iBAAiB,EAAE,iBAAiB;YAAE,8BAAC,gBAAgB,eAAK,KAAK,EAAI,CAAa,CAAC;IAClK,CAAC;AAFI,CAEJ,CAAC;AARW,QAAA,cAAc,kBAQzB"}
|
|
@@ -126,14 +126,23 @@ function hideTokens(currentDatabaseElement) {
|
|
|
126
126
|
const accessTokenExpiresAt = (accessTokenPayload && accessTokenPayload.exp)? accessTokenPayload.exp : tokens.issued_at + tokens.expires_in;
|
|
127
127
|
const expiresAt = idTokenExpiresAt < accessTokenExpiresAt ? idTokenExpiresAt : accessTokenExpiresAt;
|
|
128
128
|
secureTokens.expiresAt = expiresAt;
|
|
129
|
-
|
|
129
|
+
|
|
130
130
|
tokens.expiresAt = expiresAt;
|
|
131
131
|
|
|
132
132
|
if(!isTokensOidcValid(tokens, currentDatabaseElement.nonce.nonce, currentDatabaseElement.oidcServerConfiguration)){
|
|
133
133
|
throw Error("Tokens are not OpenID valid");
|
|
134
134
|
}
|
|
135
|
-
|
|
135
|
+
|
|
136
|
+
// When refresh_token is not rotated we reuse ald refresh_token
|
|
137
|
+
if(currentDatabaseElement.tokens != null && "refresh_token" in currentDatabaseElement.tokens && !("refresh_token" in tokens)){
|
|
138
|
+
const refreshToken = currentDatabaseElement.tokens.refresh_token;
|
|
139
|
+
currentDatabaseElement.tokens = {...tokens, refresh_token : refreshToken};
|
|
140
|
+
} else{
|
|
141
|
+
currentDatabaseElement.tokens = tokens;
|
|
142
|
+
}
|
|
143
|
+
|
|
136
144
|
currentDatabaseElement.status = "LOGGED_IN";
|
|
145
|
+
const body = JSON.stringify(secureTokens);
|
|
137
146
|
return new Response(body, response);
|
|
138
147
|
});
|
|
139
148
|
};
|
package/dist/ReactOidc.d.ts
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import { StringMap } from "./vanilla/oidc";
|
|
2
2
|
export declare const useOidc: (configurationName?: string) => {
|
|
3
|
-
login: (callbackPath?: string | undefined, extras?: StringMap,
|
|
3
|
+
login: (callbackPath?: string | undefined, extras?: StringMap, silentLoginOnly?: boolean) => any;
|
|
4
4
|
logout: (callbackPath?: string | null | undefined, extras?: StringMap) => any;
|
|
5
|
-
renewTokens: () => any;
|
|
5
|
+
renewTokens: (extras?: StringMap) => any;
|
|
6
6
|
isAuthenticated: boolean;
|
|
7
7
|
};
|
|
8
8
|
export declare type OidcAccessToken = {
|
package/dist/ReactOidc.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ReactOidc.d.ts","sourceRoot":"","sources":["../src/oidc/ReactOidc.tsx"],"names":[],"mappings":"AACA,OAAa,EAAC,SAAS,EAAC,MAAM,gBAAgB,CAAC;AAa/C,eAAO,MAAM,OAAO;2BAqBY,MAAM,GAAG,SAAS,WAAqB,SAAS
|
|
1
|
+
{"version":3,"file":"ReactOidc.d.ts","sourceRoot":"","sources":["../src/oidc/ReactOidc.tsx"],"names":[],"mappings":"AACA,OAAa,EAAC,SAAS,EAAC,MAAM,gBAAgB,CAAC;AAa/C,eAAO,MAAM,OAAO;2BAqBY,MAAM,GAAG,SAAS,WAAqB,SAAS;4BAG9C,MAAM,GAAG,IAAI,GAAG,SAAS,WAAqB,SAAS;2BAGzD,SAAS;;CAIxC,CAAA;AAcD,oBAAY,eAAe,GAAG;IAC1B,WAAW,CAAC,EAAE,GAAG,CAAC;IAClB,kBAAkB,CAAC,EAAE,GAAG,CAAA;CAC3B,CAAA;AAED,eAAO,MAAM,kBAAkB,iDA4B9B,CAAA;AAcD,oBAAY,WAAW,GAAG;IACtB,OAAO,CAAC,EAAE,GAAG,CAAC;IACd,cAAc,CAAC,EAAE,GAAG,CAAA;CACvB,CAAA;AAED,eAAO,MAAM,cAAc,6CA2B1B,CAAA"}
|
package/dist/ReactOidc.js
CHANGED
|
@@ -35,20 +35,20 @@ var useOidc = function (configurationName) {
|
|
|
35
35
|
oidc.removeEventSubscription(newSubscriptionId);
|
|
36
36
|
};
|
|
37
37
|
}, [configurationName]);
|
|
38
|
-
var login = function (callbackPath, extras,
|
|
38
|
+
var login = function (callbackPath, extras, silentLoginOnly) {
|
|
39
39
|
if (callbackPath === void 0) { callbackPath = undefined; }
|
|
40
40
|
if (extras === void 0) { extras = null; }
|
|
41
|
-
if (state === void 0) { state = undefined; }
|
|
42
41
|
if (silentLoginOnly === void 0) { silentLoginOnly = false; }
|
|
43
|
-
return getOidc(configurationName).loginAsync(callbackPath, extras,
|
|
42
|
+
return getOidc(configurationName).loginAsync(callbackPath, extras, false, undefined, silentLoginOnly);
|
|
44
43
|
};
|
|
45
44
|
var logout = function (callbackPath, extras) {
|
|
46
45
|
if (callbackPath === void 0) { callbackPath = undefined; }
|
|
47
46
|
if (extras === void 0) { extras = null; }
|
|
48
47
|
return getOidc(configurationName).logoutAsync(callbackPath, extras);
|
|
49
48
|
};
|
|
50
|
-
var renewTokens = function () {
|
|
51
|
-
|
|
49
|
+
var renewTokens = function (extras) {
|
|
50
|
+
if (extras === void 0) { extras = null; }
|
|
51
|
+
return getOidc(configurationName).renewTokensAsync(extras);
|
|
52
52
|
};
|
|
53
53
|
return { login: login, logout: logout, renewTokens: renewTokens, isAuthenticated: isAuthenticated };
|
|
54
54
|
};
|
package/dist/ReactOidc.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ReactOidc.js","sourceRoot":"","sources":["../src/oidc/ReactOidc.tsx"],"names":[],"mappings":";;;;;;AAAA,+BAAiD;AACjD,wDAA+C;AAE/C,IAAM,wBAAwB,GAAG,SAAS,CAAC;AAE3C,IAAM,sBAAsB,GAAG,UAAC,OAAO,EAAE,iBAAiB;IACtD,IAAI,eAAe,GAAW,KAAK,CAAC;IACpC,IAAM,IAAI,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC;IACxC,IAAG,IAAI,EAAC;QACJ,eAAe,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC,MAAM,IAAI,IAAI,CAAC;KAC/D;IACD,OAAO,eAAe,CAAC;AAC3B,CAAC,CAAA;AAEM,IAAM,OAAO,GAAE,UAAC,iBAA0C;IAA1C,kCAAA,EAAA,4CAA0C;IAC7D,IAAM,OAAO,GAAI,cAAI,CAAC,GAAG,CAAC;IACpB,IAAA,KAAwC,IAAA,gBAAQ,EAAU,sBAAsB,CAAC,OAAO,EAAE,iBAAiB,CAAC,CAAC,EAA5G,eAAe,QAAA,EAAE,kBAAkB,QAAyE,CAAC;IAEpH,IAAA,iBAAS,EAAC;QACN,IAAI,SAAS,GAAG,IAAI,CAAC;QACrB,IAAM,IAAI,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC;QACxC,kBAAkB,CAAC,sBAAsB,CAAC,OAAO,EAAE,iBAAiB,CAAC,CAAC,CAAC;QACvE,IAAM,iBAAiB,GAAG,IAAI,CAAC,eAAe,CAAC,UAAC,IAAI,EAAE,IAAI;YACtD,IAAG,IAAI,KAAK,cAAI,CAAC,UAAU,CAAC,uBAAuB,IAAI,IAAI,KAAK,cAAI,CAAC,UAAU,CAAC,oBAAoB,IAAI,IAAI,KAAK,cAAI,CAAC,UAAU,CAAC,aAAa,EAAC;gBAC3I,IAAG,SAAS,EAAE;oBACV,kBAAkB,CAAC,sBAAsB,CAAC,OAAO,EAAE,iBAAiB,CAAC,CAAC,CAAC;iBAC1E;aACJ;QACL,CAAC,CAAC,CAAC;QACH,OAAO;YACH,SAAS,GAAG,KAAK,CAAC;YAClB,IAAI,CAAC,uBAAuB,CAAC,iBAAiB,CAAC,CAAC;QACpD,CAAC,CAAC;IACN,CAAC,EAAE,CAAC,iBAAiB,CAAC,CAAC,CAAC;IAExB,IAAM,KAAK,GAAG,UAAC,YAA2C,EAAE,MAAqB,EAAE,
|
|
1
|
+
{"version":3,"file":"ReactOidc.js","sourceRoot":"","sources":["../src/oidc/ReactOidc.tsx"],"names":[],"mappings":"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"}
|
|
@@ -47,7 +47,7 @@ var SilentLogin = (function (_a) {
|
|
|
47
47
|
}
|
|
48
48
|
(0, react_1.useEffect)(function () {
|
|
49
49
|
if (!oidc.tokens) {
|
|
50
|
-
oidc.loginAsync(null, extras,
|
|
50
|
+
oidc.loginAsync(null, extras, true, queryParams.scope);
|
|
51
51
|
}
|
|
52
52
|
return function () {
|
|
53
53
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SilentLogin.component.js","sourceRoot":"","sources":["../../../src/oidc/core/default-component/SilentLogin.component.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6CAAsD;AACtD,4DAAsC;AACtC,yDAA0E;AAG1E,IAAM,WAAW,GAAuB,CAAC,UAAC,EAAoB;QAAnB,iBAAiB,uBAAA;IACxD,IAAM,WAAW,GAAG,IAAA,6CAA+B,EAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IAE1E,IAAM,OAAO,GAAI,cAAI,CAAC,GAAG,CAAC;IAC1B,IAAM,IAAI,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC;IAExC,IAAI,MAAM,GAAG,IAAI,CAAC;IAElB,KAAyB,UAA2B,EAA3B,KAAA,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,EAA3B,cAA2B,EAA3B,IAA2B,EAAE;QAA7C,IAAA,WAAY,EAAX,GAAG,QAAA,EAAE,KAAK,QAAA;QAChB,IAAG,GAAG,KAAK,OAAO,IAAI,GAAG,IAAI,OAAO,EAAC;YACjC,SAAS;SACZ;QACD,IAAG,MAAM,KAAK,IAAI,EAAC;YACf,MAAM,GAAG,EAAE,CAAC;SACf;QACD,MAAM,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;KACvB;IAED,IAAA,iBAAS,EAAC;QACN,IAAG,CAAC,IAAI,CAAC,MAAM,EAAC;YACZ,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,MAAM,EAAG,
|
|
1
|
+
{"version":3,"file":"SilentLogin.component.js","sourceRoot":"","sources":["../../../src/oidc/core/default-component/SilentLogin.component.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6CAAsD;AACtD,4DAAsC;AACtC,yDAA0E;AAG1E,IAAM,WAAW,GAAuB,CAAC,UAAC,EAAoB;QAAnB,iBAAiB,uBAAA;IACxD,IAAM,WAAW,GAAG,IAAA,6CAA+B,EAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IAE1E,IAAM,OAAO,GAAI,cAAI,CAAC,GAAG,CAAC;IAC1B,IAAM,IAAI,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC;IAExC,IAAI,MAAM,GAAG,IAAI,CAAC;IAElB,KAAyB,UAA2B,EAA3B,KAAA,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,EAA3B,cAA2B,EAA3B,IAA2B,EAAE;QAA7C,IAAA,WAAY,EAAX,GAAG,QAAA,EAAE,KAAK,QAAA;QAChB,IAAG,GAAG,KAAK,OAAO,IAAI,GAAG,IAAI,OAAO,EAAC;YACjC,SAAS;SACZ;QACD,IAAG,MAAM,KAAK,IAAI,EAAC;YACf,MAAM,GAAG,EAAE,CAAC;SACf;QACD,MAAM,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;KACvB;IAED,IAAA,iBAAS,EAAC;QACN,IAAG,CAAC,IAAI,CAAC,MAAM,EAAC;YACZ,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,MAAM,EAAG,IAAI,EAAE,WAAW,CAAC,KAAK,CAAC,CAAC;SAC3D;QACD,OAAO;QACP,CAAC,CAAA;IACL,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,OAAO,6DAAK,CAAC;AACjB,CAAC,CAAC,CAAC;AAEH,kBAAe,WAAW,CAAC"}
|
|
@@ -169,7 +169,7 @@ var initWorkerAsync = function (serviceWorkerRelativeUrl, configurationName) { r
|
|
|
169
169
|
case 1:
|
|
170
170
|
result = _a.sent();
|
|
171
171
|
// @ts-ignore
|
|
172
|
-
return [2 /*return*/, { tokens: (0, parseTokens_1.parseOriginalTokens)(result.tokens), status: result.status }];
|
|
172
|
+
return [2 /*return*/, { tokens: (0, parseTokens_1.parseOriginalTokens)(result.tokens, null), status: result.status }];
|
|
173
173
|
}
|
|
174
174
|
});
|
|
175
175
|
}); };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"initWorker.js","sourceRoot":"","sources":["../../src/oidc/vanilla/initWorker.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"initWorker.js","sourceRoot":"","sources":["../../src/oidc/vanilla/initWorker.ts"],"names":[],"mappings":"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"}
|
package/dist/vanilla/oidc.d.ts
CHANGED
|
@@ -95,12 +95,12 @@ export declare class Oidc {
|
|
|
95
95
|
tryKeepExistingSessionPromise: any;
|
|
96
96
|
tryKeepExistingSessionAsync(): Promise<any>;
|
|
97
97
|
loginPromise: Promise<any>;
|
|
98
|
-
loginAsync(callbackPath?: string, extras?: StringMap,
|
|
98
|
+
loginAsync(callbackPath?: string, extras?: StringMap, isSilentSignin?: boolean, scope?: string, silentLoginOnly?: boolean): Promise<any>;
|
|
99
99
|
startCheckSessionAsync(checkSessionIFrameUri: any, clientId: any, sessionState: any, isSilentSignin?: boolean): Promise<unknown>;
|
|
100
100
|
loginCallbackPromise: Promise<any>;
|
|
101
101
|
loginCallbackAsync(isSilenSignin?: boolean): Promise<any>;
|
|
102
102
|
_loginCallbackAsync(isSilentSignin?: boolean): Promise<unknown>;
|
|
103
|
-
synchroniseTokensAsync(refreshToken: any, index?: number, forceRefresh?: boolean): any;
|
|
103
|
+
synchroniseTokensAsync(refreshToken: any, index?: number, forceRefresh?: boolean, extras?: StringMap): any;
|
|
104
104
|
syncTokensInfoAsync(configuration: any, configurationName: any, currentTokens: any, forceRefresh?: boolean): Promise<{
|
|
105
105
|
tokens: any;
|
|
106
106
|
status: string;
|
|
@@ -109,7 +109,7 @@ export declare class Oidc {
|
|
|
109
109
|
loginCallbackWithAutoTokensRenewAsync(): Promise<loginCallbackResult>;
|
|
110
110
|
userInfoPromise: Promise<any>;
|
|
111
111
|
userInfoAsync(): Promise<any>;
|
|
112
|
-
renewTokensAsync(): Promise<void>;
|
|
112
|
+
renewTokensAsync(extras?: StringMap): Promise<void>;
|
|
113
113
|
destroyAsync(status: any): Promise<void>;
|
|
114
114
|
logoutSameTabAsync(clientId: any, sub: any): Promise<void>;
|
|
115
115
|
logoutOtherTabAsync(clientId: any, sub: any): Promise<void>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oidc.d.ts","sourceRoot":"","sources":["../../src/oidc/vanilla/oidc.ts"],"names":[],"mappings":"AAAA,OAAO,EAGH,iCAAiC,EAQpC,MAAM,iBAAiB,CAAC;AASzB,OAAO,EAAC,qCAAqC,EAAC,MAAM,yDAAyD,CAAC;
|
|
1
|
+
{"version":3,"file":"oidc.d.ts","sourceRoot":"","sources":["../../src/oidc/vanilla/oidc.ts"],"names":[],"mappings":"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"}
|
package/dist/vanilla/oidc.js
CHANGED
|
@@ -75,7 +75,7 @@ var timer_1 = __importDefault(require("./timer"));
|
|
|
75
75
|
var checkSessionIFrame_1 = require("./checkSessionIFrame");
|
|
76
76
|
var route_utils_1 = require("./route-utils");
|
|
77
77
|
var parseTokens_1 = require("./parseTokens");
|
|
78
|
-
var performTokenRequestAsync = function (url, details, extras) { return __awaiter(void 0, void 0, void 0, function () {
|
|
78
|
+
var performTokenRequestAsync = function (url, details, extras, oldTokens) { return __awaiter(void 0, void 0, void 0, function () {
|
|
79
79
|
var _i, _a, _b, key, value, formBody, property, encodedKey, encodedValue, formBodyString, response, tokens;
|
|
80
80
|
return __generator(this, function (_c) {
|
|
81
81
|
switch (_c.label) {
|
|
@@ -98,7 +98,6 @@ var performTokenRequestAsync = function (url, details, extras) { return __awaite
|
|
|
98
98
|
headers: {
|
|
99
99
|
'Content-Type': 'application/x-www-form-urlencoded;charset=UTF-8',
|
|
100
100
|
},
|
|
101
|
-
//mode: 'cors',
|
|
102
101
|
body: formBodyString,
|
|
103
102
|
})];
|
|
104
103
|
case 1:
|
|
@@ -111,7 +110,7 @@ var performTokenRequestAsync = function (url, details, extras) { return __awaite
|
|
|
111
110
|
tokens = _c.sent();
|
|
112
111
|
return [2 /*return*/, {
|
|
113
112
|
success: true,
|
|
114
|
-
data: (0, parseTokens_1.parseOriginalTokens)(tokens)
|
|
113
|
+
data: (0, parseTokens_1.parseOriginalTokens)(tokens, oldTokens)
|
|
115
114
|
}];
|
|
116
115
|
}
|
|
117
116
|
});
|
|
@@ -184,13 +183,14 @@ var loginCallbackWithAutoTokensRenewAsync = function (oidc) { return __awaiter(v
|
|
|
184
183
|
}
|
|
185
184
|
});
|
|
186
185
|
}); };
|
|
187
|
-
function renewTokensAndStartTimerAsync(oidc, refreshToken, forceRefresh) {
|
|
186
|
+
function renewTokensAndStartTimerAsync(oidc, refreshToken, forceRefresh, extras) {
|
|
188
187
|
if (forceRefresh === void 0) { forceRefresh = false; }
|
|
188
|
+
if (extras === void 0) { extras = null; }
|
|
189
189
|
return __awaiter(this, void 0, void 0, function () {
|
|
190
190
|
var _a, tokens, status, serviceWorker, session;
|
|
191
191
|
return __generator(this, function (_b) {
|
|
192
192
|
switch (_b.label) {
|
|
193
|
-
case 0: return [4 /*yield*/, oidc.synchroniseTokensAsync(refreshToken, 0, forceRefresh)];
|
|
193
|
+
case 0: return [4 /*yield*/, oidc.synchroniseTokensAsync(refreshToken, 0, forceRefresh, extras)];
|
|
194
194
|
case 1:
|
|
195
195
|
_a = _b.sent(), tokens = _a.tokens, status = _a.status;
|
|
196
196
|
oidc.tokens = tokens;
|
|
@@ -198,7 +198,7 @@ function renewTokensAndStartTimerAsync(oidc, refreshToken, forceRefresh) {
|
|
|
198
198
|
case 2:
|
|
199
199
|
serviceWorker = _b.sent();
|
|
200
200
|
if (!!serviceWorker) return [3 /*break*/, 4];
|
|
201
|
-
session = (0, initSession_1.initSession)(
|
|
201
|
+
session = (0, initSession_1.initSession)(oidc.configurationName, oidc.configuration.redirect_uri, oidc.configuration.storage);
|
|
202
202
|
return [4 /*yield*/, session.setTokens(oidc.tokens)];
|
|
203
203
|
case 3:
|
|
204
204
|
_b.sent();
|
|
@@ -211,14 +211,15 @@ function renewTokensAndStartTimerAsync(oidc, refreshToken, forceRefresh) {
|
|
|
211
211
|
return [2 /*return*/];
|
|
212
212
|
case 6:
|
|
213
213
|
if (oidc.timeoutId) {
|
|
214
|
-
oidc.timeoutId = autoRenewTokens(oidc, tokens.refreshToken, oidc.tokens.expiresAt);
|
|
214
|
+
oidc.timeoutId = autoRenewTokens(oidc, tokens.refreshToken, oidc.tokens.expiresAt, extras);
|
|
215
215
|
}
|
|
216
216
|
return [2 /*return*/];
|
|
217
217
|
}
|
|
218
218
|
});
|
|
219
219
|
});
|
|
220
220
|
}
|
|
221
|
-
var autoRenewTokens = function (oidc, refreshToken, expiresAt) {
|
|
221
|
+
var autoRenewTokens = function (oidc, refreshToken, expiresAt, extras) {
|
|
222
|
+
if (extras === void 0) { extras = null; }
|
|
222
223
|
var refreshTimeBeforeTokensExpirationInSecond = oidc.configuration.refresh_time_before_tokens_expiration_in_second;
|
|
223
224
|
return timer_1.default.setTimeout(function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
224
225
|
var timeLeft, timeInfo;
|
|
@@ -228,7 +229,7 @@ var autoRenewTokens = function (oidc, refreshToken, expiresAt) {
|
|
|
228
229
|
timeLeft = (0, parseTokens_1.computeTimeLeft)(refreshTimeBeforeTokensExpirationInSecond, expiresAt);
|
|
229
230
|
timeInfo = { timeLeft: timeLeft };
|
|
230
231
|
oidc.publishEvent(Oidc.eventNames.token_timer, timeInfo);
|
|
231
|
-
return [4 /*yield*/, renewTokensAndStartTimerAsync(oidc, refreshToken)];
|
|
232
|
+
return [4 /*yield*/, renewTokensAndStartTimerAsync(oidc, refreshToken, false, extras)];
|
|
232
233
|
case 1:
|
|
233
234
|
_a.sent();
|
|
234
235
|
return [2 /*return*/];
|
|
@@ -285,7 +286,6 @@ var userInfoAsync = function (oidc) { return __awaiter(void 0, void 0, void 0, f
|
|
|
285
286
|
case 0: return [4 /*yield*/, fetch(url, {
|
|
286
287
|
headers: {
|
|
287
288
|
authorization: "Bearer ".concat(accessToken),
|
|
288
|
-
// credentials: 'include'
|
|
289
289
|
}
|
|
290
290
|
})];
|
|
291
291
|
case 1:
|
|
@@ -415,8 +415,6 @@ var Oidc = /** @class */ (function () {
|
|
|
415
415
|
this.userInfo = null;
|
|
416
416
|
this.events = [];
|
|
417
417
|
this.timeoutId = null;
|
|
418
|
-
//this.serviceWorker = null;
|
|
419
|
-
//this.session = null;
|
|
420
418
|
this.synchroniseTokensAsync.bind(this);
|
|
421
419
|
this.loginCallbackWithAutoTokensRenewAsync.bind(this);
|
|
422
420
|
this.initAsync.bind(this);
|
|
@@ -669,7 +667,6 @@ var Oidc = /** @class */ (function () {
|
|
|
669
667
|
serviceWorker.startKeepAliveServiceWorker();
|
|
670
668
|
// @ts-ignore
|
|
671
669
|
this.tokens = tokens;
|
|
672
|
-
//this.serviceWorker = serviceWorker;
|
|
673
670
|
// @ts-ignore
|
|
674
671
|
this.timeoutId = autoRenewTokens(this, this.tokens.refreshToken, this.tokens.expiresAt);
|
|
675
672
|
return [4 /*yield*/, serviceWorker.getSessionStateAsync()];
|
|
@@ -704,8 +701,6 @@ var Oidc = /** @class */ (function () {
|
|
|
704
701
|
if (!tokens) return [3 /*break*/, 11];
|
|
705
702
|
// @ts-ignore
|
|
706
703
|
this.tokens = (0, parseTokens_1.setTokens)(tokens);
|
|
707
|
-
//session.setTokens(this.tokens);
|
|
708
|
-
//this.session = session;
|
|
709
704
|
// @ts-ignore
|
|
710
705
|
this.timeoutId = autoRenewTokens(this, tokens.refreshToken, this.tokens.expiresAt);
|
|
711
706
|
sessionState = session.getSessionState();
|
|
@@ -748,10 +743,9 @@ var Oidc = /** @class */ (function () {
|
|
|
748
743
|
});
|
|
749
744
|
});
|
|
750
745
|
};
|
|
751
|
-
Oidc.prototype.loginAsync = function (callbackPath, extras,
|
|
746
|
+
Oidc.prototype.loginAsync = function (callbackPath, extras, isSilentSignin, scope, silentLoginOnly) {
|
|
752
747
|
if (callbackPath === void 0) { callbackPath = undefined; }
|
|
753
748
|
if (extras === void 0) { extras = null; }
|
|
754
|
-
if (state === void 0) { state = undefined; }
|
|
755
749
|
if (isSilentSignin === void 0) { isSilentSignin = false; }
|
|
756
750
|
if (scope === void 0) { scope = undefined; }
|
|
757
751
|
if (silentLoginOnly === void 0) { silentLoginOnly = false; }
|
|
@@ -763,7 +757,7 @@ var Oidc = /** @class */ (function () {
|
|
|
763
757
|
return [2 /*return*/, this.loginPromise];
|
|
764
758
|
}
|
|
765
759
|
loginLocalAsync = function () { return __awaiter(_this, void 0, void 0, function () {
|
|
766
|
-
var location, url, configuration, extraFinal, silentResult, e_2, redirectUri, randomString, extraFinal, nonce, serviceWorker, oidcServerConfiguration, storage, session, queryStringUtil, authorizationHandler, authRequest, exception_2;
|
|
760
|
+
var location, url, configuration, state, extraFinal, silentResult, e_2, redirectUri, randomString, extraFinal, nonce, serviceWorker, oidcServerConfiguration, storage, session, queryStringUtil, authorizationHandler, authRequest, exception_2;
|
|
767
761
|
var _a, _b;
|
|
768
762
|
return __generator(this, function (_c) {
|
|
769
763
|
switch (_c.label) {
|
|
@@ -771,6 +765,11 @@ var Oidc = /** @class */ (function () {
|
|
|
771
765
|
location = window.location;
|
|
772
766
|
url = callbackPath || location.pathname + (location.search || '') + (location.hash || '');
|
|
773
767
|
configuration = this.configuration;
|
|
768
|
+
state = undefined;
|
|
769
|
+
if (extras && "state" in extras) {
|
|
770
|
+
state = extras["state"];
|
|
771
|
+
delete extras["state"];
|
|
772
|
+
}
|
|
774
773
|
if (!silentLoginOnly) return [3 /*break*/, 4];
|
|
775
774
|
_c.label = 1;
|
|
776
775
|
case 1:
|
|
@@ -783,7 +782,7 @@ var Oidc = /** @class */ (function () {
|
|
|
783
782
|
this.tokens = silentResult.tokens;
|
|
784
783
|
this.publishEvent(eventNames.token_aquired, {});
|
|
785
784
|
// @ts-ignore
|
|
786
|
-
this.timeoutId = autoRenewTokens(this, this.tokens.refreshToken, this.tokens.expiresAt);
|
|
785
|
+
this.timeoutId = autoRenewTokens(this, this.tokens.refreshToken, this.tokens.expiresAt, extras);
|
|
787
786
|
return [2 /*return*/, {}];
|
|
788
787
|
}
|
|
789
788
|
return [3 /*break*/, 4];
|
|
@@ -1016,10 +1015,8 @@ var Oidc = /** @class */ (function () {
|
|
|
1016
1015
|
nonceData_1 = null;
|
|
1017
1016
|
if (!serviceWorker_1) return [3 /*break*/, 9];
|
|
1018
1017
|
serviceWorker_1.startKeepAliveServiceWorker();
|
|
1019
|
-
//const serviceWorker = serviceWorker;
|
|
1020
1018
|
return [4 /*yield*/, serviceWorker_1.initAsync(oidcServerConfiguration_1, "loginCallbackAsync")];
|
|
1021
1019
|
case 3:
|
|
1022
|
-
//const serviceWorker = serviceWorker;
|
|
1023
1020
|
_a.sent();
|
|
1024
1021
|
return [4 /*yield*/, serviceWorker_1.loadItemsAsync()];
|
|
1025
1022
|
case 4:
|
|
@@ -1164,34 +1161,38 @@ var Oidc = /** @class */ (function () {
|
|
|
1164
1161
|
});
|
|
1165
1162
|
});
|
|
1166
1163
|
};
|
|
1167
|
-
Oidc.prototype.synchroniseTokensAsync = function (refreshToken, index, forceRefresh) {
|
|
1164
|
+
Oidc.prototype.synchroniseTokensAsync = function (refreshToken, index, forceRefresh, extras) {
|
|
1168
1165
|
if (index === void 0) { index = 0; }
|
|
1169
1166
|
if (forceRefresh === void 0) { forceRefresh = false; }
|
|
1167
|
+
if (extras === void 0) { extras = null; }
|
|
1170
1168
|
return __awaiter(this, void 0, void 0, function () {
|
|
1171
|
-
var numberTryOnline, configuration, localsilentLoginAsync, _a, status_1, tokens, _b, clientId, redirectUri, authority,
|
|
1169
|
+
var numberTryOnline, configuration, localsilentLoginAsync, _a, status_1, tokens, _b, clientId, redirectUri, authority, tokenExtras, finalExtras, details, oidcServerConfiguration, tokenResponse, exception_4;
|
|
1172
1170
|
var _this = this;
|
|
1173
|
-
return __generator(this, function (
|
|
1174
|
-
switch (
|
|
1171
|
+
return __generator(this, function (_c) {
|
|
1172
|
+
switch (_c.label) {
|
|
1175
1173
|
case 0:
|
|
1176
1174
|
if (!document.hidden) return [3 /*break*/, 3];
|
|
1177
1175
|
return [4 /*yield*/, (0, initWorker_1.sleepAsync)(1000)];
|
|
1178
1176
|
case 1:
|
|
1179
|
-
|
|
1177
|
+
_c.sent();
|
|
1180
1178
|
this.publishEvent(eventNames.refreshTokensAsync, { message: "wait because document is hidden" });
|
|
1181
1179
|
return [4 /*yield*/, this.synchroniseTokensAsync(refreshToken, index, forceRefresh)];
|
|
1182
|
-
case 2: return [2 /*return*/,
|
|
1180
|
+
case 2: return [2 /*return*/, _c.sent()];
|
|
1183
1181
|
case 3:
|
|
1184
1182
|
numberTryOnline = 6;
|
|
1185
|
-
|
|
1183
|
+
_c.label = 4;
|
|
1186
1184
|
case 4:
|
|
1187
1185
|
if (!(!navigator.onLine && numberTryOnline > 0)) return [3 /*break*/, 6];
|
|
1188
1186
|
return [4 /*yield*/, (0, initWorker_1.sleepAsync)(1000)];
|
|
1189
1187
|
case 5:
|
|
1190
|
-
|
|
1188
|
+
_c.sent();
|
|
1191
1189
|
numberTryOnline--;
|
|
1192
1190
|
this.publishEvent(eventNames.refreshTokensAsync, { message: "wait because navigator is offline try ".concat(numberTryOnline) });
|
|
1193
1191
|
return [3 /*break*/, 4];
|
|
1194
1192
|
case 6:
|
|
1193
|
+
if (!extras) {
|
|
1194
|
+
extras = {};
|
|
1195
|
+
}
|
|
1195
1196
|
configuration = this.configuration;
|
|
1196
1197
|
localsilentLoginAsync = function () { return __awaiter(_this, void 0, void 0, function () {
|
|
1197
1198
|
var loginParams, silent_token_response, exceptionSilent_1;
|
|
@@ -1200,7 +1201,7 @@ var Oidc = /** @class */ (function () {
|
|
|
1200
1201
|
case 0:
|
|
1201
1202
|
_a.trys.push([0, 2, , 4]);
|
|
1202
1203
|
loginParams = getLoginParams(this.configurationName, configuration.redirect_uri);
|
|
1203
|
-
return [4 /*yield*/, this.silentLoginAsync(__assign(__assign({}, loginParams.extras), { prompt: "none" }), loginParams.state)];
|
|
1204
|
+
return [4 /*yield*/, this.silentLoginAsync(__assign(__assign(__assign({}, loginParams.extras), extras), { prompt: "none" }), loginParams.state)];
|
|
1204
1205
|
case 1:
|
|
1205
1206
|
silent_token_response = _a.sent();
|
|
1206
1207
|
if (silent_token_response) {
|
|
@@ -1227,12 +1228,12 @@ var Oidc = /** @class */ (function () {
|
|
|
1227
1228
|
});
|
|
1228
1229
|
}); };
|
|
1229
1230
|
if (!(index <= 4)) return [3 /*break*/, 25];
|
|
1230
|
-
|
|
1231
|
+
_c.label = 7;
|
|
1231
1232
|
case 7:
|
|
1232
|
-
|
|
1233
|
+
_c.trys.push([7, 24, , 25]);
|
|
1233
1234
|
return [4 /*yield*/, this.syncTokensInfoAsync(configuration, this.configurationName, this.tokens, forceRefresh)];
|
|
1234
1235
|
case 8:
|
|
1235
|
-
_a =
|
|
1236
|
+
_a = _c.sent(), status_1 = _a.status, tokens = _a.tokens;
|
|
1236
1237
|
_b = status_1;
|
|
1237
1238
|
switch (_b) {
|
|
1238
1239
|
case "SESSION_LOST": return [3 /*break*/, 9];
|
|
@@ -1257,24 +1258,19 @@ var Oidc = /** @class */ (function () {
|
|
|
1257
1258
|
case 14:
|
|
1258
1259
|
this.publishEvent(eventNames.refreshTokensAsync_begin, { refreshToken: refreshToken, status: status_1, tryNumber: index });
|
|
1259
1260
|
return [4 /*yield*/, localsilentLoginAsync()];
|
|
1260
|
-
case 15: return [2 /*return*/,
|
|
1261
|
+
case 15: return [2 /*return*/, _c.sent()];
|
|
1261
1262
|
case 16:
|
|
1262
1263
|
if (!!refreshToken) return [3 /*break*/, 18];
|
|
1263
1264
|
this.publishEvent(eventNames.refreshTokensAsync_begin, { refreshToken: refreshToken, tryNumber: index });
|
|
1264
1265
|
return [4 /*yield*/, localsilentLoginAsync()];
|
|
1265
|
-
case 17: return [2 /*return*/,
|
|
1266
|
+
case 17: return [2 /*return*/, _c.sent()];
|
|
1266
1267
|
case 18:
|
|
1267
1268
|
this.publishEvent(eventNames.refreshTokensAsync_begin, { refreshToken: refreshToken, status: status_1, tryNumber: index });
|
|
1268
1269
|
clientId = configuration.client_id;
|
|
1269
1270
|
redirectUri = configuration.redirect_uri;
|
|
1270
1271
|
authority = configuration.authority;
|
|
1271
|
-
|
|
1272
|
-
|
|
1273
|
-
for (_i = 0, _c = Object.entries(configuration.token_request_extras); _i < _c.length; _i++) {
|
|
1274
|
-
_d = _c[_i], key = _d[0], value = _d[1];
|
|
1275
|
-
extras[key] = value;
|
|
1276
|
-
}
|
|
1277
|
-
}
|
|
1272
|
+
tokenExtras = configuration.token_request_extras ? configuration.token_request_extras : {};
|
|
1273
|
+
finalExtras = __assign(__assign({}, tokenExtras), extras);
|
|
1278
1274
|
details = {
|
|
1279
1275
|
client_id: clientId,
|
|
1280
1276
|
redirect_uri: redirectUri,
|
|
@@ -1283,10 +1279,10 @@ var Oidc = /** @class */ (function () {
|
|
|
1283
1279
|
};
|
|
1284
1280
|
return [4 /*yield*/, this.initAsync(authority, configuration.authority_configuration)];
|
|
1285
1281
|
case 19:
|
|
1286
|
-
oidcServerConfiguration =
|
|
1287
|
-
return [4 /*yield*/, performTokenRequestAsync(oidcServerConfiguration.tokenEndpoint, details,
|
|
1282
|
+
oidcServerConfiguration = _c.sent();
|
|
1283
|
+
return [4 /*yield*/, performTokenRequestAsync(oidcServerConfiguration.tokenEndpoint, details, finalExtras, tokens)];
|
|
1288
1284
|
case 20:
|
|
1289
|
-
tokenResponse =
|
|
1285
|
+
tokenResponse = _c.sent();
|
|
1290
1286
|
if (!tokenResponse.success) return [3 /*break*/, 21];
|
|
1291
1287
|
if (!(0, parseTokens_1.isTokensOidcValid)(tokenResponse.data, null, oidcServerConfiguration)) {
|
|
1292
1288
|
this.publishEvent(eventNames.refreshTokensAsync_error, { message: "refresh token return not valid tokens" });
|
|
@@ -1301,10 +1297,10 @@ var Oidc = /** @class */ (function () {
|
|
|
1301
1297
|
tokenResponse: tokenResponse
|
|
1302
1298
|
});
|
|
1303
1299
|
return [4 /*yield*/, this.synchroniseTokensAsync(null, index + 1, forceRefresh)];
|
|
1304
|
-
case 22: return [2 /*return*/,
|
|
1300
|
+
case 22: return [2 /*return*/, _c.sent()];
|
|
1305
1301
|
case 23: return [3 /*break*/, 25];
|
|
1306
1302
|
case 24:
|
|
1307
|
-
exception_4 =
|
|
1303
|
+
exception_4 = _c.sent();
|
|
1308
1304
|
console.error(exception_4);
|
|
1309
1305
|
this.publishEvent(eventNames.refreshTokensAsync_silent_error, { message: "exception", exception: exception_4.message });
|
|
1310
1306
|
return [2 /*return*/, this.synchroniseTokensAsync(refreshToken, index + 1, forceRefresh)];
|
|
@@ -1403,7 +1399,8 @@ var Oidc = /** @class */ (function () {
|
|
|
1403
1399
|
return result;
|
|
1404
1400
|
});
|
|
1405
1401
|
};
|
|
1406
|
-
Oidc.prototype.renewTokensAsync = function () {
|
|
1402
|
+
Oidc.prototype.renewTokensAsync = function (extras) {
|
|
1403
|
+
if (extras === void 0) { extras = null; }
|
|
1407
1404
|
return __awaiter(this, void 0, void 0, function () {
|
|
1408
1405
|
return __generator(this, function (_a) {
|
|
1409
1406
|
switch (_a.label) {
|
|
@@ -1413,7 +1410,7 @@ var Oidc = /** @class */ (function () {
|
|
|
1413
1410
|
}
|
|
1414
1411
|
timer_1.default.clearTimeout(this.timeoutId);
|
|
1415
1412
|
// @ts-ignore
|
|
1416
|
-
return [4 /*yield*/, renewTokensAndStartTimerAsync(this, this.tokens.refreshToken, true)];
|
|
1413
|
+
return [4 /*yield*/, renewTokensAndStartTimerAsync(this, this.tokens.refreshToken, true, extras)];
|
|
1417
1414
|
case 1:
|
|
1418
1415
|
// @ts-ignore
|
|
1419
1416
|
_a.sent();
|