@authup/server-kit 1.0.0-beta.24 → 1.0.0-beta.26

package/LICENSE

@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2021-2024 Peter Placzek
+   Copyright 2021-2025 Peter Placzek <peter.placzek1996@gmail.com>
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

package/dist/crypto/json-web-token/extract.d.ts

@@ -4,8 +4,13 @@ import type { JWTClaims, JWTHeader } from '@authup/specs';
  *
  * @param token
  *
- * @throws TokenError
+ * @throws JWTError
  */
 export declare function extractTokenHeader(token: string): JWTHeader;
+/**
+ * @param token
+ *
+ * @throws JWTError
+ */
 export declare function extractTokenPayload(token: string): JWTClaims;
 //# sourceMappingURL=extract.d.ts.map

package/dist/crypto/json-web-token/extract.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"extract.d.ts","sourceRoot":"","sources":["../../../src/crypto/json-web-token/extract.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAG1D;;;;;;GAMG;AACH,wBAAgB,kBAAkB,CAC9B,KAAK,EAAE,MAAM,GACb,SAAS,CA6BZ;AAED,wBAAgB,mBAAmB,CAC/B,KAAK,EAAE,MAAM,GACb,SAAS,CAeZ"}
+{"version":3,"file":"extract.d.ts","sourceRoot":"","sources":["../../../src/crypto/json-web-token/extract.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAG1D;;;;;;GAMG;AACH,wBAAgB,kBAAkB,CAC9B,KAAK,EAAE,MAAM,GACb,SAAS,CA6BZ;AAED;;;;GAIG;AACH,wBAAgB,mBAAmB,CAC/B,KAAK,EAAE,MAAM,GACb,SAAS,CAeZ"}

package/dist/crypto/json-web-token/utils.d.ts

@@ -1,6 +1,6 @@
-import { JWTAlgorithm, TokenError } from '@authup/specs';
+import { JWTAlgorithm, JWTError } from '@authup/specs';
 import { Algorithm } from '@node-rs/jsonwebtoken';
-export declare function createErrorForJWTError(e: unknown): TokenError;
+export declare function createErrorForJWTError(e: unknown): JWTError;
 export declare function transformJWTAlgorithmToInternal(algorithm: `${JWTAlgorithm}`): Algorithm;
 export declare function transformInternalToJWTAlgorithm(input: Algorithm): JWTAlgorithm;
 //# sourceMappingURL=utils.d.ts.map

package/dist/crypto/json-web-token/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/crypto/json-web-token/utils.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AACzD,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAGlD,wBAAgB,sBAAsB,CAAC,CAAC,EAAE,OAAO,GAAI,UAAU,CA2C9D;AAED,wBAAgB,+BAA+B,CAAC,SAAS,EAAE,GAAG,YAAY,EAAE,GAAI,SAAS,CAsCxF;AAED,wBAAgB,+BAA+B,CAAC,KAAK,EAAE,SAAS,GAAI,YAAY,CA2B/E"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/crypto/json-web-token/utils.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACvD,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAGlD,wBAAgB,sBAAsB,CAAC,CAAC,EAAE,OAAO,GAAI,QAAQ,CA2C5D;AAED,wBAAgB,+BAA+B,CAAC,SAAS,EAAE,GAAG,YAAY,EAAE,GAAI,SAAS,CAsCxF;AAED,wBAAgB,+BAA+B,CAAC,KAAK,EAAE,SAAS,GAAI,YAAY,CA2B/E"}

package/dist/crypto/json-web-token/verify/module.d.ts

@@ -6,7 +6,7 @@ import type { TokenVerifyOptions } from './types';
  * @param token
  * @param context
  *
- * @throws TokenError
+ * @throws OAuth2Error
  */
 export declare function verifyToken(token: string, context: TokenVerifyOptions): Promise<OAuth2TokenPayload>;
 //# sourceMappingURL=module.d.ts.map

