protonfile-auth 1.0.8 → 1.1.0

package/lib/Entities/QRSession.d.ts

@@ -0,0 +1,6 @@
+import { BaseEntity } from 'typeorm';
+import { User } from './User';
+export declare class QRSession extends BaseEntity {
+    auth_id: string;
+    user: User;
+}

package/lib/Entities/QRSession.js

@@ -0,0 +1,24 @@
+"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.QRSession = void 0;
+const typeorm_1 = require("typeorm");
+const User_1 = require("./User");
+let QRSession = class QRSession extends typeorm_1.BaseEntity {
+};
+__decorate([
+    (0, typeorm_1.PrimaryGeneratedColumn)('uuid')
+], QRSession.prototype, "auth_id", void 0);
+__decorate([
+    (0, typeorm_1.ManyToOne)(() => User_1.User, { nullable: false }),
+    (0, typeorm_1.JoinColumn)({ name: 'user_id' })
+], QRSession.prototype, "user", void 0);
+QRSession = __decorate([
+    (0, typeorm_1.Entity)()
+], QRSession);
+exports.QRSession = QRSession;

package/lib/controllers/login.js

@@ -15,14 +15,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const bcryptjs_1 = __importDefault(require("bcryptjs"));
 const auth_1 = require("../services/auth");
 const User_1 = require("../Entities/User");
-const Session_1 = require("../Entities/Session");
-const session_1 = require("../services/session");
 exports.default = (req, res) => __awaiter(void 0, void 0, void 0, function* () {
     try {
         const { email, password } = req.body;
-        if (process.env.NODE_ENV === 'debug') {
-            console.debug(email, password, req.body);
-        }
         if (!(email && password)) {
             return res.status(400).send('All input is required');
         }
@@ -32,44 +27,9 @@ exports.default = (req, res) => __awaiter(void 0, void 0, void 0, function* () {
         }
         if (user && (yield bcryptjs_1.default.compare(password, user.password))) {
             // Create token
-            const token = (0, auth_1.createAccessToken)({ user_id: user.user_id });
-            (0, auth_1.setRefreshTokenCookie)(res, (0, auth_1.createRefreshToken)({
-                user_id: user.user_id,
-            }));
-            if (req.cookies.session_id) {
-                const session = JSON.parse(req.cookies.session_id);
-                try {
-                    (0, session_1.verifySessionToken)(session.token);
-                    const newSession = yield (0, session_1.bumpSessionToken)(session.session_id);
-                    (0, session_1.setSessionCookie)(res, JSON.stringify(newSession));
-                }
-                catch (err) {
-                    res.clearCookie('session_id');
-                    res.clearCookie('jid');
-                    if (process.env.NODE_ENV === 'debug') {
-                        console.debug(err);
-                    }
-                }
-            }
-            else {
-                const insert = yield Session_1.Session.insert({
-                    token: (0, session_1.createSessionToken)({ user_id: user.user_id }),
-                    user_id: user.user_id,
-                    user_agent: req.headers['user-agent'] || 'Unknown',
-                });
-                const session = yield Session_1.Session.findOne({
-                    session_id: insert.generatedMaps[0].session_id,
-                });
-                if (!session) {
-                    return;
-                }
-                (0, session_1.setSessionCookie)(res, JSON.stringify(session));
-            }
+            const token = yield (0, auth_1.performLogin)(req, res, user);
             return res.status(200).json(Object.assign(Object.assign({}, user), { token }));
         }
-        if (process.env.NODE_ENV === 'debug') {
-            console.debug(user, yield bcryptjs_1.default.compare(password, user.password));
-        }
         res.status(400).send('Invalid Credentials');
     }
     catch (err) {

package/lib/controllers/logout.d.ts

@@ -1,3 +1,3 @@
 import { Request, Response } from 'express';
-declare const _default: (_req: Request, res: Response) => void;
+declare const _default: (_req: Request, res: Response) => Promise<void>;
 export default _default;

package/lib/controllers/logout.js

@@ -1,7 +1,18 @@
 "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.default = (_req, res) => {
-    res.clearCookie('jid');
-    res.clearCookie('session_id');
+const auth_1 = require("../services/auth");
+const session_1 = require("../services/session");
+exports.default = (_req, res) => __awaiter(void 0, void 0, void 0, function* () {
+    yield (0, auth_1.clearRefreshTokenCookie)(res);
+    yield (0, session_1.clearSessionCookie)(res);
     res.sendStatus(200);
-};
+});

package/lib/controllers/qr.d.ts

@@ -0,0 +1,3 @@
+import { Request, Response } from 'express';
+export declare const get: (req: Request, res: Response) => Promise<Response<any, Record<string, any>> | undefined>;
+export declare const post: (req: Request, res: Response) => Promise<Response<any, Record<string, any>> | undefined>;

package/lib/controllers/qr.js

@@ -0,0 +1,53 @@
+"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());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.post = exports.get = void 0;
+const auth_1 = require("../services/auth");
+const jsonwebtoken_1 = __importDefault(require("jsonwebtoken"));
+const events_1 = __importDefault(require("events"));
+const User_1 = require("../Entities/User");
+const emitter = new events_1.default();
+const get = (req, res) => __awaiter(void 0, void 0, void 0, function* () {
+    if (!req.query.request_id) {
+        const request = yield (0, auth_1.generateQrAuth)();
+        return res.send(request);
+    }
+    const request_id = req.query.request_id;
+    if (typeof request_id !== 'string') {
+        return res.sendStatus(400);
+    }
+    emitter.on(request_id, (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 }));
+    }));
+});
+exports.get = get;
+const post = (req, res) => __awaiter(void 0, void 0, void 0, function* () {
+    try {
+        const token = jsonwebtoken_1.default.verify(req.body.qr_token, process.env.ACCESS_TOKEN_KEY);
+        if (typeof token === 'string') {
+            return res.sendStatus(500);
+        }
+        const user = yield User_1.User.findOne({ user_id: req.user.user_id });
+        if (!user) {
+            throw 'User not found';
+        }
+        emitter.emit(token.auth_id, user);
+        res.sendStatus(200);
+    }
+    catch (err) {
+        res.status(500).send(err);
+    }
+});
+exports.post = post;

