@owlmeans/web-oidc-rp 0.1.18-rc.21 → 0.1.18-rc.23

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 (25) hide show
  1. package/README.md +7 -7
  2. package/agent-meta/manifest.json +2 -2
  3. package/agent-meta/skills/web-oidc-rp/SKILL.md +4 -4
  4. package/build/auth/methods.js +1 -1
  5. package/build/auth/methods.js.map +1 -1
  6. package/build/auth/plugins/google-client.js +10 -10
  7. package/build/auth/plugins/google-client.js.map +1 -1
  8. package/build/auth/plugins/helpers.d.ts.map +1 -1
  9. package/build/auth/plugins/oidc-client.js +2 -2
  10. package/build/auth/plugins/oidc-client.js.map +1 -1
  11. package/build/guard.d.ts +1 -1
  12. package/build/guard.d.ts.map +1 -1
  13. package/build/guard.js +5 -5
  14. package/build/guard.js.map +1 -1
  15. package/build/popup.d.ts.map +1 -1
  16. package/build/service.d.ts.map +1 -1
  17. package/build/service.js +3 -3
  18. package/build/service.js.map +1 -1
  19. package/package.json +16 -16
  20. package/src/auth/methods.ts +1 -1
  21. package/src/auth/plugins/google-client.tsx +10 -10
  22. package/src/auth/plugins/oidc-client.tsx +2 -2
  23. package/src/guard.ts +5 -5
  24. package/src/service.ts +3 -3
  25. package/tests/context.ts +1 -2
package/README.md CHANGED
@@ -5,7 +5,7 @@ Browser-side OIDC relying party — guard, auth service, and React components fo
5
5
  ## Overview
6
6
 
7
7
  - `appendOidcGuard(context)` — registers the OIDC guard on a web context
8
- - `setupOidcGuard(modules, coguards?, extras?)` — attaches the guard onto module declarations
8
+ - `setupOidcGuard(entrypoints, coguards?, extras?)` — attaches the guard onto entrypoint declarations
9
9
  - `makeOidcAuthService(alias?)` — browser-side OIDC auth service (built on `oidc-client-ts`)
10
10
  - React components for login and callback handling
11
11
  - `OidcAuthPurposes` enum — `Unknown` | `Subscribe` | `Login`
@@ -31,12 +31,12 @@ export const makeContext = <C extends Config, T extends Context<C>>(cfg: C): T =
31
31
  }
32
32
  ```
33
33
 
34
- Wire OIDC onto module declarations:
34
+ Wire OIDC onto entrypoint declarations:
35
35
 
36
36
  ```typescript
37
37
  import { setupOidcGuard } from '@owlmeans/web-oidc-rp'
38
38
 
