protonfile-auth 1.6.4 → 1.6.5

package/lib/services/session.js

@@ -1,81 +1,81 @@
-"use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.deleteSession = exports.clearSessionCookie = exports.setSessionCookie = exports.compareSessionTokenVersion = exports.bumpSessionToken = exports.verifySessionToken = exports.createSessionToken = void 0;
-const jsonwebtoken_1 = require("jsonwebtoken");
-const Session_1 = require("../Entities/Session");
-const createSessionToken = (payload, version) => {
-    return (0, jsonwebtoken_1.sign)({
-        user_id: payload.user_id,
-        version: version || 0,
-        session_id: payload.session_id,
-    }, process.env.SESSION_TOKEN_KEY, {
-        expiresIn: '7d',
-    });
-};
-exports.createSessionToken = createSessionToken;
-const verifySessionToken = (token) => {
-    return (0, jsonwebtoken_1.verify)(token, process.env.SESSION_TOKEN_KEY);
-};
-exports.verifySessionToken = verifySessionToken;
-const bumpSessionToken = (jwtSession) => {
-    return new Promise((resolve, reject) => __awaiter(void 0, void 0, void 0, function* () {
-        const session = yield Session_1.Session.findOne({
-            session_id: jwtSession.session_id,
-        });
-        if (!session)
-            return reject('Token not found');
-        try {
-            const newToken = (0, exports.createSessionToken)({ user_id: session.user_id, session_id: session.session_id }, session.version + 1);
-            Session_1.Session.update({ session_id: session.session_id }, {
-                version: session.version + 1,
-                last_used: (Date.now() / 1000).toFixed(0).toString(),
-            });
-            resolve(newToken);
-        }
-        catch (err) {
-            reject(err);
-        }
-    }));
-};
-exports.bumpSessionToken = bumpSessionToken;
-const compareSessionTokenVersion = (jwtSession) => __awaiter(void 0, void 0, void 0, function* () {
-    const session = yield Session_1.Session.findOne({ session_id: jwtSession.session_id });
-    if (!session)
-        throw 'Session not found';
-    if (session.version > jwtSession.version)
-        throw 'Token expired';
-});
-exports.compareSessionTokenVersion = compareSessionTokenVersion;
-const setSessionCookie = (res, value) => __awaiter(void 0, void 0, void 0, function* () {
-    const currentTime = Math.floor(new Date().getTime() / 1000);
-    const weekExpiration = currentTime + 86400 * 7; // adds 7 days to timestamp
-    res.cookie('pid', value, {
-        sameSite: 'none',
-        expires: new Date(weekExpiration * 1000),
-        httpOnly: true,
-        secure: process.env.NODE_ENV === 'production' ? true : false,
-    });
-});
-exports.setSessionCookie = setSessionCookie;
-const clearSessionCookie = (res) => __awaiter(void 0, void 0, void 0, function* () {
-    return res.clearCookie('pid');
-});
-exports.clearSessionCookie = clearSessionCookie;
-const deleteSession = (session_id) => __awaiter(void 0, void 0, void 0, function* () {
-    const session = yield Session_1.Session.findOne({ session_id });
-    if (!session) {
-        throw 'Session not found';
-    }
-    session.remove();
-    return session;
-});
-exports.deleteSession = deleteSession;
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.deleteSession = exports.clearSessionCookie = exports.setSessionCookie = exports.compareSessionTokenVersion = exports.bumpSessionToken = exports.verifySessionToken = exports.createSessionToken = void 0;
+const jsonwebtoken_1 = require("jsonwebtoken");
+const Session_1 = require("../Entities/Session");
+const createSessionToken = (payload, version) => {
+    return (0, jsonwebtoken_1.sign)({
+        user_id: payload.user_id,
+        version: version || 0,
+        session_id: payload.session_id,
+    }, process.env.SESSION_TOKEN_KEY, {
+        expiresIn: '7d',
+    });
+};
+exports.createSessionToken = createSessionToken;
+const verifySessionToken = (token) => {
+    return (0, jsonwebtoken_1.verify)(token, process.env.SESSION_TOKEN_KEY);
+};
+exports.verifySessionToken = verifySessionToken;
+const bumpSessionToken = (jwtSession) => {
+    return new Promise((resolve, reject) => __awaiter(void 0, void 0, void 0, function* () {
+        const session = yield Session_1.Session.findOne({
+            where: { session_id: jwtSession.session_id },
+        });
+        if (!session)
+            return reject('Token not found');
+        try {
+            const newToken = (0, exports.createSessionToken)({ user_id: session.user_id, session_id: session.session_id }, session.version + 1);
+            Session_1.Session.update({ session_id: session.session_id }, {
+                version: session.version + 1,
+                last_used: (Date.now() / 1000).toFixed(0).toString(),
+            });
+            resolve(newToken);
+        }
+        catch (err) {
+            reject(err);
+        }
+    }));
+};
+exports.bumpSessionToken = bumpSessionToken;
+const compareSessionTokenVersion = (jwtSession) => __awaiter(void 0, void 0, void 0, function* () {
+    const session = yield Session_1.Session.findOne({ where: { session_id: jwtSession.session_id } });
+    if (!session)
+        throw 'Session not found';
+    if (session.version > jwtSession.version)
+        throw 'Token expired';
+});
+exports.compareSessionTokenVersion = compareSessionTokenVersion;
+const setSessionCookie = (res, value) => __awaiter(void 0, void 0, void 0, function* () {
+    const currentTime = Math.floor(new Date().getTime() / 1000);
+    const weekExpiration = currentTime + 86400 * 7; // adds 7 days to timestamp
+    res.cookie('pid', value, {
+        sameSite: 'none',
+        expires: new Date(weekExpiration * 1000),
+        httpOnly: true,
+        secure: process.env.NODE_ENV === 'production' ? true : false,
+    });
+});
+exports.setSessionCookie = setSessionCookie;
+const clearSessionCookie = (res) => __awaiter(void 0, void 0, void 0, function* () {
+    return res.clearCookie('pid');
+});
+exports.clearSessionCookie = clearSessionCookie;
+const deleteSession = (session_id) => __awaiter(void 0, void 0, void 0, function* () {
+    const session = yield Session_1.Session.findOne({ where: { session_id } });
+    if (!session) {
+        throw 'Session not found';
+    }
+    session.remove();
+    return session;
+});
+exports.deleteSession = deleteSession;

