@axa-fr/react-oidc 6.13.0 → 6.13.2
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/vanilla/login.d.ts.map +1 -1
- package/dist/vanilla/login.js +5 -5
- package/dist/vanilla/login.js.map +1 -1
- package/dist/vanilla/silentLogin.js +1 -2
- package/dist/vanilla/silentLogin.js.map +1 -1
- package/package.json +1 -1
- package/src/oidc/vanilla/login.ts +3 -4
- package/src/oidc/vanilla/silentLogin.ts +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"login.d.ts","sourceRoot":"","sources":["../../src/oidc/vanilla/login.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,iBAAiB,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AAYvD,eAAO,MAAM,iBAAiB,uDAA6C,iBAAiB,2CAA+B,IAAI,aAAY,QAAQ,qBAAmB,MAAM,WAAqB,SAAS,oCAAuC,MAAM,
|
|
1
|
+
{"version":3,"file":"login.d.ts","sourceRoot":"","sources":["../../src/oidc/vanilla/login.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,iBAAiB,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AAYvD,eAAO,MAAM,iBAAiB,uDAA6C,iBAAiB,2CAA+B,IAAI,aAAY,QAAQ,qBAAmB,MAAM,WAAqB,SAAS,oCAAuC,MAAM,kBAkEtP,CAAC;AAEF,eAAO,MAAM,kBAAkB,+DAiJ9B,CAAC"}
|
package/dist/vanilla/login.js
CHANGED
|
@@ -31,7 +31,7 @@ const defaultLoginAsync = (window, configurationName, configuration, publishEven
|
|
|
31
31
|
const originExtras = extras;
|
|
32
32
|
extras = Object.assign({}, extras);
|
|
33
33
|
const loginLocalAsync = () => __awaiter(void 0, void 0, void 0, function* () {
|
|
34
|
-
var _a
|
|
34
|
+
var _a;
|
|
35
35
|
const location = window.location;
|
|
36
36
|
const url = callbackPath || location.pathname + (location.search || '') + (location.hash || '');
|
|
37
37
|
let state;
|
|
@@ -52,7 +52,7 @@ const defaultLoginAsync = (window, configurationName, configuration, publishEven
|
|
|
52
52
|
if (!scope) {
|
|
53
53
|
scope = configuration.scope;
|
|
54
54
|
}
|
|
55
|
-
const extraFinal =
|
|
55
|
+
const extraFinal = !configuration.extras ? extras : Object.assign(Object.assign({}, configuration.extras), extras);
|
|
56
56
|
if (!extraFinal.nonce) {
|
|
57
57
|
extraFinal.nonce = randomString(12);
|
|
58
58
|
}
|
|
@@ -69,9 +69,8 @@ const defaultLoginAsync = (window, configurationName, configuration, publishEven
|
|
|
69
69
|
yield storage.setItem('dummy', {});
|
|
70
70
|
}
|
|
71
71
|
else {
|
|
72
|
-
|
|
72
|
+
const session = (0, initSession_1.initSession)(configurationName, (_a = configuration.storage) !== null && _a !== void 0 ? _a : sessionStorage);
|
|
73
73
|
session.setLoginParams(configurationName, { callbackPath: url, extras: originExtras, state });
|
|
74
|
-
session = (0, initSession_1.initSession)(configurationName);
|
|
75
74
|
yield session.setNonceAsync(nonce);
|
|
76
75
|
storage = new memoryStorageBackend_1.MemoryStorageBackend(session.saveItemsAsync, {});
|
|
77
76
|
}
|
|
@@ -97,6 +96,7 @@ const defaultLoginAsync = (window, configurationName, configuration, publishEven
|
|
|
97
96
|
};
|
|
98
97
|
exports.defaultLoginAsync = defaultLoginAsync;
|
|
99
98
|
const loginCallbackAsync = (oidc) => (isSilentSignin = false) => __awaiter(void 0, void 0, void 0, function* () {
|
|
99
|
+
var _a;
|
|
100
100
|
try {
|
|
101
101
|
oidc.publishEvent(events_1.eventNames.loginCallbackAsync_begin, {});
|
|
102
102
|
const configuration = oidc.configuration;
|
|
@@ -126,7 +126,7 @@ const loginCallbackAsync = (oidc) => (isSilentSignin = false) => __awaiter(void
|
|
|
126
126
|
getLoginParams = serviceWorker.getLoginParams(oidc.configurationName);
|
|
127
127
|
}
|
|
128
128
|
else {
|
|
129
|
-
const session = (0, initSession_1.initSession)(oidc.configurationName);
|
|
129
|
+
const session = (0, initSession_1.initSession)(oidc.configurationName, (_a = configuration.storage) !== null && _a !== void 0 ? _a : sessionStorage);
|
|
130
130
|
session.setSessionState(sessionState);
|
|
131
131
|
const items = yield session.loadItemsAsync();
|
|
132
132
|
storage = new memoryStorageBackend_1.MemoryStorageBackend(session.saveItemsAsync, items);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"login.js","sourceRoot":"","sources":["../../src/oidc/vanilla/login.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6CAMyB;AAEzB,qCAAsC;AACtC,+CAA4C;AAC5C,6CAA+C;AAC/C,iEAA8D;AAC9D,qEAAwF;AACxF,+CAA6D;AAC7D,+CAAgE;AAGhE,MAAM,YAAY,GAAG,UAAS,MAAM;IAChC,IAAI,IAAI,GAAG,EAAE,CAAC;IACd,MAAM,QAAQ,GAAG,gEAAgE,CAAC;IAClF,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,EAAE,CAAC,EAAE,EAAE;QAC7B,IAAI,IAAI,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC;KACxE;IACD,OAAO,IAAI,CAAC;AAChB,CAAC,CAAC;AAEF,wDAAwD;AACjD,MAAM,iBAAiB,GAAG,CAAC,MAAM,EAAE,iBAAiB,EAAE,aAA+B,EAAE,YAAiC,EAAE,SAAkB,EAAE,EAAE,CAAC,CAAC,eAAsB,SAAS,EAAE,SAAmB,IAAI,EAAE,cAAc,GAAG,KAAK,EAAE,QAAe,SAAS,EAAE,EAAE;IACnQ,MAAM,YAAY,GAAG,MAAM,CAAC;IAC5B,MAAM,qBAAQ,MAAM,CAAE,CAAC;IACvB,MAAM,eAAe,GAAG,GAAS,EAAE;;QAC/B,MAAM,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC;QACjC,MAAM,GAAG,GAAG,YAAY,IAAI,QAAQ,CAAC,QAAQ,GAAG,CAAC,QAAQ,CAAC,MAAM,IAAI,EAAE,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC;QAChG,IAAI,KAAK,CAAC;QACV,IAAI,MAAM,IAAI,OAAO,IAAI,MAAM,EAAE;YAC7B,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC;YACrB,OAAO,MAAM,CAAC,KAAK,CAAC;SACvB;QAED,YAAY,CAAC,mBAAU,CAAC,gBAAgB,EAAE,EAAE,CAAC,CAAC;QAC9C,IAAI,MAAM,EAAE;YACR,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE;gBACnC,IAAI,GAAG,CAAC,QAAQ,CAAC,gBAAgB,CAAC,EAAE;oBAChC,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC;iBACtB;aACJ;SACJ;QACD,IAAI;YACA,MAAM,WAAW,GAAG,cAAc,CAAC,CAAC,CAAC,aAAa,CAAC,mBAAmB,CAAC,CAAC,CAAC,aAAa,CAAC,YAAY,CAAC;YACpG,IAAI,CAAC,KAAK,EAAE;gBACR,KAAK,GAAG,aAAa,CAAC,KAAK,CAAC;aAC/B;YAED,MAAM,UAAU,GAAG,
|
|
1
|
+
{"version":3,"file":"login.js","sourceRoot":"","sources":["../../src/oidc/vanilla/login.ts"],"names":[],"mappings":"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"}
|
|
@@ -114,7 +114,6 @@ const defaultSilentLoginAsync = (window, configurationName, configuration, publi
|
|
|
114
114
|
return (0, exports._silentLoginAsync)(configurationName, configuration, publishEvent.bind(oidc))(extras, state, scope);
|
|
115
115
|
};
|
|
116
116
|
const loginLocalAsync = () => __awaiter(void 0, void 0, void 0, function* () {
|
|
117
|
-
var _a;
|
|
118
117
|
if (oidc.timeoutId) {
|
|
119
118
|
timer_1.default.clearTimeout(oidc.timeoutId);
|
|
120
119
|
}
|
|
@@ -124,7 +123,7 @@ const defaultSilentLoginAsync = (window, configurationName, configuration, publi
|
|
|
124
123
|
delete extras.state;
|
|
125
124
|
}
|
|
126
125
|
try {
|
|
127
|
-
const extraFinal =
|
|
126
|
+
const extraFinal = !configuration.extras ? extras : Object.assign(Object.assign({}, configuration.extras), extras);
|
|
128
127
|
const silentResult = yield silentLoginAsync(Object.assign(Object.assign({}, extraFinal), { prompt: 'none' }), state, scope);
|
|
129
128
|
if (silentResult) {
|
|
130
129
|
oidc.tokens = silentResult.tokens;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"silentLogin.js","sourceRoot":"","sources":["../../src/oidc/vanilla/silentLogin.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"silentLogin.js","sourceRoot":"","sources":["../../src/oidc/vanilla/silentLogin.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -51,7 +51,7 @@ export const defaultLoginAsync = (window, configurationName, configuration:OidcC
|
|
|
51
51
|
scope = configuration.scope;
|
|
52
52
|
}
|
|
53
53
|
|
|
54
|
-
const extraFinal = extras
|
|
54
|
+
const extraFinal = !configuration.extras ? extras : { ...configuration.extras, ...extras };
|
|
55
55
|
if (!extraFinal.nonce) {
|
|
56
56
|
extraFinal.nonce = randomString(12);
|
|
57
57
|
}
|
|
@@ -67,9 +67,8 @@ export const defaultLoginAsync = (window, configurationName, configuration:OidcC
|
|
|
67
67
|
storage = new MemoryStorageBackend(serviceWorker.saveItemsAsync, {});
|
|
68
68
|
await storage.setItem('dummy', {});
|
|
69
69
|
} else {
|
|
70
|
-
|
|
70
|
+
const session = initSession(configurationName, configuration.storage ?? sessionStorage);
|
|
71
71
|
session.setLoginParams(configurationName, { callbackPath: url, extras: originExtras, state });
|
|
72
|
-
session = initSession(configurationName);
|
|
73
72
|
await session.setNonceAsync(nonce);
|
|
74
73
|
storage = new MemoryStorageBackend(session.saveItemsAsync, {});
|
|
75
74
|
}
|
|
@@ -123,7 +122,7 @@ export const loginCallbackAsync = (oidc) => async (isSilentSignin = false) => {
|
|
|
123
122
|
nonceData = await serviceWorker.getNonceAsync();
|
|
124
123
|
getLoginParams = serviceWorker.getLoginParams(oidc.configurationName);
|
|
125
124
|
} else {
|
|
126
|
-
const session = initSession(oidc.configurationName);
|
|
125
|
+
const session = initSession(oidc.configurationName, configuration.storage ?? sessionStorage);
|
|
127
126
|
session.setSessionState(sessionState);
|
|
128
127
|
const items = await session.loadItemsAsync();
|
|
129
128
|
storage = new MemoryStorageBackend(session.saveItemsAsync, items);
|
|
@@ -120,7 +120,7 @@ export const defaultSilentLoginAsync = (window, configurationName, configuration
|
|
|
120
120
|
}
|
|
121
121
|
|
|
122
122
|
try {
|
|
123
|
-
const extraFinal = extras
|
|
123
|
+
const extraFinal = !configuration.extras ? extras : { ...configuration.extras, ...extras };
|
|
124
124
|
const silentResult = await silentLoginAsync({
|
|
125
125
|
...extraFinal,
|
|
126
126
|
prompt: 'none',
|