@doffy-gittix/common 1.0.6 → 1.0.9

package/build/index.d.ts

@@ -1,4 +1,3 @@
 export * from './errors/index.js';
 export * from './middleware/index.js';
-export * from './config.js';
 //# sourceMappingURL=index.d.ts.map

package/build/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,mBAAmB,CAAC;AAClC,cAAc,uBAAuB,CAAC;AACtC,cAAc,aAAa,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,mBAAmB,CAAC;AAClC,cAAc,uBAAuB,CAAC"}

package/build/index.js

@@ -1,4 +1,3 @@
 export * from './errors/index.js';
 export * from './middleware/index.js';
-export * from './config.js';
 //# sourceMappingURL=index.js.map

package/build/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,mBAAmB,CAAC;AAClC,cAAc,uBAAuB,CAAC;AACtC,cAAc,aAAa,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,mBAAmB,CAAC;AAClC,cAAc,uBAAuB,CAAC"}

package/build/middleware/get-current-user-handler.d.ts

@@ -7,10 +7,10 @@ declare global {
     namespace Express {
         interface Request {
             currentUser?: CurrentUser | null;
-            session?: Record<string, string>;
+            session?: Record<string, string> | null;
         }
     }
 }
-export declare const getCurrentUserHandler: (req: Request, _res: Response, next: NextFunction) => void;
+export declare const useCurrentUserHandler: (config: Record<string, string>) => (req: Request, _res: Response, next: NextFunction) => void;
 export {};
 //# sourceMappingURL=get-current-user-handler.d.ts.map

