protonfile-auth 1.2.0 → 1.5.0

package/lib/Entities/TempToken.d.ts

@@ -0,0 +1,5 @@
+import { BaseEntity } from 'typeorm';
+export declare class TempToken extends BaseEntity {
+    token: string;
+    expires: number;
+}

package/lib/Entities/TempToken.js

@@ -0,0 +1,22 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TempToken = void 0;
+const typeorm_1 = require("typeorm");
+let TempToken = class TempToken extends typeorm_1.BaseEntity {
+};
+__decorate([
+    (0, typeorm_1.PrimaryColumn)('text')
+], TempToken.prototype, "token", void 0);
+__decorate([
+    (0, typeorm_1.Column)('bigint')
+], TempToken.prototype, "expires", void 0);
+TempToken = __decorate([
+    (0, typeorm_1.Entity)()
+], TempToken);
+exports.TempToken = TempToken;

package/lib/controllers/change_password.js

@@ -18,6 +18,7 @@ const jsonwebtoken_1 = __importDefault(require("jsonwebtoken"));
 const mail_1 = require("../services/mail");
 const bcryptjs_1 = __importDefault(require("bcryptjs"));
 const Session_1 = require("../Entities/Session");
+const TempToken_1 = require("../services/TempToken");
 const get = (req, res) => __awaiter(void 0, void 0, void 0, function* () {
     const user = yield User_1.User.findOne({ email: req.params.email });
     if (!user) {
@@ -35,6 +36,10 @@ const post = (req, res) => __awaiter(void 0, void 0, void 0, function* () {
         if (typeof token === 'string') {
             throw 'token malformed';
         }
+        const temptoken = new TempToken_1.TempTokenService(req.body.token, token.exp || 0);
+        if (!(yield temptoken.isValid())) {
+            throw 'token expired';
+        }
         const user = yield User_1.User.findOne({ user_id: token.user_id });
         if (!user) {
             return res.sendStatus(404);
@@ -43,6 +48,7 @@ const post = (req, res) => __awaiter(void 0, void 0, void 0, function* () {
         if (req.body.revoke_all) {
             yield Session_1.Session.delete({ user_id: user.user_id });
         }
+        yield temptoken.invalidate();
         res.sendStatus(200);
     }
     catch (err) {

package/lib/controllers/qr.js

@@ -27,10 +27,12 @@ const get = (req, res) => __awaiter(void 0, void 0, void 0, function* () {
     if (typeof request_id !== 'string') {
         return res.sendStatus(400);
     }
-    emitter.on(request_id, (user) => __awaiter(void 0, void 0, void 0, function* () {
+    const handler = (user) => __awaiter(void 0, void 0, void 0, function* () {
         const token = yield (0, auth_1.performLogin)(req, res, user);
-        return res.status(200).json(Object.assign(Object.assign({}, user), { token }));
-    }));
+        res.status(200).json(Object.assign(Object.assign({}, user), { token }));
+    });
+    emitter.on(request_id, handler);
+    req.on('close', () => emitter.removeListener(request_id, handler));
 });
 exports.get = get;
 const post = (req, res) => __awaiter(void 0, void 0, void 0, function* () {

package/lib/index.d.ts

@@ -4,12 +4,20 @@ import express from 'express';
 import { ConnectionOptions } from 'typeorm';
 import { User } from './Entities/User';
 import { Session } from './Entities/Session';
+import { TempToken } from './Entities/TempToken';
+import { TempTokenService } from './services/TempToken';
+import SessionCleaner from './services/SessionCleaner';
 declare const _default: {
     router: (typeormConfig: ConnectionOptions) => import("express-serve-static-core").Router;
     authMiddleware: (req: express.Request<import("express-serve-static-core").ParamsDictionary, any, any, import("qs").ParsedQs, Record<string, any>>, res: express.Response<any, Record<string, any>>, next: express.NextFunction) => Promise<void | express.Response<any, Record<string, any>>>;
     entities: {
         User: typeof User;
         Session: typeof Session;
+        TempToken: typeof TempToken;
+    };
+    services: {
+        TempTokenService: typeof TempTokenService;
+        SessionCleaner: typeof SessionCleaner;
     };
 };
 export default _default;

package/lib/index.js

@@ -17,9 +17,16 @@ const cookie_parser_1 = __importDefault(require("cookie-parser"));
 const typeorm_1 = require("typeorm");
 const User_1 = require("./Entities/User");
 const Session_1 = require("./Entities/Session");
+const TempToken_1 = require("./Entities/TempToken");
+const TempToken_2 = require("./services/TempToken");
+const SessionCleaner_1 = __importDefault(require("./services/SessionCleaner"));
 exports.default = {
     router: (typeormConfig) => {
-        (0, typeorm_1.createConnection)(Object.assign(Object.assign({}, typeormConfig), { entities: [User_1.User, Session_1.Session] }));
+        (0, typeorm_1.createConnection)(Object.assign(Object.assign({}, typeormConfig), { entities: [User_1.User, Session_1.Session, TempToken_1.TempToken] })).then((connection) => {
+            User_1.User.useConnection(connection);
+            Session_1.Session.useConnection(connection);
+            TempToken_1.TempToken.useConnection(connection);
+        });
         const router = express_1.default.Router();
         router.use(body_parser_1.default.urlencoded({ extended: false }));
         router.post('/register', register_1.default);
@@ -33,5 +40,6 @@ exports.default = {
         return router;
     },
     authMiddleware: verifyToken_1.default,
-    entities: { User: User_1.User, Session: Session_1.Session },
+    entities: { User: User_1.User, Session: Session_1.Session, TempToken: TempToken_1.TempToken },
+    services: { TempTokenService: TempToken_2.TempTokenService, SessionCleaner: SessionCleaner_1.default },
 };

package/lib/services/SessionCleaner.d.ts

@@ -0,0 +1,7 @@
+declare class SessionCleaner {
+    private handle?;
+    constructor();
+    register(interval?: number): void;
+    unregister(): void;
+}
+export default SessionCleaner;

package/lib/services/SessionCleaner.js

@@ -0,0 +1,39 @@
+"use strict";
+// removes expired sessions
+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 });
+const Session_1 = require("../Entities/Session");
+const jsonwebtoken_1 = require("jsonwebtoken");
+class SessionCleaner {
+    constructor() { }
+    register(interval) {
+        this.handle = setInterval(() => __awaiter(this, void 0, void 0, function* () {
+            const sessions = yield Session_1.Session.find();
+            for (const session of sessions) {
+                const decodedToken = (0, jsonwebtoken_1.decode)(session.token);
+                if (typeof decodedToken === 'string' || !decodedToken)
+                    return;
+                const { exp } = decodedToken;
+                const expiration = exp ? exp * 1000 : 0;
+                const now = Date.now();
+                const isExpired = now > expiration;
+                if (isExpired)
+                    Session_1.Session.remove(session);
+            }
+        }), interval || 60000);
+    }
+    unregister() {
+        if (!this.handle)
+            return;
+        clearInterval(this.handle);
+    }
+}
+exports.default = SessionCleaner;

package/lib/services/TempToken.d.ts

@@ -0,0 +1,9 @@
+import { TempToken } from '../Entities/TempToken';
+export declare class TempTokenService {
+    token: string;
+    expires: number;
+    private tempToken;
+    constructor(token: string, expires: number);
+    invalidate(): Promise<TempToken>;
+    isValid(): Promise<boolean>;
+}

package/lib/services/TempToken.js

@@ -0,0 +1,40 @@
+"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.TempTokenService = void 0;
+const TempToken_1 = require("../Entities/TempToken");
+const typeorm_1 = require("typeorm");
+class TempTokenService {
+    constructor(token, expires) {
+        this.token = token;
+        this.expires = expires;
+        this.tempToken = new TempToken_1.TempToken();
+        this.tempToken.token = this.token;
+        this.tempToken.expires = this.expires;
+        setInterval(() => {
+            const timestamp = +new Date();
+            TempToken_1.TempToken.delete({ expires: (0, typeorm_1.LessThan)(timestamp) });
+        }, 600 * 1000);
+    }
+    invalidate() {
+        return this.tempToken.save();
+    }
+    isValid() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const found = yield TempToken_1.TempToken.findOne({ token: this.token });
+            if (found) {
+                return false;
+            }
+            return true;
+        });
+    }
+}
+exports.TempTokenService = TempTokenService;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "protonfile-auth",
-	"version": "1.2.0",
+	"version": "1.5.0",
 	"description": "protonfile-auth",
 	"main": "lib/index.js",
 	"types": "lib/index.d.ts",