protonfile-auth 1.4.0 → 1.6.0

package/lib/Entities/OTP.d.ts

@@ -0,0 +1,9 @@
+import { BaseEntity } from 'typeorm';
+import { User } from './User';
+export declare class OTP extends BaseEntity {
+    code: string;
+    scope: string;
+    expiration: number;
+    user_id: string;
+    user: User;
+}

package/lib/Entities/OTP.js

@@ -0,0 +1,47 @@
+"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.OTP = void 0;
+const typeorm_1 = require("typeorm");
+const User_1 = require("./User");
+let OTP = class OTP extends typeorm_1.BaseEntity {
+};
+__decorate([
+    (0, typeorm_1.PrimaryColumn)({
+        name: 'code',
+        type: 'text',
+        default: () => 'getNumericId(100000, 999999)',
+    })
+], OTP.prototype, "code", void 0);
+__decorate([
+    (0, typeorm_1.Column)('text')
+], OTP.prototype, "scope", void 0);
+__decorate([
+    (0, typeorm_1.Column)({
+        type: 'bigint',
+        default: () => 'extract(epoch from now())::int + 600',
+    })
+], OTP.prototype, "expiration", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ name: 'user_id', type: 'text' })
+], OTP.prototype, "user_id", void 0);
+__decorate([
+    (0, typeorm_1.ManyToOne)(() => User_1.User, { nullable: false }),
+    (0, typeorm_1.JoinColumn)({ name: 'user_id' })
+], OTP.prototype, "user", void 0);
+OTP = __decorate([
+    (0, typeorm_1.Entity)()
+], OTP);
+exports.OTP = OTP;
+/*
+CREATE OR REPLACE FUNCTION getNumericId(integer, integer) RETURNS integer
+    AS 'SELECT floor(random() * ($2-$1+1) + $1)::int'
+    LANGUAGE SQL
+    IMMUTABLE
+    RETURNS NULL ON NULL INPUT;
+*/

package/lib/Entities/User.d.ts

@@ -5,4 +5,5 @@ export declare class User extends BaseEntity {
     last_name: string;
     email: string;
     password: string;
+    email_verified: boolean;
 }

package/lib/Entities/User.js

@@ -25,6 +25,9 @@ __decorate([
 __decorate([
     (0, typeorm_1.Column)('text')
 ], User.prototype, "password", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ name: 'email_verified', type: 'boolean', default: false })
+], User.prototype, "email_verified", void 0);
 User = __decorate([
     (0, typeorm_1.Entity)()
 ], User);

package/lib/controllers/login.js

