@axa-fr/react-oidc 6.14.8 → 6.14.9
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/ReactOidc.d.ts +1 -1
- package/dist/ReactOidc.d.ts.map +1 -1
- package/dist/ReactOidc.js +26 -4
- package/dist/ReactOidc.js.map +1 -1
- package/dist/vanilla/renewTokens.d.ts +1 -1
- package/dist/vanilla/renewTokens.d.ts.map +1 -1
- package/dist/vanilla/renewTokens.js +1 -0
- package/dist/vanilla/renewTokens.js.map +1 -1
- package/package.json +1 -1
- package/src/oidc/ReactOidc.tsx +17 -3
- package/src/oidc/vanilla/renewTokens.ts +1 -0
package/dist/ReactOidc.d.ts
CHANGED
|
@@ -2,7 +2,7 @@ import { StringMap } from './vanilla/types';
|
|
|
2
2
|
export declare const useOidc: (configurationName?: string) => {
|
|
3
3
|
login: (callbackPath?: string | undefined, extras?: StringMap, silentLoginOnly?: boolean) => Promise<void>;
|
|
4
4
|
logout: (callbackPath?: string | null | undefined, extras?: StringMap) => Promise<void>;
|
|
5
|
-
renewTokens: (extras?: StringMap) => Promise<
|
|
5
|
+
renewTokens: (extras?: StringMap) => Promise<OidcAccessToken | OidcIdToken>;
|
|
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":"AAEA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAkB5C,eAAO,MAAM,OAAO;2BAuBY,MAAM,GAAG,SAAS,WAAqB,SAAS;4BAG9C,MAAM,GAAG,IAAI,GAAG,SAAS,WAAqB,SAAS;
|
|
1
|
+
{"version":3,"file":"ReactOidc.d.ts","sourceRoot":"","sources":["../src/oidc/ReactOidc.tsx"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAkB5C,eAAO,MAAM,OAAO;2BAuBY,MAAM,GAAG,SAAS,WAAqB,SAAS;4BAG9C,MAAM,GAAG,IAAI,GAAG,SAAS,WAAqB,SAAS;2BAGlD,SAAS,KAAW,QAAQ,eAAe,GAAG,WAAW,CAAC;;CAehG,CAAC;AAiBF,oBAAY,eAAe,GAAG;IAC1B,WAAW,CAAC,EAAE,GAAG,CAAC;IAClB,kBAAkB,CAAC,EAAE,GAAG,CAAC;CAC5B,CAAA;AAED,eAAO,MAAM,kBAAkB,iDAgC9B,CAAC;AAcF,oBAAY,WAAW,GAAG;IACtB,OAAO,CAAC,EAAE,GAAG,CAAC;IACd,cAAc,CAAC,EAAE,GAAG,CAAC;CACxB,CAAA;AAED,eAAO,MAAM,cAAc,6CAgC1B,CAAC"}
|
package/dist/ReactOidc.js
CHANGED
|
@@ -1,4 +1,13 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
+
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
|
+
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
+
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
+
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
+
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
+
});
|
|
10
|
+
};
|
|
2
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
12
|
exports.useOidcIdToken = exports.useOidcAccessToken = exports.useOidc = void 0;
|
|
4
13
|
const react_1 = require("react");
|
|
@@ -39,9 +48,19 @@ const useOidc = (configurationName = defaultConfigurationName) => {
|
|
|
39
48
|
const logout = (callbackPath = undefined, extras = null) => {
|
|
40
49
|
return getOidc(configurationName).logoutAsync(callbackPath, extras);
|
|
41
50
|
};
|
|
42
|
-
const renewTokens = (extras = null) => {
|
|
43
|
-
|
|
44
|
-
|
|
51
|
+
const renewTokens = (extras = null) => __awaiter(void 0, void 0, void 0, function* () {
|
|
52
|
+
const tokens = yield getOidc(configurationName).renewTokensAsync(extras);
|
|
53
|
+
return {
|
|
54
|
+
// @ts-ignore
|
|
55
|
+
accessToken: tokens.accessToken,
|
|
56
|
+
// @ts-ignore
|
|
57
|
+
accessTokenPayload: tokens.accessTokenPayload,
|
|
58
|
+
// @ts-ignore
|
|
59
|
+
idToken: tokens.idToken,
|
|
60
|
+
// @ts-ignore
|
|
61
|
+
idTokenPayload: tokens.idTokenPayload,
|
|
62
|
+
};
|
|
63
|
+
});
|
|
45
64
|
return { login, logout, renewTokens, isAuthenticated };
|
|
46
65
|
};
|
|
47
66
|
exports.useOidc = useOidc;
|
|
@@ -51,7 +70,10 @@ const initTokens = (configurationName) => {
|
|
|
51
70
|
const oidc = getOidc(configurationName);
|
|
52
71
|
if (oidc.tokens) {
|
|
53
72
|
const tokens = oidc.tokens;
|
|
54
|
-
return {
|
|
73
|
+
return {
|
|
74
|
+
accessToken: tokens.accessToken,
|
|
75
|
+
accessTokenPayload: tokens.accessTokenPayload,
|
|
76
|
+
};
|
|
55
77
|
}
|
|
56
78
|
return accessTokenInitialState;
|
|
57
79
|
};
|
package/dist/ReactOidc.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ReactOidc.js","sourceRoot":"","sources":["../src/oidc/ReactOidc.tsx"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"ReactOidc.js","sourceRoot":"","sources":["../src/oidc/ReactOidc.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
import { StringMap } from './types';
|
|
2
|
-
export declare function renewTokensAndStartTimerAsync(oidc: any, refreshToken: any, forceRefresh?: boolean, extras?: StringMap): Promise<
|
|
2
|
+
export declare function renewTokensAndStartTimerAsync(oidc: any, refreshToken: any, forceRefresh?: boolean, extras?: StringMap): Promise<any>;
|
|
3
3
|
export declare const autoRenewTokens: (oidc: any, refreshToken: any, expiresAt: any, extras?: StringMap) => any;
|
|
4
4
|
//# sourceMappingURL=renewTokens.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"renewTokens.d.ts","sourceRoot":"","sources":["../../src/oidc/vanilla/renewTokens.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AAEpC,wBAAsB,6BAA6B,CAAC,IAAI,KAAA,EAAE,YAAY,KAAA,EAAE,YAAY,UAAQ,EAAE,MAAM,GAAC,SAAgB,
|
|
1
|
+
{"version":3,"file":"renewTokens.d.ts","sourceRoot":"","sources":["../../src/oidc/vanilla/renewTokens.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AAEpC,wBAAsB,6BAA6B,CAAC,IAAI,KAAA,EAAE,YAAY,KAAA,EAAE,YAAY,UAAQ,EAAE,MAAM,GAAC,SAAgB,gBAmBpH;AAED,eAAO,MAAM,eAAe,0DAA0C,SAAS,QAQ9E,CAAC"}
|
|
@@ -34,6 +34,7 @@ function renewTokensAndStartTimerAsync(oidc, refreshToken, forceRefresh = false,
|
|
|
34
34
|
if (oidc.timeoutId) {
|
|
35
35
|
oidc.timeoutId = (0, exports.autoRenewTokens)(oidc, tokens.refreshToken, oidc.tokens.expiresAt, extras);
|
|
36
36
|
}
|
|
37
|
+
return oidc.tokens;
|
|
37
38
|
});
|
|
38
39
|
}
|
|
39
40
|
exports.renewTokensAndStartTimerAsync = renewTokensAndStartTimerAsync;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"renewTokens.js","sourceRoot":"","sources":["../../src/oidc/vanilla/renewTokens.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,+CAA4C;AAC5C,6CAA+C;AAC/C,kDAA0B;AAC1B,+CAAgD;AAChD,oDAA4B;AAG5B,SAAsB,6BAA6B,CAAC,IAAI,EAAE,YAAY,EAAE,YAAY,GAAG,KAAK,EAAE,SAAmB,IAAI;;QACjH,MAAM,YAAY,GAAG,CAAC,MAAM,EAAE,EAAE,GAAG,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;QAC3D,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,sBAAsB,CAAC,YAAY,EAAE,CAAC,EAAE,YAAY,EAAE,MAAM,EAAE,YAAY,CAAC,CAAC;QAElH,MAAM,aAAa,GAAG,MAAM,IAAA,4BAAe,EAAC,IAAI,CAAC,aAAa,CAAC,2BAA2B,EAAE,IAAI,CAAC,iBAAiB,CAAC,CAAC;QACpH,IAAI,CAAC,aAAa,EAAE;YAChB,MAAM,OAAO,GAAG,IAAA,yBAAW,EAAC,IAAI,CAAC,iBAAiB,EAAE,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;YAChF,MAAM,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;SACxC;QAED,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE;YACd,MAAM,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;YAChC,OAAO;SACV;QAED,IAAI,IAAI,CAAC,SAAS,EAAE;YAChB,IAAI,CAAC,SAAS,GAAG,IAAA,uBAAe,EAAC,IAAI,EAAE,MAAM,CAAC,YAAY,EAAE,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;SAC9F;
|
|
1
|
+
{"version":3,"file":"renewTokens.js","sourceRoot":"","sources":["../../src/oidc/vanilla/renewTokens.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,+CAA4C;AAC5C,6CAA+C;AAC/C,kDAA0B;AAC1B,+CAAgD;AAChD,oDAA4B;AAG5B,SAAsB,6BAA6B,CAAC,IAAI,EAAE,YAAY,EAAE,YAAY,GAAG,KAAK,EAAE,SAAmB,IAAI;;QACjH,MAAM,YAAY,GAAG,CAAC,MAAM,EAAE,EAAE,GAAG,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;QAC3D,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,sBAAsB,CAAC,YAAY,EAAE,CAAC,EAAE,YAAY,EAAE,MAAM,EAAE,YAAY,CAAC,CAAC;QAElH,MAAM,aAAa,GAAG,MAAM,IAAA,4BAAe,EAAC,IAAI,CAAC,aAAa,CAAC,2BAA2B,EAAE,IAAI,CAAC,iBAAiB,CAAC,CAAC;QACpH,IAAI,CAAC,aAAa,EAAE;YAChB,MAAM,OAAO,GAAG,IAAA,yBAAW,EAAC,IAAI,CAAC,iBAAiB,EAAE,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;YAChF,MAAM,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;SACxC;QAED,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE;YACd,MAAM,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;YAChC,OAAO;SACV;QAED,IAAI,IAAI,CAAC,SAAS,EAAE;YAChB,IAAI,CAAC,SAAS,GAAG,IAAA,uBAAe,EAAC,IAAI,EAAE,MAAM,CAAC,YAAY,EAAE,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;SAC9F;QACD,OAAO,IAAI,CAAC,MAAM,CAAC;IACvB,CAAC;CAAA;AAnBD,sEAmBC;AAEM,MAAM,eAAe,GAAG,CAAC,IAAI,EAAE,YAAY,EAAE,SAAS,EAAE,SAAmB,IAAI,EAAE,EAAE;IACtF,MAAM,yCAAyC,GAAG,IAAI,CAAC,aAAa,CAAC,+CAA+C,CAAC;IACrH,OAAO,eAAK,CAAC,UAAU,CAAC,GAAS,EAAE;QAC/B,MAAM,QAAQ,GAAG,IAAA,6BAAe,EAAC,yCAAyC,EAAE,SAAS,CAAC,CAAC;QACvF,MAAM,QAAQ,GAAG,EAAE,QAAQ,EAAE,CAAC;QAC9B,IAAI,CAAC,YAAY,CAAC,cAAI,CAAC,UAAU,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC;QACzD,MAAM,6BAA6B,CAAC,IAAI,EAAE,YAAY,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;IAC3E,CAAC,CAAA,EAAE,IAAI,CAAC,CAAC;AACb,CAAC,CAAC;AARW,QAAA,eAAe,mBAQ1B"}
|
package/package.json
CHANGED
package/src/oidc/ReactOidc.tsx
CHANGED
|
@@ -47,8 +47,19 @@ export const useOidc = (configurationName = defaultConfigurationName) => {
|
|
|
47
47
|
const logout = (callbackPath: string | null | undefined = undefined, extras:StringMap = null) => {
|
|
48
48
|
return getOidc(configurationName).logoutAsync(callbackPath, extras);
|
|
49
49
|
};
|
|
50
|
-
const renewTokens = (extras:StringMap = null) => {
|
|
51
|
-
|
|
50
|
+
const renewTokens = async (extras: StringMap = null) : Promise<OidcAccessToken | OidcIdToken> => {
|
|
51
|
+
const tokens = await getOidc(configurationName).renewTokensAsync(extras);
|
|
52
|
+
|
|
53
|
+
return {
|
|
54
|
+
// @ts-ignore
|
|
55
|
+
accessToken: tokens.accessToken,
|
|
56
|
+
// @ts-ignore
|
|
57
|
+
accessTokenPayload: tokens.accessTokenPayload,
|
|
58
|
+
// @ts-ignore
|
|
59
|
+
idToken: tokens.idToken,
|
|
60
|
+
// @ts-ignore
|
|
61
|
+
idTokenPayload: tokens.idTokenPayload,
|
|
62
|
+
};
|
|
52
63
|
};
|
|
53
64
|
return { login, logout, renewTokens, isAuthenticated };
|
|
54
65
|
};
|
|
@@ -60,7 +71,10 @@ const initTokens = (configurationName: string) => {
|
|
|
60
71
|
const oidc = getOidc(configurationName);
|
|
61
72
|
if (oidc.tokens) {
|
|
62
73
|
const tokens = oidc.tokens;
|
|
63
|
-
return {
|
|
74
|
+
return {
|
|
75
|
+
accessToken: tokens.accessToken,
|
|
76
|
+
accessTokenPayload: tokens.accessTokenPayload,
|
|
77
|
+
};
|
|
64
78
|
}
|
|
65
79
|
return accessTokenInitialState;
|
|
66
80
|
};
|
|
@@ -23,6 +23,7 @@ export async function renewTokensAndStartTimerAsync(oidc, refreshToken, forceRef
|
|
|
23
23
|
if (oidc.timeoutId) {
|
|
24
24
|
oidc.timeoutId = autoRenewTokens(oidc, tokens.refreshToken, oidc.tokens.expiresAt, extras);
|
|
25
25
|
}
|
|
26
|
+
return oidc.tokens;
|
|
26
27
|
}
|
|
27
28
|
|
|
28
29
|
export const autoRenewTokens = (oidc, refreshToken, expiresAt, extras:StringMap = null) => {
|