@toa.io/extensions.exposition 1.0.0-alpha.92 → 1.0.0-alpha.93

package/components/identity.federation/source/types/context.ts

@@ -53,15 +53,3 @@ export interface IdToken {
   iat: number
   nbf?: number
 }
-
-export interface AuthenticateInput {
-  authority: string
-  credentials: string
-}
-
-export interface AuthenticateOutput {
-  identity: {
-    id: string
-    claim: Pick<IdToken, 'iss' | 'sub' | 'aud'>
-  }
-}

package/features/access.feature

@@ -421,12 +421,12 @@ Feature: Access authorization
       """
       403 Forbidden
 
-      Basic authentication scheme is required to access this resource.
+      Basic authentication scheme is required to access this resource
       """
 
   Scenario: Adding a role without required permissions
 
-  Trunk directives should not be applied to the Identity management resources.
+  Trunk directives should not be applied to the Identity management resources
 
     Given the annotation:
       """yaml

package/features/authorities.federation.feature

@@ -1,5 +1,15 @@
 Feature: OIDC tokens with authorities
 
+  Background:
+    Given local IDP is running
+    And the `identity.federation` database is empty
+    And the `identity.federation` configuration:
+      """yaml
+      trust:
+        - iss: http://localhost:44444
+      """
+
+
   Scenario: OIDC tokens are scoped to authorities
     Given the annotation:
       """yaml
@@ -11,13 +21,6 @@ Feature: OIDC tokens with authorities
           GET:
             dev:stub: Hello
       """
-    And local IDP is running
-    And the `identity.federation` database is empty
-    And the `identity.federation` configuration:
-      """yaml
-      trust:
-        - iss: http://localhost:44444
-      """
     And the IDP token for One is issued
     And the IDP token for Two is issued
 
@@ -29,7 +32,7 @@ Feature: OIDC tokens with authorities
       accept: application/yaml
       content-type: application/yaml
 
-      credentials: ${{ One.id_token }}
+      token: ${{ One.id_token }}
       """
     Then the following reply is sent:
       """
@@ -44,7 +47,7 @@ Feature: OIDC tokens with authorities
       accept: application/yaml
       content-type: application/yaml
 
-      credentials: ${{ Two.id_token }}
+      token: ${{ Two.id_token }}
       """
     Then the following reply is sent:
       """

package/features/etag.feature

@@ -176,7 +176,7 @@ Feature: Optimistic concurrency control
       """
       400 Bad Request
 
-      Invalid ETag.
+      Invalid ETag
       """
 
   Scenario: Etag with non-queryable operation

package/features/identity.basic.feature

@@ -207,7 +207,7 @@ Feature: Basic authentication
       422 Unprocessable Entity
 
       code: <code>
-      message: <problem> is not meeting the requirements.
+      message: <problem> is not meeting the requirements
       """
     Examples:
       | username                                                                                                                          | password    | problem  | code             |
@@ -318,7 +318,7 @@ Feature: Basic authentication
       422 Unprocessable Entity
 
       code: PRINCIPAL_LOCKED
-      message: Principal username cannot be changed.
+      message: Principal username cannot be changed
       """
 
   Scenario: Creating an Identity using inception with existing credentials

package/features/identity.federation.feature

@@ -18,7 +18,6 @@ Feature: Identity Federation
       host: nex.toa.io
       authorization: Bearer ${{ User.id_token }}
       accept: application/yaml
-      content-type: application/yaml
       """
     Then the following reply is sent:
       """
@@ -76,7 +75,6 @@ Feature: Identity Federation
       host: nex.toa.io
       authorization: Bearer ${{ GoodUser.id_token }}
       accept: application/yaml
-      content-type: application/yaml
       """
     Then the following reply is sent:
       """
@@ -206,3 +204,60 @@ Feature: Identity Federation
       roles:
         - system
       """
+
+  Scenario: Adding federation to an existing identity
+    Given the `identity.federation` configuration:
+      """yaml
+      trust:
+        - iss: http://localhost:44444
+      """
+    And the `identity.basic` database is empty
+
+    # create an identity
+    When the following request is received:
+      """
+      POST /identity/basic/ HTTP/1.1
+      host: nex.toa.io
+      content-type: application/yaml
+      accept: application/yaml
+
+      username: #{{ id | set Bob.username }}
+      password: #{{ password 8 | set Bob.password }}
+      """
+    Then the following reply is sent:
+      """
+      201 Created
+
+      id: ${{ Bob.id }}
+      """
+
+    When the IDP token for Bob is issued
+
+    # add federation
+    When the following request is received:
+      """
+      POST /identity/federation/${{ User.id }}/ HTTP/1.1
+      host: nex.toa.io
+      authorization: Basic #{{ basic Bob }}
+      content-type: application/yaml
+      accept: application/yaml
+
+      credentials: ${{ Bob.id_token }}
+      """
+    Then the following reply is sent:
+      """
+      201 Created
+      """
+    And the following request is received:
+      """
+      GET /identity/ HTTP/1.1
+      host: nex.toa.io
+      authorization: Bearer ${{ Bob.id_token }}
+      accept: application/yaml
+      """
+    Then the following reply is sent:
+      """
+      200 OK
+
+      id: ${{ Bob.id }}
+      """

