oidc-spa 8.0.3 → 8.0.4
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/angular/angular.d.ts +72 -0
- package/angular/angular.js +253 -0
- package/angular/angular.js.map +1 -0
- package/angular/index.d.ts +1 -0
- package/angular/index.js +6 -0
- package/angular/index.js.map +1 -0
- package/core/createOidc.js +1 -1
- package/esm/angular/angular.d.ts +72 -0
- package/esm/angular/angular.js +249 -0
- package/esm/angular/angular.js.map +1 -0
- package/esm/angular/index.d.ts +1 -0
- package/esm/angular/index.js +2 -0
- package/esm/angular/index.js.map +1 -0
- package/esm/core/createOidc.js +1 -1
- package/esm/mock/angular.d.ts +41 -0
- package/esm/mock/angular.js +7 -0
- package/esm/mock/angular.js.map +1 -0
- package/esm/mock/react.js +2 -2
- package/esm/mock/react.js.map +1 -1
- package/esm/react/react.d.ts +1 -1
- package/esm/react/react.js +5 -5
- package/esm/react/react.js.map +1 -1
- package/mock/angular.d.ts +41 -0
- package/mock/angular.js +10 -0
- package/mock/angular.js.map +1 -0
- package/mock/react.js +1 -1
- package/mock/react.js.map +1 -1
- package/package.json +24 -3
- package/react/react.d.ts +1 -1
- package/react/react.js +6 -6
- package/react/react.js.map +1 -1
- package/src/angular/angular.ts +428 -0
- package/src/angular/index.ts +1 -0
- package/src/mock/angular.ts +11 -0
- package/src/mock/react.tsx +2 -2
- package/src/react/react.tsx +6 -6
|
@@ -0,0 +1,72 @@
|
|
|
1
|
+
import { type Oidc, type ParamsOfCreateOidc, OidcInitializationError } from "../core";
|
|
2
|
+
import type { ValueOrAsyncGetter } from "../tools/ValueOrAsyncGetter";
|
|
3
|
+
import { type Signal, type EnvironmentProviders } from "@angular/core";
|
|
4
|
+
import { type CanActivateFn } from "@angular/router";
|
|
5
|
+
export type OidcAngular = OidcAngular.NotLoggedIn | OidcAngular.LoggedIn;
|
|
6
|
+
export declare namespace OidcAngular {
|
|
7
|
+
type Common = Oidc.Common;
|
|
8
|
+
type NotLoggedIn = Common & {
|
|
9
|
+
isUserLoggedIn: false;
|
|
10
|
+
login: (params?: {
|
|
11
|
+
extraQueryParams?: Record<string, string | undefined>;
|
|
12
|
+
transformUrlBeforeRedirect?: (url: string) => string;
|
|
13
|
+
}) => Promise<never>;
|
|
14
|
+
};
|
|
15
|
+
type LoggedIn = Common & {
|
|
16
|
+
isUserLoggedIn: true;
|
|
17
|
+
logout: Oidc.LoggedIn["logout"];
|
|
18
|
+
renewTokens: Oidc.LoggedIn["renewTokens"];
|
|
19
|
+
goToAuthServer: Oidc.LoggedIn["goToAuthServer"];
|
|
20
|
+
backFromAuthServer: {
|
|
21
|
+
extraQueryParams: Record<string, string>;
|
|
22
|
+
result: Record<string, string>;
|
|
23
|
+
} | undefined;
|
|
24
|
+
isNewBrowserSession: boolean;
|
|
25
|
+
};
|
|
26
|
+
}
|
|
27
|
+
type OidcAngularApi<DecodedIdToken extends Record<string, unknown>, AutoLogin extends boolean> = {
|
|
28
|
+
getOidc: AutoLogin extends true ? {
|
|
29
|
+
(params?: {
|
|
30
|
+
assert: "user logged in";
|
|
31
|
+
}): OidcAngular.LoggedIn;
|
|
32
|
+
} : {
|
|
33
|
+
(params?: {
|
|
34
|
+
assert?: undefined;
|
|
35
|
+
}): OidcAngular;
|
|
36
|
+
(params: {
|
|
37
|
+
assert: "user logged in";
|
|
38
|
+
}): OidcAngular.LoggedIn;
|
|
39
|
+
(params: {
|
|
40
|
+
assert: "user not logged in";
|
|
41
|
+
}): OidcAngular.NotLoggedIn;
|
|
42
|
+
};
|
|
43
|
+
getOidcInitializationError: () => OidcInitializationError | undefined;
|
|
44
|
+
get$decodedIdToken: () => Signal<DecodedIdToken>;
|
|
45
|
+
get$secondsLeftBeforeAutoLogout: (params: {
|
|
46
|
+
warningDurationSeconds: number;
|
|
47
|
+
}) => Signal<number | undefined>;
|
|
48
|
+
getTokens: () => Promise<{
|
|
49
|
+
isUserLoggedIn: false;
|
|
50
|
+
prTokens?: never;
|
|
51
|
+
} | {
|
|
52
|
+
isUserLoggedIn: true;
|
|
53
|
+
prTokens: Promise<Oidc.Tokens<DecodedIdToken>>;
|
|
54
|
+
}>;
|
|
55
|
+
provideOidcInitAwaiter: EnvironmentProviders;
|
|
56
|
+
} & (AutoLogin extends true ? {} : {
|
|
57
|
+
enforceLoginGuard: CanActivateFn;
|
|
58
|
+
});
|
|
59
|
+
export declare function createAngularOidc_dependencyInjection<DecodedIdToken extends Record<string, unknown>, ParamsOfCreateOidc extends {
|
|
60
|
+
autoLogin?: boolean;
|
|
61
|
+
} & ({
|
|
62
|
+
decodedIdTokenSchema: {
|
|
63
|
+
parse: (data: unknown) => DecodedIdToken;
|
|
64
|
+
} | undefined;
|
|
65
|
+
} | {})>(paramsOrGetParams: ValueOrAsyncGetter<ParamsOfCreateOidc>, createOidc: (params: ParamsOfCreateOidc) => Promise<Oidc<DecodedIdToken>>): OidcAngularApi<DecodedIdToken, ParamsOfCreateOidc extends {
|
|
66
|
+
autoLogin?: true | undefined;
|
|
67
|
+
} ? true : false>;
|
|
68
|
+
/** @see: https://docs.oidc-spa.dev/v/v8/usage#angular-api */
|
|
69
|
+
export declare function createAngularOidc<DecodedIdToken extends Record<string, unknown> = Oidc.Tokens.DecodedIdToken_base, AutoLogin extends boolean = false>(params: ValueOrAsyncGetter<Omit<ParamsOfCreateOidc<DecodedIdToken, AutoLogin>, "homeUrl">>): OidcAngularApi<DecodedIdToken, Omit<ParamsOfCreateOidc<DecodedIdToken, AutoLogin>, "homeUrl"> extends infer T ? T extends Omit<ParamsOfCreateOidc<DecodedIdToken, AutoLogin>, "homeUrl"> ? T extends {
|
|
70
|
+
autoLogin?: true | undefined;
|
|
71
|
+
} ? true : false : never : never>;
|
|
72
|
+
export {};
|
|
@@ -0,0 +1,253 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.createAngularOidc_dependencyInjection = createAngularOidc_dependencyInjection;
|
|
4
|
+
exports.createAngularOidc = createAngularOidc;
|
|
5
|
+
const core_1 = require("../core");
|
|
6
|
+
const tsafe_1 = require("../vendor/frontend/tsafe");
|
|
7
|
+
const tsafe_2 = require("../vendor/frontend/tsafe");
|
|
8
|
+
const Deferred_1 = require("../tools/Deferred");
|
|
9
|
+
const core_2 = require("@angular/core");
|
|
10
|
+
const router_1 = require("@angular/router");
|
|
11
|
+
const rxjs_interop_1 = require("@angular/core/rxjs-interop");
|
|
12
|
+
const rxjs_1 = require("rxjs");
|
|
13
|
+
const createObjectThatThrowsIfAccessed_1 = require("../tools/createObjectThatThrowsIfAccessed");
|
|
14
|
+
function createAngularOidc_dependencyInjection(paramsOrGetParams, createOidc) {
|
|
15
|
+
const dReadyToCreate = new Deferred_1.Deferred();
|
|
16
|
+
// NOTE: It can be InitializationError only if autoLogin is true
|
|
17
|
+
const prOidcOrAutoLoginInitializationError = (async () => {
|
|
18
|
+
const params = await (async () => {
|
|
19
|
+
await dReadyToCreate.pr;
|
|
20
|
+
if (typeof paramsOrGetParams === "function") {
|
|
21
|
+
const getParams = paramsOrGetParams;
|
|
22
|
+
const params = await getParams();
|
|
23
|
+
return params;
|
|
24
|
+
}
|
|
25
|
+
const params = paramsOrGetParams;
|
|
26
|
+
return params;
|
|
27
|
+
})();
|
|
28
|
+
let oidc;
|
|
29
|
+
try {
|
|
30
|
+
oidc = await createOidc(params);
|
|
31
|
+
}
|
|
32
|
+
catch (error) {
|
|
33
|
+
if (!(error instanceof core_1.OidcInitializationError)) {
|
|
34
|
+
throw error;
|
|
35
|
+
}
|
|
36
|
+
return error;
|
|
37
|
+
}
|
|
38
|
+
return oidc;
|
|
39
|
+
})();
|
|
40
|
+
let oidcOrAutoLoginInitializationError = undefined;
|
|
41
|
+
prOidcOrAutoLoginInitializationError.then(value => {
|
|
42
|
+
oidcOrAutoLoginInitializationError = value;
|
|
43
|
+
});
|
|
44
|
+
function getOidc(params) {
|
|
45
|
+
const { assert: assert_params } = params ?? {};
|
|
46
|
+
if (oidcOrAutoLoginInitializationError === undefined) {
|
|
47
|
+
throw new Error("oidc-spa: calling getOidc() before provideOidcInitAwaiter has resolved");
|
|
48
|
+
}
|
|
49
|
+
if (oidcOrAutoLoginInitializationError instanceof core_1.OidcInitializationError) {
|
|
50
|
+
throw new Error("oidc-spa: calling getOidc() while getOidcInitializationError() is not `undefined` in autoLogin: true mode");
|
|
51
|
+
}
|
|
52
|
+
const oidc = oidcOrAutoLoginInitializationError;
|
|
53
|
+
check_assertion: {
|
|
54
|
+
if (assert_params === undefined) {
|
|
55
|
+
break check_assertion;
|
|
56
|
+
}
|
|
57
|
+
const getMessage = (v) => [
|
|
58
|
+
"There is a logic error in the application.",
|
|
59
|
+
`If this component is mounted the user is supposed ${v}.`,
|
|
60
|
+
"An explicit assertion was made in this sense."
|
|
61
|
+
].join(" ");
|
|
62
|
+
switch (assert_params) {
|
|
63
|
+
case "user logged in":
|
|
64
|
+
if (!oidc.isUserLoggedIn) {
|
|
65
|
+
throw new Error(getMessage("to be logged in but currently they arn't"));
|
|
66
|
+
}
|
|
67
|
+
break;
|
|
68
|
+
case "user not logged in":
|
|
69
|
+
if (oidc.isUserLoggedIn) {
|
|
70
|
+
throw new Error(getMessage("not to be logged in but currently they are"));
|
|
71
|
+
}
|
|
72
|
+
break;
|
|
73
|
+
default:
|
|
74
|
+
(0, tsafe_1.assert)(false);
|
|
75
|
+
}
|
|
76
|
+
}
|
|
77
|
+
const common = {
|
|
78
|
+
params: oidc.params
|
|
79
|
+
};
|
|
80
|
+
return oidc.isUserLoggedIn
|
|
81
|
+
? (0, tsafe_2.id)({
|
|
82
|
+
...common,
|
|
83
|
+
isUserLoggedIn: true,
|
|
84
|
+
logout: oidc.logout,
|
|
85
|
+
renewTokens: oidc.renewTokens,
|
|
86
|
+
goToAuthServer: oidc.goToAuthServer,
|
|
87
|
+
backFromAuthServer: oidc.backFromAuthServer,
|
|
88
|
+
isNewBrowserSession: oidc.isNewBrowserSession
|
|
89
|
+
})
|
|
90
|
+
: (0, tsafe_2.id)({
|
|
91
|
+
...common,
|
|
92
|
+
isUserLoggedIn: false,
|
|
93
|
+
login: params => oidc.login({
|
|
94
|
+
...params,
|
|
95
|
+
doesCurrentHrefRequiresAuth: false
|
|
96
|
+
})
|
|
97
|
+
});
|
|
98
|
+
}
|
|
99
|
+
function getOidcInitializationError() {
|
|
100
|
+
if (oidcOrAutoLoginInitializationError === undefined) {
|
|
101
|
+
throw new Error("oidc-spa: calling getOidcInitializationError() before provideOidcInitAwaiter has resolved");
|
|
102
|
+
}
|
|
103
|
+
if (oidcOrAutoLoginInitializationError instanceof core_1.OidcInitializationError) {
|
|
104
|
+
return oidcOrAutoLoginInitializationError;
|
|
105
|
+
}
|
|
106
|
+
const oidc = oidcOrAutoLoginInitializationError;
|
|
107
|
+
if (!oidc.isUserLoggedIn && oidc.initializationError !== undefined) {
|
|
108
|
+
return oidc.initializationError;
|
|
109
|
+
}
|
|
110
|
+
return undefined;
|
|
111
|
+
}
|
|
112
|
+
const { get$decodedIdToken } = (() => {
|
|
113
|
+
function createDecodedIdToken$() {
|
|
114
|
+
if (oidcOrAutoLoginInitializationError === undefined) {
|
|
115
|
+
throw new Error("oidc-spa: calling get$decodedIdToken() before provideOidcInitAwaiter has resolved");
|
|
116
|
+
}
|
|
117
|
+
if (oidcOrAutoLoginInitializationError instanceof core_1.OidcInitializationError) {
|
|
118
|
+
throw new Error("oidc-spa: calling getOidc() while getOidcInitializationError() is not `undefined` in autoLogin: true mode");
|
|
119
|
+
}
|
|
120
|
+
const oidc = oidcOrAutoLoginInitializationError;
|
|
121
|
+
let initialValue;
|
|
122
|
+
if (!oidc.isUserLoggedIn) {
|
|
123
|
+
initialValue = (0, createObjectThatThrowsIfAccessed_1.createObjectThatThrowsIfAccessed)({
|
|
124
|
+
debugMessage: [
|
|
125
|
+
"You are trying to read the decodedIdToken but the user",
|
|
126
|
+
"isn't logged in"
|
|
127
|
+
].join(" ")
|
|
128
|
+
});
|
|
129
|
+
}
|
|
130
|
+
else {
|
|
131
|
+
initialValue = oidc.getDecodedIdToken();
|
|
132
|
+
}
|
|
133
|
+
const decodedIdToken$ = new rxjs_1.BehaviorSubject(initialValue);
|
|
134
|
+
if (oidc.isUserLoggedIn) {
|
|
135
|
+
oidc.subscribeToTokensChange(() => {
|
|
136
|
+
const decodedIdToken = oidc.getDecodedIdToken();
|
|
137
|
+
if (decodedIdToken$.getValue() === decodedIdToken) {
|
|
138
|
+
return;
|
|
139
|
+
}
|
|
140
|
+
decodedIdToken$.next(decodedIdToken);
|
|
141
|
+
});
|
|
142
|
+
}
|
|
143
|
+
return decodedIdToken$;
|
|
144
|
+
}
|
|
145
|
+
let decodedIdToken$ = undefined;
|
|
146
|
+
function get$decodedIdToken() {
|
|
147
|
+
return (0, rxjs_interop_1.toSignal)((decodedIdToken$ ?? (decodedIdToken$ = createDecodedIdToken$())), {
|
|
148
|
+
requireSync: true
|
|
149
|
+
});
|
|
150
|
+
}
|
|
151
|
+
return { get$decodedIdToken };
|
|
152
|
+
})();
|
|
153
|
+
const { get$secondsLeftBeforeAutoLogout } = (() => {
|
|
154
|
+
function createSecondsLeftBeforeAutoLogout$() {
|
|
155
|
+
if (oidcOrAutoLoginInitializationError === undefined) {
|
|
156
|
+
throw new Error("oidc-spa: calling get$decodedIdToken() before provideOidcInitAwaiter has resolved");
|
|
157
|
+
}
|
|
158
|
+
if (oidcOrAutoLoginInitializationError instanceof core_1.OidcInitializationError) {
|
|
159
|
+
throw new Error("oidc-spa: calling getOidc() while getOidcInitializationError() is not `undefined` in autoLogin: true mode");
|
|
160
|
+
}
|
|
161
|
+
const oidc = oidcOrAutoLoginInitializationError;
|
|
162
|
+
const secondsLeftBeforeAutoLogout$ = new rxjs_1.BehaviorSubject(undefined);
|
|
163
|
+
if (oidc.isUserLoggedIn) {
|
|
164
|
+
oidc.subscribeToAutoLogoutCountdown(({ secondsLeft }) => secondsLeftBeforeAutoLogout$.next(secondsLeft));
|
|
165
|
+
}
|
|
166
|
+
return secondsLeftBeforeAutoLogout$;
|
|
167
|
+
}
|
|
168
|
+
let secondsLeftBeforeAutoLogout$ = undefined;
|
|
169
|
+
function get$secondsLeftBeforeAutoLogout(params) {
|
|
170
|
+
const { warningDurationSeconds } = params;
|
|
171
|
+
secondsLeftBeforeAutoLogout$ ?? (secondsLeftBeforeAutoLogout$ = createSecondsLeftBeforeAutoLogout$());
|
|
172
|
+
const secondsLeftBeforeAutoLogout$_cropped = new rxjs_1.BehaviorSubject(secondsLeftBeforeAutoLogout$.getValue());
|
|
173
|
+
secondsLeftBeforeAutoLogout$.subscribe(secondsLeftBeforeAutoLogout => {
|
|
174
|
+
if (secondsLeftBeforeAutoLogout === undefined ||
|
|
175
|
+
secondsLeftBeforeAutoLogout > warningDurationSeconds) {
|
|
176
|
+
if (secondsLeftBeforeAutoLogout$_cropped.getValue() !== undefined) {
|
|
177
|
+
secondsLeftBeforeAutoLogout$_cropped.next(undefined);
|
|
178
|
+
}
|
|
179
|
+
return;
|
|
180
|
+
}
|
|
181
|
+
secondsLeftBeforeAutoLogout$_cropped.next(secondsLeftBeforeAutoLogout);
|
|
182
|
+
});
|
|
183
|
+
const signal = (0, rxjs_interop_1.toSignal)(secondsLeftBeforeAutoLogout$_cropped, {
|
|
184
|
+
requireSync: true
|
|
185
|
+
});
|
|
186
|
+
return signal;
|
|
187
|
+
}
|
|
188
|
+
return { get$secondsLeftBeforeAutoLogout };
|
|
189
|
+
})();
|
|
190
|
+
async function getTokens() {
|
|
191
|
+
const oidcOrAutoLoginInitializationError = await prOidcOrAutoLoginInitializationError;
|
|
192
|
+
if (oidcOrAutoLoginInitializationError instanceof core_1.OidcInitializationError) {
|
|
193
|
+
return new Promise(() => { });
|
|
194
|
+
}
|
|
195
|
+
const oidc = oidcOrAutoLoginInitializationError;
|
|
196
|
+
return oidc.isUserLoggedIn
|
|
197
|
+
? { isUserLoggedIn: true, prTokens: oidc.getTokens() }
|
|
198
|
+
: {
|
|
199
|
+
isUserLoggedIn: false
|
|
200
|
+
};
|
|
201
|
+
}
|
|
202
|
+
const provideOidcInitAwaiter = (0, core_2.provideAppInitializer)(async () => {
|
|
203
|
+
dReadyToCreate.resolve();
|
|
204
|
+
await prOidcOrAutoLoginInitializationError;
|
|
205
|
+
});
|
|
206
|
+
const enforceLoginGuard = async (route) => {
|
|
207
|
+
const router = (0, core_2.inject)(router_1.Router);
|
|
208
|
+
const oidcOrAutoLoginInitializationError = await prOidcOrAutoLoginInitializationError;
|
|
209
|
+
if (oidcOrAutoLoginInitializationError instanceof core_1.OidcInitializationError) {
|
|
210
|
+
return new Promise(() => { });
|
|
211
|
+
}
|
|
212
|
+
const oidc = oidcOrAutoLoginInitializationError;
|
|
213
|
+
if (!oidc.isUserLoggedIn) {
|
|
214
|
+
const redirectUrl = (() => {
|
|
215
|
+
const tree = router.createUrlTree(route.url.map(u => u.path), {
|
|
216
|
+
queryParams: route.queryParams
|
|
217
|
+
});
|
|
218
|
+
return router.serializeUrl(tree);
|
|
219
|
+
})();
|
|
220
|
+
const doesCurrentHrefRequiresAuth = location.href.replace(/\/$/, "") === redirectUrl.replace(/\/$/, "");
|
|
221
|
+
await oidc.login({
|
|
222
|
+
doesCurrentHrefRequiresAuth,
|
|
223
|
+
redirectUrl
|
|
224
|
+
});
|
|
225
|
+
}
|
|
226
|
+
return true;
|
|
227
|
+
};
|
|
228
|
+
const oidcAngularApi = (0, tsafe_2.id)({
|
|
229
|
+
getOidc: getOidc,
|
|
230
|
+
getOidcInitializationError,
|
|
231
|
+
get$decodedIdToken,
|
|
232
|
+
get$secondsLeftBeforeAutoLogout,
|
|
233
|
+
getTokens,
|
|
234
|
+
provideOidcInitAwaiter,
|
|
235
|
+
enforceLoginGuard
|
|
236
|
+
});
|
|
237
|
+
// @ts-expect-error: We know what we are doing
|
|
238
|
+
return oidcAngularApi;
|
|
239
|
+
}
|
|
240
|
+
/** @see: https://docs.oidc-spa.dev/v/v8/usage#angular-api */
|
|
241
|
+
function createAngularOidc(params) {
|
|
242
|
+
return createAngularOidc_dependencyInjection(params, params => (0, core_1.createOidc)({
|
|
243
|
+
...params,
|
|
244
|
+
homeUrl: (() => {
|
|
245
|
+
const baseEl = document.querySelector("base[href]");
|
|
246
|
+
if (!baseEl) {
|
|
247
|
+
throw new Error('No <base href="..."> element found in the DOM');
|
|
248
|
+
}
|
|
249
|
+
return baseEl.getAttribute("href") ?? "/";
|
|
250
|
+
})()
|
|
251
|
+
}));
|
|
252
|
+
}
|
|
253
|
+
//# sourceMappingURL=angular.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"angular.js","sourceRoot":"","sources":["../src/angular/angular.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export { type OidcAngular, createAngularOidc } from "./angular";
|
package/angular/index.js
ADDED
|
@@ -0,0 +1,6 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.createAngularOidc = void 0;
|
|
4
|
+
var angular_1 = require("./angular");
|
|
5
|
+
Object.defineProperty(exports, "createAngularOidc", { enumerable: true, get: function () { return angular_1.createAngularOidc; } });
|
|
6
|
+
//# sourceMappingURL=index.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/angular/index.ts"],"names":[],"mappings":";;;AAAA,qCAAgE;AAArC,4GAAA,iBAAiB,OAAA"}
|
package/core/createOidc.js
CHANGED
|
@@ -62,7 +62,7 @@ const isNewBrowserSession_1 = require("./isNewBrowserSession");
|
|
|
62
62
|
const getIsOnline_1 = require("../tools/getIsOnline");
|
|
63
63
|
const isKeycloak_1 = require("../keycloak/isKeycloak");
|
|
64
64
|
// NOTE: Replaced at build time
|
|
65
|
-
const VERSION = "8.0.
|
|
65
|
+
const VERSION = "8.0.4";
|
|
66
66
|
const globalContext = {
|
|
67
67
|
prOidcByConfigId: new Map(),
|
|
68
68
|
hasLogoutBeenCalled: (0, tsafe_1.id)(false),
|
|
@@ -0,0 +1,72 @@
|
|
|
1
|
+
import { type Oidc, type ParamsOfCreateOidc, OidcInitializationError } from "../core";
|
|
2
|
+
import type { ValueOrAsyncGetter } from "../tools/ValueOrAsyncGetter";
|
|
3
|
+
import { type Signal, type EnvironmentProviders } from "@angular/core";
|
|
4
|
+
import { type CanActivateFn } from "@angular/router";
|
|
5
|
+
export type OidcAngular = OidcAngular.NotLoggedIn | OidcAngular.LoggedIn;
|
|
6
|
+
export declare namespace OidcAngular {
|
|
7
|
+
type Common = Oidc.Common;
|
|
8
|
+
type NotLoggedIn = Common & {
|
|
9
|
+
isUserLoggedIn: false;
|
|
10
|
+
login: (params?: {
|
|
11
|
+
extraQueryParams?: Record<string, string | undefined>;
|
|
12
|
+
transformUrlBeforeRedirect?: (url: string) => string;
|
|
13
|
+
}) => Promise<never>;
|
|
14
|
+
};
|
|
15
|
+
type LoggedIn = Common & {
|
|
16
|
+
isUserLoggedIn: true;
|
|
17
|
+
logout: Oidc.LoggedIn["logout"];
|
|
18
|
+
renewTokens: Oidc.LoggedIn["renewTokens"];
|
|
19
|
+
goToAuthServer: Oidc.LoggedIn["goToAuthServer"];
|
|
20
|
+
backFromAuthServer: {
|
|
21
|
+
extraQueryParams: Record<string, string>;
|
|
22
|
+
result: Record<string, string>;
|
|
23
|
+
} | undefined;
|
|
24
|
+
isNewBrowserSession: boolean;
|
|
25
|
+
};
|
|
26
|
+
}
|
|
27
|
+
type OidcAngularApi<DecodedIdToken extends Record<string, unknown>, AutoLogin extends boolean> = {
|
|
28
|
+
getOidc: AutoLogin extends true ? {
|
|
29
|
+
(params?: {
|
|
30
|
+
assert: "user logged in";
|
|
31
|
+
}): OidcAngular.LoggedIn;
|
|
32
|
+
} : {
|
|
33
|
+
(params?: {
|
|
34
|
+
assert?: undefined;
|
|
35
|
+
}): OidcAngular;
|
|
36
|
+
(params: {
|
|
37
|
+
assert: "user logged in";
|
|
38
|
+
}): OidcAngular.LoggedIn;
|
|
39
|
+
(params: {
|
|
40
|
+
assert: "user not logged in";
|
|
41
|
+
}): OidcAngular.NotLoggedIn;
|
|
42
|
+
};
|
|
43
|
+
getOidcInitializationError: () => OidcInitializationError | undefined;
|
|
44
|
+
get$decodedIdToken: () => Signal<DecodedIdToken>;
|
|
45
|
+
get$secondsLeftBeforeAutoLogout: (params: {
|
|
46
|
+
warningDurationSeconds: number;
|
|
47
|
+
}) => Signal<number | undefined>;
|
|
48
|
+
getTokens: () => Promise<{
|
|
49
|
+
isUserLoggedIn: false;
|
|
50
|
+
prTokens?: never;
|
|
51
|
+
} | {
|
|
52
|
+
isUserLoggedIn: true;
|
|
53
|
+
prTokens: Promise<Oidc.Tokens<DecodedIdToken>>;
|
|
54
|
+
}>;
|
|
55
|
+
provideOidcInitAwaiter: EnvironmentProviders;
|
|
56
|
+
} & (AutoLogin extends true ? {} : {
|
|
57
|
+
enforceLoginGuard: CanActivateFn;
|
|
58
|
+
});
|
|
59
|
+
export declare function createAngularOidc_dependencyInjection<DecodedIdToken extends Record<string, unknown>, ParamsOfCreateOidc extends {
|
|
60
|
+
autoLogin?: boolean;
|
|
61
|
+
} & ({
|
|
62
|
+
decodedIdTokenSchema: {
|
|
63
|
+
parse: (data: unknown) => DecodedIdToken;
|
|
64
|
+
} | undefined;
|
|
65
|
+
} | {})>(paramsOrGetParams: ValueOrAsyncGetter<ParamsOfCreateOidc>, createOidc: (params: ParamsOfCreateOidc) => Promise<Oidc<DecodedIdToken>>): OidcAngularApi<DecodedIdToken, ParamsOfCreateOidc extends {
|
|
66
|
+
autoLogin?: true | undefined;
|
|
67
|
+
} ? true : false>;
|
|
68
|
+
/** @see: https://docs.oidc-spa.dev/v/v8/usage#angular-api */
|
|
69
|
+
export declare function createAngularOidc<DecodedIdToken extends Record<string, unknown> = Oidc.Tokens.DecodedIdToken_base, AutoLogin extends boolean = false>(params: ValueOrAsyncGetter<Omit<ParamsOfCreateOidc<DecodedIdToken, AutoLogin>, "homeUrl">>): OidcAngularApi<DecodedIdToken, Omit<ParamsOfCreateOidc<DecodedIdToken, AutoLogin>, "homeUrl"> extends infer T ? T extends Omit<ParamsOfCreateOidc<DecodedIdToken, AutoLogin>, "homeUrl"> ? T extends {
|
|
70
|
+
autoLogin?: true | undefined;
|
|
71
|
+
} ? true : false : never : never>;
|
|
72
|
+
export {};
|