serverpreconfigured 2.1.2 → 2.1.4

package/dist/expressServer.d.ts

@@ -1,12 +1,18 @@
+/// <reference types="node" />
+import express from "express";
+import { Express } from "express";
+import { Server } from "http";
 export default class ExpressServer {
-    app: any;
+    app: Express;
     authBaseUrl: string;
     usePort: number;
+    server?: Server;
     wsAuthBaseUrl: string;
     constructor();
     listen(port?: any): void;
     initModules(): void;
     initAuthSystem(baseUrl?: string): void;
     initWSAuthSystem(wsBaseUrl?: string): void;
-    getApp(): any;
+    getApp(): express.Express;
+    getServer(): Server | undefined;
 }

package/dist/expressServer.js

@@ -21,7 +21,7 @@ class ExpressServer {
     listen(port = null) {
         if (port != null)
             this.usePort = parseInt(port);
-        this.app.listen(this.usePort);
+        this.server = this.app.listen(this.usePort);
     }
     initModules() {
         (0, sessions_1.initSessions)(this.app);
@@ -39,5 +39,8 @@ class ExpressServer {
     getApp() {
         return this.app;
     }
+    getServer() {
+        return this.server;
+    }
 }
 exports.default = ExpressServer;

package/dist/users/users.d.ts

@@ -1,3 +1,4 @@
+import { User } from "./../database/models/User";
 import { UserCreateInterface } from "./types";
 export declare function getUserSessionData(req: any): string;
 export declare function getUserById(id: Number): Promise<any>;
@@ -6,5 +7,5 @@ export declare function getUserIdByUserEmail(email: string): Promise<number>;
 export declare function deleteUserById(id: Number): Promise<any>;
 export declare function isUserExist(email: string): Promise<boolean>;
 export declare function createUser(data: UserCreateInterface): Promise<any>;
-export declare function changeUserPassword(email: string, password: string): Promise<Bluebird<T>>;
+export declare function changeUserPassword(email: string, password: string): Promise<User>;
 export declare function checkUserPassword(email: string, password_string: string): Promise<boolean>;

package/package.json

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

package/src/expressServer.ts

@@ -1,14 +1,17 @@
 import express from "express";
+import { Express } from "express";
 import { initSessions } from "./modules/sessions";
 import { initPostReader } from "./modules/postreader";
 import { initCors } from "./modules/initcors";
 import  ENV  from "./settings/env";
 import authRouter from "./routes/users";
 import { router as wsAuthRoter } from "./routes/wsauth";
+import { Server } from "http";
 export default class ExpressServer{
-    app:any;
+    app:Express;
     authBaseUrl:string;
     usePort:number;
+    server?:Server;
     wsAuthBaseUrl:string;
     constructor(){
        this.authBaseUrl="";
@@ -20,7 +23,7 @@ export default class ExpressServer{
     listen(port:any=null){
        if(port!=null)
           this.usePort=parseInt(port);
-       this.app.listen(this.usePort);  
+       this.server=this.app.listen(this.usePort);  
     }
 
     initModules(){
@@ -40,4 +43,7 @@ export default class ExpressServer{
     getApp(){
       return this.app;
     }
+    getServer(){
+      return this.server;
+    }
 }

package/src/users/users.ts

@@ -64,7 +64,7 @@ export async function createUser(data:UserCreateInterface):Promise<any>{
      }
 }
 
-export async function changeUserPassword(email:string,password:string){
+export async function changeUserPassword(email:string,password:string):Promise<User>{
      try{
           let user=await User.findOne({where:{email}});
           if(!user)