serverpreconfigured 1.0.4 → 1.0.7

package/dist/server.d.ts

@@ -1,11 +1,12 @@
-export { userIsLogged } from "./auth/auth";
+export * from "./auth/auth";
 export { User } from "./database/models/User";
 export { dataBase } from "./database/database";
-export { setSessionValue, deleteSessionValue } from "./sessions/secureset";
-export { getSessionValue } from "./sessions/secureget";
-export { checkUserPassword } from "./users/users";
+export * from "./sessions/secureset";
+export * from "./sessions/secureget";
+export * from "./users/users";
 export { WebSocketAuth } from "./database/models/WSAuth";
-export { checkWSAuthToken, authenticateWS, checkConnectionAuth } from "./wsauth/wsauth";
+export * from "./wsauth/wsauth";
 export { randomString } from "./utils/string/random";
+export { JSONResponse } from "./utils/response";
 import ExpressServer from "./expressServer";
 export default ExpressServer;

package/dist/server.js

@@ -1,31 +1,26 @@
 "use strict";
+function __export(m) {
+    for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
+}
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-var auth_1 = require("./auth/auth");
-exports.userIsLogged = auth_1.userIsLogged;
+__export(require("./auth/auth"));
 ;
 var User_1 = require("./database/models/User");
 exports.User = User_1.User;
 var database_1 = require("./database/database");
 exports.dataBase = database_1.dataBase;
-var secureset_1 = require("./sessions/secureset");
-exports.setSessionValue = secureset_1.setSessionValue;
-exports.deleteSessionValue = secureset_1.deleteSessionValue;
-var secureget_1 = require("./sessions/secureget");
-exports.getSessionValue = secureget_1.getSessionValue;
-var users_1 = require("./users/users");
-exports.checkUserPassword = users_1.checkUserPassword;
+__export(require("./sessions/secureset"));
+__export(require("./sessions/secureget"));
+__export(require("./users/users"));
 var WSAuth_1 = require("./database/models/WSAuth");
 exports.WebSocketAuth = WSAuth_1.WebSocketAuth;
-var wsauth_1 = require("./wsauth/wsauth");
-exports.checkWSAuthToken = wsauth_1.checkWSAuthToken;
-exports.authenticateWS = wsauth_1.authenticateWS;
-exports.checkConnectionAuth = wsauth_1.checkConnectionAuth;
+__export(require("./wsauth/wsauth"));
 var random_1 = require("./utils/string/random");
 exports.randomString = random_1.randomString;
+var response_1 = require("./utils/response");
+exports.JSONResponse = response_1.JSONResponse;
 const expressServer_1 = __importDefault(require("./expressServer"));
-;
 exports.default = expressServer_1.default;
-const e = new expressServer_1.default();

package/dist/users/users.d.ts

@@ -1,4 +1,5 @@
 import { UserCreateInterface } from "./types";
+export declare function getUserSessionData(req: any): string;
 export declare function getUserById(id: Number): Promise<any>;
 export declare function getUserByEmail(email: string): Promise<any>;
 export declare function getUserIdByUserEmail(email: string): Promise<number>;

package/dist/users/users.js

