@toa.io/extensions.exposition 1.0.0-alpha.195 → 1.0.0-alpha.197

package/components/identity.federation/source/incept.ts

@@ -1,21 +1,23 @@
-import { Err } from 'error-value'
-import { decode } from './lib'
+import { decode, exchange, type Ctx } from './lib'
 import type { Request } from '@toa.io/types'
 import type { Context, Entity, TransitInput, Scheme } from './types'
 
 export async function effect (input: Input, context: Context): Promise<Output | Error> {
-  if (input.scheme === 'code') return ERR_SCHEME
-
-  const payload = await decode(input.credentials, {
+  const ctx: Ctx = {
     trust: context.configuration.trust,
     logs: context.logs
-  })
+  }
+
+  const claims = input.scheme === 'bearer'
+    ? await decode(input.credentials, ctx)
+    : await exchange(input.credentials, ctx)
 
-  if (payload instanceof Error)
-    return payload
 
-  const { iss, sub } = payload
-  const request: Request<TransitInput> = { input: { authority: input.authority, iss, sub } satisfies Omit<Entity, 'id'> }
+  if (claims instanceof Error)
+    return claims
+
+  const { iss, sub } = claims
+  const request: Request<TransitInput> = { input: { authority: input.authority, iss, sub } }
 
   if (input.id !== undefined)
     request.query = { id: input.id }
@@ -23,12 +25,10 @@ export async function effect (input: Input, context: Context): Promise<Output |
   return await context.local.transit(request)
 }
 
-const ERR_SCHEME = new Err('ERR_SCHEME', 'Unsupported scheme')
-
 export interface Input {
   authority: string
+  scheme: Scheme
   credentials: string
-  scheme?: Scheme
   id?: string
 }
 

package/components/identity.otp/manifest.toa.yaml

@@ -11,6 +11,7 @@ entity:
     properties: &properties
       authority: { type: string }
       username: { type: string }
+      identity: *id
     required: [authority, username]
   index:
     username:

package/components/identity.otp/operations/authenticate.js

@@ -13,15 +13,16 @@ async function effect(input, context) {
         context.logs.debug('OTP code not found', { key });
         return ERR_EXPIRED;
     }
