authen-express 0.0.1 → 0.0.4

package/lib/index.js

@@ -1,20 +1,36 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 var AuthenticationController = (function () {
-  function AuthenticationController(log, auth, cookie) {
+  function AuthenticationController(log, login, cookie, decrypt) {
     this.log = log;
-    this.auth = auth;
+    this.login = login;
     this.cookie = cookie;
+    this.decrypt = decrypt;
     this.authenticate = this.authenticate.bind(this);
   }
   AuthenticationController.prototype.authenticate = function (req, res) {
     var _this = this;
     var user = req.body;
-    if (!user.username || user.username.length === 0 || !user.password || user.password.length === 0) {
-      res.status(401).end('username and password cannot be empty');
+    if (!user.username || user.username.length === 0) {
+      return res.status(401).end('username cannot be empty');
     }
-    this.auth(user).then(function (result) {
-      var account = result.user;
+    if (!user.password || user.password.length === 0) {
+      return res.status(401).end('password cannot be empty');
+    }
+    if (user.step && user.step > 1 && (!user.passcode || user.passcode.length === 0)) {
+      return res.status(401).end('passcode cannot be empty');
+    }
+    if (this.decrypt) {
+      var p = this.decrypt(user.password);
+      if (p === undefined) {
+        return res.status(401).end('cannot decrypt password');
+      }
+      else {
+        user.password = p;
+      }
+    }
+    this.login(user).then(function (r) {
+      var account = r.user;
       if (_this.cookie && account && account.token && account.tokenExpiredTime) {
         res.status(200).cookie('token', account.token, {
           sameSite: 'strict',
@@ -22,10 +38,10 @@ var AuthenticationController = (function () {
           expires: account.tokenExpiredTime,
           httpOnly: true,
           secure: true,
-        }).json(result).end();
+        }).json(r).end();
       }
       else {
-        res.status(200).json(result).end();
+        res.status(200).json(r).end();
       }
     }).catch(function (err) { return handleError(err, res, _this.log); });
   };
@@ -41,8 +57,8 @@ var PrivilegeController = (function () {
   }
   PrivilegeController.prototype.all = function (req, res) {
     var _this = this;
-    this.privileges().then(function (result) {
-      res.json(result).end();
+    this.privileges().then(function (r) {
+      res.json(r).end();
     }).catch(function (err) { return handleError(err, res, _this.log); });
   };
   return PrivilegeController;
@@ -62,11 +78,6 @@ function handleError(err, res, log) {
 }
 exports.handleError = handleError;
 function toString(v) {
-  if (typeof v === 'string') {
-    return v;
-  }
-  else {
-    return JSON.stringify(v);
-  }
+  return typeof v === 'string' ? v : JSON.stringify(v);
 }
 exports.toString = toString;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "authen-express",
-  "version": "0.0.1",
+  "version": "0.0.4",
   "description": "authen-express",
   "main": "./lib/index.js",
   "types": "./src/index.ts",

package/src/index.ts

@@ -21,15 +21,15 @@ export interface Privilege {
   children?: Privilege[];
   permissions?: number;
 }
-export interface AuthResult {
+export interface AuthResult<ID> {
   status: number | string;
-  user?: UserAccount;
+  user?: UserAccount<ID>;
   message?: string;
 }
-export type Result = AuthResult;
-export type LoginResult = AuthResult;
-export interface UserAccount {
-  id?: string;
+export type Result<ID> = AuthResult<ID>;
+export type LoginResult<ID> = AuthResult<ID>;
+export interface UserAccount<ID> {
+  id?: ID;
   username?: string;
   contact?: string;
   email?: string;
@@ -48,17 +48,31 @@ export interface UserAccount {
   gender?: string;
   imageURL?: string;
 }
-export class AuthenticationController<T extends User> {
-  constructor (private log: Log, private auth: (user: T) => Promise<AuthResult>, public cookie?: boolean) {
+export class AuthenticationController<T extends User, ID> {
+  constructor (public log: Log, public login: (user: T) => Promise<AuthResult<ID>>, public cookie?: boolean, public decrypt?: (cipherText: string) => string|undefined) {
     this.authenticate = this.authenticate.bind(this);
   }
   authenticate(req: Request, res: Response) {
     const user: T = req.body;
-    if (!user.username || user.username.length === 0 || !user.password || user.password.length === 0) {
-      res.status(401).end('username and password cannot be empty');
+    if (!user.username || user.username.length === 0) {
+      return res.status(401).end('username cannot be empty');
+    }
+    if (!user.password || user.password.length === 0) {
+      return res.status(401).end('password cannot be empty');
+    }
+    if (user.step && user.step > 1 && (!user.passcode || user.passcode.length === 0)) {
+      return res.status(401).end('passcode cannot be empty');
+    }
+    if (this.decrypt) {
+      const p = this.decrypt(user.password);
+      if (p === undefined) {
+        return res.status(401).end('cannot decrypt password');
+      } else {
+        user.password = p;
+      }
     }
-    this.auth(user).then(result => {
-      const account = result.user;
+    this.login(user).then(r => {
+      const account = r.user;
       if (this.cookie && account && account.token && account.tokenExpiredTime) {
         res.status(200).cookie(
           'token', account.token,
@@ -68,21 +82,22 @@ export class AuthenticationController<T extends User> {
             expires: account.tokenExpiredTime,
             httpOnly: true,
             secure: true,
-          }).json(result).end();
+          }).json(r).end();
       } else {
-        res.status(200).json(result).end();
+        res.status(200).json(r).end();
       }
     }).catch(err => handleError(err, res, this.log));
   }
 }
 export const AuthenticationHandler = AuthenticationController;
+// tslint:disable-next-line:max-classes-per-file
 export class PrivilegeController {
   constructor(private log: Log, public privileges: () => Promise<Privilege[]>) {
     this.all = this.all.bind(this);
   }
   all(req: Request, res: Response) {
-    this.privileges().then(result => {
-      res.json(result).end();
+    this.privileges().then(r => {
+      res.json(r).end();
     }).catch(err => handleError(err, res, this.log));
   }
 }
@@ -98,9 +113,5 @@ export function handleError(err: any, res: Response, log?: (msg: string) => void
   }
 }
 export function toString(v: any): string {
-  if (typeof v === 'string') {
-    return v;
-  } else {
-    return JSON.stringify(v);
-  }
+  return typeof v === 'string' ? v : JSON.stringify(v);
 }