oidc-spa 8.3.8 → 8.4.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.
Files changed (8) hide show
  1. package/core/createOidc.js +1 -1
  2. package/esm/core/createOidc.js +1 -1
  3. package/esm/tanstack-start/react/createOidcSpaApi.js +41 -77
  4. package/esm/tanstack-start/react/createOidcSpaApi.js.map +1 -1
  5. package/esm/tanstack-start/react/types.d.ts +13 -19
  6. package/package.json +1 -1
  7. package/src/tanstack-start/react/createOidcSpaApi.tsx +52 -99
  8. package/src/tanstack-start/react/types.tsx +11 -17
package/core/createOidc.js CHANGED
@@ -72,7 +72,7 @@ const homeAndRedirectUri_1 = require("./homeAndRedirectUri");
72
72
  const ensureNonBlankPaint_1 = require("../tools/ensureNonBlankPaint");
73
73
  const StateDataCookie_1 = require("./StateDataCookie");
74
74
  // NOTE: Replaced at build time
75
- const VERSION = "8.3.8";
75
+ const VERSION = "8.4.0";
76
76
  const globalContext = {
77
77
  prOidcByConfigId: new Map(),
78
78
  hasLogoutBeenCalled: (0, id_1.id)(false)
package/esm/core/createOidc.js CHANGED
@@ -35,7 +35,7 @@ import { getHomeAndRedirectUri } from "./homeAndRedirectUri";
35
35
  import { ensureNonBlankPaint } from "../tools/ensureNonBlankPaint";
36
36
  import { setStateDataCookieIfEnabled, clearStateDataCookie, getIsStateDataCookieEnabled } from "./StateDataCookie";
37
37
  // NOTE: Replaced at build time
38
- const VERSION = "8.3.8";
38
+ const VERSION = "8.4.0";
39
39
  const globalContext = {
40
40
  prOidcByConfigId: new Map(),
41
41
  hasLogoutBeenCalled: id(false)
package/esm/tanstack-start/react/createOidcSpaApi.js CHANGED
@@ -1,4 +1,3 @@
1
- import { jsx as _jsx } from "react/jsx-runtime";
2
1
  import { useState, useEffect, useReducer } from "react";
3
2
  import { OidcInitializationError } from "../../core/OidcInitializationError";
4
3
  import { Deferred } from "../../tools/Deferred";
@@ -63,51 +62,28 @@ export function createOidcSpaApi(params) {
63
62
  });
64
63
  function useOidc(params) {
65
64
  const { assert: assert_params } = params ?? {};
66
- /*
67
- if (!isBrowser) {
68
- throw new Error(
69
- [
70
- "oidc-spa: useOidc() can't be used on the server.",
71
- "You can prevent this component from rendering on the server",
72
- "by wrapping it into <OidcInitializationGate />"
73
- ].join(" ")
74
- );
75
- }
76
- */
77
- const { hasResolved, value: oidcCore } = dOidcCoreOrInitializationError.getState();
78
- if (oidcCore instanceof OidcInitializationError) {
79
- throw oidcCore;
80
- }
65
+ const { hasResolved, value: oidcCoreOrInitializationError } = dOidcCoreOrInitializationError.getState();
81
66
  check_assertion: {
82
67
  if (assert_params === undefined) {
83
68
  break check_assertion;
84
69
  }
85
- if (assert_params === "init completed") {
86
- if (!hasResolved) {
87
- throw new Error([
88
- "oidc-spa: There is a logic error in the application.",
89
- "you called useOidc({ assert: 'init completed' }) but",
90
- ...(isBrowser
91
- ? [
92
- "the component making this call was rendered before",
93
- "the oidc initialization has completed."
94
- ]
95
- : ["we are on the server, this assertion will always be wrong."]),
96
- "\nTo avoid this error make sure you call this within",
97
- "<OidcInitializationGate /> or remove the assertion and check",
98
- "the hasInitCompleted property."
99
- ].join(" "));
100
- }
101
- break check_assertion;
102
- }
103
- if (!hasResolved) {
70
+ if (!hasResolved || oidcCoreOrInitializationError instanceof Error) {
104
71
  throw new Error([
105
72
  "oidc-spa: There is a logic error in the application.",
106
73
  `you called useOidc({ assert: "${assert_params}" }) but`,
107
- "initialization hasn't completed yet, we don't know yet if the",
108
- "user is logged in or not."
74
+ ...(isBrowser
75
+ ? [
76
+ "the component making this call was rendered before",
77
+ "the auth state of the user was established."
78
+ ]
79
+ : ["we are on the server, this assertion will always be wrong."]),
80
+ "\nTo avoid this error make sure to check isOidcReady higher in the tree."
109
81
  ].join(" "));
110
82
  }
83
+ if (assert_params === "ready") {
84
+ break check_assertion;
85
+ }
86
+ const oidcCore = oidcCoreOrInitializationError;
111
87
  const getMessage = (v) => [
112
88
  "oidc-spa: There is a logic error in the application.",
113
89
  `If this component is mounted the user is supposed ${v}.`,
@@ -145,9 +121,13 @@ export function createOidcSpaApi(params) {
145
121
  };
146
122
  }, []);
147
123
  const [, reRenderIfDecodedIdTokenChanged] = useState(() => {
148
- if (oidcCore === undefined) {
124
+ if (!hasResolved) {
149
125
  return undefined;
150
126
  }
127
+ if (oidcCoreOrInitializationError instanceof Error) {
128
+ return undefined;
129
+ }
130
+ const oidcCore = oidcCoreOrInitializationError;
151
131
  if (!oidcCore.isUserLoggedIn) {
152
132
  return undefined;
153
133
  }
@@ -155,9 +135,13 @@ export function createOidcSpaApi(params) {
155
135
  });
156
136
  const [evtIsDecodedIdTokenUsed] = useState(() => createStatefulEvt(() => false));
157
137
  useEffect(() => {
158
- if (oidcCore === undefined) {
159
- return undefined;
138
+ if (!hasResolved) {
139
+ return;
160
140
  }
141
+ if (oidcCoreOrInitializationError instanceof Error) {
142
+ return;
143
+ }
144
+ const oidcCore = oidcCoreOrInitializationError;
161
145
  if (!oidcCore.isUserLoggedIn) {
162
146
  return;
163
147
  }
@@ -185,7 +169,7 @@ export function createOidcSpaApi(params) {
185
169
  isActive = false;
186
170
  unsubscribe?.();
187
171
  };
188
- }, []);
172
+ }, [hasResolved]);
189
173
  const [evtIsAutoLogoutStateUsed] = useState(() => createStatefulEvt(() => false));
190
174
  const [, reRenderIfAutoLogoutStateChanged] = useState(() => evtAutoLogoutState.current);
191
175
  useEffect(() => {
@@ -219,19 +203,29 @@ export function createOidcSpaApi(params) {
219
203
  }
220
204
  setHasHydratedToTrue();
221
205
  }, []);
222
- if (!hasResolved || hasHydrated === false) {
206
+ if (!hasResolved || oidcCoreOrInitializationError instanceof Error || hasHydrated === false) {
223
207
  return id({
224
- hasInitCompleted: false,
208
+ isOidcReady: false,
225
209
  autoLogoutState: {
226
210
  shouldDisplayWarning: false
227
- }
211
+ },
212
+ oidcInitializationError: (() => {
213
+ if (!hasResolved) {
214
+ return undefined;
215
+ }
216
+ if (!(oidcCoreOrInitializationError instanceof Error)) {
217
+ return undefined;
218
+ }
219
+ return oidcCoreOrInitializationError;
220
+ })()
228
221
  });
229
222
  }
223
+ const oidcCore = oidcCoreOrInitializationError;
230
224
  if (!oidcCore.isUserLoggedIn) {
231
225
  return id({
232
- hasInitCompleted: true,
226
+ isOidcReady: true,
233
227
  isUserLoggedIn: false,
234
- initializationError: oidcCore.initializationError,
228
+ oidcInitializationError: oidcCore.initializationError,
235
229
  issuerUri: oidcCore.params.issuerUri,
236
230
  clientId: oidcCore.params.clientId,
237
231
  validRedirectUri: oidcCore.params.validRedirectUri,
@@ -243,7 +237,7 @@ export function createOidcSpaApi(params) {
243
237
  });
244
238
  }
245
239
  return id({
246
- hasInitCompleted: true,
240
+ isOidcReady: true,
247
241
  isUserLoggedIn: true,
248
242
  get decodedIdToken() {
249
243
  evtIsDecodedIdTokenUsed.current = true;
@@ -543,35 +537,6 @@ export function createOidcSpaApi(params) {
543
537
  }
544
538
  }
545
539
  enforceLogin[BEFORE_LOAD_FN_BRAND_PROPERTY_NAME] = true;
546
- function OidcInitializationGate(props) {
547
- const { errorComponent: ErrorComponent, pendingComponent: PendingComponent, children } = props;
548
- const [oidcCoreOrInitializationError, setOidcCoreOrInitializationError] = useState(undefined);
549
- useEffect(() => {
550
- let isActive = true;
551
- dOidcCoreOrInitializationError.pr.then(oidcCoreOrInitializationError => {
552
- if (!isActive) {
553
- return;
554
- }
555
- setOidcCoreOrInitializationError(oidcCoreOrInitializationError);
556
- });
557
- return () => {
558
- isActive = false;
559
- };
560
- }, []);
561
- if (oidcCoreOrInitializationError === undefined) {
562
- if (PendingComponent === undefined) {
563
- return null;
564
- }
565
- return _jsx(PendingComponent, {});
566
- }
567
- if (oidcCoreOrInitializationError instanceof OidcInitializationError) {
568
- if (ErrorComponent === undefined) {
569
- throw oidcCoreOrInitializationError;
570
- }
571
- return _jsx(ErrorComponent, { oidcInitializationError: oidcCoreOrInitializationError });
572
- }
573
- return children;
574
- }
575
540
  const prValidateAndGetAccessTokenClaims = createValidateAndGetAccessTokenClaims === undefined
576
541
  ? undefined
577
542
  : dParamsOfBootstrap.pr.then(paramsOfBootstrap => createValidateAndGetAccessTokenClaims({
@@ -709,7 +674,6 @@ export function createOidcSpaApi(params) {
709
674
  getOidc,
710
675
  bootstrapOidc,
711
676
  enforceLogin,
712
- OidcInitializationGate,
713
677
  oidcFnMiddleware,
714
678
  oidcRequestMiddleware
715
679
  };
package/esm/tanstack-start/react/createOidcSpaApi.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"createOidcSpaApi.js","sourceRoot":"","sources":["../../../src/tanstack-start/react/createOidcSpaApi.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"createOidcSpaApi.js","sourceRoot":"","sources":["../../../src/tanstack-start/react/createOidcSpaApi.tsx"],"names":[],"mappings":"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"}
package/esm/tanstack-start/react/types.d.ts CHANGED
@@ -1,4 +1,3 @@
1
- import type { ReactNode, ComponentType } from "react";
2
1
  import type { Oidc as Oidc_core, OidcInitializationError } from "../../core";
3
2
  import type { FunctionMiddlewareAfterServer, RequestMiddlewareAfterServer } from "@tanstack/react-start";
4
3
  import type { GetterOrDirectValue } from "../../tools/GetterOrDirectValue";
@@ -14,12 +13,15 @@ export type UseOidc<DecodedIdToken> = {
14
13
  (params: {
15
14
  assert: "user not logged in";
16
15
  }): UseOidc.Oidc.NotLoggedIn;
16
+ (params: {
17
+ assert: "ready";
18
+ }): Exclude<UseOidc.Oidc<DecodedIdToken>, UseOidc.Oidc.NotReady>;
17
19
  };
18
20
  export declare namespace UseOidc {
19
21
  type WithAutoLogin<DecodedIdToken> = (params?: {
20
- assert: "init completed";
22
+ assert: "ready";
21
23
  }) => Oidc.LoggedIn<DecodedIdToken>;
22
- type Oidc<DecodedIdToken> = (Oidc.InitNotCompleted & {
24
+ type Oidc<DecodedIdToken> = (Oidc.NotReady & {
23
25
  isUserLoggedIn?: never;
24
26
  issuerUri?: never;
25
27
  clientId?: never;
@@ -31,7 +33,6 @@ export declare namespace UseOidc {
31
33
  backFromAuthServer?: never;
32
34
  isNewBrowserSession?: never;
33
35
  login?: never;
34
- initializationError?: never;
35
36
  }) | (Oidc.NotLoggedIn & {
36
37
  decodedIdToken?: never;
37
38
  logout?: never;
@@ -41,17 +42,18 @@ export declare namespace UseOidc {
41
42
  isNewBrowserSession?: never;
42
43
  }) | (Oidc.LoggedIn<DecodedIdToken> & {
43
44
  login?: never;
44
- initializationError?: never;
45
+ oidcInitializationError?: never;
45
46
  });
46
47
  namespace Oidc {
47
- type InitNotCompleted = {
48
- hasInitCompleted: false;
48
+ type NotReady = {
49
+ isOidcReady: false;
49
50
  autoLogoutState: {
50
51
  shouldDisplayWarning: false;
51
52
  };
53
+ oidcInitializationError: OidcInitializationError | undefined;
52
54
  };
53
55
  type NotLoggedIn = {
54
- hasInitCompleted: true;
56
+ isOidcReady: true;
55
57
  isUserLoggedIn: false;
56
58
  issuerUri: string;
57
59
  clientId: string;
@@ -64,10 +66,10 @@ export declare namespace UseOidc {
64
66
  autoLogoutState: {
65
67
  shouldDisplayWarning: false;
66
68
  };
67
- initializationError: OidcInitializationError | undefined;
69
+ oidcInitializationError: OidcInitializationError | undefined;
68
70
  };
69
71
  type LoggedIn<DecodedIdToken> = {
70
- hasInitCompleted: true;
72
+ isOidcReady: true;
71
73
  isUserLoggedIn: true;
72
74
  issuerUri: string;
73
75
  clientId: string;
@@ -385,15 +387,7 @@ export type OidcSpaApi<AutoLogin, DecodedIdToken, AccessTokenClaims> = {
385
387
  } & (AccessTokenClaims extends undefined ? {} : {
386
388
  oidcFnMiddleware: AutoLogin extends true ? OidcFnMiddleware.WithAutoLogin<AccessTokenClaims> : OidcFnMiddleware<AccessTokenClaims>;
387
389
  oidcRequestMiddleware: AutoLogin extends true ? OidcRequestMiddleware.WithAutoLogin<AccessTokenClaims> : OidcRequestMiddleware<AccessTokenClaims>;
388
- }) & (AutoLogin extends true ? {
389
- OidcInitializationGate: (props: {
390
- errorComponent?: ComponentType<{
391
- oidcInitializationError: OidcInitializationError;
392
- }>;
393
- pendingComponent?: ComponentType<{}>;
394
- children: ReactNode;
395
- }) => ReactNode;
396
- } : {
390
+ }) & (AutoLogin extends true ? {} : {
397
391
  enforceLogin: (loaderContext: {
398
392
  cause: "preload" | string;
399
393
  location: {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "oidc-spa",
3
- "version": "8.3.8",
3
+ "version": "8.4.0",
4
4
  "description": "OIDC Client for Client Centric Web Applications",
5
5
  "repository": {
6
6
  "type": "git",
package/src/tanstack-start/react/createOidcSpaApi.tsx CHANGED
@@ -1,4 +1,4 @@
1
- import { useState, useEffect, type ReactNode, useReducer, type ComponentType } from "react";
1
+ import { useState, useEffect, useReducer } from "react";
2
2
  import type {
3
3
  CreateValidateAndGetAccessTokenClaims,
4
4
  OidcSpaApi,
@@ -116,66 +116,40 @@ export function createOidcSpaApi<
116
116
  });
117
117
 
118
118
  function useOidc(params?: {
119
- assert?: "user logged in" | "user not logged in" | "init completed";
119
+ assert?: "user logged in" | "user not logged in" | "ready";
120
120
  }): UseOidc.Oidc<DecodedIdToken> {
121
121
  const { assert: assert_params } = params ?? {};
122
122
 
123
- /*
124
- if (!isBrowser) {
125
- throw new Error(
126
- [
127
- "oidc-spa: useOidc() can't be used on the server.",
128
- "You can prevent this component from rendering on the server",
129
- "by wrapping it into <OidcInitializationGate />"
130
- ].join(" ")
131
- );
132
- }
133
- */
134
-
135
- const { hasResolved, value: oidcCore } = dOidcCoreOrInitializationError.getState();
136
-
137
- if (oidcCore instanceof OidcInitializationError) {
138
- throw oidcCore;
139
- }
123
+ const { hasResolved, value: oidcCoreOrInitializationError } =
124
+ dOidcCoreOrInitializationError.getState();
140
125
 
141
126
  check_assertion: {
142
127
  if (assert_params === undefined) {
143
128
  break check_assertion;
144
129
  }
145
130
 
146
- if (assert_params === "init completed") {
147
- if (!hasResolved) {
148
- throw new Error(
149
- [
150
- "oidc-spa: There is a logic error in the application.",
151
- "you called useOidc({ assert: 'init completed' }) but",
152
- ...(isBrowser
153
- ? [
154
- "the component making this call was rendered before",
155
- "the oidc initialization has completed."
156
- ]
157
- : ["we are on the server, this assertion will always be wrong."]),
158
- "\nTo avoid this error make sure you call this within",
159
- "<OidcInitializationGate /> or remove the assertion and check",
160
- "the hasInitCompleted property."
161
- ].join(" ")
162
- );
163
- }
164
-
165
- break check_assertion;
166
- }
167
-
168
- if (!hasResolved) {
131
+ if (!hasResolved || oidcCoreOrInitializationError instanceof Error) {
169
132
  throw new Error(
170
133
  [
171
134
  "oidc-spa: There is a logic error in the application.",
172
135
  `you called useOidc({ assert: "${assert_params}" }) but`,
173
- "initialization hasn't completed yet, we don't know yet if the",
174
- "user is logged in or not."
136
+ ...(isBrowser
137
+ ? [
138
+ "the component making this call was rendered before",
139
+ "the auth state of the user was established."
140
+ ]
141
+ : ["we are on the server, this assertion will always be wrong."]),
142
+ "\nTo avoid this error make sure to check isOidcReady higher in the tree."
175
143
  ].join(" ")
176
144
  );
177
145
  }
178
146
 
147
+ if (assert_params === "ready") {
148
+ break check_assertion;
149
+ }
150
+
151
+ const oidcCore = oidcCoreOrInitializationError;
152
+
179
153
  const getMessage = (v: string) =>
180
154
  [
181
155
  "oidc-spa: There is a logic error in the application.",
@@ -221,10 +195,16 @@ export function createOidcSpaApi<
221
195
  }, []);
222
196
 
223
197
  const [, reRenderIfDecodedIdTokenChanged] = useState<DecodedIdToken | undefined>(() => {
224
- if (oidcCore === undefined) {
198
+ if (!hasResolved) {
199
+ return undefined;
200
+ }
201
+
202
+ if (oidcCoreOrInitializationError instanceof Error) {
225
203
  return undefined;
226
204
  }
227
205
 
206
+ const oidcCore = oidcCoreOrInitializationError;
207
+
228
208
  if (!oidcCore.isUserLoggedIn) {
229
209
  return undefined;
230
210
  }
@@ -234,10 +214,16 @@ export function createOidcSpaApi<
234
214
  const [evtIsDecodedIdTokenUsed] = useState(() => createStatefulEvt<boolean>(() => false));
235
215
 
236
216
  useEffect(() => {
237
- if (oidcCore === undefined) {
238
- return undefined;
217
+ if (!hasResolved) {
218
+ return;
239
219
  }
240
220
 
221
+ if (oidcCoreOrInitializationError instanceof Error) {
222
+ return;
223
+ }
224
+
225
+ const oidcCore = oidcCoreOrInitializationError;
226
+
241
227
  if (!oidcCore.isUserLoggedIn) {
242
228
  return;
243
229
  }
@@ -274,7 +260,7 @@ export function createOidcSpaApi<
274
260
  isActive = false;
275
261
  unsubscribe?.();
276
262
  };
277
- }, []);
263
+ }, [hasResolved]);
278
264
 
279
265
  const [evtIsAutoLogoutStateUsed] = useState(() => createStatefulEvt<boolean>(() => false));
280
266
 
@@ -324,20 +310,31 @@ export function createOidcSpaApi<
324
310
  setHasHydratedToTrue();
325
311
  }, []);
326
312
 
327
- if (!hasResolved || hasHydrated === false) {
328
- return id<UseOidc.Oidc.InitNotCompleted>({
329
- hasInitCompleted: false,
313
+ if (!hasResolved || oidcCoreOrInitializationError instanceof Error || hasHydrated === false) {
314
+ return id<UseOidc.Oidc.NotReady>({
315
+ isOidcReady: false,
330
316
  autoLogoutState: {
331
317
  shouldDisplayWarning: false
332
- }
318
+ },
319
+ oidcInitializationError: (() => {
320
+ if (!hasResolved) {
321
+ return undefined;
322
+ }
323
+ if (!(oidcCoreOrInitializationError instanceof Error)) {
324
+ return undefined;
325
+ }
326
+ return oidcCoreOrInitializationError;
327
+ })()
333
328
  });
334
329
  }
335
330
 
331
+ const oidcCore = oidcCoreOrInitializationError;
332
+
336
333
  if (!oidcCore.isUserLoggedIn) {
337
334
  return id<UseOidc.Oidc.NotLoggedIn>({
338
- hasInitCompleted: true,
335
+ isOidcReady: true,
339
336
  isUserLoggedIn: false,
340
- initializationError: oidcCore.initializationError,
337
+ oidcInitializationError: oidcCore.initializationError,
341
338
  issuerUri: oidcCore.params.issuerUri,
342
339
  clientId: oidcCore.params.clientId,
343
340
  validRedirectUri: oidcCore.params.validRedirectUri,
@@ -351,7 +348,7 @@ export function createOidcSpaApi<
351
348
  }
352
349
 
353
350
  return id<UseOidc.Oidc.LoggedIn<DecodedIdToken>>({
354
- hasInitCompleted: true,
351
+ isOidcReady: true,
355
352
  isUserLoggedIn: true,
356
353
  get decodedIdToken() {
357
354
  evtIsDecodedIdTokenUsed.current = true;
@@ -764,49 +761,6 @@ export function createOidcSpaApi<
764
761
 
765
762
  enforceLogin[BEFORE_LOAD_FN_BRAND_PROPERTY_NAME] = true;
766
763
 
767
- function OidcInitializationGate(props: {
768
- errorComponent?: ComponentType<{ oidcInitializationError: OidcInitializationError }>;
769
- pendingComponent?: ComponentType<{}>;
770
- children: ReactNode;
771
- }): ReactNode {
772
- const { errorComponent: ErrorComponent, pendingComponent: PendingComponent, children } = props;
773
-
774
- const [oidcCoreOrInitializationError, setOidcCoreOrInitializationError] = useState<
775
- Oidc_core<DecodedIdToken> | OidcInitializationError | undefined
776
- >(undefined);
777
-
778
- useEffect(() => {
779
- let isActive = true;
780
-
781
- dOidcCoreOrInitializationError.pr.then(oidcCoreOrInitializationError => {
782
- if (!isActive) {
783
- return;
784
- }
785
- setOidcCoreOrInitializationError(oidcCoreOrInitializationError);
786
- });
787
-
788
- return () => {
789
- isActive = false;
790
- };
791
- }, []);
792
-
793
- if (oidcCoreOrInitializationError === undefined) {
794
- if (PendingComponent === undefined) {
795
- return null;
796
- }
797
- return <PendingComponent />;
798
- }
799
-
800
- if (oidcCoreOrInitializationError instanceof OidcInitializationError) {
801
- if (ErrorComponent === undefined) {
802
- throw oidcCoreOrInitializationError;
803
- }
804
- return <ErrorComponent oidcInitializationError={oidcCoreOrInitializationError} />;
805
- }
806
-
807
- return children;
808
- }
809
-
810
764
  const prValidateAndGetAccessTokenClaims =
811
765
  createValidateAndGetAccessTokenClaims === undefined
812
766
  ? undefined
@@ -1020,7 +974,6 @@ export function createOidcSpaApi<
1020
974
  getOidc,
1021
975
  bootstrapOidc,
1022
976
  enforceLogin,
1023
- OidcInitializationGate,
1024
977
  oidcFnMiddleware,
1025
978
  oidcRequestMiddleware
1026
979
  };
package/src/tanstack-start/react/types.tsx CHANGED
@@ -1,4 +1,3 @@
1
- import type { ReactNode, ComponentType } from "react";
2
1
  import type { Oidc as Oidc_core, OidcInitializationError } from "../../core";
3
2
  import type { FunctionMiddlewareAfterServer, RequestMiddlewareAfterServer } from "@tanstack/react-start";
4
3
  import type { GetterOrDirectValue } from "../../tools/GetterOrDirectValue";
@@ -9,15 +8,16 @@ export type UseOidc<DecodedIdToken> = {
9
8
  (params?: { assert?: undefined }): UseOidc.Oidc<DecodedIdToken>;
10
9
  (params: { assert: "user logged in" }): UseOidc.Oidc.LoggedIn<DecodedIdToken>;
11
10
  (params: { assert: "user not logged in" }): UseOidc.Oidc.NotLoggedIn;
11
+ (params: { assert: "ready" }): Exclude<UseOidc.Oidc<DecodedIdToken>, UseOidc.Oidc.NotReady>;
12
12
  };
13
13
 
14
14
  export namespace UseOidc {
15
15
  export type WithAutoLogin<DecodedIdToken> = (params?: {
16
- assert: "init completed";
16
+ assert: "ready";
17
17
  }) => Oidc.LoggedIn<DecodedIdToken>;
18
18
 
19
19
  export type Oidc<DecodedIdToken> =
20
- | (Oidc.InitNotCompleted & {
20
+ | (Oidc.NotReady & {
21
21
  isUserLoggedIn?: never;
22
22
  issuerUri?: never;
23
23
  clientId?: never;
@@ -31,7 +31,6 @@ export namespace UseOidc {
31
31
  isNewBrowserSession?: never;
32
32
 
33
33
  login?: never;
34
- initializationError?: never;
35
34
  })
36
35
  | (Oidc.NotLoggedIn & {
37
36
  decodedIdToken?: never;
@@ -43,19 +42,20 @@ export namespace UseOidc {
43
42
  })
44
43
  | (Oidc.LoggedIn<DecodedIdToken> & {
45
44
  login?: never;
46
- initializationError?: never;
45
+ oidcInitializationError?: never;
47
46
  });
48
47
 
49
48
  export namespace Oidc {
50
- export type InitNotCompleted = {
51
- hasInitCompleted: false;
49
+ export type NotReady = {
50
+ isOidcReady: false;
52
51
  autoLogoutState: {
53
52
  shouldDisplayWarning: false;
54
53
  };
54
+ oidcInitializationError: OidcInitializationError | undefined;
55
55
  };
56
56
 
57
57
  export type NotLoggedIn = {
58
- hasInitCompleted: true;
58
+ isOidcReady: true;
59
59
  isUserLoggedIn: false;
60
60
  issuerUri: string;
61
61
  clientId: string;
@@ -68,11 +68,11 @@ export namespace UseOidc {
68
68
  autoLogoutState: {
69
69
  shouldDisplayWarning: false;
70
70
  };
71
- initializationError: OidcInitializationError | undefined;
71
+ oidcInitializationError: OidcInitializationError | undefined;
72
72
  };
73
73
 
74
74
  export type LoggedIn<DecodedIdToken> = {
75
- hasInitCompleted: true;
75
+ isOidcReady: true;
76
76
  isUserLoggedIn: true;
77
77
  issuerUri: string;
78
78
  clientId: string;
@@ -445,13 +445,7 @@ export type OidcSpaApi<AutoLogin, DecodedIdToken, AccessTokenClaims> = {
445
445
  : OidcRequestMiddleware<AccessTokenClaims>;
446
446
  }) &
447
447
  (AutoLogin extends true
448
- ? {
449
- OidcInitializationGate: (props: {
450
- errorComponent?: ComponentType<{ oidcInitializationError: OidcInitializationError }>;
451
- pendingComponent?: ComponentType<{}>;
452
- children: ReactNode;
453
- }) => ReactNode;
454
- }
448
+ ? {}
455
449
  : {
456
450
  enforceLogin: (loaderContext: {
457
451
  cause: "preload" | string;