-    const identity = await context.local.ensure({
+    const entry = await context.local.ensure({
         entity: {
             authority,
             username
         }
     });
-    if (identity === null)
+    if (entry === null)
         return ERR_NOT_FOUND;
-    return { identity: { id: identity.id } };
+    const id = entry.identity ?? entry.id;
+    return { identity: { id } };
 }
 exports.effect = effect;
 const ERR_INVALID_CREDENTIALS = new error_value_1.Err('INVALID_CREDENTIALS');

package/components/identity.otp/operations/authenticate.js.map

@@ -1 +1 @@
-{"version":3,"file":"authenticate.js","sourceRoot":"","sources":["../source/authenticate.ts"],"names":[],"mappings":";;;AAAA,6CAAiC;AAG1B,KAAK,UAAU,MAAM,CAAE,KAAY,EAAE,OAAgB;IAC1D,MAAM,EAAE,SAAS,EAAE,WAAW,EAAE,GAAG,KAAK,CAAA;IACxC,MAAM,CAAC,QAAQ,EAAE,IAAI,CAAC,GAAG,MAAM,CAAC,IAAI,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC,QAAQ,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;IAEjF,IAAI,IAAI,KAAK,SAAS;QACpB,OAAO,uBAAuB,CAAA;IAEhC,MAAM,GAAG,GAAG,GAAG,SAAS,IAAI,QAAQ,IAAI,IAAI,EAAE,CAAA;IAC9C,MAAM,CAAC,GAAG,MAAM,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;IAEtC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;QACZ,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,oBAAoB,EAAE,EAAE,GAAG,EAAE,CAAC,CAAA;QAEjD,OAAO,WAAW,CAAA;IACpB,CAAC;IAED,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC;QAC1C,MAAM,EAAE;YACN,SAAS;YACT,QAAQ;SACT;KACF,CAAC,CAAA;IAEF,IAAI,QAAQ,KAAK,IAAI;QACnB,OAAO,aAAa,CAAA;IAEtB,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,EAAE,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAA;AAC1C,CAAC;AA3BD,wBA2BC;AAED,MAAM,uBAAuB,GAAG,IAAI,iBAAG,CAAC,qBAAqB,CAAC,CAAA;AAC9D,MAAM,WAAW,GAAG,IAAI,iBAAG,CAAC,SAAS,CAAC,CAAA;AACtC,MAAM,aAAa,GAAG,IAAI,iBAAG,CAAC,WAAW,CAAC,CAAA"}
+{"version":3,"file":"authenticate.js","sourceRoot":"","sources":["../source/authenticate.ts"],"names":[],"mappings":";;;AAAA,6CAAiC;AAG1B,KAAK,UAAU,MAAM,CAAE,KAAY,EAAE,OAAgB;IAC1D,MAAM,EAAE,SAAS,EAAE,WAAW,EAAE,GAAG,KAAK,CAAA;IACxC,MAAM,CAAC,QAAQ,EAAE,IAAI,CAAC,GAAG,MAAM,CAAC,IAAI,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC,QAAQ,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;IAEjF,IAAI,IAAI,KAAK,SAAS;QACpB,OAAO,uBAAuB,CAAA;IAEhC,MAAM,GAAG,GAAG,GAAG,SAAS,IAAI,QAAQ,IAAI,IAAI,EAAE,CAAA;IAC9C,MAAM,CAAC,GAAG,MAAM,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;IAEtC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;QACZ,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,oBAAoB,EAAE,EAAE,GAAG,EAAE,CAAC,CAAA;QAEjD,OAAO,WAAW,CAAA;IACpB,CAAC;IAED,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC;QACvC,MAAM,EAAE;YACN,SAAS;YACT,QAAQ;SACT;KACF,CAAC,CAAA;IAEF,IAAI,KAAK,KAAK,IAAI;QAChB,OAAO,aAAa,CAAA;IAEtB,MAAM,EAAE,GAAG,KAAK,CAAC,QAAQ,IAAI,KAAK,CAAC,EAAE,CAAA;IAErC,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,EAAE,EAAE,CAAA;AAC7B,CAAC;AA7BD,wBA6BC;AAED,MAAM,uBAAuB,GAAG,IAAI,iBAAG,CAAC,qBAAqB,CAAC,CAAA;AAC9D,MAAM,WAAW,GAAG,IAAI,iBAAG,CAAC,SAAS,CAAC,CAAA;AACtC,MAAM,aAAa,GAAG,IAAI,iBAAG,CAAC,WAAW,CAAC,CAAA"}

package/components/identity.otp/operations/issue.js

@@ -6,12 +6,13 @@ async function effect(input, context) {
     const code = Math.floor(100000 + Math.random() * 900000).toString();
     const key = `${authority}:${username}:${code}`;
     const lifetime = input.lifetime ?? context.configuration.lifetime;
+    debugger;
     if (identity !== undefined)
         await context.local.ensure({
             entity: {
-                id: identity,
                 authority,
-                username
+                username,
+                identity,
             }
         });
     context.logs.debug('Issue OTP', { authority, username, identity, code, lifetime });

package/components/identity.otp/operations/issue.js.map

@@ -1 +1 @@
-{"version":3,"file":"issue.js","sourceRoot":"","sources":["../source/issue.ts"],"names":[],"mappings":";;;AAEO,KAAK,UAAU,MAAM,CAAE,KAAY,EAAE,OAAgB;IAC1D,MAAM,EAAE,SAAS,EAAE,QAAQ,EAAE,QAAQ,EAAE,GAAG,KAAK,CAAA;IAC/C,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,EAAE,GAAG,MAAM,CAAC,CAAC,QAAQ,EAAE,CAAA;IACnE,MAAM,GAAG,GAAG,GAAG,SAAS,IAAI,QAAQ,IAAI,IAAI,EAAE,CAAA;IAC9C,MAAM,QAAQ,GAAG,KAAK,CAAC,QAAQ,IAAI,OAAO,CAAC,aAAa,CAAC,QAAQ,CAAA;IAEjE,IAAI,QAAQ,KAAK,SAAS;QACxB,MAAM,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC;YACzB,MAAM,EAAE;gBACN,EAAE,EAAE,QAAQ;gBACZ,SAAS;gBACT,QAAQ;aACT;SACF,CAAC,CAAA;IAGJ,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,WAAW,EAAE,EAAE,SAAS,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,CAAA;IAElF,MAAM,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAA;IAE/C,OAAO,EAAE,IAAI,EAAE,CAAA;AACjB,CAAC;AArBD,wBAqBC"}
+{"version":3,"file":"issue.js","sourceRoot":"","sources":["../source/issue.ts"],"names":[],"mappings":";;;AAEO,KAAK,UAAU,MAAM,CAAE,KAAY,EAAE,OAAgB;IAC1D,MAAM,EAAE,SAAS,EAAE,QAAQ,EAAE,QAAQ,EAAE,GAAG,KAAK,CAAA;IAC/C,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,EAAE,GAAG,MAAM,CAAC,CAAC,QAAQ,EAAE,CAAA;IACnE,MAAM,GAAG,GAAG,GAAG,SAAS,IAAI,QAAQ,IAAI,IAAI,EAAE,CAAA;IAC9C,MAAM,QAAQ,GAAG,KAAK,CAAC,QAAQ,IAAI,OAAO,CAAC,aAAa,CAAC,QAAQ,CAAA;IAEjE,QAAQ,CAAA;IAER,IAAI,QAAQ,KAAK,SAAS;QACxB,MAAM,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC;YACzB,MAAM,EAAE;gBACN,SAAS;gBACT,QAAQ;gBACR,QAAQ;aACT;SACF,CAAC,CAAA;IAGJ,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,WAAW,EAAE,EAAE,SAAS,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,CAAA;IAElF,MAAM,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAA;IAE/C,OAAO,EAAE,IAAI,EAAE,CAAA;AACjB,CAAC;AAvBD,wBAuBC"}

package/components/identity.otp/operations/lib/Entity.d.ts

@@ -2,4 +2,5 @@ export interface Entity {
     id: string;
     authority: string;
     username: string;
+    identity?: string;
 }