package/lib/controllers/refresh_token.js

@@ -34,7 +34,7 @@ exports.default = (req, res) => __awaiter(void 0, void 0, void 0, function* () {
     }
     catch (err) {
         console.log(err);
-        res.clearCookie('session_id');
+        yield (0, session_1.clearSessionCookie)(res);
         return res.sendStatus(403);
     }
     const user = yield User_1.User.findOne({ user_id: payload.user_id });

package/lib/index.js

@@ -11,6 +11,7 @@ const login_1 = __importDefault(require("./controllers/login"));
 const verifyToken_1 = __importDefault(require("./middlewares/verifyToken"));
 const refresh_token_1 = __importDefault(require("./controllers/refresh_token"));
 const logout_1 = __importDefault(require("./controllers/logout"));
+const qr_1 = require("./controllers/qr");
 const cookie_parser_1 = __importDefault(require("cookie-parser"));
 const typeorm_1 = require("typeorm");
 const User_1 = require("./Entities/User");
@@ -24,6 +25,8 @@ exports.default = {
         router.post('/login', (0, cookie_parser_1.default)(), login_1.default);
         router.post('/refresh_token', (0, cookie_parser_1.default)(), refresh_token_1.default);
         router.post('/logout', (0, cookie_parser_1.default)(), logout_1.default);
+        router.get('/qr', (0, cookie_parser_1.default)(), qr_1.get);
+        router.post('/qr', verifyToken_1.default, qr_1.post);
         return router;
     },
     authMiddleware: verifyToken_1.default,

package/lib/services/auth.d.ts

@@ -1,4 +1,11 @@
-import { Response } from 'express';
+import { Response, Request } from 'express';
+import { User } from '../Entities/User';
 export declare const createAccessToken: (payload: any) => string;
 export declare const createRefreshToken: (payload: any) => string;
 export declare const setRefreshTokenCookie: (res: Response, value: string) => Promise<void>;
+export declare const clearRefreshTokenCookie: (res: Response) => Promise<Response<any, Record<string, any>>>;
+export declare const generateQrAuth: () => Promise<{
+    request_id: string;
+    token: string;
+}>;
+export declare const performLogin: (req: Request, res: Response, user: User) => Promise<string>;

package/lib/services/auth.js

@@ -9,8 +9,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.setRefreshTokenCookie = exports.createRefreshToken = exports.createAccessToken = void 0;
+exports.performLogin = exports.generateQrAuth = exports.clearRefreshTokenCookie = exports.setRefreshTokenCookie = exports.createRefreshToken = exports.createAccessToken = void 0;
 const jsonwebtoken_1 = require("jsonwebtoken");
+const uuid_1 = require("uuid");
+const Session_1 = require("../Entities/Session");
+const session_1 = require("./session");
 const createAccessToken = (payload) => {
     return (0, jsonwebtoken_1.sign)({ user_id: payload.user_id }, process.env.ACCESS_TOKEN_KEY, {
         expiresIn: '15m',
@@ -34,3 +37,65 @@ const setRefreshTokenCookie = (res, value) => __awaiter(void 0, void 0, void 0,
     });
 });
 exports.setRefreshTokenCookie = setRefreshTokenCookie;
+const clearRefreshTokenCookie = (res) => __awaiter(void 0, void 0, void 0, function* () {
+    return res.clearCookie('jid');
+});
+exports.clearRefreshTokenCookie = clearRefreshTokenCookie;
+const generateQrAuth = () => __awaiter(void 0, void 0, void 0, function* () {
+    const id = (0, uuid_1.v4)();
+    return {
+        request_id: id,
+        token: (0, jsonwebtoken_1.sign)({ auth_id: id }, process.env.ACCESS_TOKEN_KEY, {
+            expiresIn: '5m',
+        }),
+    };
+});
+exports.generateQrAuth = generateQrAuth;
+const performLogin = (req, res, user) => {
+    return new Promise((resolve, reject) => __awaiter(void 0, void 0, void 0, function* () {
+        const token = (0, exports.createAccessToken)({ user_id: user.user_id });
+        (0, exports.setRefreshTokenCookie)(res, (0, exports.createRefreshToken)({
+            user_id: user.user_id,
+        }));
+        if (req.cookies.session_id) {
+            const session = JSON.parse(req.cookies.session_id);
+            try {
+                (0, session_1.verifySessionToken)(session.token);
+                const newSession = yield (0, session_1.bumpSessionToken)(session.session_id);
+                (0, session_1.setSessionCookie)(res, JSON.stringify(newSession));
+            }
+            catch (err) {
+                yield (0, session_1.clearSessionCookie)(res);
+                yield (0, exports.clearRefreshTokenCookie)(res);
+                const insert = yield Session_1.Session.insert({
+                    token: (0, session_1.createSessionToken)({ user_id: user.user_id }),
+                    user_id: user.user_id,
+                    user_agent: req.headers['user-agent'] || 'Unknown',
+                });
+                const session = yield Session_1.Session.findOne({
+                    session_id: insert.generatedMaps[0].session_id,
+                });
+                if (!session) {
+                    return;
+                }
+                (0, session_1.setSessionCookie)(res, JSON.stringify(session));
+            }
+        }
+        else {
+            const insert = yield Session_1.Session.insert({
+                token: (0, session_1.createSessionToken)({ user_id: user.user_id }),
+                user_id: user.user_id,
+                user_agent: req.headers['user-agent'] || 'Unknown',
+            });
+            const session = yield Session_1.Session.findOne({
+                session_id: insert.generatedMaps[0].session_id,
+            });
+            if (!session) {
+                return;
+            }
+            (0, session_1.setSessionCookie)(res, JSON.stringify(session));
+        }
+        resolve(token);
+    }));
+};
+exports.performLogin = performLogin;

package/lib/services/session.d.ts

@@ -5,3 +5,4 @@ export declare const verifySessionToken: (token: string) => string | import("jso
 export declare const bumpSessionToken: (session_id: string) => Promise<Session>;
 export declare const compareSessionTokenVersion: (session_id: string, token: string) => Promise<import("jsonwebtoken").JwtPayload>;
 export declare const setSessionCookie: (res: Response, value: string) => Promise<void>;
+export declare const clearSessionCookie: (res: Response) => Promise<Response<any, Record<string, any>>>;

package/lib/services/session.js

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.setSessionCookie = exports.compareSessionTokenVersion = exports.bumpSessionToken = exports.verifySessionToken = exports.createSessionToken = void 0;
+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) => {
@@ -76,3 +76,7 @@ const setSessionCookie = (res, value) => __awaiter(void 0, void 0, void 0, funct
     });
 });
 exports.setSessionCookie = setSessionCookie;
+const clearSessionCookie = (res) => __awaiter(void 0, void 0, void 0, function* () {
+    return res.clearCookie('session_id');
+});
+exports.clearSessionCookie = clearSessionCookie;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "protonfile-auth",
-	"version": "1.0.8",
+	"version": "1.1.0",
 	"description": "protonfile-auth",
 	"main": "lib/index.js",
 	"types": "lib/index.d.ts",
@@ -17,6 +17,7 @@
 		"@types/express": "^4.17.13",
 		"@types/jsonwebtoken": "^8.5.5",
 		"@types/pg": "^8.6.1",
+		"@types/uuid": "^8.3.1",
 		"typescript": "^4.4.4"
 	},
 	"files": [
@@ -32,6 +33,7 @@
 		"express": "^4.17.1",
 		"jsonwebtoken": "^8.5.1",
 		"pg": "^8.7.1",
-		"typeorm": "^0.2.38"
+		"typeorm": "^0.2.38",
+		"uuid": "^8.3.2"
 	}
 }