response-standardizer 1.0.2 → 1.0.4

package/dist/index.d.ts

@@ -1,4 +1,3 @@
-import { Request, Response } from "express";
 import { RestResponseFunctions, RestMiddlewareFunctions } from "./types.js";
 declare global {
     namespace Express {
@@ -16,7 +15,6 @@ export declare const initKeycloak: (config: {
     service?: string;
     realm?: string;
 }) => Promise<void>;
-export declare const protect: (req: Request, res: Response, next: any) => void;
-export declare const role: (allowedRoles: string[]) => (req: any, res: any, next: any) => void;
+export declare const protect: (allowedRoles?: string[]) => (req: any, res: any, next: any) => void | ((req: any, res: any, next: any) => void);
 export declare const RestResponse: RestResponseFunctions;
 export declare const RestMiddleware: RestMiddlewareFunctions;

package/dist/index.js

@@ -11,24 +11,28 @@ export const initKeycloak = async (config) => {
     const key = resp.data.public_key;
     KEYCLOAK_PUBLIC_KEY = `-----BEGIN PUBLIC KEY-----\n${key.match(/.{1,64}/g)?.join("\n")}\n-----END PUBLIC KEY-----`;
 };
-export const protect = (req, res, next) => {
-    const authHeader = req.headers["authorization"];
-    if (!authHeader)
-        return RestResponse.unauthorized(req, res);
-    const token = authHeader.split(" ")[1];
-    if (!token)
-        return RestResponse.unauthorized(req, res, "Token malformed");
-    try {
-        const decoded = jwt.verify(token, KEYCLOAK_PUBLIC_KEY, { algorithms: ["RS256"] });
-        req.user = decoded;
-        next();
-    }
-    catch (err) {
-        console.error(err);
-        return RestResponse.unauthorized(req, res, "Token is not valid");
-    }
+export const protect = (allowedRoles) => {
+    return (req, res, next) => {
+        const authHeader = req.headers["authorization"];
+        if (!authHeader)
+            return RestResponse.unauthorized(req, res);
+        const token = authHeader.split(" ")[1];
+        if (!token)
+            return RestResponse.unauthorized(req, res, "Token malformed");
+        try {
+            const decoded = jwt.verify(token, KEYCLOAK_PUBLIC_KEY, { algorithms: ["RS256"] });
+            req.user = decoded;
+            if (allowedRoles)
+                return role(allowedRoles);
+            next();
+        }
+        catch (err) {
+            console.error(err);
+            return RestResponse.unauthorized(req, res, "Token is not valid");
+        }
+    };
 };
-export const role = (allowedRoles) => {
+const role = (allowedRoles) => {
     return (req, res, next) => {
         const user = req.user;
         if (!user) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "response-standardizer",
-  "version": "1.0.2",
+  "version": "1.0.4",
   "description": "Express middleware to standardize API responses",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/index.ts

@@ -26,25 +26,31 @@ export const initKeycloak = async (config: { service?: string; realm?: string })
   KEYCLOAK_PUBLIC_KEY = `-----BEGIN PUBLIC KEY-----\n${key.match(/.{1,64}/g)?.join("\n")}\n-----END PUBLIC KEY-----`;
 };
 
-export const protect = (req: Request, res: Response, next: any) => {
-  const authHeader = req.headers["authorization"];
-  if (!authHeader)
-      return RestResponse.unauthorized(req, res)
-
-  const token = authHeader.split(" ")[1];
-  if (!token) 
-    return RestResponse.unauthorized(req, res, "Token malformed")
-
-  try {
-    const decoded = jwt.verify(token, KEYCLOAK_PUBLIC_KEY, { algorithms: ["RS256"] });
-    (req as any).user = decoded;
-    next();
-  } catch (err) {
-    console.error(err)
-    return RestResponse.unauthorized(req, res, "Token is not valid")
-  }
+export const protect = (allowedRoles?: string[]) => {
+    return (req: any, res: any, next: any) => {
+        const authHeader = req.headers["authorization"];
+        if (!authHeader)
+            return RestResponse.unauthorized(req, res)
+
+        const token = authHeader.split(" ")[1];
+        if (!token) 
+            return RestResponse.unauthorized(req, res, "Token malformed")
+
+        try {
+            const decoded = jwt.verify(token, KEYCLOAK_PUBLIC_KEY, { algorithms: ["RS256"] });
+            (req as any).user = decoded;
+            if(allowedRoles)
+                return role(allowedRoles);
+            
+            next();
+        } catch (err) {
+            console.error(err)
+            return RestResponse.unauthorized(req, res, "Token is not valid")
+        }
+    }
+  
 }
-export const role = (allowedRoles: string[]) => {
+const role = (allowedRoles: string[]) => {
   return (req: any, res: any, next: any) => {
     const user = req.user;
     if (!user) {
@@ -66,7 +72,6 @@ export const role = (allowedRoles: string[]) => {
   }
   
 }
-
 const success = <T>(req: Request, res: Response, data: T, message: string | null = null) => {
     res.status(200).json({ data, message });
 };