oidc-spa 4.14.0 → 4.14.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/mock/oidc.d.ts +5 -2
- package/mock/oidc.js +1 -1
- package/mock/oidc.js.map +1 -1
- package/mock/react.d.ts +2 -2
- package/mock/react.js.map +1 -1
- package/package.json +6 -6
- package/react/react.d.ts +3 -3
- package/react/react.js +28 -17
- package/react/react.js.map +1 -1
- package/src/mock/oidc.ts +6 -3
- package/src/mock/react.tsx +2 -2
- package/src/react/react.tsx +30 -23
- package/src/tools/ValueOrAsyncGetter.ts +1 -0
- package/tools/ValueOrAsyncGetter.d.ts +1 -0
- package/tools/{ValueOrPromiseOrAsyncGetter.js → ValueOrAsyncGetter.js} +1 -1
- package/tools/ValueOrAsyncGetter.js.map +1 -0
- package/src/tools/ValueOrPromiseOrAsyncGetter.ts +0 -1
- package/tools/ValueOrPromiseOrAsyncGetter.d.ts +0 -1
- package/tools/ValueOrPromiseOrAsyncGetter.js.map +0 -1
package/mock/oidc.d.ts
CHANGED
|
@@ -1,10 +1,13 @@
|
|
|
1
1
|
import type { Oidc } from "../oidc";
|
|
2
2
|
export type ParamsOfCreateMockOidc<DecodedIdToken extends Record<string, unknown> = Record<string, unknown>, IsAuthGloballyRequired extends boolean = false> = {
|
|
3
|
-
isUserInitiallyLoggedIn: boolean;
|
|
4
3
|
mockedParams?: Partial<Oidc["params"]>;
|
|
5
4
|
mockedTokens?: Partial<Oidc.Tokens<DecodedIdToken>>;
|
|
6
5
|
publicUrl?: string;
|
|
7
6
|
isAuthGloballyRequired?: IsAuthGloballyRequired;
|
|
8
7
|
postLoginRedirectUrl?: string;
|
|
9
|
-
}
|
|
8
|
+
} & (IsAuthGloballyRequired extends true ? {
|
|
9
|
+
isUserInitiallyLoggedIn?: true;
|
|
10
|
+
} : {
|
|
11
|
+
isUserInitiallyLoggedIn: boolean;
|
|
12
|
+
});
|
|
10
13
|
export declare function createMockOidc<DecodedIdToken extends Record<string, unknown> = Record<string, unknown>, IsAuthGloballyRequired extends boolean = false>(params: ParamsOfCreateMockOidc<DecodedIdToken, IsAuthGloballyRequired>): IsAuthGloballyRequired extends true ? Oidc.LoggedIn<DecodedIdToken> : Oidc<DecodedIdToken>;
|
package/mock/oidc.js
CHANGED
|
@@ -56,7 +56,7 @@ var urlParamName = "isUserLoggedIn";
|
|
|
56
56
|
function createMockOidc(params) {
|
|
57
57
|
var _this = this;
|
|
58
58
|
var _a, _b;
|
|
59
|
-
var
|
|
59
|
+
var _c = params.isUserInitiallyLoggedIn, isUserInitiallyLoggedIn = _c === void 0 ? true : _c, _d = params.mockedParams, mockedParams = _d === void 0 ? {} : _d, _e = params.mockedTokens, mockedTokens = _e === void 0 ? {} : _e, publicUrl_params = params.publicUrl, _f = params.isAuthGloballyRequired, isAuthGloballyRequired = _f === void 0 ? false : _f, postLoginRedirectUrl = params.postLoginRedirectUrl;
|
|
60
60
|
var isUserLoggedIn = (function () {
|
|
61
61
|
var result = (0, urlQueryParams_1.retrieveQueryParamFromUrl)({
|
|
62
62
|
"url": window.location.href,
|
package/mock/oidc.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oidc.js","sourceRoot":"","sources":["../src/mock/oidc.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"oidc.js","sourceRoot":"","sources":["../src/mock/oidc.ts"],"names":[],"mappings":"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"}
|
package/mock/react.d.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { type ParamsOfCreateMockOidc } from "./oidc";
|
|
2
|
-
import {
|
|
2
|
+
import type { ValueOrAsyncGetter } from "../tools/ValueOrAsyncGetter";
|
|
3
3
|
/** @see: https://docs.oidc-spa.dev/documentation/mock */
|
|
4
|
-
export declare function createMockReactOidc<DecodedIdToken extends Record<string, unknown> = Record<string, unknown>, IsAuthGloballyRequired extends boolean = false>(params:
|
|
4
|
+
export declare function createMockReactOidc<DecodedIdToken extends Record<string, unknown> = Record<string, unknown>, IsAuthGloballyRequired extends boolean = false>(params: ValueOrAsyncGetter<ParamsOfCreateMockOidc<DecodedIdToken, IsAuthGloballyRequired>>): {
|
|
5
5
|
OidcProvider: (ParamsOfCreateMockOidc<DecodedIdToken, IsAuthGloballyRequired> extends infer T ? T extends ParamsOfCreateMockOidc<DecodedIdToken, IsAuthGloballyRequired> ? T extends {
|
|
6
6
|
isAuthGloballyRequired?: true | undefined;
|
|
7
7
|
} ? true : false : never : never) extends infer T_1 ? T_1 extends (ParamsOfCreateMockOidc<DecodedIdToken, IsAuthGloballyRequired> extends infer T ? T extends ParamsOfCreateMockOidc<DecodedIdToken, IsAuthGloballyRequired> ? T extends {
|
package/mock/react.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"react.js","sourceRoot":"","sources":["../src/mock/react.tsx"],"names":[],"mappings":";;AAKA,kDAKC;AAVD,wCAAwE;AACxE,+BAAqE;AAGrE,yDAAyD;AACzD,SAAgB,mBAAmB,CAGjC,
|
|
1
|
+
{"version":3,"file":"react.js","sourceRoot":"","sources":["../src/mock/react.tsx"],"names":[],"mappings":";;AAKA,kDAKC;AAVD,wCAAwE;AACxE,+BAAqE;AAGrE,yDAAyD;AACzD,SAAgB,mBAAmB,CAGjC,MAA0F;IACxF,OAAO,IAAA,8CAAsC,EAAC,MAAM,EAAE,qBAAc,CAAC,CAAC;AAC1E,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "oidc-spa",
|
|
3
|
-
"version": "4.14.
|
|
3
|
+
"version": "4.14.2",
|
|
4
4
|
"description": "Openidconnect client for Single Page Applications",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -34,7 +34,7 @@
|
|
|
34
34
|
"./tools/StatefulObservable": "./tools/StatefulObservable.js",
|
|
35
35
|
"./tools/subscribeToUserInteraction": "./tools/subscribeToUserInteraction.js",
|
|
36
36
|
"./tools/urlQueryParams": "./tools/urlQueryParams.js",
|
|
37
|
-
"./tools/
|
|
37
|
+
"./tools/ValueOrAsyncGetter": "./tools/ValueOrAsyncGetter.js",
|
|
38
38
|
"./vendor/backend/evt": "./vendor/backend/evt.js",
|
|
39
39
|
"./vendor/backend/jsonwebtoken": "./vendor/backend/jsonwebtoken.js",
|
|
40
40
|
"./vendor/backend/node-fetch": "./vendor/backend/node-fetch.js",
|
|
@@ -71,7 +71,7 @@
|
|
|
71
71
|
"./src/tools/Deferred.ts",
|
|
72
72
|
"./src/tools/PromiseOrNot.ts",
|
|
73
73
|
"./src/tools/StatefulObservable.ts",
|
|
74
|
-
"./src/tools/
|
|
74
|
+
"./src/tools/ValueOrAsyncGetter.ts",
|
|
75
75
|
"./src/tools/base64.ts",
|
|
76
76
|
"./src/tools/createIsUserActive.ts",
|
|
77
77
|
"./src/tools/createObjectThatThrowsIfAccessed.ts",
|
|
@@ -128,9 +128,9 @@
|
|
|
128
128
|
"./tools/StatefulObservable.d.ts",
|
|
129
129
|
"./tools/StatefulObservable.js",
|
|
130
130
|
"./tools/StatefulObservable.js.map",
|
|
131
|
-
"./tools/
|
|
132
|
-
"./tools/
|
|
133
|
-
"./tools/
|
|
131
|
+
"./tools/ValueOrAsyncGetter.d.ts",
|
|
132
|
+
"./tools/ValueOrAsyncGetter.js",
|
|
133
|
+
"./tools/ValueOrAsyncGetter.js.map",
|
|
134
134
|
"./tools/base64.d.ts",
|
|
135
135
|
"./tools/base64.js",
|
|
136
136
|
"./tools/base64.js.map",
|
package/react/react.d.ts
CHANGED
|
@@ -2,7 +2,7 @@ import { type ReactNode } from "react";
|
|
|
2
2
|
import { type ParamsOfCreateOidc, type Oidc } from "../oidc";
|
|
3
3
|
import { OidcInitializationError } from "../OidcInitializationError";
|
|
4
4
|
import type { PromiseOrNot } from "../tools/PromiseOrNot";
|
|
5
|
-
import type {
|
|
5
|
+
import type { ValueOrAsyncGetter } from "../tools/ValueOrAsyncGetter";
|
|
6
6
|
export type OidcReact<DecodedIdToken extends Record<string, unknown>> = OidcReact.NotLoggedIn | OidcReact.LoggedIn<DecodedIdToken>;
|
|
7
7
|
export declare namespace OidcReact {
|
|
8
8
|
type Common = Oidc.Common;
|
|
@@ -92,11 +92,11 @@ export declare function createOidcReactApi_dependencyInjection<DecodedIdToken ex
|
|
|
92
92
|
decodedIdTokenSchema: {
|
|
93
93
|
parse: (data: unknown) => DecodedIdToken;
|
|
94
94
|
} | undefined;
|
|
95
|
-
} | {})>(
|
|
95
|
+
} | {})>(paramsOrGetParams: ValueOrAsyncGetter<ParamsOfCreateOidc>, createOidc: (params: ParamsOfCreateOidc) => PromiseOrNot<Oidc<DecodedIdToken>>): OidcReactApi<DecodedIdToken, ParamsOfCreateOidc extends {
|
|
96
96
|
isAuthGloballyRequired?: true | undefined;
|
|
97
97
|
} ? true : false>;
|
|
98
98
|
/** @see: https://docs.oidc-spa.dev/documentation/usage#react-api */
|
|
99
|
-
export declare function createReactOidc<DecodedIdToken extends Record<string, unknown> = Record<string, unknown>, IsAuthGloballyRequired extends boolean = false>(params:
|
|
99
|
+
export declare function createReactOidc<DecodedIdToken extends Record<string, unknown> = Record<string, unknown>, IsAuthGloballyRequired extends boolean = false>(params: ValueOrAsyncGetter<ParamsOfCreateOidc<DecodedIdToken, IsAuthGloballyRequired>>): OidcReactApi<DecodedIdToken, ParamsOfCreateOidc<DecodedIdToken, IsAuthGloballyRequired> extends infer T ? T extends ParamsOfCreateOidc<DecodedIdToken, IsAuthGloballyRequired> ? T extends {
|
|
100
100
|
isAuthGloballyRequired?: true | undefined;
|
|
101
101
|
} ? true : false : never : never>;
|
|
102
102
|
export {};
|
package/react/react.js
CHANGED
|
@@ -74,45 +74,56 @@ var tsafe_2 = require("../vendor/frontend/tsafe");
|
|
|
74
74
|
var useGuaranteedMemo_1 = require("../tools/powerhooks/useGuaranteedMemo");
|
|
75
75
|
var Deferred_1 = require("../tools/Deferred");
|
|
76
76
|
var oidcContext = (0, react_1.createContext)(undefined);
|
|
77
|
-
function createOidcReactApi_dependencyInjection(
|
|
77
|
+
function createOidcReactApi_dependencyInjection(paramsOrGetParams, createOidc) {
|
|
78
78
|
var _this = this;
|
|
79
79
|
var dReadyToCreate = new Deferred_1.Deferred();
|
|
80
|
+
var decodedIdTokenSchema = undefined;
|
|
80
81
|
// NOTE: It can be InitializationError only if isAuthGloballyRequired is true
|
|
81
|
-
var prOidcOrInitializationError =
|
|
82
|
-
|
|
83
|
-
var params;
|
|
82
|
+
var prOidcOrInitializationError = (function () { return __awaiter(_this, void 0, void 0, function () {
|
|
83
|
+
var params, oidc, error_1;
|
|
84
84
|
var _this = this;
|
|
85
85
|
return __generator(this, function (_a) {
|
|
86
86
|
switch (_a.label) {
|
|
87
87
|
case 0: return [4 /*yield*/, (function () { return __awaiter(_this, void 0, void 0, function () {
|
|
88
|
-
var getParams, params_1;
|
|
88
|
+
var getParams, params_1, params;
|
|
89
89
|
return __generator(this, function (_a) {
|
|
90
90
|
switch (_a.label) {
|
|
91
91
|
case 0:
|
|
92
|
-
if (!(typeof paramsOrGetParams === "function")) return [3 /*break*/,
|
|
92
|
+
if (!(typeof paramsOrGetParams === "function")) return [3 /*break*/, 3];
|
|
93
93
|
getParams = paramsOrGetParams;
|
|
94
94
|
return [4 /*yield*/, dReadyToCreate.pr];
|
|
95
95
|
case 1:
|
|
96
96
|
_a.sent();
|
|
97
|
-
|
|
97
|
+
return [4 /*yield*/, getParams()];
|
|
98
|
+
case 2:
|
|
99
|
+
params_1 = _a.sent();
|
|
98
100
|
return [2 /*return*/, params_1];
|
|
99
|
-
case
|
|
101
|
+
case 3:
|
|
102
|
+
params = paramsOrGetParams;
|
|
103
|
+
return [2 /*return*/, params];
|
|
100
104
|
}
|
|
101
105
|
});
|
|
102
106
|
}); })()];
|
|
103
107
|
case 1:
|
|
104
108
|
params = _a.sent();
|
|
105
|
-
|
|
109
|
+
if ("decodedIdTokenSchema" in params) {
|
|
110
|
+
decodedIdTokenSchema = params.decodedIdTokenSchema;
|
|
111
|
+
}
|
|
112
|
+
_a.label = 2;
|
|
113
|
+
case 2:
|
|
114
|
+
_a.trys.push([2, 4, , 5]);
|
|
115
|
+
return [4 /*yield*/, createOidc(params)];
|
|
116
|
+
case 3:
|
|
117
|
+
oidc = _a.sent();
|
|
118
|
+
return [3 /*break*/, 5];
|
|
119
|
+
case 4:
|
|
120
|
+
error_1 = _a.sent();
|
|
121
|
+
(0, tsafe_1.assert)(error_1 instanceof OidcInitializationError_1.OidcInitializationError);
|
|
122
|
+
return [2 /*return*/, error_1];
|
|
123
|
+
case 5: return [2 /*return*/, oidc];
|
|
106
124
|
}
|
|
107
125
|
});
|
|
108
|
-
}); })
|
|
109
|
-
.catch(function (error) {
|
|
110
|
-
if (!(error instanceof OidcInitializationError_1.OidcInitializationError)) {
|
|
111
|
-
throw error;
|
|
112
|
-
}
|
|
113
|
-
return error;
|
|
114
|
-
});
|
|
115
|
-
var decodedIdTokenSchema = ("decodedIdTokenSchema" in params ? params : { "decodedIdTokenSchema": undefined }).decodedIdTokenSchema;
|
|
126
|
+
}); })();
|
|
116
127
|
function OidcProvider(props) {
|
|
117
128
|
var fallback = props.fallback, ErrorFallback = props.ErrorFallback, children = props.children;
|
|
118
129
|
var _a = __read((0, react_1.useState)(undefined), 2), oidcOrInitializationError = _a[0], setOidcOrInitializationError = _a[1];
|
package/react/react.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"react.js","sourceRoot":"","sources":["../src/react/react.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AA+GA,
|
|
1
|
+
{"version":3,"file":"react.js","sourceRoot":"","sources":["../src/react/react.tsx"],"names":[],"mappings":"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"}
|
package/src/mock/oidc.ts
CHANGED
|
@@ -8,13 +8,16 @@ export type ParamsOfCreateMockOidc<
|
|
|
8
8
|
DecodedIdToken extends Record<string, unknown> = Record<string, unknown>,
|
|
9
9
|
IsAuthGloballyRequired extends boolean = false
|
|
10
10
|
> = {
|
|
11
|
-
isUserInitiallyLoggedIn: boolean;
|
|
12
11
|
mockedParams?: Partial<Oidc["params"]>;
|
|
13
12
|
mockedTokens?: Partial<Oidc.Tokens<DecodedIdToken>>;
|
|
14
13
|
publicUrl?: string;
|
|
15
14
|
isAuthGloballyRequired?: IsAuthGloballyRequired;
|
|
16
15
|
postLoginRedirectUrl?: string;
|
|
17
|
-
}
|
|
16
|
+
} & (IsAuthGloballyRequired extends true
|
|
17
|
+
? { isUserInitiallyLoggedIn?: true }
|
|
18
|
+
: {
|
|
19
|
+
isUserInitiallyLoggedIn: boolean;
|
|
20
|
+
});
|
|
18
21
|
|
|
19
22
|
const urlParamName = "isUserLoggedIn";
|
|
20
23
|
|
|
@@ -25,7 +28,7 @@ export function createMockOidc<
|
|
|
25
28
|
params: ParamsOfCreateMockOidc<DecodedIdToken, IsAuthGloballyRequired>
|
|
26
29
|
): IsAuthGloballyRequired extends true ? Oidc.LoggedIn<DecodedIdToken> : Oidc<DecodedIdToken> {
|
|
27
30
|
const {
|
|
28
|
-
isUserInitiallyLoggedIn,
|
|
31
|
+
isUserInitiallyLoggedIn = true,
|
|
29
32
|
mockedParams = {},
|
|
30
33
|
mockedTokens = {},
|
|
31
34
|
publicUrl: publicUrl_params,
|
package/src/mock/react.tsx
CHANGED
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
import { createOidcReactApi_dependencyInjection } from "../react/react";
|
|
2
2
|
import { createMockOidc, type ParamsOfCreateMockOidc } from "./oidc";
|
|
3
|
-
import {
|
|
3
|
+
import type { ValueOrAsyncGetter } from "../tools/ValueOrAsyncGetter";
|
|
4
4
|
|
|
5
5
|
/** @see: https://docs.oidc-spa.dev/documentation/mock */
|
|
6
6
|
export function createMockReactOidc<
|
|
7
7
|
DecodedIdToken extends Record<string, unknown> = Record<string, unknown>,
|
|
8
8
|
IsAuthGloballyRequired extends boolean = false
|
|
9
|
-
>(params:
|
|
9
|
+
>(params: ValueOrAsyncGetter<ParamsOfCreateMockOidc<DecodedIdToken, IsAuthGloballyRequired>>) {
|
|
10
10
|
return createOidcReactApi_dependencyInjection(params, createMockOidc);
|
|
11
11
|
}
|
package/src/react/react.tsx
CHANGED
|
@@ -5,7 +5,7 @@ import { assert } from "../vendor/frontend/tsafe";
|
|
|
5
5
|
import { id } from "../vendor/frontend/tsafe";
|
|
6
6
|
import { useGuaranteedMemo } from "../tools/powerhooks/useGuaranteedMemo";
|
|
7
7
|
import type { PromiseOrNot } from "../tools/PromiseOrNot";
|
|
8
|
-
import type {
|
|
8
|
+
import type { ValueOrAsyncGetter } from "../tools/ValueOrAsyncGetter";
|
|
9
9
|
import { Deferred } from "../tools/Deferred";
|
|
10
10
|
|
|
11
11
|
export type OidcReact<DecodedIdToken extends Record<string, unknown>> =
|
|
@@ -120,7 +120,7 @@ export function createOidcReactApi_dependencyInjection<
|
|
|
120
120
|
| {}
|
|
121
121
|
)
|
|
122
122
|
>(
|
|
123
|
-
|
|
123
|
+
paramsOrGetParams: ValueOrAsyncGetter<ParamsOfCreateOidc>,
|
|
124
124
|
createOidc: (params: ParamsOfCreateOidc) => PromiseOrNot<Oidc<DecodedIdToken>>
|
|
125
125
|
): OidcReactApi<
|
|
126
126
|
DecodedIdToken,
|
|
@@ -128,35 +128,42 @@ export function createOidcReactApi_dependencyInjection<
|
|
|
128
128
|
> {
|
|
129
129
|
const dReadyToCreate = new Deferred<void>();
|
|
130
130
|
|
|
131
|
+
let decodedIdTokenSchema: { parse: (data: unknown) => DecodedIdToken } | undefined = undefined;
|
|
132
|
+
|
|
131
133
|
// NOTE: It can be InitializationError only if isAuthGloballyRequired is true
|
|
132
|
-
const prOidcOrInitializationError =
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
const getParams = paramsOrGetParams;
|
|
134
|
+
const prOidcOrInitializationError = (async () => {
|
|
135
|
+
const params = await (async () => {
|
|
136
|
+
if (typeof paramsOrGetParams === "function") {
|
|
137
|
+
const getParams = paramsOrGetParams;
|
|
137
138
|
|
|
138
|
-
|
|
139
|
+
await dReadyToCreate.pr;
|
|
139
140
|
|
|
140
|
-
|
|
141
|
+
const params = await getParams();
|
|
141
142
|
|
|
142
|
-
|
|
143
|
-
|
|
143
|
+
return params;
|
|
144
|
+
}
|
|
144
145
|
|
|
145
|
-
|
|
146
|
-
})();
|
|
146
|
+
const params = paramsOrGetParams;
|
|
147
147
|
|
|
148
|
-
return
|
|
149
|
-
})
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
148
|
+
return params;
|
|
149
|
+
})();
|
|
150
|
+
|
|
151
|
+
if ("decodedIdTokenSchema" in params) {
|
|
152
|
+
decodedIdTokenSchema = params.decodedIdTokenSchema;
|
|
153
|
+
}
|
|
154
|
+
|
|
155
|
+
let oidc;
|
|
156
|
+
|
|
157
|
+
try {
|
|
158
|
+
oidc = await createOidc(params);
|
|
159
|
+
} catch (error) {
|
|
160
|
+
assert(error instanceof OidcInitializationError);
|
|
154
161
|
|
|
155
162
|
return error;
|
|
156
|
-
}
|
|
163
|
+
}
|
|
157
164
|
|
|
158
|
-
|
|
159
|
-
|
|
165
|
+
return oidc;
|
|
166
|
+
})();
|
|
160
167
|
|
|
161
168
|
function OidcProvider(props: {
|
|
162
169
|
fallback?: ReactNode;
|
|
@@ -346,6 +353,6 @@ export function createOidcReactApi_dependencyInjection<
|
|
|
346
353
|
export function createReactOidc<
|
|
347
354
|
DecodedIdToken extends Record<string, unknown> = Record<string, unknown>,
|
|
348
355
|
IsAuthGloballyRequired extends boolean = false
|
|
349
|
-
>(params:
|
|
356
|
+
>(params: ValueOrAsyncGetter<ParamsOfCreateOidc<DecodedIdToken, IsAuthGloballyRequired>>) {
|
|
350
357
|
return createOidcReactApi_dependencyInjection(params, createOidc);
|
|
351
358
|
}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export type ValueOrAsyncGetter<T> = T | (() => Promise<T>);
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export type ValueOrAsyncGetter<T> = T | (() => Promise<T>);
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ValueOrAsyncGetter.js","sourceRoot":"","sources":["../src/tools/ValueOrAsyncGetter.ts"],"names":[],"mappings":""}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
export type ValueOrPromiseOrAsyncGetter<T> = T | Promise<T> | (() => Promise<T>);
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
export type ValueOrPromiseOrAsyncGetter<T> = T | Promise<T> | (() => Promise<T>);
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"ValueOrPromiseOrAsyncGetter.js","sourceRoot":"","sources":["../src/tools/ValueOrPromiseOrAsyncGetter.ts"],"names":[],"mappings":""}
|