@owlmeans/client-auth 0.1.1 → 0.1.3
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/LICENSE +1 -1
- package/README.md +32 -489
- package/build/components/dispatcher/component.d.ts.map +1 -1
- package/build/components/dispatcher/component.js +5 -2
- package/build/components/dispatcher/component.js.map +1 -1
- package/build/components/dispatcher/types.d.ts +3 -1
- package/build/components/dispatcher/types.d.ts.map +1 -1
- package/build/helper.d.ts +4 -4
- package/build/helper.d.ts.map +1 -1
- package/build/helper.js +15 -14
- package/build/helper.js.map +1 -1
- package/build/manager/components/authentication/control.js +4 -4
- package/build/manager/components/authentication/control.js.map +1 -1
- package/build/manager/modules.d.ts +1 -1
- package/build/manager/modules.d.ts.map +1 -1
- package/build/manager/modules.js +1 -1
- package/build/manager/modules.js.map +1 -1
- package/build/modules.d.ts +2 -2
- package/build/modules.d.ts.map +1 -1
- package/build/modules.js +1 -1
- package/build/modules.js.map +1 -1
- package/build/service.js +1 -1
- package/build/service.js.map +1 -1
- package/package.json +26 -21
- package/src/components/dispatcher/component.tsx +5 -2
- package/src/components/dispatcher/types.ts +3 -1
- package/src/helper.ts +18 -16
- package/src/manager/components/authentication/control.ts +5 -5
- package/src/manager/modules.ts +1 -1
- package/src/modules.ts +3 -3
- package/src/service.ts +2 -2
- package/tests/context.ts +27 -0
- package/tests/service.spec.ts +138 -0
- package/tests/tsconfig.json +12 -0
- package/tsconfig.json +6 -10
package/build/helper.js
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
|
-
import { useContext } from '@owlmeans/client';
|
|
2
|
-
import { provideRequest } from '@owlmeans/client-
|
|
1
|
+
import { useContext, useNavigate } from '@owlmeans/client';
|
|
2
|
+
import { provideRequest } from '@owlmeans/client-entrypoint';
|
|
3
3
|
import { useWs as useWebSocket } from '@owlmeans/client-socket';
|
|
4
4
|
import { useEffect, useMemo, useState } from 'react';
|
|
5
|
-
import { AUTH_QUERY } from '@owlmeans/auth';
|
|
6
|
-
import { useFlow } from '@owlmeans/web-flow'
|
|
7
|
-
import { DEFAULT_ENTITY } from './consts.js'
|
|
8
|
-
import { OidcAuthStep } from '@owlmeans/flow'
|
|
5
|
+
import { AUTH_QUERY, DISPATCHER } from '@owlmeans/auth';
|
|
6
|
+
// import { useFlow } from '@owlmeans/web-flow'
|
|
7
|
+
// import { DEFAULT_ENTITY } from './consts.js'
|
|
8
|
+
// import { OidcAuthStep } from '@owlmeans/flow'
|
|
9
9
|
export const useWs = (module, _request) => {
|
|
10
10
|
const ctx = useContext();
|
|
11
|
-
const mod = useMemo(() => typeof module === 'string' ? ctx.
|
|
11
|
+
const mod = useMemo(() => typeof module === 'string' ? ctx.entrypoint(module) : module, [module]);
|
|
12
12
|
const request = useMemo(() => {
|
|
13
13
|
if (_request == null) {
|
|
14
14
|
_request = provideRequest(mod.getAlias(), mod.getPath());
|
|
@@ -28,21 +28,22 @@ export const useWs = (module, _request) => {
|
|
|
28
28
|
}, [_request]);
|
|
29
29
|
return useWebSocket(module, request);
|
|
30
30
|
};
|
|
31
|
-
export const useSelfAuth = (force = true
|
|
31
|
+
export const useSelfAuth = (force = true /*, entity: string = DEFAULT_ENTITY*/) => {
|
|
32
32
|
const context = useContext();
|
|
33
|
-
const flow = useFlow(context.cfg.shortAlias ?? context.cfg.service)
|
|
33
|
+
// const flow = useFlow(context.cfg.shortAlias ?? context.cfg.service)
|
|
34
34
|
const [authenticated, setAuthenticated] = useState(false);
|
|
35
|
+
const nav = useNavigate();
|
|
35
36
|
useEffect(() => {
|
|
36
|
-
if (flow == null)
|
|
37
|
-
return;
|
|
37
|
+
// if (flow == null) return
|
|
38
38
|
context.auth().authenticated().then(async (auth) => {
|
|
39
39
|
if (force && !auth) {
|
|
40
|
-
|
|
41
|
-
|
|
40
|
+
nav.go(DISPATCHER);
|
|
41
|
+
// flow.flow().entity(entity)
|
|
42
|
+
// await flow.proceed(flow.flow().transition(OidcAuthStep.Ephemeral))
|
|
42
43
|
}
|
|
43
44
|
setAuthenticated(!!auth);
|
|
44
45
|
});
|
|
45
|
-
}, [
|
|
46
|
+
}, []);
|
|
46
47
|
return authenticated;
|
|
47
48
|
};
|
|
48
49
|
//# sourceMappingURL=helper.js.map
|
package/build/helper.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"helper.js","sourceRoot":"","sources":["../src/helper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAA;
|
|
1
|
+
{"version":3,"file":"helper.js","sourceRoot":"","sources":["../src/helper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAA;AAE1D,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAA;AAC5D,OAAO,EAAE,KAAK,IAAI,YAAY,EAAE,MAAM,yBAAyB,CAAA;AAG/D,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAEpD,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAA;AACvD,+CAA+C;AAC/C,+CAA+C;AAC/C,gDAAgD;AAEhD,MAAM,CAAC,MAAM,KAAK,GAAG,CACnB,MAAsC,EAAE,QAAwC,EAChF,EAAE;IACF,MAAM,GAAG,GAAG,UAAU,EAAkD,CAAA;IAExE,MAAM,GAAG,GAAG,OAAO,CACjB,GAAG,EAAE,CAAC,OAAO,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,UAAU,CAAmB,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,MAAM,CAAC,CAC/F,CAAA;IAED,MAAM,OAAO,GAAG,OAAO,CAAC,GAAG,EAAE;QAC3B,IAAI,QAAQ,IAAI,IAAI,EAAE,CAAC;YACrB,QAAQ,GAAG,cAAc,CAAC,GAAG,CAAC,QAAQ,EAAE,EAAE,GAAG,CAAC,OAAO,EAAE,CAAC,CAAA;QAC1D,CAAC;QACD,IAAI,CAAC;YACH,IAAI,QAAQ,EAAE,KAAK,EAAE,CAAC,UAAU,CAAC,IAAI,IAAI,EAAE,CAAC;gBAC1C,IAAI,QAAQ,CAAC,KAAK,IAAI,IAAI,EAAE,CAAC;oBAC3B,QAAQ,CAAC,KAAK,GAAG,EAAE,CAAA;gBACrB,CAAC;gBACD,QAAQ,CAAC,KAAK,CAAC,UAAU,CAAC,GAAG,GAAG,CAAC,IAAI,EAAE,CAAC,KAAK,CAAA;YAC/C,CAAC;QACH,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;QAClB,CAAC;QAED,OAAO,QAAQ,CAAA;IACjB,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAA;IAEd,OAAO,YAAY,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;AACtC,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,QAAiB,IAAI,CAAA,qCAAqC,EAAE,EAAE;IACxF,MAAM,OAAO,GAAG,UAAU,EAAkD,CAAA;IAC5E,sEAAsE;IACtE,MAAM,CAAC,aAAa,EAAE,gBAAgB,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAA;IACzD,MAAM,GAAG,GAAG,WAAW,EAAE,CAAA;IAEzB,SAAS,CAAC,GAAG,EAAE;QACb,2BAA2B;QAC3B,OAAO,CAAC,IAAI,EAAE,CAAC,aAAa,EAAE,CAAC,IAAI,CAAC,KAAK,EAAC,IAAI,EAAC,EAAE;YAC/C,IAAI,KAAK,IAAI,CAAC,IAAI,EAAE,CAAC;gBACnB,GAAG,CAAC,EAAE,CAAC,UAAU,CAAC,CAAA;gBAClB,6BAA6B;gBAC7B,qEAAqE;YACvE,CAAC;YAED,gBAAgB,CAAC,CAAC,CAAC,IAAI,CAAC,CAAA;QAC1B,CAAC,CAAC,CAAA;IACJ,CAAC,EAAE,EAAE,CAAC,CAAA;IAEN,OAAO,aAAa,CAAA;AACtB,CAAC,CAAA"}
|
|
@@ -2,7 +2,7 @@ import { ALL_SCOPES, AUTHEN_AUTHEN, AUTHEN_INIT, AuthRole, AuthenticationStage,
|
|
|
2
2
|
import { AuthenCredError } from '../../errors.js';
|
|
3
3
|
import { plugins } from '../../plugins/index.js';
|
|
4
4
|
import { EnvelopeKind, makeEnvelopeModel } from '@owlmeans/basic-envelope';
|
|
5
|
-
import {
|
|
5
|
+
import { EntrypointOutcome } from '@owlmeans/entrypoint';
|
|
6
6
|
import { DEFAULT_ALIAS as FLOW_SERVICE, FLOW_STATE } from '@owlmeans/client-flow';
|
|
7
7
|
import { CONTROL_STATE_ID } from './consts.js';
|
|
8
8
|
import { ResilientError } from '@owlmeans/error';
|
|
@@ -22,7 +22,7 @@ export const makeControl = (context, callback) => {
|
|
|
22
22
|
control.type = control.request.type;
|
|
23
23
|
control.beforeAuthenticate = plugins[control.type].beforeAuthenticate;
|
|
24
24
|
control.afterAuthenticate = plugins[control.type].afterAuthenticate;
|
|
25
|
-
const module = context.
|
|
25
|
+
const module = context.entrypoint(AUTHEN_INIT);
|
|
26
26
|
const [allowance] = await module.call({ body: control.request });
|
|
27
27
|
control.allowance = allowance;
|
|
28
28
|
control.updateStage(AuthenticationStage.Authenticate);
|
|
@@ -56,9 +56,9 @@ export const makeControl = (context, callback) => {
|
|
|
56
56
|
}
|
|
57
57
|
// We return back unwrapped challenge
|
|
58
58
|
credentials.challenge = control.allowance?.challenge;
|
|
59
|
-
const [token, status] = await context.
|
|
59
|
+
const [token, status] = await context.entrypoint(AUTHEN_AUTHEN)
|
|
60
60
|
.call({ body: credentials });
|
|
61
|
-
if (status ===
|
|
61
|
+
if (status === EntrypointOutcome.Ok && token.token != null
|
|
62
62
|
&& token.token !== '' && control.afterAuthenticate != null) {
|
|
63
63
|
const resultingCred = makeEnvelopeModel(token.token, EnvelopeKind.Token).message();
|
|
64
64
|
await control.afterAuthenticate(resultingCred, context);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"control.js","sourceRoot":"","sources":["../../../../src/manager/components/authentication/control.ts"],"names":[],"mappings":"AACA,OAAO,EACL,UAAU,EAAE,aAAa,EAAE,WAAW,EAAE,QAAQ,EAAE,mBAAmB,EAAE,kBAAkB,GAC1F,MAAM,gBAAgB,CAAA;AAKvB,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;AACjD,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAA;AAChD,OAAO,EAAE,YAAY,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAA;AAE1E,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"control.js","sourceRoot":"","sources":["../../../../src/manager/components/authentication/control.ts"],"names":[],"mappings":"AACA,OAAO,EACL,UAAU,EAAE,aAAa,EAAE,WAAW,EAAE,QAAQ,EAAE,mBAAmB,EAAE,kBAAkB,GAC1F,MAAM,gBAAgB,CAAA;AAKvB,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;AACjD,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAA;AAChD,OAAO,EAAE,YAAY,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAA;AAE1E,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAA;AACxD,OAAO,EAAE,aAAa,IAAI,YAAY,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAA;AAEjF,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAA;AAC9C,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAA;AAEhD,MAAM,CAAC,MAAM,WAAW,GAAG,CACzB,OAAoC,EACpC,QAAiD,EAC1B,EAAE;IACzB,sDAAsD;IACtD,MAAM,OAAO,GAA0B;QAErC,KAAK,EAAE,mBAAmB,CAAC,IAAI;QAE/B,IAAI,EAAE,kBAAkB,CAAC,YAAY;QAErC,QAAQ;QAER,QAAQ,EAAE,KAAK,EAAC,KAAK,EAAC,EAAE;YACtB,OAAO,CAAC,KAAK,GAAG,cAAc,CAAC,MAAM,CAAC,KAAc,CAAC,CAAA;YAErD,OAAO,CAAC,WAAW,CAAC,mBAAmB,CAAC,KAAK,CAAC,CAAA;QAChD,CAAC;QAED,gBAAgB,EAAE,KAAK,EAAC,OAAO,EAAC,EAAE;YAChC,OAAO,CAAC,WAAW,CAAC,mBAAmB,CAAC,SAAS,CAAC,CAAA;YAElD,OAAO,CAAC,OAAO,GAAG,CAAC,OAAO,IAAI,EAAE,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,CAAqB,CAAA;YACzE,OAAO,CAAC,IAAI,GAAG,OAAO,CAAC,OAAO,CAAC,IAAc,CAAA;YAE7C,OAAO,CAAC,kBAAkB,GAAG,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,kBAAkB,CAAA;YACrE,OAAO,CAAC,iBAAiB,GAAG,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,iBAAiB,CAAA;YAEnE,MAAM,MAAM,GAAG,OAAO,CAAC,UAAU,CAAsC,WAAW,CAAC,CAAA;YACnF,MAAM,CAAC,SAAS,CAAC,GAAG,MAAM,MAAM,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,OAAO,CAAC,OAAO,EAAE,CAAC,CAAA;YAEhE,OAAO,CAAC,SAAS,GAAG,SAAS,CAAA;YAE7B,OAAO,CAAC,WAAW,CAAC,mBAAmB,CAAC,YAAY,CAAC,CAAA;QACvD,CAAC;QAED,YAAY,EAAE,KAAK,EAAC,WAAW,EAAC,EAAE;YAChC,OAAO,CAAC,WAAW,CAAC,mBAAmB,CAAC,cAAc,CAAC,CAAA;YACvD,IAAI,CAAC;gBACH,WAAW,CAAC,IAAI,GAAG,OAAO,CAAC,IAAI,CAAA;gBAC/B,IAAI,OAAO,CAAC,SAAS,EAAE,SAAS,IAAI,IAAI,EAAE,CAAC;oBACzC,MAAM,IAAI,eAAe,CAAC,WAAW,CAAC,CAAA;gBACxC,CAAC;gBACD,MAAM,QAAQ,GAAkB,iBAAiB,CAAC,OAAO,CAAC,SAAS,EAAE,SAAS,EAAE,YAAY,CAAC,IAAI,CAAC,CAAA;gBAElG,WAAW,CAAC,SAAS,GAAG,QAAQ,CAAC,OAAO,EAAE,CAAA;gBAC1C,WAAW,CAAC,MAAM,GAAG,WAAW,CAAC,MAAM,IAAI,CAAC,UAAU,CAAC,CAAA;gBACvD,WAAW,CAAC,IAAI,GAAG,WAAW,CAAC,IAAI,IAAI,QAAQ,CAAC,IAAI,CAAA;gBAEpD,IAAI,WAAW,CAAC,UAAU,IAAI,IAAI,IAAI,WAAW,CAAC,UAAU,KAAK,EAAE,EAAE,CAAC;oBACpE,MAAM,IAAI,eAAe,CAAC,YAAY,CAAC,CAAA;gBACzC,CAAC;gBAED,IAAI,WAAW,CAAC,MAAM,IAAI,IAAI,IAAI,WAAW,CAAC,MAAM,KAAK,EAAE,EAAE,CAAC;oBAC5D,MAAM,IAAI,eAAe,CAAC,QAAQ,CAAC,CAAA;gBACrC,CAAC;gBAED,IAAI,WAAW,CAAC,SAAS,IAAI,IAAI,IAAI,WAAW,CAAC,SAAS,KAAK,EAAE,EAAE,CAAC;oBAClE,MAAM,IAAI,eAAe,CAAC,WAAW,CAAC,CAAA;gBACxC,CAAC;gBAED,IAAI,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,YAAY,IAAI,IAAI,EAAE,CAAC;oBAC/C,wDAAwD;oBACxD,MAAM,WAAW,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,YAAa,CAAC,WAAW,EAAE,OAAO,CAAC,CAAA;oBAEnF,IAAI,WAAW,CAAC,KAAK,KAAK,EAAE,IAAI,OAAO,CAAC,kBAAkB,IAAI,IAAI,EAAE,CAAC;wBACnE,OAAO,CAAC,kBAAkB,CAAC,WAAW,EAAE,OAAO,CAAC,CAAA;oBAClD,CAAC;gBACH,CAAC;gBAED,qCAAqC;gBACrC,WAAW,CAAC,SAAS,GAAG,OAAO,CAAC,SAAS,EAAE,SAAS,CAAA;gBAEpD,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,GAAG,MAAM,OAAO,CAAC,UAAU,CAA8B,aAAa,CAAC;qBACzF,IAAI,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC,CAAA;gBAE9B,IAAI,MAAM,KAAK,iBAAiB,CAAC,EAAE,IAAI,KAAK,CAAC,KAAK,IAAI,IAAI;uBACrD,KAAK,CAAC,KAAK,KAAK,EAAE,IAAI,OAAO,CAAC,iBAAiB,IAAI,IAAI,EAAE,CAAC;oBAC7D,MAAM,aAAa,GAAG,iBAAiB,CAAkB,KAAK,CAAC,KAAK,EAAE,YAAY,CAAC,KAAK,CAAC,CAAC,OAAO,EAAE,CAAA;oBACnG,MAAM,OAAO,CAAC,iBAAiB,CAAC,aAAa,EAAE,OAAO,CAAC,CAAA;gBACzD,CAAC;gBAED,IAAI,OAAO,CAAC,QAAQ,IAAI,IAAI,IAAI,MAAM,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;oBAC9D,OAAO,EAAE,KAAK,EAAE,EAAE,EAAE,CAAA;gBACtB,CAAC;gBAED,OAAO,KAAK,CAAA;YACd,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,6EAA6E;gBAC7E,uEAAuE;gBACvE,MAAM,KAAK,CAAA;YACb,CAAC;QACH,CAAC;QAED,WAAW,EAAE,KAAK,CAAC,EAAE;YACnB,OAAO,CAAC,KAAK,GAAG,KAAK,CAAA;YACrB,OAAO,CAAC,QAAQ,EAAE,CAAC,KAAK,CAAC,CAAA;QAC3B,CAAC;QAED,OAAO,EAAE,KAAK,IAAI,EAAE;YAClB,IAAI,OAAO,CAAC,WAAW,CAAC,UAAU,CAAC,EAAE,CAAC;gBACpC,MAAM,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAgB,UAAU,CAAC,CAAA;gBAC5D,MAAM,QAAQ,CAAC,IAAI,CAAC;oBAClB,EAAE,EAAE,gBAAgB,EAAE,GAAG;wBACvB,IAAI,EAAE,OAAO,CAAC,IAAI;wBAClB,KAAK,EAAE,OAAO,CAAC,KAAK;wBACpB,SAAS,EAAE,OAAO,CAAC,SAAS;qBAC7B;iBACF,CAAC,CAAA;gBAEF,OAAO,IAAI,CAAA;YACb,CAAC;YAED,OAAO,KAAK,CAAA;QACd,CAAC;QAED,OAAO,EAAE,KAAK,IAAI,EAAE;YAClB,IAAI,OAAO,CAAC,WAAW,CAAC,UAAU,CAAC,EAAE,CAAC;gBACpC,MAAM,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAgB,UAAU,CAAC,CAAA;gBAC5D,MAAM,KAAK,GAAG,MAAM,QAAQ,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAA;gBACnD,IAAI,KAAK,IAAI,IAAI,EAAE,CAAC;oBAClB,MAAM,MAAM,GAAG,KAAkD,CAAA;oBACjE,IAAI,MAAM,CAAC,IAAI,IAAI,IAAI,EAAE,CAAC;wBACxB,OAAO,CAAC,IAAI,GAAG,MAAM,CAAC,IAAI,CAAA;oBAC5B,CAAC;oBACD,OAAO,CAAC,kBAAkB,GAAG,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,kBAAkB,CAAA;oBACrE,OAAO,CAAC,iBAAiB,GAAG,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,iBAAiB,CAAA;oBAEnE,IAAI,MAAM,CAAC,KAAK,IAAI,IAAI,EAAE,CAAC;wBACzB,OAAO,CAAC,KAAK,GAAG,MAAM,CAAC,KAAK,CAAA;oBAC9B,CAAC;oBACD,IAAI,MAAM,CAAC,SAAS,IAAI,IAAI,EAAE,CAAC;wBAC7B,OAAO,CAAC,SAAS,GAAG,MAAM,CAAC,SAAS,CAAA;oBACtC,CAAC;oBAED,OAAO,IAAI,CAAA;gBACb,CAAC;YACH,CAAC;YACD,OAAO,KAAK,CAAA;QACd,CAAC;QAED,kBAAkB,EAAE,KAAK,IAAI,EAAE;YAC7B,IAAI,OAAO,CAAC,WAAW,CAAC,UAAU,CAAC,EAAE,CAAC;gBACpC,MAAM,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAgB,UAAU,CAAC,CAAA;gBAC5D,IAAI,IAAI,IAAI,MAAM,QAAQ,CAAC,IAAI,CAAC,gBAAgB,CAAC,EAAE,CAAC;oBAClD,OAAO,IAAI,CAAA;gBACb,CAAC;YACH,CAAC;YAED,OAAO,KAAK,CAAA;QACd,CAAC;QAED,YAAY,EAAE,KAAK,IAAI,EAAE;YACvB,IAAI,OAAO,CAAC,WAAW,CAAC,UAAU,CAAC,EAAE,CAAC;gBACpC,MAAM,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAgB,UAAU,CAAC,CAAA;gBAC5D,MAAM,QAAQ,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAA;YACzC,CAAC;QACH,CAAC;QAED,IAAI,EAAE,KAAK,IAAI,EAAE;YACf,MAAM,KAAK,GAAG,YAAY,CAAA;YAC1B,IAAI,OAAO,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE,CAAC;gBAC9B,MAAM,IAAI,GAAG,OAAO,CAAC,OAAO,CAAc,KAAK,CAAC,CAAA;gBAChD,MAAM,IAAI,CAAC,KAAK,EAAE,CAAA;gBAClB,IAAI,MAAM,IAAI,CAAC,QAAQ,EAAE,CAAC;oBACxB,OAAO,IAAI,CAAA;gBACb,CAAC;YACH,CAAC;YAED,OAAO,IAAI,CAAA;QACb,CAAC;KACF,CAAA;IAED,OAAO,OAAO,CAAA;AAChB,CAAC,CAAA"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export declare const modules: import("@owlmeans/
|
|
1
|
+
export declare const modules: import("@owlmeans/entrypoint").CommonEntrypoint[];
|
|
2
2
|
//# sourceMappingURL=modules.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"modules.d.ts","sourceRoot":"","sources":["../../src/manager/modules.ts"],"names":[],"mappings":"AAiBA,eAAO,MAAM,OAAO,
|
|
1
|
+
{"version":3,"file":"modules.d.ts","sourceRoot":"","sources":["../../src/manager/modules.ts"],"names":[],"mappings":"AAiBA,eAAO,MAAM,OAAO,mDAAO,CAAA"}
|
package/build/manager/modules.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { AUTHEN, AUTHEN_AUTHEN, AUTHEN_INIT, AUTHEN_RELY, CAUTHEN, CAUTHEN_AUTHEN, CAUTHEN_AUTHEN_DEFAULT, CAUTHEN_AUTHEN_TYPED, DISPATCHER } from '@owlmeans/auth';
|
|
2
2
|
import { modules as list } from '@owlmeans/auth-common';
|
|
3
3
|
import { handler } from '@owlmeans/client';
|
|
4
|
-
import { elevate, stab } from '@owlmeans/client-
|
|
4
|
+
import { elevate, stab } from '@owlmeans/client-entrypoint';
|
|
5
5
|
import { AuthenticationHOC } from './components/authentication/component.js';
|
|
6
6
|
elevate(list, AUTHEN);
|
|
7
7
|
elevate(list, AUTHEN_INIT, true);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"modules.js","sourceRoot":"","sources":["../../src/manager/modules.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,WAAW,EAAE,WAAW,EAAE,OAAO,EAAE,cAAc,EAAE,sBAAsB,EAAE,oBAAoB,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAA;AACnK,OAAO,EAAE,OAAO,IAAI,IAAI,EAAE,MAAM,uBAAuB,CAAA;AACvD,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAA;AAC1C,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"modules.js","sourceRoot":"","sources":["../../src/manager/modules.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,WAAW,EAAE,WAAW,EAAE,OAAO,EAAE,cAAc,EAAE,sBAAsB,EAAE,oBAAoB,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAA;AACnK,OAAO,EAAE,OAAO,IAAI,IAAI,EAAE,MAAM,uBAAuB,CAAA;AACvD,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAA;AAC1C,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,6BAA6B,CAAA;AAC3D,OAAO,EAAE,iBAAiB,EAAE,MAAM,0CAA0C,CAAA;AAE5E,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,CAAA;AACrB,OAAO,CAAC,IAAI,EAAE,WAAW,EAAE,IAAI,CAAC,CAAA;AAChC,OAAO,CAAC,IAAI,EAAE,aAAa,EAAE,IAAI,CAAC,CAAA;AAClC,OAAO,CAAC,IAAI,EAAE,WAAW,CAAC,CAAA;AAC1B,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,CAAA;AACtB,OAAO,CAAC,IAAI,EAAE,cAAc,CAAC,CAAA;AAC7B,OAAO,CAAC,IAAI,EAAE,sBAAsB,EAAE,OAAO,CAAC,iBAAiB,EAAE,CAAC,CAAC,CAAA;AACnE,OAAO,CAAC,IAAI,EAAE,oBAAoB,EAAE,OAAO,CAAC,iBAAiB,EAAE,CAAC,CAAC,CAAA;AACjE,OAAO,CAAC,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAA;AAEhD,MAAM,CAAC,MAAM,OAAO,GAAG,IAAI,CAAA"}
|
package/build/modules.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type {
|
|
2
|
-
export declare const modules:
|
|
1
|
+
import type { ClientEntrypoint } from '@owlmeans/client-entrypoint';
|
|
2
|
+
export declare const modules: ClientEntrypoint[];
|
|
3
3
|
export declare const setupExternalAuthentication: (service: string) => void;
|
|
4
4
|
//# sourceMappingURL=modules.d.ts.map
|
package/build/modules.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"modules.d.ts","sourceRoot":"","sources":["../src/modules.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"modules.d.ts","sourceRoot":"","sources":["../src/modules.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAA;AAInE,eAAO,MAAM,OAAO,EAAE,gBAAgB,EAA+B,CAAA;AAErE,eAAO,MAAM,2BAA2B,GAAI,SAAS,MAAM,SAE1D,CAAA"}
|
package/build/modules.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { elevate, stab } from '@owlmeans/client-
|
|
1
|
+
import { elevate, stab } from '@owlmeans/client-entrypoint';
|
|
2
2
|
import { modules as list } from '@owlmeans/auth-common';
|
|
3
3
|
import { CAUTHEN_FLOW_ENTER, DISPATCHER_AUTHEN } from '@owlmeans/auth';
|
|
4
4
|
elevate(list, DISPATCHER_AUTHEN);
|
package/build/modules.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"modules.js","sourceRoot":"","sources":["../src/modules.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"modules.js","sourceRoot":"","sources":["../src/modules.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,6BAA6B,CAAA;AAC3D,OAAO,EAAE,OAAO,IAAI,IAAI,EAAE,MAAM,uBAAuB,CAAA;AACvD,OAAO,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAA;AAGtE,OAAO,CAAC,IAAI,EAAE,iBAAiB,CAAC,CAAA;AAEhC,MAAM,CAAC,MAAM,OAAO,GAAuB,IAA0B,CAAA;AAErE,MAAM,CAAC,MAAM,2BAA2B,GAAG,CAAC,OAAe,EAAE,EAAE;IAC7D,OAAO,CAAC,IAAI,EAAE,kBAAkB,EAAE,IAAI,EAAE,EAAE,YAAY,EAAE,EAAE,SAAS,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC,CAAA;AACvF,CAAC,CAAA"}
|
package/build/service.js
CHANGED
|
@@ -12,7 +12,7 @@ export const makeAuthService = (alias = DEFAULT_ALIAS) => {
|
|
|
12
12
|
},
|
|
13
13
|
authenticate: async (token) => {
|
|
14
14
|
const context = assertContext(service.ctx, location);
|
|
15
|
-
const [authToken] = await context.
|
|
15
|
+
const [authToken] = await context.entrypoint(DISPATCHER_AUTHEN)
|
|
16
16
|
.call({ body: token });
|
|
17
17
|
await service.update(authToken.token);
|
|
18
18
|
},
|
package/build/service.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"service.js","sourceRoot":"","sources":["../src/service.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,OAAO,EAAE,MAAM,aAAa,CAAA;AACnE,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAA;AAEhE,OAAO,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAA;AAGtE,OAAO,EAAE,YAAY,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAA;AAC1E,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAA;AAEtD,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,QAAgB,aAAa,EAAe,EAAE;IAC5E,MAAM,QAAQ,GAAG,gBAAgB,KAAK,EAAE,CAAA;IACxC,MAAM,OAAO,GAAgB,aAAa,CAAc,KAAK,EAAE;QAC7D,KAAK,EAAE,KAAK,IAAI,EAAE,CAAC,OAAO,CAAC,aAAa,EAAE,IAAI,IAAI;QAElD,MAAM,EAAE,KAAK,IAAO,EAAE;YACpB,OAAO,KAAK,CAAM,CAAA;QACpB,CAAC;QAED,YAAY,EAAE,KAAK,EAAC,KAAK,EAAC,EAAE;YAC1B,MAAM,OAAO,GAAG,aAAa,CAAC,OAAO,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAA;YAEpD,MAAM,CAAC,SAAS,CAAC,GAAG,MAAM,OAAO,CAAC,
|
|
1
|
+
{"version":3,"file":"service.js","sourceRoot":"","sources":["../src/service.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,11 +1,13 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@owlmeans/client-auth",
|
|
3
|
-
"version": "0.1.
|
|
3
|
+
"version": "0.1.3",
|
|
4
|
+
"license": "MIT",
|
|
4
5
|
"type": "module",
|
|
5
6
|
"scripts": {
|
|
6
7
|
"build": "tsc -b",
|
|
7
8
|
"dev": "sleep 66 && nodemon -e ts,tsx,json --watch src --exec \"tsc -p ./tsconfig.json\"",
|
|
8
|
-
"watch": "tsc -b -w --preserveWatchOutput --pretty"
|
|
9
|
+
"watch": "tsc -b -w --preserveWatchOutput --pretty",
|
|
10
|
+
"test": "bun test ./tests"
|
|
9
11
|
},
|
|
10
12
|
"main": "build/index.js",
|
|
11
13
|
"module": "build/index.js",
|
|
@@ -41,24 +43,24 @@
|
|
|
41
43
|
}
|
|
42
44
|
},
|
|
43
45
|
"dependencies": {
|
|
44
|
-
"@owlmeans/auth": "^0.1.
|
|
45
|
-
"@owlmeans/auth-common": "^0.1.
|
|
46
|
-
"@owlmeans/basic-envelope": "^0.1.
|
|
47
|
-
"@owlmeans/basic-keys": "^0.1.
|
|
48
|
-
"@owlmeans/client": "^0.1.
|
|
49
|
-
"@owlmeans/client-context": "^0.1.
|
|
50
|
-
"@owlmeans/client-flow": "^0.1.
|
|
51
|
-
"@owlmeans/client-
|
|
52
|
-
"@owlmeans/client-resource": "^0.1.
|
|
53
|
-
"@owlmeans/client-socket": "^0.1.
|
|
54
|
-
"@owlmeans/context": "^0.1.
|
|
55
|
-
"@owlmeans/did": "^0.1.
|
|
56
|
-
"@owlmeans/error": "^0.1.
|
|
57
|
-
"@owlmeans/flow": "^0.1.
|
|
58
|
-
"@owlmeans/
|
|
59
|
-
"@owlmeans/resource": "^0.1.
|
|
60
|
-
"@owlmeans/socket": "^0.1.
|
|
61
|
-
"@owlmeans/web-flow": "^0.1.
|
|
46
|
+
"@owlmeans/auth": "^0.1.3",
|
|
47
|
+
"@owlmeans/auth-common": "^0.1.3",
|
|
48
|
+
"@owlmeans/basic-envelope": "^0.1.3",
|
|
49
|
+
"@owlmeans/basic-keys": "^0.1.3",
|
|
50
|
+
"@owlmeans/client": "^0.1.3",
|
|
51
|
+
"@owlmeans/client-context": "^0.1.3",
|
|
52
|
+
"@owlmeans/client-flow": "^0.1.3",
|
|
53
|
+
"@owlmeans/client-entrypoint": "^0.1.3",
|
|
54
|
+
"@owlmeans/client-resource": "^0.1.3",
|
|
55
|
+
"@owlmeans/client-socket": "^0.1.3",
|
|
56
|
+
"@owlmeans/context": "^0.1.3",
|
|
57
|
+
"@owlmeans/did": "^0.1.3",
|
|
58
|
+
"@owlmeans/error": "^0.1.3",
|
|
59
|
+
"@owlmeans/flow": "^0.1.3",
|
|
60
|
+
"@owlmeans/entrypoint": "^0.1.3",
|
|
61
|
+
"@owlmeans/resource": "^0.1.3",
|
|
62
|
+
"@owlmeans/socket": "^0.1.3",
|
|
63
|
+
"@owlmeans/web-flow": "^0.1.3",
|
|
62
64
|
"@scure/base": "^1.1.9"
|
|
63
65
|
},
|
|
64
66
|
"peerDependencies": {
|
|
@@ -66,10 +68,13 @@
|
|
|
66
68
|
"react": "*"
|
|
67
69
|
},
|
|
68
70
|
"devDependencies": {
|
|
71
|
+
"@owlmeans/dep-config": "workspace:*",
|
|
72
|
+
"@owlmeans/test-auth": "^0.1.2",
|
|
73
|
+
"@types/bun": "^1.3.0",
|
|
69
74
|
"@types/react": "^19.2.7",
|
|
70
75
|
"nodemon": "^3.1.11",
|
|
71
76
|
"npm-check": "^6.0.1",
|
|
72
|
-
"typescript": "^
|
|
77
|
+
"typescript": "^6.0.2"
|
|
73
78
|
},
|
|
74
79
|
"publishConfig": {
|
|
75
80
|
"access": "public"
|
|
@@ -13,7 +13,7 @@ import { DEFAULT_ALIAS as FLOW_SERVICE } from '@owlmeans/client-flow'
|
|
|
13
13
|
import { FLOW_PLACEHOLDER, OidcAuthStep, STD_OIDC_FLOW } from '@owlmeans/flow'
|
|
14
14
|
import { SERVICE_PARAM } from '@owlmeans/web-flow'
|
|
15
15
|
|
|
16
|
-
export const DispatcherHOC: TDispatcherHOC = Renderer => ({ context, params, alias, query }) => {
|
|
16
|
+
export const DispatcherHOC: TDispatcherHOC = Renderer => ({ context, params, alias, query, payload }) => {
|
|
17
17
|
const [forwarding, setForwarding] = useState<StateToken | undefined>()
|
|
18
18
|
|
|
19
19
|
const navigator = useNavigate()
|
|
@@ -41,7 +41,7 @@ export const DispatcherHOC: TDispatcherHOC = Renderer => ({ context, params, ali
|
|
|
41
41
|
// We do nothing if we are in the middle of a flow
|
|
42
42
|
if (await flow.supplied) {
|
|
43
43
|
const state = await flow.state()
|
|
44
|
-
// If the flow we are in already has a
|
|
44
|
+
// If the flow we are in already has a target, it means this is some flow
|
|
45
45
|
// that is really happening and we do not need to override it with our own.
|
|
46
46
|
// It's MAY BE required on the auth manager service side, cause this
|
|
47
47
|
// component is actually reused by both service and identity providers of OwlMeans.
|
|
@@ -56,6 +56,9 @@ export const DispatcherHOC: TDispatcherHOC = Renderer => ({ context, params, ali
|
|
|
56
56
|
) as string | undefined
|
|
57
57
|
if (target != null) {
|
|
58
58
|
model.target(target)
|
|
59
|
+
if (payload != null) {
|
|
60
|
+
model.updatePayload(payload)
|
|
61
|
+
}
|
|
59
62
|
} else if (model.state().flow === STD_OIDC_FLOW) {
|
|
60
63
|
const target = model.step().service
|
|
61
64
|
model.target(target)
|
|
@@ -2,13 +2,15 @@ import type { FC, PropsWithChildren } from 'react'
|
|
|
2
2
|
import type { RoutedComponent } from '@owlmeans/client'
|
|
3
3
|
import type { AuthToken } from '@owlmeans/auth'
|
|
4
4
|
import type { ClientContext, ClientConfig } from '@owlmeans/client-context'
|
|
5
|
-
import type { AbstractRequest } from '@owlmeans/
|
|
5
|
+
import type { AbstractRequest } from '@owlmeans/entrypoint'
|
|
6
|
+
import type { FlowPayload } from '@owlmeans/flow'
|
|
6
7
|
|
|
7
8
|
export interface DispatcherProps {
|
|
8
9
|
alias: string
|
|
9
10
|
params: AbstractRequest['params']
|
|
10
11
|
query?: AbstractRequest['query']
|
|
11
12
|
context: ClientContext<ClientConfig>
|
|
13
|
+
payload?: FlowPayload
|
|
12
14
|
}
|
|
13
15
|
|
|
14
16
|
export interface TDispatcherHOC {
|
package/src/helper.ts
CHANGED
|
@@ -1,23 +1,23 @@
|
|
|
1
|
-
import { useContext } from '@owlmeans/client'
|
|
2
|
-
import type {
|
|
3
|
-
import { provideRequest } from '@owlmeans/client-
|
|
1
|
+
import { useContext, useNavigate } from '@owlmeans/client'
|
|
2
|
+
import type { ClientEntrypoint } from '@owlmeans/client-entrypoint'
|
|
3
|
+
import { provideRequest } from '@owlmeans/client-entrypoint'
|
|
4
4
|
import { useWs as useWebSocket } from '@owlmeans/client-socket'
|
|
5
|
-
import type { AbstractRequest } from '@owlmeans/
|
|
5
|
+
import type { AbstractRequest } from '@owlmeans/entrypoint'
|
|
6
6
|
import type { AuthServiceAppend } from './types.js'
|
|
7
7
|
import { useEffect, useMemo, useState } from 'react'
|
|
8
8
|
import type { ClientContext } from '@owlmeans/client-context'
|
|
9
|
-
import { AUTH_QUERY } from '@owlmeans/auth'
|
|
10
|
-
import { useFlow } from '@owlmeans/web-flow'
|
|
11
|
-
import { DEFAULT_ENTITY } from './consts.js'
|
|
12
|
-
import { OidcAuthStep } from '@owlmeans/flow'
|
|
9
|
+
import { AUTH_QUERY, DISPATCHER } from '@owlmeans/auth'
|
|
10
|
+
// import { useFlow } from '@owlmeans/web-flow'
|
|
11
|
+
// import { DEFAULT_ENTITY } from './consts.js'
|
|
12
|
+
// import { OidcAuthStep } from '@owlmeans/flow'
|
|
13
13
|
|
|
14
14
|
export const useWs = (
|
|
15
|
-
module: string |
|
|
15
|
+
module: string | ClientEntrypoint<any>, _request?: Partial<AbstractRequest<any>>
|
|
16
16
|
) => {
|
|
17
17
|
const ctx = useContext() as unknown as AuthServiceAppend & ClientContext
|
|
18
18
|
|
|
19
19
|
const mod = useMemo(
|
|
20
|
-
() => typeof module === 'string' ? ctx.
|
|
20
|
+
() => typeof module === 'string' ? ctx.entrypoint<ClientEntrypoint>(module) : module, [module]
|
|
21
21
|
)
|
|
22
22
|
|
|
23
23
|
const request = useMemo(() => {
|
|
@@ -41,22 +41,24 @@ export const useWs = (
|
|
|
41
41
|
return useWebSocket(module, request)
|
|
42
42
|
}
|
|
43
43
|
|
|
44
|
-
export const useSelfAuth = (force: boolean = true
|
|
44
|
+
export const useSelfAuth = (force: boolean = true/*, entity: string = DEFAULT_ENTITY*/) => {
|
|
45
45
|
const context = useContext() as unknown as AuthServiceAppend & ClientContext
|
|
46
|
-
const flow = useFlow(context.cfg.shortAlias ?? context.cfg.service)
|
|
46
|
+
// const flow = useFlow(context.cfg.shortAlias ?? context.cfg.service)
|
|
47
47
|
const [authenticated, setAuthenticated] = useState(false)
|
|
48
|
+
const nav = useNavigate()
|
|
48
49
|
|
|
49
50
|
useEffect(() => {
|
|
50
|
-
if (flow == null) return
|
|
51
|
+
// if (flow == null) return
|
|
51
52
|
context.auth().authenticated().then(async auth => {
|
|
52
53
|
if (force && !auth) {
|
|
53
|
-
|
|
54
|
-
|
|
54
|
+
nav.go(DISPATCHER)
|
|
55
|
+
// flow.flow().entity(entity)
|
|
56
|
+
// await flow.proceed(flow.flow().transition(OidcAuthStep.Ephemeral))
|
|
55
57
|
}
|
|
56
58
|
|
|
57
59
|
setAuthenticated(!!auth)
|
|
58
60
|
})
|
|
59
|
-
}, [
|
|
61
|
+
}, [])
|
|
60
62
|
|
|
61
63
|
return authenticated
|
|
62
64
|
}
|
|
@@ -5,12 +5,12 @@ import {
|
|
|
5
5
|
import type { AllowanceResponse, AllowanceRequest, AuthToken, AuthCredentials } from '@owlmeans/auth'
|
|
6
6
|
import type { ClientContext } from '@owlmeans/client'
|
|
7
7
|
import type { ClientConfig } from '@owlmeans/client-context'
|
|
8
|
-
import type {
|
|
8
|
+
import type { ClientEntrypoint } from '@owlmeans/client-entrypoint'
|
|
9
9
|
import { AuthenCredError } from '../../errors.js'
|
|
10
10
|
import { plugins } from '../../plugins/index.js'
|
|
11
11
|
import { EnvelopeKind, makeEnvelopeModel } from '@owlmeans/basic-envelope'
|
|
12
12
|
import type { EnvelopeModel } from '@owlmeans/basic-envelope'
|
|
13
|
-
import {
|
|
13
|
+
import { EntrypointOutcome } from '@owlmeans/entrypoint'
|
|
14
14
|
import { DEFAULT_ALIAS as FLOW_SERVICE, FLOW_STATE } from '@owlmeans/client-flow'
|
|
15
15
|
import type { FlowService, StateResource } from '@owlmeans/client-flow'
|
|
16
16
|
import { CONTROL_STATE_ID } from './consts.js'
|
|
@@ -44,7 +44,7 @@ export const makeControl = (
|
|
|
44
44
|
control.beforeAuthenticate = plugins[control.type].beforeAuthenticate
|
|
45
45
|
control.afterAuthenticate = plugins[control.type].afterAuthenticate
|
|
46
46
|
|
|
47
|
-
const module = context.
|
|
47
|
+
const module = context.entrypoint<ClientEntrypoint<AllowanceResponse>>(AUTHEN_INIT)
|
|
48
48
|
const [allowance] = await module.call({ body: control.request })
|
|
49
49
|
|
|
50
50
|
control.allowance = allowance
|
|
@@ -89,10 +89,10 @@ export const makeControl = (
|
|
|
89
89
|
// We return back unwrapped challenge
|
|
90
90
|
credentials.challenge = control.allowance?.challenge
|
|
91
91
|
|
|
92
|
-
const [token, status] = await context.
|
|
92
|
+
const [token, status] = await context.entrypoint<ClientEntrypoint<AuthToken>>(AUTHEN_AUTHEN)
|
|
93
93
|
.call({ body: credentials })
|
|
94
94
|
|
|
95
|
-
if (status ===
|
|
95
|
+
if (status === EntrypointOutcome.Ok && token.token != null
|
|
96
96
|
&& token.token !== '' && control.afterAuthenticate != null) {
|
|
97
97
|
const resultingCred = makeEnvelopeModel<AuthCredentials>(token.token, EnvelopeKind.Token).message()
|
|
98
98
|
await control.afterAuthenticate(resultingCred, context)
|
package/src/manager/modules.ts
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
import { AUTHEN, AUTHEN_AUTHEN, AUTHEN_INIT, AUTHEN_RELY, CAUTHEN, CAUTHEN_AUTHEN, CAUTHEN_AUTHEN_DEFAULT, CAUTHEN_AUTHEN_TYPED, DISPATCHER } from '@owlmeans/auth'
|
|
3
3
|
import { modules as list } from '@owlmeans/auth-common'
|
|
4
4
|
import { handler } from '@owlmeans/client'
|
|
5
|
-
import { elevate, stab } from '@owlmeans/client-
|
|
5
|
+
import { elevate, stab } from '@owlmeans/client-entrypoint'
|
|
6
6
|
import { AuthenticationHOC } from './components/authentication/component.js'
|
|
7
7
|
|
|
8
8
|
elevate(list, AUTHEN)
|
package/src/modules.ts
CHANGED
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
|
|
2
|
-
import { elevate, stab } from '@owlmeans/client-
|
|
2
|
+
import { elevate, stab } from '@owlmeans/client-entrypoint'
|
|
3
3
|
import { modules as list } from '@owlmeans/auth-common'
|
|
4
4
|
import { CAUTHEN_FLOW_ENTER, DISPATCHER_AUTHEN } from '@owlmeans/auth'
|
|
5
|
-
import type {
|
|
5
|
+
import type { ClientEntrypoint } from '@owlmeans/client-entrypoint'
|
|
6
6
|
|
|
7
7
|
elevate(list, DISPATCHER_AUTHEN)
|
|
8
8
|
|
|
9
|
-
export const modules:
|
|
9
|
+
export const modules: ClientEntrypoint[] = list as ClientEntrypoint[]
|
|
10
10
|
|
|
11
11
|
export const setupExternalAuthentication = (service: string) => {
|
|
12
12
|
elevate(list, CAUTHEN_FLOW_ENTER, stab, { routeOptions: { overrides: { service } } })
|
package/src/service.ts
CHANGED
|
@@ -5,7 +5,7 @@ import { assertContext, createService } from '@owlmeans/context'
|
|
|
5
5
|
import type { ClientContext, ClientConfig } from '@owlmeans/client-context'
|
|
6
6
|
import { AuthorizationError, DISPATCHER_AUTHEN } from '@owlmeans/auth'
|
|
7
7
|
import type { Auth, AuthToken } from '@owlmeans/auth'
|
|
8
|
-
import type {
|
|
8
|
+
import type { ClientEntrypoint } from '@owlmeans/client-entrypoint'
|
|
9
9
|
import { EnvelopeKind, makeEnvelopeModel } from '@owlmeans/basic-envelope'
|
|
10
10
|
import { authMiddleware } from '@owlmeans/auth-common'
|
|
11
11
|
|
|
@@ -21,7 +21,7 @@ export const makeAuthService = (alias: string = DEFAULT_ALIAS): AuthService => {
|
|
|
21
21
|
authenticate: async token => {
|
|
22
22
|
const context = assertContext(service.ctx, location)
|
|
23
23
|
|
|
24
|
-
const [authToken] = await context.
|
|
24
|
+
const [authToken] = await context.entrypoint<ClientEntrypoint<AuthToken>>(DISPATCHER_AUTHEN)
|
|
25
25
|
.call({ body: token })
|
|
26
26
|
|
|
27
27
|
await service.update(authToken.token)
|
package/tests/context.ts
ADDED
|
@@ -0,0 +1,27 @@
|
|
|
1
|
+
import { AppType, Layer, makeBasicContext } from '@owlmeans/context'
|
|
2
|
+
import type { BasicConfig, BasicContext } from '@owlmeans/context'
|
|
3
|
+
import { createStaticResource } from '@owlmeans/static-resource'
|
|
4
|
+
import { AUTH_RESOURCE, DEFAULT_ALIAS } from '../src/consts.js'
|
|
5
|
+
import { makeAuthService } from '../src/service.js'
|
|
6
|
+
|
|
7
|
+
const RESOURCE_KEY = 'client-auth-test-store'
|
|
8
|
+
|
|
9
|
+
export const makeTestContext = () => {
|
|
10
|
+
const cfg: BasicConfig = {
|
|
11
|
+
ready: false,
|
|
12
|
+
service: 'client-auth-tests',
|
|
13
|
+
layer: Layer.Application,
|
|
14
|
+
type: AppType.Frontend,
|
|
15
|
+
services: {},
|
|
16
|
+
}
|
|
17
|
+
|
|
18
|
+
const context = makeBasicContext(cfg) as BasicContext<BasicConfig>
|
|
19
|
+
|
|
20
|
+
// AUTH_RESOURCE stores the bearer token record
|
|
21
|
+
context.registerResource(createStaticResource(AUTH_RESOURCE, RESOURCE_KEY))
|
|
22
|
+
|
|
23
|
+
// Register client auth service
|
|
24
|
+
context.registerService(makeAuthService(DEFAULT_ALIAS))
|
|
25
|
+
|
|
26
|
+
return context
|
|
27
|
+
}
|