39
- setupOidcGuard(modules, undefined, { payload: { simplified: true } })
39
+ setupOidcGuard(entrypoints, undefined, { payload: { simplified: true } })
40
40
  ```
41
41
 
42
42
  ## API
@@ -45,9 +45,9 @@ setupOidcGuard(modules, undefined, { payload: { simplified: true } })
45
45
 
46
46
  Registers the OIDC guard service on the web context.
47
47
 
48
- ### `setupOidcGuard(modules, coguards?, extras?)`
48
+ ### `setupOidcGuard(entrypoints, coguards?, extras?)`
49
49
 
50
- Attaches the OIDC guard to the given module declarations. `coguards` lets you compose with another guard alias; `extras` overrides the parametrised props (e.g., `payload.simplified`).
50
+ Attaches the OIDC guard to the given entrypoint declarations. `coguards` lets you compose with another guard alias; `extras` overrides the parametrised props (e.g., `payload.simplified`).
51
51
 
52
52
  ### `makeOidcAuthService(alias?): OidcAuthService`
53
53
 
@@ -67,11 +67,11 @@ Login and callback React components exported from `./components` (re-exported at
67
67
  - Import `@owlmeans/web-oidc-rp/auth/plugins` for side effects to register `OIDC_CLIENT_AUTH` and `GOOGLE_CLIENT_AUTH` with `@owlmeans/client-auth`.
68
68
  - The Google plugin uses `useValue`, persists auth control state before redirect, restores it on return, and submits URL query params as `AuthCredentials`.
69
69
  - The browser starts login; the server exchanges provider code, links local identity, and returns a normal bearer token.
70
- - Keep product authorization server-side through module gates and identity profile scopes.
70
+ - Keep product authorization server-side through entrypoint gates and identity profile scopes.
71
71
 
72
72
  ## Related Packages
73
73
 
74
- - [`@owlmeans/oidc`](../oidc) — shared `OIDC_GATE`, `OIDC_GUARD`, dispatcher modules
74
+ - [`@owlmeans/oidc`](../oidc) — shared `OIDC_GATE`, `OIDC_GUARD`, dispatcher entrypoints
75
75
  - [`@owlmeans/web-client`](../web-client) — base web context this guard plugs into
76
76
  - [`@owlmeans/mui-panel`](../mui-panel) — `makeContext` typically used as the base
77
77
  - [`@owlmeans/client-auth`](../client-auth) — auth manager primitives the guard interacts with
package/agent-meta/manifest.json CHANGED
@@ -1,8 +1,8 @@
1
1
  {
2
2
  "schemaVersion": 2,
3
3
  "package": "@owlmeans/web-oidc-rp",
4
- "version": "0.1.18-rc.21",
5
- "generatedAt": "2026-09-01T12:30:48.600Z",
4
+ "version": "0.1.18-rc.23",
5
+ "generatedAt": "2026-09-01T16:28:56.988Z",
6
6
  "canonicalRepo": "https://github.com/owlmeans/common",
7
7
  "entries": [
8
8
  {
package/agent-meta/skills/web-oidc-rp/SKILL.md CHANGED
@@ -8,14 +8,14 @@ user-invocable: false
8
8
  # @owlmeans/web-oidc-rp
9
9
 
10
10
  **Layer:** Web (React)
11
- **Install:** `"@owlmeans/web-oidc-rp": "^0.1.18-rc.21"` in `dependencies`
11
+ **Install:** `"@owlmeans/web-oidc-rp": "^0.1.18-rc.23"` in `dependencies`
12
12
 
13
13
  ## Key Exports
14
14
 
15
15
  | Export | Description |
16
16
  |--------|-------------|
17
17
  | `appendOidcGuard<C, T>(context)` | Add OIDC guard to a web context |
18
- | `setupOidcGuard(modules, options?, payloadOptions?)` | Wire OIDC guard onto module declarations |
18
+ | `setupOidcGuard(entrypoints, options?, payloadOptions?)` | Wire OIDC guard onto entrypoint declarations |
19
19
  | `service` | Web OIDC RP service (oidc-client-ts based) |
20
20
  | `components` | Login / callback React components |
21
21
  | Constants | OIDC client aliases |
@@ -93,8 +93,8 @@ calls them, so a running project must keep working across a framework upgrade. N
93
93
  - Importing `@owlmeans/web-oidc-rp/auth/plugins` registers both `OIDC_CLIENT_AUTH` and `GOOGLE_CLIENT_AUTH` plugins into the `@owlmeans/client-auth` plugin registry.
94
94
  - The Google plugin uses `useValue` to manage redirect side effects, persists auth control state before redirect, restores it on return, then submits URL query params as `AuthCredentials`.
95
95
  - The browser plugin starts login; the server finalizes provider exchange, links local identity, and returns a normal bearer token.
96
- - Do not encode product authorization in browser OIDC plugins. Server module gates and local identity profiles remain the authorization source.
97
- - **URL generation:** Use `context.module<Module<string>>(alias).call({ full: true, params })` to build full URLs (redirect_uri, post-auth home). Import `HOME` and module aliases from `@owlmeans/web-client` / `@owlmeans/auth`. Never use raw `window.location.origin + window.location.pathname` concatenation.
96
+ - Do not encode product authorization in browser OIDC plugins. Server entrypoint gates and local identity profiles remain the authorization source.
97
+ - **URL generation:** Use `context.entrypoint<ClientEntrypoint<string>>(alias).call({ full: true, params })` to build full URLs (redirect_uri, post-auth home). Import `HOME` and entrypoint aliases from `@owlmeans/web-client` / `@owlmeans/auth`. Never use raw `window.location.origin + window.location.pathname` concatenation.
98
98
 
99
99
  ## Depends On
100
100
 
package/build/auth/methods.js CHANGED
@@ -45,7 +45,7 @@ export const oidcMethodSource = {
45
45
  // nothing may be awaited first. The choice travels with it and the surrogate re-runs the
46
46
  // method itself, one window up, where the round trip can actually complete.
47
47
  if (methodCtx.env.embedded && !methodCtx.env.surrogate) {
48
- const dispatcher = methodCtx.context.entrypoint(DISPATCHER).getPath();
48
+ const dispatcher = methodCtx.context.entrypoint(DISPATCHER).path();
49
49
  return await login.begin({
50
50
  url: `${dispatcher}?${LOGIN_METHOD_QUERY}=${encodeURIComponent(id)}`,
51
51
  });
package/build/auth/methods.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"methods.js","sourceRoot":"","sources":["../../src/auth/methods.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"methods.js","sourceRoot":"","sources":["../../src/auth/methods.ts"],"names":[],"mappings":"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"}
package/build/auth/plugins/google-client.js CHANGED
@@ -34,16 +34,16 @@ export const googleClientPlugin = {
34
34
  await authService.authenticate(token);
35
35
  }
36
36
  // Navigate to app root after successful authentication
37
- const [homeUrl] = await context.module(HOME).call({ full: true }) ?? [];
38
- window.location.href = homeUrl ?? window.location.origin;
37
+ const homeUrl = await context.entrypoint(HOME).url(undefined, { absolute: true });
38
+ window.location.href = homeUrl;
39
39
  return;
40
40
  }
41
41
  }
42
42
  // Initial request — ask server for Google auth URL
43
- const [source] = await context.module(CAUTHEN_AUTHEN_TYPED).call({
44
- full: true, params: { type }
45
- }) ?? [];
46
- await control.requestAllowence({ type, source: source ?? '' });
43
+ const source = await context.entrypoint(CAUTHEN_AUTHEN_TYPED).url({
44
+ params: { type }
45
+ }, { absolute: true });
46
+ await control.requestAllowence({ type, source });
47
47
  break;
48
48
  }
49
49
  case AuthenticationStage.Authenticate: {
@@ -51,10 +51,10 @@ export const googleClientPlugin = {
51
51
  return;
52
52
  if (control.allowance?.challenge != null) {
53
53
  // The server wraps challenge as "source:googleUrl" — extract the URL part
54
- const [source] = await context.module(CAUTHEN_AUTHEN_TYPED).call({
55
- full: true, params: { type }
56
- }) ?? [];
57
- const url = extractGoogleUrl(control.allowance.challenge, source ?? '');
54
+ const source = await context.entrypoint(CAUTHEN_AUTHEN_TYPED).url({
55
+ params: { type }
56
+ }, { absolute: true });
57
+ const url = extractGoogleUrl(control.allowance.challenge, source);
58
58
  // Persist control state before redirect
59
59
  await control.persist();
60
60
  // Redirect to Google
package/build/auth/plugins/google-client.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"google-client.js","sourceRoot":"","sources":["../../../src/auth/plugins/google-client.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"google-client.js","sourceRoot":"","sources":["../../../src/auth/plugins/google-client.tsx"],"names":[],"mappings":"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"}
package/build/auth/plugins/helpers.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../../src/auth/plugins/helpers.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAIH,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAA;AAErD;;;;GAIG;AACH,eAAO,MAAM,gBAAgB,sBAAuB,MAAM,gBAAgB,MAAM,KAAG,MAQlF,CAAA;AAED;;GAEG;AACH,eAAO,MAAM,wBAAwB,gBACtB,MAAM,QACb,MAAM,aACD,MAAM,KAChB,eAOD,CAAA"}
1
+ {"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../../src/auth/plugins/helpers.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAIH,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAA;AAErD;;;;GAIG;AACH,eAAO,MAAM,gBAAgB,GAAI,mBAAmB,MAAM,EAAE,cAAc,MAAM,KAAG,MAQlF,CAAA;AAED;;GAEG;AACH,eAAO,MAAM,wBAAwB,GACnC,aAAa,MAAM,EACnB,MAAM,MAAM,EACZ,WAAW,MAAM,KAChB,eAOD,CAAA"}
package/build/auth/plugins/oidc-client.js CHANGED
@@ -7,7 +7,7 @@ import { EnvelopeKind, makeEnvelopeModel } from '@owlmeans/basic-envelope';
7
7
  import { useContext } from '@owlmeans/web-client';
8
8
  import { DEFAULT_ALIAS, OidcAuthPurposes } from '../../consts.js';
9
9
  import { OidcAuthStep, OidpAuthStep, UnknownFlowStep } from '@owlmeans/flow';
10
- import { useModule } from '@owlmeans/client';
10
+ import { useEntrypoint } from '@owlmeans/client';
11
11
  export const oidcClientPlugin = {
12
12
  type: OIDC_CLIENT_AUTH,
13
13
  method: {
@@ -21,7 +21,7 @@ export const oidcClientPlugin = {
21
21
  Implementation: Renderer => ({ type, stage, control }) => {
22
22
  const context = useContext();
23
23
  Renderer = Renderer ?? oidcClientPlugin.Renderer;
24
- const module = useModule();
24
+ const module = useEntrypoint();
25
25
  useEffect(() => {
26
26
  let canceled = false;
27
27
  // @TODO extract somewhere else and make it more consequential
package/build/auth/plugins/oidc-client.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"oidc-client.js","sourceRoot":"","sources":["../../../src/auth/plugins/oidc-client.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"oidc-client.js","sourceRoot":"","sources":["../../../src/auth/plugins/oidc-client.tsx"],"names":[],"mappings":"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"}
package/build/guard.d.ts CHANGED
@@ -3,5 +3,5 @@ import type { OidcGuardOptions } from '@owlmeans/oidc';
3
3
  import type { ParametrisedProps } from '@owlmeans/web-client';
4
4
  import type { Config, Context } from './types.js';
5
5
  export declare const appendOidcGuard: <C extends Config, T extends Context<C>>(context: T, opts?: OidcGuardOptions) => T;
6
- export declare const setupOidcGuard: (modules: CommonEntrypoint[], coguards?: string | string[], extras?: Partial<ParametrisedProps>) => void;
6
+ export declare const setupOidcGuard: (entrypoints: CommonEntrypoint[], coguards?: string | string[], extras?: Partial<ParametrisedProps>) => void;
7
7
  //# sourceMappingURL=guard.d.ts.map
package/build/guard.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"guard.d.ts","sourceRoot":"","sources":["../src/guard.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAA;AAC5D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAA;AAMtD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAA;AAM7D,OAAO,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,YAAY,CAAA;AAEjD,eAAO,MAAM,eAAe,GAAI,CAAC,SAAS,MAAM,EAAE,CAAC,SAAS,OAAO,CAAC,CAAC,CAAC,WAC3D,CAAC,SAAS,gBAAgB,MAYpC,CAAA;AAED,eAAO,MAAM,cAAc,YAAa,gBAAgB,EAAE,aAAa,MAAM,GAAG,MAAM,EAAE,WAAW,OAAO,CAAC,iBAAiB,CAAC,SAQ5H,CAAA"}
1
+ {"version":3,"file":"guard.d.ts","sourceRoot":"","sources":["../src/guard.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAA;AAC5D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAA;AAMtD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAA;AAM7D,OAAO,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,YAAY,CAAA;AAEjD,eAAO,MAAM,eAAe,GAAI,CAAC,SAAS,MAAM,EAAE,CAAC,SAAS,OAAO,CAAC,CAAC,CAAC,EACpE,SAAS,CAAC,EAAE,OAAO,gBAAgB,MAYpC,CAAA;AAED,eAAO,MAAM,cAAc,GAAI,aAAa,gBAAgB,EAAE,EAAE,WAAW,MAAM,GAAG,MAAM,EAAE,EAAE,SAAS,OAAO,CAAC,iBAAiB,CAAC,SAQhI,CAAA"}
package/build/guard.js CHANGED
@@ -15,11 +15,11 @@ export const appendOidcGuard = (context, opts) => {
15
15
  ensureLoginService(ctx).registerMethodSource(oidcMethodSource);
16
16
  return ctx;
17
17
  };
18
- export const setupOidcGuard = (modules, coguards, extras) => {
18
+ export const setupOidcGuard = (entrypoints, coguards, extras) => {
19
19
  const DispatcherCom = extras ? parametriseDispatcher(extras, Dispatcher) : Dispatcher;
20
- setupBasicOidcGuard(modules, coguards);
21
- elevate(modules, DISPATCHER_OIDC_INIT);
22
- elevate(modules, DISPATCHER_OIDC);
23
- elevate(modules, DISPATCHER, handler(DispatcherCom), { force: true });
20
+ setupBasicOidcGuard(entrypoints, coguards);
21
+ elevate(entrypoints, DISPATCHER_OIDC_INIT);
22
+ elevate(entrypoints, DISPATCHER_OIDC);
23
+ elevate(entrypoints, DISPATCHER, handler(DispatcherCom));
24
24
  };
25
25
  //# sourceMappingURL=guard.js.map
package/build/guard.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"guard.js","sourceRoot":"","sources":["../src/guard.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAA;AAC3C,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAA;AAG1C,OAAO,EACL,eAAe,IAAI,oBAAoB,EACvC,eAAe,EAAE,oBAAoB,EACrC,cAAc,IAAI,mBAAmB,EACtC,MAAM,gBAAgB,CAAA;AAEvB,OAAO,EAAE,OAAO,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAA;AACrE,OAAO,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAA;AAChE,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAA;AACvD,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAA;AACpD,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAA;AAGlD,MAAM,CAAC,MAAM,eAAe,GAAG,CAC7B,OAAU,EAAE,IAAuB,EACnC,EAAE;IACF,OAAO,CAAC,eAAe,CAAC,mBAAmB,EAAE,CAAC,CAAA;IAE9C,MAAM,GAAG,GAAG,oBAAoB,CAAO,OAAO,EAAE,IAAI,CAAC,CAAA;IAErD,4FAA4F;IAC5F,gGAAgG;IAChG,6EAA6E;IAC7E,kBAAkB,CAAC,GAAG,CAAC,CAAC,oBAAoB,CAAC,gBAAgB,CAAC,CAAA;IAE9D,OAAO,GAAG,CAAA;AACZ,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,OAA2B,EAAE,QAA4B,EAAE,MAAmC,EAAE,EAAE;IAC/H,MAAM,aAAa,GAAG,MAAM,CAAC,CAAC,CAAC,qBAAqB,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC,UAAU,CAAA;IAErF,mBAAmB,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAA;IAEtC,OAAO,CAAC,OAAO,EAAE,oBAAoB,CAAC,CAAA;IACtC,OAAO,CAAC,OAAO,EAAE,eAAe,CAAC,CAAA;IACjC,OAAO,CAAC,OAAO,EAAE,UAAU,EAAE,OAAO,CAAC,aAAa,CAAC,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAA;AACvE,CAAC,CAAA"}
1
+ {"version":3,"file":"guard.js","sourceRoot":"","sources":["../src/guard.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAA;AAC3C,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAA;AAG1C,OAAO,EACL,eAAe,IAAI,oBAAoB,EACvC,eAAe,EAAE,oBAAoB,EACrC,cAAc,IAAI,mBAAmB,EACtC,MAAM,gBAAgB,CAAA;AAEvB,OAAO,EAAE,OAAO,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAA;AACrE,OAAO,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAA;AAChE,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAA;AACvD,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAA;AACpD,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAA;AAGlD,MAAM,CAAC,MAAM,eAAe,GAAG,CAC7B,OAAU,EAAE,IAAuB,EACnC,EAAE;IACF,OAAO,CAAC,eAAe,CAAC,mBAAmB,EAAE,CAAC,CAAA;IAE9C,MAAM,GAAG,GAAG,oBAAoB,CAAO,OAAO,EAAE,IAAI,CAAC,CAAA;IAErD,4FAA4F;IAC5F,gGAAgG;IAChG,6EAA6E;IAC7E,kBAAkB,CAAC,GAAG,CAAC,CAAC,oBAAoB,CAAC,gBAAgB,CAAC,CAAA;IAE9D,OAAO,GAAG,CAAA;AACZ,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,WAA+B,EAAE,QAA4B,EAAE,MAAmC,EAAE,EAAE;IACnI,MAAM,aAAa,GAAG,MAAM,CAAC,CAAC,CAAC,qBAAqB,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC,UAAU,CAAA;IAErF,mBAAmB,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAA;IAE1C,OAAO,CAAC,WAAW,EAAE,oBAAoB,CAAC,CAAA;IAC1C,OAAO,CAAC,WAAW,EAAE,eAAe,CAAC,CAAA;IACrC,OAAO,CAAC,WAAW,EAAE,UAAU,EAAE,OAAO,CAAC,aAAa,CAAC,CAAC,CAAA;AAC1D,CAAC,CAAA"}
package/build/popup.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"popup.d.ts","sourceRoot":"","sources":["../src/popup.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAGjE;;;;;;;;;;;GAWG;AAEH,qGAAqG;AACrG,eAAO,MAAM,QAAQ,eAAa,CAAA;AAElC,0EAA0E;AAC1E,eAAO,MAAM,kBAAkB,YAAgB,CAAA;AAE/C,oEAAoE;AACpE,eAAO,MAAM,gBAAgB,eAAc,CAAA;AAE3C,uFAAuF;AACvF,eAAO,MAAM,cAAc,GAAU,CAAC,SAAS,SAAS,EAAE,CAAC,SAAS,UAAU,CAAC,CAAC,CAAC,WACtE,CAAC,SAAS,MAAM,KACxB,OAAO,CAAC,IAAI,CAAyC,CAAA;AAExD,yDAAyD;AACzD,eAAO,MAAM,iBAAiB,UAAW,MAAM,GAAG,IAAI,GAAG,SAAS,KAAG,OASpE,CAAA;AAED,wDAAwD;AACxD,eAAO,MAAM,aAAa,GAAU,CAAC,SAAS,SAAS,EAAE,CAAC,SAAS,UAAU,CAAC,CAAC,CAAC,WACrE,CAAC,iBAAiB,MAAM,KAChC,OAAO,CAAC,OAAO,CAC4D,CAAA"}
1
+ {"version":3,"file":"popup.d.ts","sourceRoot":"","sources":["../src/popup.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAGjE;;;;;;;;;;;GAWG;AAEH,qGAAqG;AACrG,eAAO,MAAM,QAAQ,eAAa,CAAA;AAElC,0EAA0E;AAC1E,eAAO,MAAM,kBAAkB,YAAgB,CAAA;AAE/C,oEAAoE;AACpE,eAAO,MAAM,gBAAgB,eAAc,CAAA;AAE3C,uFAAuF;AACvF,eAAO,MAAM,cAAc,GAAU,CAAC,SAAS,SAAS,EAAE,CAAC,SAAS,UAAU,CAAC,CAAC,CAAC,EAC/E,SAAS,CAAC,EAAE,OAAO,MAAM,KACxB,OAAO,CAAC,IAAI,CAAyC,CAAA;AAExD,yDAAyD;AACzD,eAAO,MAAM,iBAAiB,GAAI,OAAO,MAAM,GAAG,IAAI,GAAG,SAAS,KAAG,OASpE,CAAA;AAED,wDAAwD;AACxD,eAAO,MAAM,aAAa,GAAU,CAAC,SAAS,SAAS,EAAE,CAAC,SAAS,UAAU,CAAC,CAAC,CAAC,EAC9E,SAAS,CAAC,EAAE,eAAe,MAAM,KAChC,OAAO,CAAC,OAAO,CAC4D,CAAA"}
package/build/service.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"service.d.ts","sourceRoot":"","sources":["../src/service.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAmB,eAAe,EAAmB,MAAM,YAAY,CAAA;AAanF,eAAO,MAAM,mBAAmB,WAAW,MAAM,KAAmB,eAwInE,CAAA"}
1
+ {"version":3,"file":"service.d.ts","sourceRoot":"","sources":["../src/service.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAmB,eAAe,EAAmB,MAAM,YAAY,CAAA;AAanF,eAAO,MAAM,mBAAmB,GAAI,QAAO,MAAsB,KAAG,eAwInE,CAAA"}
package/build/service.js CHANGED
@@ -23,7 +23,7 @@ export const makeOidcAuthService = (alias = DEFAULT_ALIAS) => {
23
23
  }
24
24
  const ctx = service.assertCtx();
25
25
  params.authUrl = (await store(ctx).get(storeKey)).authUrl;
26
- const [authToken] = await ctx.module(DISPATCHER_OIDC)
26
+ const authToken = await ctx.entrypoint(DISPATCHER_OIDC)
27
27
  .call({ body: params });
28
28
  if (authToken.token != null && authToken.token !== '') {
29
29
  await adoptToken(ctx, authToken.token);
@@ -47,7 +47,7 @@ export const makeOidcAuthService = (alias = DEFAULT_ALIAS) => {
47
47
  }
48
48
  params.entity ??= state.entityId;
49
49
  const ctx = service.assertCtx();
50
- let [redirectTo] = await ctx.module(DISPATCHER_OIDC_INIT)
50
+ let redirectTo = await ctx.entrypoint(DISPATCHER_OIDC_INIT)
51
51
  .call({ body: params });
52
52
  if (flow.payload().simplified === 'true') {
53
53
  redirectTo += '&simplified=true';
@@ -98,7 +98,7 @@ export const makeOidcAuthService = (alias = DEFAULT_ALIAS) => {
98
98
  if (authorityStep.module == null) {
99
99
  throw new FlowStepMissconfigured(authorityStep.step);
100
100
  }
101
- const [authorityUrl] = await context.module(authorityStep.module).call();
101
+ const authorityUrl = await context.entrypoint(authorityStep.module).url();
102
102
  const redirectTransition = flowModel.next();
103
103
  flowModel.transit(redirectTransition.transition, true);
104
104
  const redirectUrl = await flow.proceed(undefined, true);
package/build/service.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"service.js","sourceRoot":"","sources":["../src/service.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,IAAI,EAAE,MAAM,mBAAmB,CAAA;AACtE,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAA;AAC3C,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAA;AAC5C,OAAO,EAAE,aAAa,IAAI,YAAY,EAAE,MAAM,uBAAuB,CAAA;AACrE,OAAO,EAAE,sBAAsB,EAAE,YAAY,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAA;AAEjG,OAAO,EAAE,eAAe,EAAE,oBAAoB,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAA;AAEvF,OAAO,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAA;AAExD,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,KAAK,GAAW,aAAa,EAAmB,EAAE;IACpF,MAAM,KAAK,GAAG,CAAC,OAAgB,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,KAAK,EAAmB,CAAA;IAC3E,MAAM,QAAQ,GAAG,0BAA0B,CAAA;IAE3C,MAAM,OAAO,GAAoB,aAAa,CAAkB,KAAK,EAAE;QACrE;;WAEG;QACH,QAAQ,EAAE,KAAK,EAAC,MAAM,EAAC,EAAE;YACvB;;;;eAIG;YACH,IAAI,MAAM,CAAC,eAAe,CAAC,IAAI,IAAI,EAAE,CAAC;gBACpC,OAAO,KAAK,CAAA;YACd,CAAC;YAED,MAAM,GAAG,GAAG,OAAO,CAAC,SAAS,EAAmB,CAAA;YAEhD,MAAM,CAAC,OAAO,GAAG,CAAC,MAAM,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAA;YAEzD,MAAM,CAAC,SAAS,CAAC,GAAG,MAAM,GAAG,CAAC,MAAM,CAAoB,eAAe,CAAC;iBACrE,IAAI,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAA;YAEzB,IAAI,SAAS,CAAC,KAAK,IAAI,IAAI,IAAI,SAAS,CAAC,KAAK,KAAK,EAAE,EAAE,CAAC;gBACtD,MAAM,UAAU,CAAC,GAAG,EAAE,SAAS,CAAC,KAAK,CAAC,CAAA;gBAEtC,OAAO,IAAI,CAAA;YACb,CAAC;YAED,OAAO,KAAK,CAAA;QACd,CAAC;QAED,YAAY,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE;YACnC;;;;;eAKG;YACH,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,EAAE,CAAA;YAC1B,IAAI,KAAK,CAAC,IAAI,KAAK,aAAa,IAAI,KAAK,CAAC,IAAI,KAAK,YAAY,CAAC,SAAS,EAAE,CAAC;gBAC1E,OAAO,IAAI,CAAA;YACb,CAAC;YACD,IAAI,MAAM,CAAC,MAAM,IAAI,IAAI,IAAI,KAAK,CAAC,QAAQ,IAAI,IAAI,EAAE,CAAC;gBACpD,OAAO,IAAI,CAAA;YACb,CAAC;YACD,MAAM,CAAC,MAAM,KAAK,KAAK,CAAC,QAAS,CAAA;YAEjC,MAAM,GAAG,GAAG,OAAO,CAAC,SAAS,EAAmB,CAAA;YAEhD,IAAI,CAAC,UAAU,CAAC,GAAG,MAAM,GAAG,CAAC,MAAM,CAAiB,oBAAoB,CAAC;iBACtE,IAAI,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAA;YAEzB,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC,UAAU,KAAK,MAAM,EAAE,CAAC;gBACzC,UAAU,IAAI,kBAAkB,CAAA;YAClC,CAAC;YAED,MAAM,OAAO,GAAG,OAAO,CAAC,SAAS,EAAmB,CAAA;YACpD,MAAM,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAE,UAAU,EAAE,CAAC,CAAA;YAEhE,OAAO,UAAU,CAAA;QACnB,CAAC;QAED,oBAAoB,EAAE,KAAK,EAAC,MAAM,EAAC,EAAE;YACnC,MAAM,OAAO,GAAG,aAAa,CAAkB,OAAO,CAAC,GAAc,CAAC,CAAA;YAEtE,MAAM,IAAI,GAAG,OAAO,CAAC,OAAO,CAAc,YAAY,CAAC,CAAA;YACvD,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,KAAK,EAAE,CAAA;YACpC,IAAI,SAAS,IAAI,IAAI,EAAE,CAAC;gBACtB,MAAM,IAAI,WAAW,CAAC,eAAe,CAAC,CAAA;YACxC,CAAC;YAED,MAAM,mBAAmB,GAAG,SAAS,CAAC,IAAI,EAAE,CAAA;YAC5C,SAAS,CAAC,OAAO,CAAC,mBAAmB,CAAC,UAAU,EAAE,IAAI,EAAE;gBACtD,OAAO,EAAE,MAAM,CAAC,OAAO;gBACvB,UAAU,EAAE,MAAM,CAAC,UAAU;aAC9B,CAAC,CAAA;YAEF,gEAAgE;YAChE,IAAI,MAAM,CAAC,KAAK,KAAK,IAAI,EAAE,CAAC;gBAC1B,MAAM,kBAAkB,GAAG,SAAS,CAAC,IAAI,EAAE,CAAA;gBAC3C,SAAS,CAAC,OAAO,CAAC,kBAAkB,CAAC,UAAU,EAAE,IAAI,EAAE;oBACrD,OAAO,EAAE,MAAM,CAAC,OAAO;oBACvB,UAAU,EAAE,MAAM,CAAC,UAAU;iBAC9B,CAAC,CAAA;YACJ,CAAC;YAED,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,EAAE,GAAG,EAAE,MAAM,CAAC,GAAG,EAAE,EAAE,EAAE,IAAI,CAAC,CAAA;YAE7E,OAAO,WAAW,CAAA;QACpB,CAAC;QAED;;;;;WAKG;QACH,kBAAkB,EAAE,KAAK,IAAI,EAAE;YAC7B,MAAM,OAAO,GAAG,aAAa,CAAkB,OAAO,CAAC,GAAc,CAAC,CAAA;YAEtE,MAAM,IAAI,GAAG,OAAO,CAAC,OAAO,CAAc,YAAY,CAAC,CAAA;YAEvD,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,KAAK,EAAE,CAAA;YACpC,IAAI,SAAS,IAAI,IAAI,EAAE,CAAC;gBACtB,MAAM,IAAI,WAAW,CAAC,eAAe,CAAC,CAAA;YACxC,CAAC;YAED,MAAM,mBAAmB,GAAG,SAAS,CAAC,IAAI,EAAE,CAAA;YAC5C,SAAS,CAAC,OAAO,CAAC,mBAAmB,CAAC,UAAU,EAAE,IAAI,CAAC,CAAA;YACvD,MAAM,aAAa,GAAG,SAAS,CAAC,IAAI,EAAE,CAAA;YACtC,IAAI,aAAa,CAAC,MAAM,IAAI,IAAI,EAAE,CAAC;gBACjC,MAAM,IAAI,sBAAsB,CAAC,aAAa,CAAC,IAAI,CAAC,CAAA;YACtD,CAAC;YACD,MAAM,CAAC,YAAY,CAAC,GAAG,MAAM,OAAO,CAAC,MAAM,CAAS,aAAa,CAAC,MAAM,CAAC,CAAC,IAAI,EAAU,CAAA;YAExF,MAAM,kBAAkB,GAAG,SAAS,CAAC,IAAI,EAAE,CAAA;YAC3C,SAAS,CAAC,OAAO,CAAC,kBAAkB,CAAC,UAAU,EAAE,IAAI,CAAC,CAAA;YAEtD,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,IAAI,CAAC,CAAA;YAEvD,yDAAyD;YACzD,MAAM,OAAO,GAAG,IAAI,WAAW,CAAC;gBAC9B,wDAAwD;gBACxD,SAAS,EAAE,EAAE;gBACb,YAAY,EAAE,WAAW;gBACzB,SAAS,EAAE,YAAY;aACxB,CAAC,CAAA;YAEF,MAAM,OAAO,CAAC,cAAc,CAAC,EAAE,KAAK,EAAE,SAAS,CAAC,SAAS,EAAE,EAAE,CAAC,CAAA;QAChE,CAAC;KACF,CAAC,CAAA;IAEF,OAAO,OAAO,CAAA;AAChB,CAAC,CAAA"}
1
+ {"version":3,"file":"service.js","sourceRoot":"","sources":["../src/service.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@owlmeans/web-oidc-rp",
3
- "version": "0.1.18-rc.21",
3
+ "version": "0.1.18-rc.23",
4
4
  "license": "MIT",
5
5
  "type": "module",
6
6
  "scripts": {
@@ -29,19 +29,19 @@
29
29
  }
30
30
  },
31
31
  "dependencies": {
32
- "@owlmeans/auth": "^0.1.18-rc.7",
33
- "@owlmeans/basic-envelope": "^0.1.18-rc.9",
34
- "@owlmeans/client": "^0.1.18-rc.11",
35
- "@owlmeans/client-auth": "^0.1.18-rc.13",
36
- "@owlmeans/client-flow": "^0.1.18-rc.12",
37
- "@owlmeans/client-i18n": "^0.1.18-rc.10",
38
- "@owlmeans/context": "^0.1.18-rc.6",
39
- "@owlmeans/flow": "^0.1.18-rc.10",
40
- "@owlmeans/entrypoint": "^0.1.18-rc.8",
41
- "@owlmeans/oidc": "^0.1.18-rc.9",
42
- "@owlmeans/resource": "^0.1.18-rc.7",
43
- "@owlmeans/web-client": "^0.1.18-rc.18",
44
- "@owlmeans/web-flow": "^0.1.18-rc.12",
32
+ "@owlmeans/auth": "^0.1.18-rc.8",
33
+ "@owlmeans/basic-envelope": "^0.1.18-rc.10",
34
+ "@owlmeans/client": "^0.1.18-rc.13",
35
+ "@owlmeans/client-auth": "^0.1.18-rc.17",
36
+ "@owlmeans/client-flow": "^0.1.18-rc.14",
37
+ "@owlmeans/client-i18n": "^0.1.18-rc.12",
38
+ "@owlmeans/context": "^0.1.18-rc.7",
39
+ "@owlmeans/flow": "^0.1.18-rc.12",
40
+ "@owlmeans/entrypoint": "^0.1.18-rc.9",
41
+ "@owlmeans/oidc": "^0.1.18-rc.11",
42
+ "@owlmeans/resource": "^0.1.18-rc.8",
43
+ "@owlmeans/web-client": "^0.1.18-rc.21",
44
+ "@owlmeans/web-flow": "^0.1.18-rc.14",
45
45
  "oidc-client-ts": "3.5.0"
46
46
  },
47
47
  "peerDependencies": {
@@ -55,8 +55,8 @@
55
55
  },
56
56
  "devDependencies": {
57
57
  "@owlmeans/dep-config": "workspace:*",
58
- "@owlmeans/test-auth": "^0.1.18-rc.9",
59
- "@owlmeans/test-ui": "^0.1.18-rc.11",
58
+ "@owlmeans/test-auth": "^0.1.18-rc.11",
59
+ "@owlmeans/test-ui": "^0.1.18-rc.13",
60
60
  "@radix-ui/react-progress": "^1.1.7",
61
61
  "@tailwindcss/vite": "^4.1.16",
62
62
  "@types/bun": "^1.4.0",
package/src/auth/methods.ts CHANGED
@@ -61,7 +61,7 @@ export const oidcMethodSource: LoginMethodSource = {
61
61
  // nothing may be awaited first. The choice travels with it and the surrogate re-runs the
62
62
  // method itself, one window up, where the round trip can actually complete.
63
63
  if (methodCtx.env.embedded && !methodCtx.env.surrogate) {
64
- const dispatcher = methodCtx.context.entrypoint<ClientEntrypoint>(DISPATCHER).getPath()
64
+ const dispatcher = methodCtx.context.entrypoint<ClientEntrypoint>(DISPATCHER).path()
65
65
 
66
66
  return await login.begin({
67
67
  url: `${dispatcher}?${LOGIN_METHOD_QUERY}=${encodeURIComponent(id)}`,
package/src/auth/plugins/google-client.tsx CHANGED
@@ -51,18 +51,18 @@ export const googleClientPlugin: AuthenticationPlugin = {
51
51
  }
52
52
 
53
53
  // Navigate to app root after successful authentication
54
- const [homeUrl] = await context.module<Module<string>>(HOME).call({ full: true }) ?? []
55
- window.location.href = homeUrl ?? window.location.origin
54
+ const homeUrl = await context.entrypoint<Module<string>>(HOME).url(undefined, { absolute: true })
55
+ window.location.href = homeUrl
56
56
 
57
57
  return
58
58
  }
59
59
  }
60
60
 
61
61
  // Initial request — ask server for Google auth URL
62
- const [source] = await context.module<Module<string>>(CAUTHEN_AUTHEN_TYPED).call({
63
- full: true, params: { type }
64
- }) ?? []
65
- await control.requestAllowence({ type, source: source ?? '' })
62
+ const source = await context.entrypoint<Module<string>>(CAUTHEN_AUTHEN_TYPED).url({
63
+ params: { type }
64
+ }, { absolute: true })
65
+ await control.requestAllowence({ type, source })
66
66
  break
67
67
  }
68
68
 
@@ -71,10 +71,10 @@ export const googleClientPlugin: AuthenticationPlugin = {
71
71
 
72
72
  if (control.allowance?.challenge != null) {
73
73
  // The server wraps challenge as "source:googleUrl" — extract the URL part
74
- const [source] = await context.module<Module<string>>(CAUTHEN_AUTHEN_TYPED).call({
75
- full: true, params: { type }
76
- }) ?? []
77
- const url = extractGoogleUrl(control.allowance.challenge, source ?? '')
74
+ const source = await context.entrypoint<Module<string>>(CAUTHEN_AUTHEN_TYPED).url({
75
+ params: { type }
76
+ }, { absolute: true })
77
+ const url = extractGoogleUrl(control.allowance.challenge, source)
78
78
 
79
79
  // Persist control state before redirect
80
80
  await control.persist()
package/src/auth/plugins/oidc-client.tsx CHANGED
@@ -10,7 +10,7 @@ import type { Config, Context, OidcAuthService } from '../../types.js'
10
10
  import { useContext } from '@owlmeans/web-client'
11
11
  import { DEFAULT_ALIAS, OidcAuthPurposes } from '../../consts.js'
12
12
  import { OidcAuthStep, OidpAuthStep, UnknownFlowStep } from '@owlmeans/flow'
13
- import { useModule } from '@owlmeans/client'
13
+ import { useEntrypoint } from '@owlmeans/client'
14
14
 
15
15
  export const oidcClientPlugin: AuthenticationPlugin = {
16
16
  type: OIDC_CLIENT_AUTH,
@@ -27,7 +27,7 @@ export const oidcClientPlugin: AuthenticationPlugin = {
27
27
  Implementation: Renderer => ({ type, stage, control }) => {
28
28
  const context = useContext<Config, Context>()
29
29
  Renderer = Renderer ?? oidcClientPlugin.Renderer
30
- const module = useModule()
30
+ const module = useEntrypoint()
31
31
 
32
32
  useEffect(() => {
33
33
  let canceled = false
package/src/guard.ts CHANGED
@@ -30,12 +30,12 @@ export const appendOidcGuard = <C extends Config, T extends Context<C>>(
30
30
  return ctx
31
31
  }
32
32
 
33
- export const setupOidcGuard = (modules: CommonEntrypoint[], coguards?: string | string[], extras?: Partial<ParametrisedProps>) => {
33
+ export const setupOidcGuard = (entrypoints: CommonEntrypoint[], coguards?: string | string[], extras?: Partial<ParametrisedProps>) => {
34
34
  const DispatcherCom = extras ? parametriseDispatcher(extras, Dispatcher) : Dispatcher
35
35
 
36
- setupBasicOidcGuard(modules, coguards)
36
+ setupBasicOidcGuard(entrypoints, coguards)
37
37
 
38
- elevate(modules, DISPATCHER_OIDC_INIT)
39
- elevate(modules, DISPATCHER_OIDC)
40
- elevate(modules, DISPATCHER, handler(DispatcherCom), { force: true })
38
+ elevate(entrypoints, DISPATCHER_OIDC_INIT)
39
+ elevate(entrypoints, DISPATCHER_OIDC)
40
+ elevate(entrypoints, DISPATCHER, handler(DispatcherCom))
41
41
  }
package/src/service.ts CHANGED
@@ -33,7 +33,7 @@ export const makeOidcAuthService = (alias: string = DEFAULT_ALIAS): OidcAuthServ
33
33
 
34
34
  params.authUrl = (await store(ctx).get(storeKey)).authUrl
35
35
 
36
- const [authToken] = await ctx.module<Module<AuthToken>>(DISPATCHER_OIDC)
36
+ const authToken = await ctx.entrypoint<Module<AuthToken>>(DISPATCHER_OIDC)
37
37
  .call({ body: params })
38
38
 
39
39
  if (authToken.token != null && authToken.token !== '') {
@@ -63,7 +63,7 @@ export const makeOidcAuthService = (alias: string = DEFAULT_ALIAS): OidcAuthServ
63
63
 
64
64
  const ctx = service.assertCtx<Config, Context>()
65
65
 
66
- let [redirectTo] = await ctx.module<Module<string>>(DISPATCHER_OIDC_INIT)
66
+ let redirectTo = await ctx.entrypoint<Module<string>>(DISPATCHER_OIDC_INIT)
67
67
  .call({ body: params })
68
68
 
69
69
  if (flow.payload().simplified === 'true') {
@@ -127,7 +127,7 @@ export const makeOidcAuthService = (alias: string = DEFAULT_ALIAS): OidcAuthServ
127
127
  if (authorityStep.module == null) {
128
128
  throw new FlowStepMissconfigured(authorityStep.step)
129
129
  }
130
- const [authorityUrl] = await context.module<Module>(authorityStep.module).call<string>()
130
+ const authorityUrl = await context.entrypoint<Module>(authorityStep.module).url()
131
131
 
132
132
  const redirectTransition = flowModel.next()
133
133
  flowModel.transit(redirectTransition.transition, true)
package/tests/context.ts CHANGED
@@ -1,11 +1,10 @@
1
- import { AppType, Layer, makeBasicContext } from '@owlmeans/context'
1
+ import { AppType, makeBasicContext } from '@owlmeans/context'
2
2
  import type { BasicConfig, BasicContext } from '@owlmeans/context'
3
3
 
4
4
  export const makeTestContext = () => {
5
5
  const cfg: BasicConfig = {
6
6
  ready: false,
7
7
  service: 'web-oidc-rp-tests',
8
- layer: Layer.Application,
9
8
  type: AppType.Frontend,
10
9
  services: {},
11
10
  }