@@ -12,7 +12,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 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 getUserSessionData(req) {
+    return secureget_1.getSessionValue(req, config_1.SESSION_LOGGED_DATA);
+}
+exports.getUserSessionData = getUserSessionData;
 function getUserById(id) {
     return __awaiter(this, void 0, void 0, function* () {
         let result = yield User_1.User.findOne({ where: { id: id.toString() } });

package/dist/wsauth/types.d.ts

@@ -1,4 +0,0 @@
-export declare enum AuthenticateWSResult {
-    OK = 1,
-    InvalidToken = 2
-}

package/dist/wsauth/types.js

@@ -1,7 +1 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-var AuthenticateWSResult;
-(function (AuthenticateWSResult) {
-    AuthenticateWSResult[AuthenticateWSResult["OK"] = 1] = "OK";
-    AuthenticateWSResult[AuthenticateWSResult["InvalidToken"] = 2] = "InvalidToken";
-})(AuthenticateWSResult = exports.AuthenticateWSResult || (exports.AuthenticateWSResult = {}));

package/dist/wsauth/wsauth.d.ts

@@ -1,6 +1,5 @@
-import { AuthenticateWSResult } from "./types";
 export declare function getWSAuthDataByUserId(userId: number): Promise<any>;
 export declare function setWSAuthDataNewToken(userId: number, expiration_hours?: number): Promise<any>;
 export declare function checkWSAuthToken(userId: number, token: string): Promise<boolean>;
-export declare function authenticateWS(userId: number, token: string, connection_token: string): Promise<AuthenticateWSResult>;
+export declare function authenticateWS(userId: number, token: string, connection_token: string): Promise<boolean>;
 export declare function checkConnectionAuth(userId: number, connection_token: string): Promise<boolean>;

package/dist/wsauth/wsauth.js

@@ -12,7 +12,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const server_1 = require("../server");
 const server_2 = require("../server");
 const random_1 = require("./../utils/string/random");
-const types_1 = require("./types");
 server_1.WebSocketAuth.init(server_2.dataBase);
 function getWSAuthDataByUserId(userId) {
     return __awaiter(this, void 0, void 0, function* () {
@@ -79,11 +78,11 @@ function authenticateWS(userId, token, connection_token) {
     return __awaiter(this, void 0, void 0, function* () {
         try {
             if (!(yield checkWSAuthToken(userId, token)))
-                return types_1.AuthenticateWSResult.InvalidToken;
+                return false;
             let ws = yield getWSAuthDataByUserId(userId);
             ws.auth_connection_token = connection_token;
             yield ws.save();
-            return types_1.AuthenticateWSResult.OK;
+            return true;
         }
         catch (e) {
             throw e;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "serverpreconfigured",
-  "version": "1.0.4",
+  "version": "1.0.7",
   "description": "\"Pre-configured server with authentication system and database integration\"",
   "main": "dist/server.js",
   "keywords": ["server","pre configured","database","authentication"],
@@ -21,7 +21,7 @@
     "cors": "^2.8.5",
     "express": "^4.17.3",
     "express-session": "^1.17.2",
-    "meta-sanitizer": "^2.0.2",
+    "meta-sanitizer": "^2.1.1",
     "nodemon": "^2.0.15",
     "pg": "^8.7.3",
     "pg-hstore": "^2.3.4",

package/src/server.ts

@@ -1,13 +1,12 @@
-export { userIsLogged } from "./auth/auth";;
+export  * from "./auth/auth";;
 export { User } from "./database/models/User";
 export { dataBase } from "./database/database";
-export { setSessionValue,deleteSessionValue } from "./sessions/secureset";
-export { getSessionValue } from "./sessions/secureget";
-export { checkUserPassword } from "./users/users";
+export * from "./sessions/secureset";
+export * from "./sessions/secureget";
+export * from "./users/users";
 export { WebSocketAuth } from "./database/models/WSAuth";
-export { checkWSAuthToken ,authenticateWS,checkConnectionAuth} from "./wsauth/wsauth";
-export { randomString } from "./utils/string/random"
+export * from "./wsauth/wsauth";
+export { randomString } from "./utils/string/random";
+export { JSONResponse } from "./utils/response";
 import ExpressServer from "./expressServer";
-;
 export default ExpressServer;
-const e=new ExpressServer();

package/src/users/users.ts

@@ -2,7 +2,13 @@ import {dataBase} from "./../database/database";
 import { User } from "./../database/models/User";
 import { createArgon2Hash,checkArgon2Password } from "./password";
 import {UserCreateInterface} from "./types";
+import {SESSION_LOGGED_DATA} from "../auth/config";
+import {getSessionValue} from "../sessions/secureget";
 User.init(dataBase);
+
+export function getUserSessionData(req:any):string{
+   return getSessionValue(req,SESSION_LOGGED_DATA);
+}
 export async function getUserById(id:Number){
      let result=await User.findOne({where:{id:id.toString()}});
      return (result);

package/src/wsauth/types.ts

@@ -1,4 +0,0 @@
-export enum AuthenticateWSResult{
-    OK=1,
-    InvalidToken,
-}

package/src/wsauth/wsauth.ts

@@ -1,7 +1,6 @@
 import { WebSocketAuth } from "../server";
 import { dataBase } from "../server";
 import {randomString} from "./../utils/string/random";
-import {AuthenticateWSResult} from "./types";
 WebSocketAuth.init(dataBase);
 export async function getWSAuthDataByUserId(userId:number):Promise<any>{
    try{
@@ -54,14 +53,14 @@ export async function checkWSAuthToken(userId:number,token:string):Promise<boole
     }
 }
 
-export async function authenticateWS(userId:number,token:string,connection_token:string):Promise<AuthenticateWSResult>{
+export async function authenticateWS(userId:number,token:string,connection_token:string):Promise<boolean>{
     try{
       if(!(await checkWSAuthToken(userId,token)))
-         return AuthenticateWSResult.InvalidToken; 
+         return false; 
       let ws=await getWSAuthDataByUserId(userId);  
       ws.auth_connection_token=connection_token;
       await ws.save();
-      return AuthenticateWSResult.OK;
+      return true;
     }catch(e){
        throw e;
     }