skyeye-svc-common-utils 1.0.5 → 1.0.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "skyeye-svc-common-utils",
-  "version": "1.0.5",
+  "version": "1.0.7",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -56,7 +56,7 @@
     "node-fetch": "^2.6.0",
     "nyc": "^15.1.0",
     "rotating-file-stream": "^1.4.6",
-    "skyeye-common-const": "1.0.2",
+    "skyeye-common-const": "1.0.3",
     "swagger-jsdoc": "^3.5.0",
     "swagger-ui-express": "^4.1.3",
     "ts-node": "^9.0.0",

package/src/models/baseControllerParameter.ts

@@ -1,5 +1,8 @@
 import { ServiceResponse, UserInfo } from "../interfaces";
 import { QueryRunner } from "typeorm";
+import { commonAppConst, jsonContentTypeHeaders } from "../utils/appConst";
+import { generateJWT } from "../utils/commonUtils";
+import { httpRequest } from "../lib/httpClient";
 
 export class BaseControllerParameter {
     queryRunner: QueryRunner;
@@ -8,5 +11,12 @@ export class BaseControllerParameter {
   
     constructor() {
     }
-  }
-  
+    async sendInternalHttpRequest(method: string, url : string,  data: any = null,) {
+      let headers:any = jsonContentTypeHeaders();
+      let token: string = `${commonAppConst.httpHeader.BEARER} ${await generateJWT(this.userInfo)}`;
+      headers[commonAppConst.httpHeader.AUTHORIZATION] = token;
+      return httpRequest(method, url, data, headers).then(response => {
+        return response.json()
+      })
+    }
+  }

package/src/utils/commonUtils/appUtils.ts

@@ -1,9 +1,7 @@
 import { logger } from '../logger/logger';
 import { ServiceResponse, Pagination, UserInfo } from '../../interfaces';
-import { commonAppConst, jsonContentTypeHeaders } from '../../utils/appConst';
+import { commonAppConst } from '../../utils/appConst';
 import { allApplicationFeatures, ApplicationFeature, commonAppConst as sCommonAppConst, Feature } from 'skyeye-common-const';
-import { httpRequest } from '../../lib/httpClient';
-import { generateJWT } from './jwtUtils';
 
 export async function mappingToModel(input: any, output: any) {
     if (input !== undefined && input !== null) {
@@ -99,11 +97,4 @@ export async function userInfoToFeatureListByName(userInfo: UserInfo, featureNam
     } catch (err) {
         logger.error(err);
     }
-}
-
-export async function sendInternalHttpRequest(userInfo:UserInfo, method: string, url : string,  data: any = null,) {
-    let headers:any = jsonContentTypeHeaders();
-    let token: string = `${commonAppConst.httpHeader.BEARER} ${await generateJWT(userInfo)}`;
-    headers[commonAppConst.httpHeader.AUTHORIZATION] = token;
-    return httpRequest(method, url, data, headers)
 }