package/package.json

@@ -1,46 +1,52 @@
-{
-	"name": "protonfile-auth",
-	"version": "1.6.4",
-	"description": "protonfile-auth",
-	"main": "lib/index.js",
-	"types": "lib/index.d.ts",
-	"scripts": {
-		"build": "tsc",
-		"test": "echo \"Error: no test specified\" && exit 1",
-		"prepare": "npm run build"
-	},
-	"keywords": [],
-	"author": "",
-	"license": "ISC",
-	"devDependencies": {
-		"@types/bcryptjs": "^2.4.2",
-		"@types/better-sqlite3": "^7.5.0",
-		"@types/express": "^4.17.13",
-		"@types/jsonwebtoken": "^8.5.5",
-		"@types/nodemailer": "^6.4.4",
-		"@types/pg": "^8.6.1",
-		"@types/uuid": "^8.3.1",
-		"better-sqlite3": "^7.6.2",
-		"typescript": "^4.4.4"
-	},
-	"files": [
-		"lib"
-	],
-	"dependencies": {
-		"@types/cookie-parser": "^1.4.2",
-		"bcryptjs": "^2.4.3",
-		"body-parser": "^1.19.0",
-		"cookie-parser": "^1.4.5",
-		"cors": "^2.8.5",
-		"dotenv": "^10.0.0",
-		"express": "^4.17.1",
-		"handlebars": "^4.7.7",
-		"jsonwebtoken": "^8.5.1",
-		"nanoid": "^3.3.4",
-		"node-cache": "^5.1.2",
-		"nodemailer": "^6.7.0",
-		"pg": "^8.7.1",
-		"typeorm": "^0.2.38",
-		"uuid": "^8.3.2"
-	}
-}
+{
+  "name": "protonfile-auth",
+  "version": "1.6.5",
+  "description": "protonfile-auth",
+  "main": "lib/index.js",
+  "types": "lib/index.d.ts",
+  "scripts": {
+    "build": "tsc --project tsconfig.build.json",
+    "test": "jest --runInBand",
+    "prepare": "npm run build"
+  },
+  "keywords": [],
+  "author": "",
+  "license": "ISC",
+  "devDependencies": {
+    "@types/bcryptjs": "^2.4.2",
+    "@types/better-sqlite3": "^7.5.0",
+    "@types/express": "^4.17.13",
+    "@types/jest": "^28.1.6",
+    "@types/jsonwebtoken": "^8.5.5",
+    "@types/nodemailer": "^6.4.4",
+    "@types/pg": "^8.6.1",
+    "@types/supertest": "^2.0.12",
+    "@types/uuid": "^8.3.1",
+    "better-sqlite3": "^8.7.0",
+    "jest": "^28.1.3",
+    "supertest": "^6.2.4",
+    "ts-jest": "^28.0.7",
+    "typed-emitter": "^2.1.0",
+    "typescript": "4.5"
+  },
+  "files": [
+    "lib"
+  ],
+  "dependencies": {
+    "@types/cookie-parser": "^1.4.2",
+    "bcryptjs": "^2.4.3",
+    "body-parser": "^1.19.0",
+    "cookie-parser": "^1.4.5",
+    "cors": "^2.8.5",
+    "dotenv": "^10.0.0",
+    "express": "^4.17.1",
+    "handlebars": "^4.7.7",
+    "jsonwebtoken": "^9.0.3",
+    "nanoid": "^3.3.4",
+    "node-cache": "^5.1.2",
+    "nodemailer": "^7.0.12",
+    "pg": "^8.7.1",
+    "typeorm": "^0.3.28",
+    "uuid": "^8.3.2"
+  }
+}