response-standardizer 1.0.4 → 1.0.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. package/dist/index.d.ts +1 -1
  2. package/dist/index.js +17 -19
  3. package/package.json +1 -1
  4. package/src/index.ts +3 -6
package/dist/index.d.ts CHANGED
@@ -15,6 +15,6 @@ export declare const initKeycloak: (config: {
15
15
  service?: string;
16
16
  realm?: string;
17
17
  }) => Promise<void>;
18
- export declare const protect: (allowedRoles?: string[]) => (req: any, res: any, next: any) => void | ((req: any, res: any, next: any) => void);
18
+ export declare const protect: (allowedRoles?: string[]) => (req: any, res: any, next: any) => void;
19
19
  export declare const RestResponse: RestResponseFunctions;
20
20
  export declare const RestMiddleware: RestMiddlewareFunctions;
package/dist/index.js CHANGED
@@ -23,7 +23,7 @@ export const protect = (allowedRoles) => {
23
23
  const decoded = jwt.verify(token, KEYCLOAK_PUBLIC_KEY, { algorithms: ["RS256"] });
24
24
  req.user = decoded;
25
25
  if (allowedRoles)
26
- return role(allowedRoles);
26
+ return role(req, res, next, allowedRoles);
27
27
  next();
28
28
  }
29
29
  catch (err) {
@@ -32,24 +32,22 @@ export const protect = (allowedRoles) => {
32
32
  }
33
33
  };
34
34
  };
35
- const role = (allowedRoles) => {
36
- return (req, res, next) => {
37
- const user = req.user;
38
- if (!user) {
39
- return RestResponse.unauthorized(req, res);
40
- }
41
- const realmRoles = (user?.realm_access?.roles ?? []).map((r) => r.toUpperCase());
42
- const clientRoles = Object.values(user?.resource_access ?? {})
43
- .flatMap((r) => r.roles ?? [])
44
- .map((r) => r.toUpperCase());
45
- const allowedUpper = allowedRoles.map(r => r.toUpperCase());
46
- const allRoles = [...realmRoles, ...clientRoles];
47
- const hasAccess = allowedUpper.some((role) => allRoles.includes(role));
48
- if (!hasAccess) {
49
- return RestResponse.accessDenied(req, res);
50
- }
51
- next();
52
- };
35
+ const role = (req, res, next, allowedRoles) => {
36
+ const user = req.user;
37
+ if (!user) {
38
+ return RestResponse.unauthorized(req, res);
39
+ }
40
+ const realmRoles = (user?.realm_access?.roles ?? []).map((r) => r.toUpperCase());
41
+ const clientRoles = Object.values(user?.resource_access ?? {})
42
+ .flatMap((r) => r.roles ?? [])
43
+ .map((r) => r.toUpperCase());
44
+ const allowedUpper = allowedRoles.map(r => r.toUpperCase());
45
+ const allRoles = [...realmRoles, ...clientRoles];
46
+ const hasAccess = allowedUpper.some((role) => allRoles.includes(role));
47
+ if (!hasAccess) {
48
+ return RestResponse.accessDenied(req, res);
49
+ }
50
+ next();
53
51
  };
54
52
  const success = (req, res, data, message = null) => {
55
53
  res.status(200).json({ data, message });
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "response-standardizer",
3
- "version": "1.0.4",
3
+ "version": "1.0.5",
4
4
  "description": "Express middleware to standardize API responses",
5
5
  "main": "dist/index.js",
6
6
  "types": "dist/index.d.ts",
package/src/index.ts CHANGED
@@ -40,7 +40,7 @@ export const protect = (allowedRoles?: string[]) => {
40
40
  const decoded = jwt.verify(token, KEYCLOAK_PUBLIC_KEY, { algorithms: ["RS256"] });
41
41
  (req as any).user = decoded;
42
42
  if(allowedRoles)
43
- return role(allowedRoles);
43
+ return role(req, res, next, allowedRoles);
44
44
 
45
45
  next();
46
46
  } catch (err) {
@@ -50,9 +50,8 @@ export const protect = (allowedRoles?: string[]) => {
50
50
  }
51
51
 
52
52
  }
53
- const role = (allowedRoles: string[]) => {
54
- return (req: any, res: any, next: any) => {
55
- const user = req.user;
53
+ const role = (req: any, res: any, next: any, allowedRoles: string[]) => {
54
+ const user = req.user;
56
55
  if (!user) {
57
56
  return RestResponse.unauthorized(req, res);
58
57
  }
@@ -69,8 +68,6 @@ const role = (allowedRoles: string[]) => {
69
68
  return RestResponse.accessDenied(req, res)
70
69
  }
71
70
  next()
72
- }
73
-
74
71
  }
75
72
  const success = <T>(req: Request, res: Response, data: T, message: string | null = null) => {
76
73
  res.status(200).json({ data, message });