package/build/middleware/get-current-user-handler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"get-current-user-handler.d.ts","sourceRoot":"","sources":["../../src/middleware/get-current-user-handler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAI/D,UAAU,WAAW;IACnB,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,MAAM,CAAC;CACf;AAED,OAAO,CAAC,MAAM,CAAC;IACb,UAAU,OAAO,CAAC;QAChB,UAAU,OAAO;YACf,WAAW,CAAC,EAAE,WAAW,GAAG,IAAI,CAAC;YACjC,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;SAClC;KACF;CACF;AAED,eAAO,MAAM,qBAAqB,GAChC,KAAK,OAAO,EACZ,MAAM,QAAQ,EACd,MAAM,YAAY,SAcnB,CAAC"}
+{"version":3,"file":"get-current-user-handler.d.ts","sourceRoot":"","sources":["../../src/middleware/get-current-user-handler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAG/D,UAAU,WAAW;IACnB,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,MAAM,CAAC;CACf;AAED,OAAO,CAAC,MAAM,CAAC;IACb,UAAU,OAAO,CAAC;QAChB,UAAU,OAAO;YACf,WAAW,CAAC,EAAE,WAAW,GAAG,IAAI,CAAC;YACjC,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,IAAI,CAAC;SACzC;KACF;CACF;AAwBD,eAAO,MAAM,qBAAqB,GAChC,QAAQ,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,WAnBzB,OAAO,QACN,QAAQ,QACR,YAAY,SA0BnB,CAAC"}

package/build/middleware/get-current-user-handler.js

@@ -1,13 +1,14 @@
 import jwt from 'jsonwebtoken';
-import { COOKIE_NAME, JWT_KEY } from '../config.js';
-export const getCurrentUserHandler = (req, _res, next) => {
-    const token = COOKIE_NAME && req.session?.[COOKIE_NAME];
+let cookieName = '';
+let jwtKey = '';
+const getCurrentUserHandler = (req, _res, next) => {
+    const token = req.session?.[cookieName];
     if (!token) {
         req.currentUser = null;
         return next();
     }
     try {
-        const verifiedUser = jwt.verify(token, JWT_KEY);
+        const verifiedUser = jwt.verify(token, jwtKey);
         req.currentUser = verifiedUser;
     }
     catch (error) {
@@ -15,4 +16,13 @@ export const getCurrentUserHandler = (req, _res, next) => {
     }
     next();
 };
+export const useCurrentUserHandler = (config) => {
+    const { COOKIE_NAME, JWT_KEY } = config;
+    if (!COOKIE_NAME || !JWT_KEY) {
+        throw new Error('config required');
+    }
+    cookieName = COOKIE_NAME;
+    jwtKey = JWT_KEY;
+    return getCurrentUserHandler;
+};
 //# sourceMappingURL=get-current-user-handler.js.map

package/build/middleware/get-current-user-handler.js.map

@@ -1 +1 @@
-{"version":3,"file":"get-current-user-handler.js","sourceRoot":"","sources":["../../src/middleware/get-current-user-handler.ts"],"names":[],"mappings":"AACA,OAAO,GAAG,MAAM,cAAc,CAAC;AAC/B,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAgBpD,MAAM,CAAC,MAAM,qBAAqB,GAAG,CACnC,GAAY,EACZ,IAAc,EACd,IAAkB,EAClB,EAAE;IACF,MAAM,KAAK,GAAG,WAAW,IAAI,GAAG,CAAC,OAAO,EAAE,CAAC,WAAW,CAAC,CAAC;IACxD,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,GAAG,CAAC,WAAW,GAAG,IAAI,CAAC;QACvB,OAAO,IAAI,EAAE,CAAC;IAChB,CAAC;IACD,IAAI,CAAC;QACH,MAAM,YAAY,GAAG,GAAG,CAAC,MAAM,CAAC,KAAK,EAAE,OAAQ,CAAgB,CAAC;QAChE,GAAG,CAAC,WAAW,GAAG,YAAY,CAAC;IACjC,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,GAAG,CAAC,WAAW,GAAG,IAAI,CAAC;IACzB,CAAC;IACD,IAAI,EAAE,CAAC;AACT,CAAC,CAAC"}
+{"version":3,"file":"get-current-user-handler.js","sourceRoot":"","sources":["../../src/middleware/get-current-user-handler.ts"],"names":[],"mappings":"AACA,OAAO,GAAG,MAAM,cAAc,CAAC;AAgB/B,IAAI,UAAU,GAAG,EAAE,CAAC;AACpB,IAAI,MAAM,GAAG,EAAE,CAAC;AAEhB,MAAM,qBAAqB,GAAG,CAC5B,GAAY,EACZ,IAAc,EACd,IAAkB,EAClB,EAAE;IACF,MAAM,KAAK,GAAG,GAAG,CAAC,OAAO,EAAE,CAAC,UAAU,CAAC,CAAC;IACxC,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,GAAG,CAAC,WAAW,GAAG,IAAI,CAAC;QACvB,OAAO,IAAI,EAAE,CAAC;IAChB,CAAC;IACD,IAAI,CAAC;QACH,MAAM,YAAY,GAAG,GAAG,CAAC,MAAM,CAAC,KAAK,EAAE,MAAM,CAAgB,CAAC;QAC9D,GAAG,CAAC,WAAW,GAAG,YAAY,CAAC;IACjC,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,GAAG,CAAC,WAAW,GAAG,IAAI,CAAC;IACzB,CAAC;IACD,IAAI,EAAE,CAAC;AACT,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,qBAAqB,GAAG,CACnC,MAA8B,EAC9B,EAAE;IACF,MAAM,EAAE,WAAW,EAAE,OAAO,EAAE,GAAG,MAAM,CAAC;IACxC,IAAI,CAAC,WAAW,IAAI,CAAC,OAAO,EAAE,CAAC;QAC7B,MAAM,IAAI,KAAK,CAAC,iBAAiB,CAAC,CAAC;IACrC,CAAC;IACD,UAAU,GAAG,WAAW,CAAC;IACzB,MAAM,GAAG,OAAO,CAAC;IACjB,OAAO,qBAAqB,CAAC;AAC/B,CAAC,CAAC"}

package/package.json

@@ -1,31 +1,31 @@
-{
-  "name": "@doffy-gittix/common",
-  "version": "1.0.6",
-  "description": "",
-  "main": "./build/index.js",
-  "types": "./build/index.d.ts",
-  "files": [
-    "build/**/*"
-  ],
-  "scripts": {
-    "build": "del-cli build && tsc",
-    "pub": "npm version patch && git add . && git commit -m \"[upd] common\" && git push && npm publish"
-  },
-  "keywords": [],
-  "author": "",
-  "license": "ISC",
-  "type": "module",
-  "devDependencies": {
-    "del-cli": "^7.0.0",
-    "typescript": "^6.0.3"
-  },
-  "dependencies": {
-    "@types/express": "^5.0.6",
-    "@types/express-validator": "^2.20.33",
-    "@types/jsonwebtoken": "^9.0.10",
-    "express": "^5.2.1",
-    "express-validator": "^7.3.2",
-    "jsonwebtoken": "^9.0.3",
-    "ts-node": "^10.9.2"
-  }
-}
+{
+  "name": "@doffy-gittix/common",
+  "version": "1.0.9",
+  "description": "",
+  "main": "./build/index.js",
+  "types": "./build/index.d.ts",
+  "files": [
+    "build/**/*"
+  ],
+  "scripts": {
+    "build": "del-cli build && tsc",
+    "pub": "npm run build && npm version patch && git add . && git commit -m \"[upd] common\" && git push && npm publish"
+  },
+  "keywords": [],
+  "author": "",
+  "license": "ISC",
+  "type": "module",
+  "devDependencies": {
+    "del-cli": "^7.0.0",
+    "typescript": "^6.0.3"
+  },
+  "dependencies": {
+    "@types/express": "^5.0.6",
+    "@types/express-validator": "^2.20.33",
+    "@types/jsonwebtoken": "^9.0.10",
+    "express": "^5.2.1",
+    "express-validator": "^7.3.2",
+    "jsonwebtoken": "^9.0.3",
+    "ts-node": "^10.9.2"
+  }
+}

package/build/config.d.ts

@@ -1,4 +0,0 @@
-export declare const COOKIE_NAME: string | undefined;
-export declare const COOKIE_KEY: string | undefined;
-export declare const JWT_KEY: string | undefined;
-//# sourceMappingURL=config.d.ts.map

package/build/config.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,WAAW,oBAA0B,CAAC;AACnD,eAAO,MAAM,UAAU,oBAAyB,CAAC;AACjD,eAAO,MAAM,OAAO,oBAAsB,CAAC"}

package/build/config.js

@@ -1,4 +0,0 @@
-export const COOKIE_NAME = process.env.COOKIE_NAME;
-export const COOKIE_KEY = process.env.COOKIE_KEY;
-export const JWT_KEY = process.env.JWT_KEY;
-//# sourceMappingURL=config.js.map

package/build/config.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,WAAW,GAAG,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC;AACnD,MAAM,CAAC,MAAM,UAAU,GAAG,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC;AACjD,MAAM,CAAC,MAAM,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC"}