serverpreconfigured 2.1.8 → 2.1.9

package/dist/database/models/User.d.ts

@@ -1,8 +1,10 @@
 import { Model } from "sequelize";
 export declare class User extends Model {
+    id: number;
     email: string;
     first_name?: string;
     is_active: boolean;
     password_hash: string;
+    last_action: Date;
     static init(sequelize: any): void;
 }

package/dist/database/models/User.js

@@ -10,6 +10,7 @@ class User extends sequelize_1.Model {
             email: sequelize_2.DataTypes.STRING,
             is_active: sequelize_2.DataTypes.BOOLEAN,
             password_hash: sequelize_2.DataTypes.STRING,
+            last_action: sequelize_2.DataTypes.DATE,
         }, {
             sequelize: sequelize,
             tableName: 'spc_users',

package/dist/middlewares/auth.js

@@ -16,7 +16,6 @@ exports.setUserDataMiddleware = void 0;
 const server_1 = require("../server");
 const server_2 = require("../server");
 const server_3 = require("../server");
-const server_4 = require("../server");
 const env_1 = __importDefault(require("../settings/env"));
 const DEBUG = env_1.default.NODE_ENV === 'development' ? true : false;
 function setUserDataMiddleware(req, res, next) {
@@ -25,8 +24,11 @@ function setUserDataMiddleware(req, res, next) {
             return res.status(401).send((0, server_2.JSONResponse)(false, undefined, "User Must Be Logged"));
         try {
             const dealerEmail = (0, server_3.getUserSessionData)(req);
-            const dealerId = yield (0, server_4.getUserIdByUserEmail)(dealerEmail);
-            req.user = { email: dealerEmail, id: dealerId };
+            const user = yield server_1.User.findOne({ where: { email: dealerEmail, is_active: true } });
+            if (!user)
+                throw "Unknown user";
+            req.user = { email: dealerEmail, id: user.id };
+            yield (0, server_1.updateUserLastAction)(user);
             next();
         }
         catch (e) {

package/dist/routes/users.js

@@ -71,6 +71,7 @@ router.post('/login', (req, res) => __awaiter(void 0, void 0, void 0, function*
                 return res.status(400).send((0, response_1.JSONResponse)(false, 0, "User deleted"));
             }
             (0, auth_3.setUserLogged)(req, email);
+            yield (0, users_1.updateUserLastAction)(user);
             return res.status(200).send((0, response_1.JSONResponse)(true, LoginErrorCode.NoError, "Login Ok"));
         }
         return res.status(403).send((0, response_1.JSONResponse)(false, LoginErrorCode.InvalidPassword, "Invalid Password"));

package/dist/users/users.d.ts

@@ -1,5 +1,6 @@
 import { User } from "./../database/models/User";
 import { UserCreateInterface } from "./types";
+export declare function updateUserLastAction(user: User): Promise<User>;
 export declare function getUserSessionData(req: any): string;
 export declare function getUserById(id: Number): Promise<any>;
 export declare function getUserByEmail(email: string): Promise<any>;

package/dist/users/users.js

@@ -9,13 +9,26 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.checkUserPassword = exports.changeUserPassword = exports.createUser = exports.isUserExist = exports.deleteUserById = exports.getUserIdByUserEmail = exports.getUserByEmail = exports.getUserById = exports.getUserSessionData = void 0;
+exports.checkUserPassword = exports.changeUserPassword = exports.createUser = exports.isUserExist = exports.deleteUserById = exports.getUserIdByUserEmail = exports.getUserByEmail = exports.getUserById = exports.getUserSessionData = exports.updateUserLastAction = void 0;
 const database_1 = require("./../database/database");
 const User_1 = require("./../database/models/User");
 const password_1 = require("./password");
 const config_1 = require("../auth/config");
 const secureget_1 = require("../sessions/secureget");
 User_1.User.init(database_1.dataBase);
+function updateUserLastAction(user) {
+    return __awaiter(this, void 0, void 0, function* () {
+        try {
+            user.last_action = new Date();
+            yield user.save();
+            return user;
+        }
+        catch (e) {
+            throw e;
+        }
+    });
+}
+exports.updateUserLastAction = updateUserLastAction;
 function getUserSessionData(req) {
     return (0, secureget_1.getSessionValue)(req, config_1.SESSION_LOGGED_DATA);
 }

package/migrations/20231109185205-serverpreconfigured-user-last-action.js

@@ -0,0 +1,16 @@
+'use strict';
+
+module.exports = {
+  async up (queryInterface, Sequelize) {
+    return await queryInterface.addColumn('spc_users','last_action',{
+      type:Sequelize.DATE,
+      allowNull:false,
+      defaultValue:'2016-01-01T00:00:00-00:00'
+    }
+   );
+  },
+
+  async down (queryInterface, Sequelize) {
+    return await queryInterface.removeColumn('spc_users','last_action');
+  }
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "serverpreconfigured",
-  "version": "2.1.8",
+  "version": "2.1.9",
   "description": "\"Pre-configured server with authentication system and database integration\"",
   "main": "dist/server.js",
   "keywords": [

package/src/database/models/User.ts

@@ -2,16 +2,19 @@ import { Model } from "sequelize";
 import { DataTypes } from "sequelize";
 
 export class User extends Model{
+    declare id:number;
     declare email:string;
     declare first_name?:string;
     declare is_active:boolean;
     declare password_hash:string;
+    declare last_action:Date;
     static init(sequelize:any){
         super.init({
             first_name:DataTypes.STRING,
             email:DataTypes.STRING,
             is_active:DataTypes.BOOLEAN,
             password_hash:DataTypes.STRING,
+            last_action:DataTypes.DATE,
         },
         { 
           sequelize:sequelize,  

package/src/middlewares/auth.ts

@@ -1,7 +1,7 @@
-import { userIsLogged } from "../server";
+import { User, updateUserLastAction, userIsLogged } from "../server";
 import { JSONResponse } from "../server";
 import { getUserSessionData } from "../server";
-import { getUserIdByUserEmail } from "../server";
+
 import ENV from "../settings/env";
 const DEBUG=ENV.NODE_ENV==='development'?true:false;
 export async function setUserDataMiddleware(req:any,res:any,next:any){
@@ -9,8 +9,11 @@ export async function setUserDataMiddleware(req:any,res:any,next:any){
       return res.status(401).send(JSONResponse(false,undefined,"User Must Be Logged"));
     try{
         const dealerEmail=getUserSessionData(req);
-        const dealerId=await getUserIdByUserEmail(dealerEmail);
-        req.user={email:dealerEmail,id:dealerId};
+        const user=await User.findOne({where:{email:dealerEmail,is_active:true}});
+        if(!user)
+          throw "Unknown user";
+        req.user={email:dealerEmail,id:user.id};
+        await updateUserLastAction(user);
         next();
      }catch(e){
        let more=null;

package/src/routes/users.ts

@@ -1,10 +1,8 @@
 import  express  from "express";
-import { deleteSessionValue ,setSessionValue} from "../sessions/secureset";
-import { SESSION_LOGGED_DATA } from "../auth/config";
 import { JSONResponse } from "../utils/response";
 import { userIsLogged } from "../auth/auth";
 import meta_sanitizer from 'meta-sanitizer';
-import { checkUserPassword } from "../users/users";
+import { checkUserPassword, updateUserLastAction } from "../users/users";
 import { createUser } from "../users/users";
 import { setUserDataMiddleware } from "../middlewares/auth";
 import ENV from "../settings/env";
@@ -58,6 +56,7 @@ router.post('/login',async (req,res)=>{
              return res.status(400).send(JSONResponse(false,0,"User deleted"));
          }
          setUserLogged(req,email);
+         await updateUserLastAction(user)
          return res.status(200).send(JSONResponse(true,LoginErrorCode.NoError,"Login Ok"));
       }
       return res.status(403).send(JSONResponse(false,LoginErrorCode.InvalidPassword,"Invalid Password"));
@@ -89,4 +88,4 @@ router.post('/register',async (req,res)=>{
 router.post('/getuser',setUserDataMiddleware,async (req:any,res)=>{
     res.send(JSONResponse(true,0,"",{email:req.user.email,id:req.user.id}));
 });
-export default router;
+export default router;

package/src/users/users.ts

@@ -6,6 +6,16 @@ import {SESSION_LOGGED_DATA} from "../auth/config";
 import {getSessionValue} from "../sessions/secureget";
 User.init(dataBase);
 
+export async function updateUserLastAction(user:User){
+     try{
+         user.last_action=new Date();
+         await user.save();
+         return user;
+     }catch(e){
+          throw e;
+     }
+}
+
 export function getUserSessionData(req:any):string{
    return getSessionValue(req,SESSION_LOGGED_DATA);
 }