package/dist/crypto/key/container.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"container.d.ts","sourceRoot":"","sources":["../../../src/crypto/key/container.ts"],"names":[],"mappings":"AAgBA,OAAO,KAAK,EAAE,mCAAmC,EAAE,yBAAyB,EAAE,MAAM,SAAS,CAAC;AAE9F,qBAAa,kBAAkB;IAC3B,SAAS,CAAC,GAAG,EAAG,SAAS,CAAC;gBAEd,SAAS,EAAG,SAAS;IAM3B,aAAa,IAAI,OAAO,CAAC,WAAW,CAAC;IAYrC,YAAY,IAAI,OAAO,CAAC,UAAU,CAAC;IAKnC,QAAQ,IAAK,OAAO,CAAC,MAAM,CAAC;IAK5B,KAAK,IAAI,OAAO,CAAC,MAAM,CAAC;IAcxB,KAAK,IAAK,OAAO,CAAC,UAAU,CAAC;WAMtB,OAAO,CAAC,GAAG,EAAE,mCAAmC,CAAC,MAAM,CAAC,GAAG,OAAO,CAAC,kBAAkB,CAAC;WAOtF,UAAU,CACnB,GAAG,EAAE,yBAAyB,CAAC,MAAM,CAAC,GACtC,OAAO,CAAC,kBAAkB,CAAC;WASlB,eAAe,CACxB,GAAG,EAAE,yBAAyB,CAAC,WAAW,CAAC,GAC3C,OAAO,CAAC,kBAAkB,CAAC;CAoBlC"}
+{"version":3,"file":"container.d.ts","sourceRoot":"","sources":["../../../src/crypto/key/container.ts"],"names":[],"mappings":"AAiBA,OAAO,KAAK,EAAE,mCAAmC,EAAE,yBAAyB,EAAE,MAAM,SAAS,CAAC;AAE9F,qBAAa,kBAAkB;IAC3B,SAAS,CAAC,GAAG,EAAG,SAAS,CAAC;gBAEd,SAAS,EAAG,SAAS;IAM3B,aAAa,IAAI,OAAO,CAAC,WAAW,CAAC;IAYrC,YAAY,IAAI,OAAO,CAAC,UAAU,CAAC;IAKnC,QAAQ,IAAK,OAAO,CAAC,MAAM,CAAC;IAK5B,KAAK,IAAI,OAAO,CAAC,MAAM,CAAC;IAcxB,KAAK,IAAK,OAAO,CAAC,UAAU,CAAC;WAMtB,OAAO,CAAC,GAAG,EAAE,mCAAmC,CAAC,MAAM,CAAC,GAAG,OAAO,CAAC,kBAAkB,CAAC;WAOtF,UAAU,CACnB,GAAG,EAAE,yBAAyB,CAAC,MAAM,CAAC,GACtC,OAAO,CAAC,kBAAkB,CAAC;WASlB,eAAe,CACxB,GAAG,EAAE,yBAAyB,CAAC,WAAW,CAAC,GAC3C,OAAO,CAAC,kBAAkB,CAAC;CAoBlC"}

