@forklaunch/core 0.11.0 → 0.11.2

package/lib/http/index.mjs

@@ -74,16 +74,24 @@ function discriminateAuthMethod(auth) {
   if ("basic" in auth) {
     return {
       type: "basic",
-      auth: auth.basic
+      auth: {
+        decodeResource: auth.decodeResource,
+        login: auth.basic.login
+      }
     };
   } else if ("jwt" in auth) {
     return {
       type: "jwt",
-      auth: auth.jwt
+      auth: {
+        decodeResource: auth.decodeResource
+      }
     };
   } else {
     return {
-      type: "jwt"
+      type: "jwt",
+      auth: {
+        decodeResource: auth.decodeResource
+      }
     };
   }
 }
@@ -136,32 +144,38 @@ async function checkAuthorizationToken(authorizationMethod, authorizationToken,
         return invalidAuthorizationTokenFormat;
       }
       try {
-        const decodedJwt = await jwtVerify(
+        const decodedJwt = await auth?.decodeResource?.(token) ?? (await jwtVerify(
           token,
           new TextEncoder().encode(process.env.JWT_SECRET)
-        );
-        if (!decodedJwt.payload.sub) {
+        )).payload;
+        if (!decodedJwt) {
           return invalidAuthorizationSubject;
         }
-        resourceId = decodedJwt.payload.sub;
+        resourceId = decodedJwt;
       } catch (error) {
-        req.openTelemetryCollector.error(error);
+        req?.openTelemetryCollector.error(error);
         return invalidAuthorizationToken;
       }
       break;
     }
     case "basic": {
-      if (authorizationToken !== (authorizationMethod.tokenPrefix ?? "Basic")) {
-        return invalidAuthorizationTokenFormat;
-      }
-      const [username, password] = Buffer.from(token, "base64").toString("utf-8").split(":");
-      if (!username || !password) {
+      if (tokenPrefix !== (authorizationMethod.tokenPrefix ?? "Basic")) {
         return invalidAuthorizationTokenFormat;
       }
-      if (!auth.login(username, password)) {
-        return invalidAuthorizationLogin;
+      if (auth.decodeResource) {
+        resourceId = await auth.decodeResource(token);
+      } else {
+        const [username, password] = Buffer.from(token, "base64").toString("utf-8").split(":");
+        if (!username || !password) {
+          return invalidAuthorizationTokenFormat;
+        }
+        if (!auth.login(username, password)) {
+          return invalidAuthorizationLogin;
+        }
+        resourceId = {
+          sub: username
+        };
       }
-      resourceId = username;
       break;
     }
     default:
@@ -567,7 +581,18 @@ function parse(req, res, next) {
       enumerable: true,
       configurable: false
     });
-    req.headers = parsedRequest.value.headers ?? {};
+    const parsedHeaders = parsedRequest.value.headers ?? {};
+    req.headers = Object.keys(req.headers).reduce(
+      (acc, key) => {
+        if (parsedHeaders?.[key]) {
+          acc[key] = parsedHeaders[key];
+        } else {
+          acc[key] = req.headers[key];
+        }
+        return acc;
+      },
+      {}
+    );
   }
   if (!parsedRequest.ok) {
     switch (req.contractDetails.options?.requestValidation) {