@@ -25,6 +25,8 @@ exports.default = (req, res) => __awaiter(void 0, void 0, void 0, function* () {
         if (!user) {
             return res.status(404).send('User not found');
         }
+        if (!user.email_verified)
+            return res.status(403).send('Email verification required');
         if (user && (yield bcryptjs_1.default.compare(password, user.password))) {
             // Create token
             const token = yield (0, auth_1.performLogin)(req, res, user);

package/lib/controllers/refresh_token.js

@@ -28,7 +28,7 @@ exports.default = (req, res) => __awaiter(void 0, void 0, void 0, function* () {
         payload = jsonwebtoken_1.default.verify(token, process.env.REFRESH_TOKEN_KEY);
         decodedSession = (0, session_1.verifySessionToken)(JSON.parse(session).token);
         const parsedSession = JSON.parse(session);
-        (0, session_1.compareSessionTokenVersion)(parsedSession.session_id, parsedSession.token);
+        yield (0, session_1.compareSessionTokenVersion)(parsedSession.session_id, parsedSession.token);
         const newSession = yield (0, session_1.bumpSessionToken)(parsedSession.session_id);
         (0, session_1.setSessionCookie)(res, JSON.stringify(newSession));
     }

package/lib/controllers/register.js

@@ -13,9 +13,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 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 mail_1 = require("../services/mail");
+const OTP_1 = require("../Entities/OTP");
 exports.default = (req, res) => __awaiter(void 0, void 0, void 0, function* () {
     try {
         const { first_name, last_name, email, password } = req.body;
@@ -37,10 +37,20 @@ exports.default = (req, res) => __awaiter(void 0, void 0, void 0, function* () {
         if (!user) {
             return;
         }
-        const token = (0, auth_1.createAccessToken)({ user_id: user.user_id });
-        const mail = new mail_1.WelcomeMail(user);
+        const queryRes = yield OTP_1.OTP.insert({
+            scope: 'registration',
+            user_id: user.user_id,
+        });
+        const otp = queryRes.identifiers[0];
+        if (!otp || !otp.code) {
+            return res.sendStatus(500);
+        }
+        const mail = new mail_1.WelcomeMail(user, otp.code);
         mail.send();
-        res.status(201).json(Object.assign(Object.assign({}, user), { token }));
+        const response = Object.assign({}, user);
+        // remove unnecessary properties
+        delete response.password;
+        res.status(201).json(response);
     }
     catch (err) {
         console.log(err);

package/lib/controllers/registerOtp.d.ts

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

package/lib/controllers/registerOtp.js

@@ -0,0 +1,30 @@
+"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 });
+const OTP_1 = require("../Entities/OTP");
+const User_1 = require("../Entities/User");
+exports.default = (req, res) => __awaiter(void 0, void 0, void 0, function* () {
+    try {
+        const { email, code } = req.query;
+        const user = yield User_1.User.findOne({ email });
+        if (!user)
+            return res.sendStatus(403);
+        const otp = yield OTP_1.OTP.findOne({ code, user_id: user.user_id });
+        if (!otp)
+            return res.sendStatus(404);
+        yield OTP_1.OTP.delete({ code: otp.code });
+        yield User_1.User.update({ user_id: user.user_id }, { email_verified: true });
+        res.sendStatus(200);
+    }
+    catch (err) {
+        console.log(err);
+    }
+});

package/lib/index.d.ts

@@ -7,6 +7,8 @@ import { Session } from './Entities/Session';
 import { TempToken } from './Entities/TempToken';
 import { TempTokenService } from './services/TempToken';
 import SessionCleaner from './services/SessionCleaner';
+import { OTP } from './Entities/OTP';
+import OTPVacuum from './services/OTPVacuum';
 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>>>;
@@ -14,10 +16,12 @@ declare const _default: {
         User: typeof User;
         Session: typeof Session;
         TempToken: typeof TempToken;
+        OTP: typeof OTP;
     };
     services: {
         TempTokenService: typeof TempTokenService;
         SessionCleaner: typeof SessionCleaner;
+        OTPVacuum: typeof OTPVacuum;
     };
 };
 export default _default;

package/lib/index.js

@@ -20,12 +20,21 @@ 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"));
+const OTP_1 = require("./Entities/OTP");
+const OTPVacuum_1 = __importDefault(require("./services/OTPVacuum"));
+const registerOtp_1 = __importDefault(require("./controllers/registerOtp"));
 exports.default = {
     router: (typeormConfig) => {
-        (0, typeorm_1.createConnection)(Object.assign(Object.assign({}, typeormConfig), { entities: [User_1.User, Session_1.Session, TempToken_1.TempToken] }));
+        (0, typeorm_1.createConnection)(Object.assign(Object.assign({}, typeormConfig), { entities: [User_1.User, Session_1.Session, TempToken_1.TempToken, OTP_1.OTP] })).then((connection) => {
+            User_1.User.useConnection(connection);
+            Session_1.Session.useConnection(connection);
+            TempToken_1.TempToken.useConnection(connection);
+            OTP_1.OTP.useConnection(connection);
+        });
         const router = express_1.default.Router();
         router.use(body_parser_1.default.urlencoded({ extended: false }));
         router.post('/register', register_1.default);
+        router.post('/register/otp', registerOtp_1.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);
@@ -36,6 +45,6 @@ exports.default = {
         return router;
     },
     authMiddleware: verifyToken_1.default,
-    entities: { User: User_1.User, Session: Session_1.Session, TempToken: TempToken_1.TempToken },
-    services: { TempTokenService: TempToken_2.TempTokenService, SessionCleaner: SessionCleaner_1.default },
+    entities: { User: User_1.User, Session: Session_1.Session, TempToken: TempToken_1.TempToken, OTP: OTP_1.OTP },
+    services: { TempTokenService: TempToken_2.TempTokenService, SessionCleaner: SessionCleaner_1.default, OTPVacuum: OTPVacuum_1.default },
 };

package/lib/services/OTPVacuum.d.ts

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

package/lib/services/OTPVacuum.js

@@ -0,0 +1,31 @@
+"use strict";
+// removes expired OTP codes
+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 OTP_1 = require("../Entities/OTP");
+const typeorm_1 = require("typeorm");
+class OTPVacuum {
+    constructor() { }
+    register(interval) {
+        this.handle = setInterval(() => __awaiter(this, void 0, void 0, function* () {
+            const res = yield OTP_1.OTP.query('select extract(epoch from now())::int as timestamp');
+            if (!res[0] || !res[0].timestamp)
+                return;
+            OTP_1.OTP.delete({ expiration: (0, typeorm_1.LessThan)(res[0].timestamp) });
+        }), interval || 60000);
+    }
+    unregister() {
+        if (!this.handle)
+            return;
+        clearInterval(this.handle);
+    }
+}
+exports.default = OTPVacuum;

package/lib/services/mail/index.d.ts

@@ -28,7 +28,7 @@ export declare class NewAccessMail extends BaseMail {
     constructor(user: User, location: string);
 }
 export declare class WelcomeMail extends BaseMail {
-    constructor(user: User);
+    constructor(user: User, otp: string);
 }
 export declare class ChangePasswordMail extends BaseMail {
     constructor(user: User, link: string);

package/lib/services/mail/index.js

@@ -67,11 +67,12 @@ class NewAccessMail extends BaseMail {
 }
 exports.NewAccessMail = NewAccessMail;
 class WelcomeMail extends BaseMail {
-    constructor(user) {
+    constructor(user, otp) {
         const _template = handlebars_1.default.compile(default_1.default);
         const mailBody = _template({
             email: user.email,
-            body: 'Welcome to Protonfile, we hope you enjoy using our service',
+            body: `Welcome to Protonfile, we hope you enjoy using our service. 
+				Use this OTP code to complete your registration: ${otp}.`,
         });
         const mailOptions = {
             subject: 'Welcome to Protonfile',

package/package.json

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