package/features/octets.feature

@@ -243,5 +243,5 @@ Feature: Octets directive family
       404 Not Found
       content-type: text/plain
 
-      Trailing slash is redundant.
+      Trailing slash is redundant
       """

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@toa.io/extensions.exposition",
-  "version": "1.0.0-alpha.92",
+  "version": "1.0.0-alpha.93",
   "description": "Toa Exposition",
   "author": "temich <tema.gurtovoy@gmail.com>",
   "homepage": "https://github.com/toa-io/toa#readme",
@@ -18,9 +18,9 @@
   },
   "dependencies": {
     "@isaacs/ttlcache": "1.4.1",
-    "@toa.io/core": "1.0.0-alpha.92",
-    "@toa.io/generic": "1.0.0-alpha.63",
-    "@toa.io/schemas": "1.0.0-alpha.63",
+    "@toa.io/core": "1.0.0-alpha.93",
+    "@toa.io/generic": "1.0.0-alpha.93",
+    "@toa.io/schemas": "1.0.0-alpha.93",
     "bcryptjs": "2.4.3",
     "error-value": "0.3.0",
     "http-cache-semantics": "4.1.1",
@@ -28,7 +28,7 @@
     "matchacho": "0.3.5",
     "msgpackr": "1.10.1",
     "negotiator": "0.6.3",
-    "openspan": "1.0.0-alpha.92",
+    "openspan": "1.0.0-alpha.93",
     "paseto": "3.1.4"
   },
   "jest": {
@@ -50,13 +50,13 @@
     "features:octets": "cucumber-js features/octets.*"
   },
   "devDependencies": {
-    "@toa.io/agent": "1.0.0-alpha.79",
-    "@toa.io/extensions.storages": "1.0.0-alpha.92",
+    "@toa.io/agent": "1.0.0-alpha.93",
+    "@toa.io/extensions.storages": "1.0.0-alpha.93",
     "@types/bcryptjs": "2.4.3",
     "@types/cors": "2.8.13",
     "@types/http-cache-semantics": "4.0.4",
     "@types/negotiator": "0.6.1",
     "jest-esbuild": "0.3.0"
   },
-  "gitHead": "975ee5af6194354efb6dd8c646b22a89c4d96f7a"
+  "gitHead": "8538b10fed0e3f692b6a5b74dbafb9dcbcdd6a47"
 }

package/source/directives/flow/Compose.ts

@@ -56,7 +56,7 @@ function json (node: object | string): string {
       return node
 
   if (Array.isArray(node))
-    return `[${node.map((v) => json(v)).join(',')}]`
+    return `[${node.map((v) => json(v as object | string)).join(',')}]`
 
   if (node.constructor !== Object)
     return JSON.stringify(node)

package/transpiled/directives/flow/Compose.js.map

@@ -1 +1 @@
-{"version":3,"file":"Compose.js","sourceRoot":"","sources":["../../../source/directives/flow/Compose.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6CAAkC;AAClC,oDAAqC;AACrC,6CAAsC;AACtC,uCAAkC;AAKlC,MAAa,OAAO;IACD,UAAU,CAAY;IAEvC,YAAoB,WAAgB;QAClC,IAAI,CAAC,UAAU,GAAG,OAAO,CAAC,WAAqB,CAAC,CAAA;IAClD,CAAC;IAEM,MAAM,CAAE,OAAgB;QAC7B,OAAO,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,EAAE,OAAwB,EAAE,EAAE;YACjE,IAAI,CAAC,CAAC,OAAO,CAAC,IAAI,YAAY,sBAAQ,CAAC,EAAE,CAAC;gBACxC,kBAAO,CAAC,IAAI,CAAC,qDAAqD,CAAC,CAAA;gBAEnE,OAAM;YACR,CAAC;YAED,MAAM,CAAC,EAAE,CAAC,OAAO,CAAC,IAAI,YAAY,sBAAQ,EAAE,+BAA+B,CAAC,CAAA;YAE5E,uEAAuE;YACvE,MAAM,CAAC,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,cAAc,CAAC,UAAU,EAAE,uCAAuC,CAAC,CAAA;YAE1F,MAAM,CAAC,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;YAE1C,OAAO,CAAC,IAAI,GAAG,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAA;QACnC,CAAC,CAAC,CAAA;IACJ,CAAC;IAEO,KAAK,CAAC,OAAO,CAAE,MAAgB;QACrC,MAAM,CAAC,GAAc,EAAE,CAAA;QAEvB,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAA;QAEzC,MAAM,IAAA,kBAAI,EAAC,MAAM,EAAE,KAAK,CAAC,CAAA;QAEzB,OAAO,CAAC,CAAA;IACV,CAAC;CACF;AAnCD,0BAmCC;AAED,SAAS,OAAO,CAAE,WAAmB;IACnC,0EAA0E;IAC1E,OAAO,IAAI,QAAQ,CAAC,GAAG,EAAE,UAAU,IAAI,CAAC,WAAW,CAAC,EAAE,CAAe,CAAA;AACvE,CAAC;AAED,SAAS,IAAI,CAAE,IAAqB;IAClC,IAAI,OAAO,IAAI,KAAK,QAAQ;QAC1B,IAAI,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC;YACvB,OAAO,IAAI,IAAI,GAAG,CAAA;;YAElB,OAAO,IAAI,CAAA;IAEf,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC;QACrB,OAAO,IAAI,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAA;IAElD,IAAI,IAAI,CAAC,WAAW,KAAK,MAAM;QAC7B,OAAO,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAA;IAE7B,OAAO,GAAG,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC;SAC9B,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,IAAI,GAAG,MAAM,IAAI,CAAC,KAAwB,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,GAAG,CAAA;AACzF,CAAC"}
+{"version":3,"file":"Compose.js","sourceRoot":"","sources":["../../../source/directives/flow/Compose.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6CAAkC;AAClC,oDAAqC;AACrC,6CAAsC;AACtC,uCAAkC;AAKlC,MAAa,OAAO;IACD,UAAU,CAAY;IAEvC,YAAoB,WAAgB;QAClC,IAAI,CAAC,UAAU,GAAG,OAAO,CAAC,WAAqB,CAAC,CAAA;IAClD,CAAC;IAEM,MAAM,CAAE,OAAgB;QAC7B,OAAO,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,EAAE,OAAwB,EAAE,EAAE;YACjE,IAAI,CAAC,CAAC,OAAO,CAAC,IAAI,YAAY,sBAAQ,CAAC,EAAE,CAAC;gBACxC,kBAAO,CAAC,IAAI,CAAC,qDAAqD,CAAC,CAAA;gBAEnE,OAAM;YACR,CAAC;YAED,MAAM,CAAC,EAAE,CAAC,OAAO,CAAC,IAAI,YAAY,sBAAQ,EAAE,+BAA+B,CAAC,CAAA;YAE5E,uEAAuE;YACvE,MAAM,CAAC,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,cAAc,CAAC,UAAU,EAAE,uCAAuC,CAAC,CAAA;YAE1F,MAAM,CAAC,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;YAE1C,OAAO,CAAC,IAAI,GAAG,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAA;QACnC,CAAC,CAAC,CAAA;IACJ,CAAC;IAEO,KAAK,CAAC,OAAO,CAAE,MAAgB;QACrC,MAAM,CAAC,GAAc,EAAE,CAAA;QAEvB,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAA;QAEzC,MAAM,IAAA,kBAAI,EAAC,MAAM,EAAE,KAAK,CAAC,CAAA;QAEzB,OAAO,CAAC,CAAA;IACV,CAAC;CACF;AAnCD,0BAmCC;AAED,SAAS,OAAO,CAAE,WAAmB;IACnC,0EAA0E;IAC1E,OAAO,IAAI,QAAQ,CAAC,GAAG,EAAE,UAAU,IAAI,CAAC,WAAW,CAAC,EAAE,CAAe,CAAA;AACvE,CAAC;AAED,SAAS,IAAI,CAAE,IAAqB;IAClC,IAAI,OAAO,IAAI,KAAK,QAAQ;QAC1B,IAAI,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC;YACvB,OAAO,IAAI,IAAI,GAAG,CAAA;;YAElB,OAAO,IAAI,CAAA;IAEf,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC;QACrB,OAAO,IAAI,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,CAAoB,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAA;IAErE,IAAI,IAAI,CAAC,WAAW,KAAK,MAAM;QAC7B,OAAO,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAA;IAE7B,OAAO,GAAG,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC;SAC9B,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,IAAI,GAAG,MAAM,IAAI,CAAC,KAAwB,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,GAAG,CAAA;AACzF,CAAC"}