@twin.org/api-auth-entity-storage-service 0.0.1-next.27 → 0.0.1-next.29

package/dist/cjs/index.cjs

@@ -71,13 +71,12 @@ class TokenHelper {
      * @returns The new token and its expiry date.
      */
     static async createToken(vaultConnector, signingKeyName, subject, ttlMinutes) {
-        // Verify was a success so we can now generate a new token.
         const nowSeconds = Math.trunc(Date.now() / 1000);
         const ttlSeconds = ttlMinutes * 60;
-        const jwt = await web.Jwt.encodeWithSigner({ alg: web.JwtAlgorithms.EdDSA }, {
+        const jwt = await web.Jwt.encodeWithSigner({ alg: "EdDSA" }, {
             sub: subject,
             exp: nowSeconds + ttlSeconds
-        }, async (alg, key, payload) => vaultConnector.sign(signingKeyName, payload));
+        }, async (header, payload) => vaultModels.VaultConnectorHelper.jwtSigner(vaultConnector, signingKeyName, header, payload));
         return {
             token: jwt,
             expiry: (nowSeconds + ttlSeconds) * 1000
@@ -95,14 +94,10 @@ class TokenHelper {
         if (!core.Is.stringValue(token)) {
             throw new core.UnauthorizedError(this._CLASS_NAME, "missing");
         }
-        const decoded = await web.Jwt.verifyWithVerifier(token, async (alg, key, payload, signature) => vaultConnector.verify(signingKeyName, payload, signature));
-        // If the signature validation failed or some of the header/payload data
-        // is not properly populated then it is unauthorized.
-        if (!decoded.verified ||
-            !core.Is.object(decoded.header) ||
-            !core.Is.object(decoded.payload) ||
-            !core.Is.stringValue(decoded.payload.sub)) {
-            throw new core.UnauthorizedError(this._CLASS_NAME, "invalidToken");
+        const decoded = await web.Jwt.verifyWithVerifier(token, async (t) => vaultModels.VaultConnectorHelper.jwtVerifier(vaultConnector, signingKeyName, t));
+        // If some of the header/payload data is not properly populated then it is unauthorized.
+        if (!core.Is.stringValue(decoded.payload.sub)) {
+            throw new core.UnauthorizedError(this._CLASS_NAME, "payloadMissingSubject");
         }
         else if (!core.Is.empty(decoded.payload?.exp) &&
             decoded.payload.exp < Math.trunc(Date.now() / 1000)) {

package/dist/esm/index.mjs

@@ -1,8 +1,8 @@
 import { property, entity, EntitySchemaFactory, EntitySchemaHelper } from '@twin.org/entity';
 import { HttpErrorHelper } from '@twin.org/api-models';
 import { Is, UnauthorizedError, Guards, BaseError, ComponentFactory, Converter, GeneralError } from '@twin.org/core';
-import { VaultConnectorFactory } from '@twin.org/vault-models';
-import { Jwt, JwtAlgorithms, HeaderTypes, HttpStatusCode } from '@twin.org/web';
+import { VaultConnectorHelper, VaultConnectorFactory } from '@twin.org/vault-models';
+import { Jwt, HeaderTypes, HttpStatusCode } from '@twin.org/web';
 import { EntityStorageConnectorFactory } from '@twin.org/entity-storage-models';
 import { Blake2b } from '@twin.org/crypto';
 
@@ -69,13 +69,12 @@ class TokenHelper {
      * @returns The new token and its expiry date.
      */
     static async createToken(vaultConnector, signingKeyName, subject, ttlMinutes) {
-        // Verify was a success so we can now generate a new token.
         const nowSeconds = Math.trunc(Date.now() / 1000);
         const ttlSeconds = ttlMinutes * 60;
-        const jwt = await Jwt.encodeWithSigner({ alg: JwtAlgorithms.EdDSA }, {
+        const jwt = await Jwt.encodeWithSigner({ alg: "EdDSA" }, {
             sub: subject,
             exp: nowSeconds + ttlSeconds
-        }, async (alg, key, payload) => vaultConnector.sign(signingKeyName, payload));
+        }, async (header, payload) => VaultConnectorHelper.jwtSigner(vaultConnector, signingKeyName, header, payload));
         return {
             token: jwt,
             expiry: (nowSeconds + ttlSeconds) * 1000
@@ -93,14 +92,10 @@ class TokenHelper {
         if (!Is.stringValue(token)) {
             throw new UnauthorizedError(this._CLASS_NAME, "missing");
         }
-        const decoded = await Jwt.verifyWithVerifier(token, async (alg, key, payload, signature) => vaultConnector.verify(signingKeyName, payload, signature));
-        // If the signature validation failed or some of the header/payload data
-        // is not properly populated then it is unauthorized.
-        if (!decoded.verified ||
-            !Is.object(decoded.header) ||
-            !Is.object(decoded.payload) ||
-            !Is.stringValue(decoded.payload.sub)) {
-            throw new UnauthorizedError(this._CLASS_NAME, "invalidToken");
+        const decoded = await Jwt.verifyWithVerifier(token, async (t) => VaultConnectorHelper.jwtVerifier(vaultConnector, signingKeyName, t));
+        // If some of the header/payload data is not properly populated then it is unauthorized.
+        if (!Is.stringValue(decoded.payload.sub)) {
+            throw new UnauthorizedError(this._CLASS_NAME, "payloadMissingSubject");
         }
         else if (!Is.empty(decoded.payload?.exp) &&
             decoded.payload.exp < Math.trunc(Date.now() / 1000)) {

package/dist/types/utils/tokenHelper.d.ts

@@ -1,4 +1,4 @@
-import type { IVaultConnector } from "@twin.org/vault-models";
+import { type IVaultConnector } from "@twin.org/vault-models";
 import { type IHttpHeaders, type IJwtHeader, type IJwtPayload } from "@twin.org/web";
 /**
  * Helper class for token operations.

package/docs/changelog.md

@@ -1,5 +1,5 @@
 # @twin.org/api-auth-entity-storage-service - Changelog
 
-## v0.0.1-next.27
+## v0.0.1-next.29
 
 - Initial Release

package/locales/en.json

@@ -11,7 +11,7 @@
 		},
 		"tokenHelper": {
 			"missing": "The JSON Web token could not be found in the authorization header",
-			"invalid": "The JSON Web token signature could not be validated",
+			"payloadMissingSubject": "The JSON Web token payload does not contain a subject",
 			"expired": "The JSON Web token has expired"
 		}
 	}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@twin.org/api-auth-entity-storage-service",
-	"version": "0.0.1-next.27",
+	"version": "0.0.1-next.29",
 	"description": "Auth Entity Storage contract implementation and REST endpoint definitions",
 	"repository": {
 		"type": "git",
@@ -14,9 +14,9 @@
 		"node": ">=20.0.0"
 	},
 	"dependencies": {
-		"@twin.org/api-auth-entity-storage-models": "0.0.1-next.27",
-		"@twin.org/api-core": "0.0.1-next.27",
-		"@twin.org/api-models": "0.0.1-next.27",
+		"@twin.org/api-auth-entity-storage-models": "0.0.1-next.29",
+		"@twin.org/api-core": "0.0.1-next.29",
+		"@twin.org/api-models": "0.0.1-next.29",
 		"@twin.org/core": "next",
 		"@twin.org/crypto": "next",
 		"@twin.org/entity": "next",