@occupop/lib-auth 1.0.0 → 1.0.2

package/dist/index.d.ts

@@ -1,9 +1,8 @@
-import type { IncomingMessage, OutgoingMessage } from 'node:http';
+import type { IncomingMessage } from 'node:http';
 import { type AwilixContainer } from '@occupop/lib-container';
 type Request = IncomingMessage & {
     container?: AwilixContainer;
 };
-type Response = OutgoingMessage;
 export type AuthUser = {
     readonly userUuid: string;
     readonly hiringCompanyUuid?: string;
@@ -22,10 +21,12 @@ export declare function getAuthUser(req: Request): AuthUser | null;
 export declare function getScopedUser(req: Request): ScopedUser | null;
 export declare function makeAuthContextValueFunction<IContainer extends AwilixContainer>({ container }: {
     container: IContainer;
-}): (req: Request, res: Response) => {
+}): ({ req }: {
+    req: Request;
+}) => Promise<{
     container: AwilixContainer<any>;
-};
-export declare function makeAuthContextMiddlewareFunction<IContainer extends AwilixContainer>({ container }: {
+}>;
+export declare function makeAuthContextMiddleware<IContainer extends AwilixContainer>({ container, }: {
     container: IContainer;
-}): (req: Request, res: Response) => void;
+}): (req: Request) => Promise<void>;
 export {};

package/dist/index.js

@@ -1,14 +1,7 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getAuthUser = getAuthUser;
-exports.getScopedUser = getScopedUser;
-exports.makeAuthContextValueFunction = makeAuthContextValueFunction;
-exports.makeAuthContextMiddlewareFunction = makeAuthContextMiddlewareFunction;
-const lib_container_1 = require("@occupop/lib-container");
-const jsonwebtoken_1 = require("jsonwebtoken");
+import { asValue } from '@occupop/lib-container';
+import { verify } from 'jsonwebtoken';
 function getToken(req) {
-    var _a;
-    return (_a = req.headers.authorization) === null || _a === void 0 ? void 0 : _a.replace(/^Bearer /, '');
+    return req.headers.authorization?.replace(/^Bearer /, '');
 }
 function checkToken(token) {
     if (!token)
@@ -16,7 +9,7 @@ function checkToken(token) {
     if (!process.env.JWT_SECRET)
         throw 'Env var JWT_SECRET not set?';
     try {
-        return (0, jsonwebtoken_1.verify)(token, process.env.JWT_SECRET);
+        return verify(token, process.env.JWT_SECRET);
     }
     catch (e) {
         return null;
@@ -26,34 +19,34 @@ function getUserPayload(req) {
     const token = getToken(req);
     return checkToken(token);
 }
-function getAuthUser(req) {
+export function getAuthUser(req) {
     const user = getUserPayload(req);
-    if (user === null || user === void 0 ? void 0 : user.userUuid)
+    if (user?.userUuid)
         return user;
     return null;
 }
-function getScopedUser(req) {
+export function getScopedUser(req) {
     const user = getUserPayload(req);
     if (user && user.userUuid === undefined)
         return user;
     return null;
 }
-function makeAuthContextValueFunction({ container }) {
-    return (req, res) => {
+export function makeAuthContextValueFunction({ container }) {
+    return async ({ req }) => {
         const authUser = getAuthUser(req);
         const scopedUser = getScopedUser(req);
         const scopedContainer = container.createScope();
         if (authUser)
-            container.register('authUser', (0, lib_container_1.asValue)(authUser));
+            container.register('authUser', asValue(authUser));
         if (scopedUser)
-            container.register('scopedUser', (0, lib_container_1.asValue)(scopedUser));
+            container.register('scopedUser', asValue(scopedUser));
         return { container: scopedContainer };
     };
 }
-function makeAuthContextMiddlewareFunction({ container }) {
-    return (req, res) => {
+export function makeAuthContextMiddleware({ container, }) {
+    return async (req) => {
         const authContextValueFunction = makeAuthContextValueFunction({ container });
-        const contextValue = authContextValueFunction(req, res);
+        const contextValue = await authContextValueFunction({ req });
         req.container = contextValue.container;
     };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@occupop/lib-auth",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "main": "dist/index.js",
   "module": "index.ts",
   "description": "...",