package/dist/crypto/key-asymmetric/create.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"create.d.ts","sourceRoot":"","sources":["../../../src/crypto/key-asymmetric/create.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,mCAAmC,EAAE,MAAM,SAAS,CAAC;AAEnE,wBAAsB,uBAAuB,CAAC,OAAO,EAAE,mCAAmC,GAAI,OAAO,CAAC,aAAa,CAAC,CAOnH"}
+{"version":3,"file":"create.d.ts","sourceRoot":"","sources":["../../../src/crypto/key-asymmetric/create.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,mCAAmC,EAAE,MAAM,SAAS,CAAC;AAEnE,wBAAsB,uBAAuB,CAAC,OAAO,EAAE,mCAAmC,GAAI,OAAO,CAAC,aAAa,CAAC,CAOnH"}

package/dist/crypto/key-symmetric/create.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"create.d.ts","sourceRoot":"","sources":["../../../src/crypto/key-symmetric/create.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,8BAA8B,EAAE,MAAM,SAAS,CAAC;AAE9D,wBAAsB,kBAAkB,CAAC,KAAK,EAAE,8BAA8B,GAAI,OAAO,CAAC,SAAS,CAAC,CAQnG"}
+{"version":3,"file":"create.d.ts","sourceRoot":"","sources":["../../../src/crypto/key-symmetric/create.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,8BAA8B,EAAE,MAAM,SAAS,CAAC;AAE9D,wBAAsB,kBAAkB,CAAC,KAAK,EAAE,8BAA8B,GAAI,OAAO,CAAC,SAAS,CAAC,CAQnG"}

package/dist/index.cjs

@@ -1,6 +1,7 @@
 'use strict';
 
 var bcrypt = require('@node-rs/bcrypt');
+var uncrypto = require('uncrypto');
 var kit = require('@authup/kit');
 var specs = require('@authup/specs');
 var jsonwebtoken = require('@node-rs/jsonwebtoken');
@@ -145,7 +146,7 @@ function normalizeAsymmetricKeyImportOptions(options) {
 
 async function createAsymmetricKeyPair(options) {
     const optionsNormalized = normalizeAsymmetricKeyPairCreateOptions(options);
-    return crypto.subtle.generateKey(optionsNormalized, true, getKeyUsagesForAsymmetricAlgorithm(optionsNormalized.name));
+    return uncrypto.subtle.generateKey(optionsNormalized, true, getKeyUsagesForAsymmetricAlgorithm(optionsNormalized.name));
 }
 
 /*
@@ -236,7 +237,7 @@ function getKeyUsagesForSymmetricAlgorithm(name) {
 
 async function createSymmetricKey(input) {
     const optionsNormalized = normalizeSymmetricKeyCreateOptions(input);
-    return crypto.subtle.generateKey(optionsNormalized, true, getKeyUsagesForSymmetricAlgorithm(optionsNormalized.name));
+    return uncrypto.subtle.generateKey(optionsNormalized, true, getKeyUsagesForSymmetricAlgorithm(optionsNormalized.name));
 }
 
 function getKeyUsagesForAlgorithm(name, format) {
@@ -253,12 +254,12 @@ class CryptoKeyContainer {
     // ----------------------------------------------
     async toArrayBuffer() {
         if (this.key.type === 'private') {
-            return crypto.subtle.exportKey('pkcs8', this.key);
+            return uncrypto.subtle.exportKey('pkcs8', this.key);
         }
         if (this.key.type === 'public') {
-            return crypto.subtle.exportKey('spki', this.key);
+            return uncrypto.subtle.exportKey('spki', this.key);
         }
-        return crypto.subtle.exportKey('raw', this.key);
+        return uncrypto.subtle.exportKey('raw', this.key);
     }
     async toUint8Array() {
         const arrayBuffer = await this.toArrayBuffer();
@@ -279,7 +280,7 @@ class CryptoKeyContainer {
         throw new Error('A symmetric key can not be encoded as PEM');
     }
     async toJWK() {
-        return crypto.subtle.exportKey('jwk', this.key);
+        return uncrypto.subtle.exportKey('jwk', this.key);
     }
     // ----------------------------------------------
     static async fromPem(ctx) {
@@ -310,7 +311,7 @@ class CryptoKeyContainer {
         } else {
             throw new SyntaxError(`Format ${ctx.format} is not supported.`);
         }
-        const cryptoKey = await crypto.subtle.importKey(ctx.format, ctx.key, normalizedOptions, true, getKeyUsagesForAlgorithm(normalizedOptions.name, ctx.format));
+        const cryptoKey = await uncrypto.subtle.importKey(ctx.format, ctx.key, normalizedOptions, true, getKeyUsagesForAlgorithm(normalizedOptions.name, ctx.format));
         return new CryptoKeyContainer(cryptoKey);
     }
     constructor(cryptoKey){
@@ -323,11 +324,11 @@ class CryptoKeyContainer {
  *
  * @param token
  *
- * @throws TokenError
+ * @throws JWTError
  */ function extractTokenHeader(token) {
     const parts = token.split('.');
     if (parts.length !== 3) {
-        throw specs.TokenError.payloadInvalid('The token format is not valid.');
+        throw specs.JWTError.invalid();
     }
     const [headerBase64] = parts;
     try {
@@ -346,20 +347,24 @@ class CryptoKeyContainer {
             'x5t#S256': header.x5TS256CertThumbprint,
         };
          */ } catch (e) {
-        throw specs.TokenError.headerInvalid('The token header could not be extracted.');
+        throw specs.JWTError.headerInvalid('The token header could not be extracted.');
     }
 }
-function extractTokenPayload(token) {
+/**
+ * @param token
+ *
+ * @throws JWTError
+ */ function extractTokenPayload(token) {
     const parts = token.split('.');
     if (parts.length !== 3) {
-        throw specs.TokenError.payloadInvalid('The token format is not valid.');
+        throw specs.JWTError.invalid();
     }
     const [, payloadBase64] = parts;
     try {
         const payload = atob(payloadBase64);
         return JSON.parse(payload);
     } catch (e) {
-        throw specs.TokenError.payloadInvalid('The token payload could not be extracted.');
+        throw specs.JWTError.payloadInvalid('The token payload could not be extracted.');
     }
 }
 
@@ -369,19 +374,19 @@ function createErrorForJWTError(e) {
             switch(e.name){
                 case 'TokenExpiredError':
                     {
-                        return specs.TokenError.expired();
+                        return specs.JWTError.expired();
                     }
                 case 'NotBeforeError':
                     {
                         if (typeof e.date === 'string' || e.date instanceof Date) {
-                            return specs.TokenError.notActiveBefore(e.date);
+                            return specs.JWTError.notActiveBefore(e.date);
                         }
                         break;
                     }
                 case 'JsonWebTokenError':
                     {
                         if (typeof e.message === 'string') {
-                            return specs.TokenError.payloadInvalid(e.message);
+                            return specs.JWTError.payloadInvalid(e.message);
                         }
                         break;
                     }
@@ -391,20 +396,20 @@ function createErrorForJWTError(e) {
         switch(e.message){
             case 'ExpiredSignature':
                 {
-                    return specs.TokenError.expired();
+                    return specs.JWTError.expired();
                 }
             case 'ImmatureSignature':
                 {
-                    return specs.TokenError.notActiveBefore();
+                    return specs.JWTError.notActiveBefore();
                 }
             case 'InvalidToken':
             case 'InvalidSignature':
                 {
-                    return specs.TokenError.payloadInvalid();
+                    return specs.JWTError.payloadInvalid();
                 }
         }
     }
-    return new specs.TokenError({
+    return new specs.JWTError({
         cause: e,
         logMessage: true,
         message: 'The JWT error could not be determined.'
@@ -506,7 +511,7 @@ async function signToken(claims, context) {
                 });
             }
     }
-    throw new specs.TokenError();
+    throw new specs.OAuth2Error();
 }
 
 /**
@@ -515,7 +520,7 @@ async function signToken(claims, context) {
  * @param token
  * @param context
  *
- * @throws TokenError
+ * @throws OAuth2Error
  */ async function verifyToken(token, context) {
     let promise;
     let output;
@@ -578,7 +583,7 @@ async function signToken(claims, context) {
         throw createErrorForJWTError(e);
     }
     if (typeof output === 'undefined') {
-        throw new specs.TokenError({
+        throw new specs.OAuth2Error({
             message: 'Invalid type.'
         });
     }
@@ -602,6 +607,9 @@ function useRedisClient() {
 }
 
 class MemoryCacheAdapter {
+    async has(key) {
+        return this.instance.has(key);
+    }
     async get(key) {
         return this.instance.get(key);
     }
@@ -645,6 +653,10 @@ class RedisCacheAdapter {
     async get(key) {
         return this.instance.get(key);
     }
+    async has(key) {
+        const output = await this.get(key);
+        return typeof output !== 'undefined';
+    }
     async set(key, value, options) {
         await this.instance.set(key, value, {
             milliseconds: options.ttl