From a3cab89ce80f9e489a92f2bf7212a5497dce5f9b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Labine?= <sebastien@smartbills.ca>
Date: Sat, 15 Feb 2025 13:38:50 -0500
Subject: [PATCH] Changed userStore from WebStorageStateStore to StateStore
---
docs/oidc-client-ts.api.md | 2 +-
src/UserManagerSettings.ts | 26 ++++++++++++++++++--------
2 files changed, 19 insertions(+), 9 deletions(-)
diff --git a/docs/oidc-client-ts.api.md b/docs/oidc-client-ts.api.md
index 614d587e..57673e94 100644
--- a/docs/oidc-client-ts.api.md
+++ b/docs/oidc-client-ts.api.md
@@ -1175,7 +1175,7 @@ export class UserManagerSettingsStore extends OidcClientSettingsStore {
// (undocumented)
readonly stopCheckSessionOnError: boolean;
// (undocumented)
- readonly userStore: WebStorageStateStore;
+ readonly userStore: StateStore;
// (undocumented)
readonly validateSubOnSilentRenew: boolean;
}
diff --git a/src/UserManagerSettings.ts b/src/UserManagerSettings.ts
index 92124c77..5c288411 100644
--- a/src/UserManagerSettings.ts
+++ b/src/UserManagerSettings.ts
@@ -1,10 +1,14 @@
// Copyright (c) Brock Allen & Dominick Baier. All rights reserved.
// Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
-import { type OidcClientSettings, OidcClientSettingsStore } from "./OidcClientSettings";
+import {
+ type OidcClientSettings,
+ OidcClientSettingsStore,
+} from "./OidcClientSettings";
import type { PopupWindowFeatures } from "./utils/PopupUtils";
import { WebStorageStateStore } from "./WebStorageStateStore";
import { InMemoryWebStorage } from "./InMemoryWebStorage";
+import type { StateStore } from "./StateStore";
export const DefaultPopupWindowFeatures: PopupWindowFeatures = {
location: false,
@@ -82,7 +86,7 @@ export interface UserManagerSettings extends OidcClientSettings {
* Storage object used to persist User for currently authenticated user (default: window.sessionStorage, InMemoryWebStorage iff no window).
* E.g. `userStore: new WebStorageStateStore({ store: window.localStorage })`
*/
- userStore?: WebStorageStateStore;
+ userStore?: StateStore;
}
/**
@@ -120,7 +124,7 @@ export class UserManagerSettingsStore extends OidcClientSettingsStore {
public readonly accessTokenExpiringNotificationTimeInSeconds: number;
- public readonly userStore: WebStorageStateStore;
+ public readonly userStore: StateStore;
public constructor(args: UserManagerSettings) {
const {
@@ -169,7 +173,10 @@ export class UserManagerSettingsStore extends OidcClientSettingsStore {
this.iframeScriptOrigin = iframeScriptOrigin;
this.silent_redirect_uri = silent_redirect_uri;
- this.silentRequestTimeoutInSeconds = silentRequestTimeoutInSeconds || requestTimeoutInSeconds || DefaultSilentRequestTimeoutInSeconds;
+ this.silentRequestTimeoutInSeconds =
+ silentRequestTimeoutInSeconds ||
+ requestTimeoutInSeconds ||
+ DefaultSilentRequestTimeoutInSeconds;
this.automaticSilentRenew = automaticSilentRenew;
this.validateSubOnSilentRenew = validateSubOnSilentRenew;
this.includeIdTokenInSilentRenew = includeIdTokenInSilentRenew;
@@ -184,13 +191,16 @@ export class UserManagerSettingsStore extends OidcClientSettingsStore {
this.revokeTokensOnSignout = revokeTokensOnSignout;
this.includeIdTokenInSilentSignout = includeIdTokenInSilentSignout;
- this.accessTokenExpiringNotificationTimeInSeconds = accessTokenExpiringNotificationTimeInSeconds;
+ this.accessTokenExpiringNotificationTimeInSeconds =
+ accessTokenExpiringNotificationTimeInSeconds;
if (userStore) {
this.userStore = userStore;
- }
- else {
- const store = typeof window !== "undefined" ? window.sessionStorage : new InMemoryWebStorage();
+ } else {
+ const store =
+ typeof window !== "undefined"
+ ? window.sessionStorage
+ : new InMemoryWebStorage();
this.userStore = new WebStorageStateStore({ store });
}
}