protonfile-auth 1.0.2 → 1.0.6

package/lib/Entities/Session.d.ts

@@ -0,0 +1,9 @@
+import { BaseEntity } from 'typeorm';
+import { User } from './User';
+export declare class Session extends BaseEntity {
+    session_id: string;
+    token: string;
+    user_id: string;
+    user: User;
+    user_agent: string;
+}

package/lib/Entities/Session.js

@@ -24,6 +24,9 @@ __decorate([
     (0, typeorm_1.ManyToOne)(() => User_1.User, { nullable: false }),
     (0, typeorm_1.JoinColumn)({ name: 'user_id' })
 ], Session.prototype, "user", void 0);
+__decorate([
+    (0, typeorm_1.Column)('text')
+], Session.prototype, "user_agent", void 0);
 Session = __decorate([
     (0, typeorm_1.Entity)()
 ], Session);

package/lib/Entities/User.d.ts

@@ -0,0 +1,8 @@
+import { BaseEntity } from 'typeorm';
+export declare class User extends BaseEntity {
+    user_id: string;
+    first_name: string;
+    last_name: string;
+    email: string;
+    password: string;
+}

package/lib/controllers/login.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/login.js

@@ -30,17 +30,15 @@ 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 });
-            const currentTime = Math.floor(new Date().getTime() / 1000);
-            const weekExpiration = currentTime + 86400 * 7; // adds 7 days to timestamp
-            res.cookie('jid', (0, auth_1.createRefreshToken)({
+            (0, auth_1.setRefreshTokenCookie)(res, (0, auth_1.createRefreshToken)({
                 user_id: user.user_id,
-            }), { expires: new Date(weekExpiration * 1000) });
+            }));
             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);
-                    res.cookie('session_id', JSON.stringify(newSession));
+                    (0, session_1.setSessionCookie)(res, JSON.stringify(newSession));
                 }
                 catch (err) {
                     res.clearCookie('session_id');
@@ -51,6 +49,7 @@ exports.default = (req, res) => __awaiter(void 0, void 0, void 0, function* () {
                 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,
@@ -58,7 +57,7 @@ exports.default = (req, res) => __awaiter(void 0, void 0, void 0, function* () {
                 if (!session) {
                     return;
                 }
-                res.cookie('session_id', JSON.stringify(session));
+                (0, session_1.setSessionCookie)(res, JSON.stringify(session));
             }
             return res.status(200).json(Object.assign(Object.assign({}, user), { token }));
         }

package/lib/controllers/logout.d.ts

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

package/lib/controllers/logout.js

@@ -2,5 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = (_req, res) => {
     res.clearCookie('jid');
+    res.clearCookie('session_id');
     res.sendStatus(200);
 };

package/lib/controllers/refresh_token.d.ts

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

package/lib/controllers/refresh_token.js

@@ -29,10 +29,11 @@ exports.default = (req, res) => __awaiter(void 0, void 0, void 0, function* () {
         decodedSession = (0, session_1.verifySessionToken)(JSON.parse(session).token);
         const parsedSession = JSON.parse(session);
         (0, session_1.compareSessionTokenVersion)(parsedSession.session_id, parsedSession.token);
-        const newSession = (0, session_1.bumpSessionToken)(parsedSession.session_id);
-        res.cookie('session_id', JSON.stringify(newSession));
+        const newSession = yield (0, session_1.bumpSessionToken)(parsedSession.session_id);
+        (0, session_1.setSessionCookie)(res, JSON.stringify(newSession));
     }
     catch (err) {
+        console.log(err);
         res.clearCookie('session_id');
         return res.sendStatus(403);
     }
@@ -40,12 +41,7 @@ exports.default = (req, res) => __awaiter(void 0, void 0, void 0, function* () {
     if (!user) {
         return res.sendStatus(404);
     }
-    const currentTime = Math.floor(new Date().getTime() / 1000);
-    const weekExpiration = currentTime + 86400 * 7; // adds 7 days to timestamp
-    res.cookie('jid', (0, auth_1.createRefreshToken)({ user_id: user.user_id }), {
-        httpOnly: true,
-        expires: new Date(weekExpiration * 1000),
-    });
+    (0, auth_1.setRefreshTokenCookie)(res, (0, auth_1.createRefreshToken)({ user_id: user.user_id }));
     return res.send({
         ok: true,
         accessToken: (0, auth_1.createAccessToken)({ user_id: user.user_id }),

package/lib/controllers/register.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/index.d.ts

@@ -0,0 +1,15 @@
+/// <reference types="qs" />
+import 'dotenv/config';
+import express from 'express';
+import { ConnectionOptions } from 'typeorm';
+import { User } from './Entities/User';
+import { Session } from './Entities/Session';
+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;
+    };
+};
+export default _default;

package/lib/index.js

@@ -27,4 +27,5 @@ exports.default = {
         return router;
     },
     authMiddleware: verifyToken_1.default,
+    entities: { User: User_1.User, Session: Session_1.Session },
 };

package/lib/middlewares/verifyToken.d.ts

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

package/lib/services/auth.d.ts

@@ -0,0 +1,4 @@
+import { Response } from 'express';
+export declare const createAccessToken: (payload: any) => string;
+export declare const createRefreshToken: (payload: any) => string;
+export declare const setRefreshTokenCookie: (res: Response, value: string) => Promise<void>;

package/lib/services/auth.js

@@ -1,6 +1,15 @@
 "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.createRefreshToken = exports.createAccessToken = void 0;
+exports.setRefreshTokenCookie = exports.createRefreshToken = exports.createAccessToken = void 0;
 const jsonwebtoken_1 = require("jsonwebtoken");
 const createAccessToken = (payload) => {
     return (0, jsonwebtoken_1.sign)({ user_id: payload.user_id }, process.env.ACCESS_TOKEN_KEY, {
@@ -14,3 +23,14 @@ const createRefreshToken = (payload) => {
     });
 };
 exports.createRefreshToken = createRefreshToken;
+const setRefreshTokenCookie = (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('jid', value, {
+        sameSite: 'none',
+        expires: new Date(weekExpiration * 1000),
+        httpOnly: true,
+        secure: process.env.NODE_ENV === 'production' ? true : false,
+    });
+});
+exports.setRefreshTokenCookie = setRefreshTokenCookie;

package/lib/services/session.d.ts

@@ -0,0 +1,7 @@
+import { Response } from 'express';
+import { Session } from '../Entities/Session';
+export declare const createSessionToken: (payload: any, version?: number | undefined) => string;
+export declare const verifySessionToken: (token: string) => string | import("jsonwebtoken").JwtPayload;
+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>;

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.compareSessionTokenVersion = exports.bumpSessionToken = exports.verifySessionToken = exports.createSessionToken = void 0;
+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) => {
@@ -65,3 +65,14 @@ const compareSessionTokenVersion = (session_id, token) => __awaiter(void 0, void
     }
 });
 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('session_id', value, {
+        sameSite: 'none',
+        expires: new Date(weekExpiration * 1000),
+        httpOnly: true,
+        secure: process.env.NODE_ENV === 'production' ? true : false,
+    });
+});
+exports.setSessionCookie = setSessionCookie;

package/package.json

@@ -1,8 +1,9 @@
 {
 	"name": "protonfile-auth",
-	"version": "1.0.2",
+	"version": "1.0.6",
 	"description": "protonfile-auth",
 	"main": "lib/index.js",
+	"types": "lib/index.d.ts",
 	"scripts": {
 		"build": "tsc",
 		"test": "echo \"Error: no test specified\" && exit 1",