skyeye-svc-common-utils 0.0.231 → 1.0.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/interfaces/userInfo.d.ts +2 -0
- package/dist/interfaces/userInfo.js +2 -0
- package/dist/interfaces/userInfo.js.map +1 -1
- package/dist/utils/appConfig.d.ts +4 -0
- package/dist/utils/appConfig.js +4 -0
- package/dist/utils/appConfig.js.map +1 -1
- package/dist/utils/appConst.d.ts +1 -1
- package/dist/utils/appConst.js +1 -1
- package/dist/utils/appConst.js.map +1 -1
- package/dist/utils/authentication/auth.js +5 -3
- package/dist/utils/authentication/auth.js.map +1 -1
- package/dist/utils/middleware/overwriteConst.d.ts +1 -1
- package/dist/utils/middleware/overwriteConst.js +2 -2
- package/dist/utils/middleware/overwriteConst.js.map +1 -1
- package/package.json +2 -2
- package/src/interfaces/userInfo.ts +6 -0
- package/src/utils/appConfig.ts +4 -0
- package/src/utils/appConst.ts +1 -1
- package/src/utils/authentication/auth.ts +5 -3
- package/src/utils/middleware/overwriteConst.ts +2 -2
|
@@ -9,6 +9,8 @@ export declare class UserInfo {
|
|
|
9
9
|
subcriptionFeaturePermissionModel: SubcriptionFeaturePermissionModel[];
|
|
10
10
|
requestOrganisation: string;
|
|
11
11
|
isPublicUser: boolean;
|
|
12
|
+
internalUsage: boolean;
|
|
13
|
+
isApiUser: boolean;
|
|
12
14
|
exp: number;
|
|
13
15
|
subKeys: string[];
|
|
14
16
|
constructor();
|
|
@@ -9,6 +9,8 @@ class UserInfo {
|
|
|
9
9
|
this.firstName = null;
|
|
10
10
|
this.lastName = null;
|
|
11
11
|
this.isPublicUser = null;
|
|
12
|
+
this.internalUsage = null;
|
|
13
|
+
this.isApiUser = null;
|
|
12
14
|
this.subcriptionFeaturePermissionModel = new Array();
|
|
13
15
|
this.requestOrganisation = null;
|
|
14
16
|
this.exp = Math.floor(Date.now() / 1000) + (60 * 60);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"userInfo.js","sourceRoot":"","sources":["../../src/interfaces/userInfo.ts"],"names":[],"mappings":";;;AAEA,MAAa,QAAQ;
|
|
1
|
+
{"version":3,"file":"userInfo.js","sourceRoot":"","sources":["../../src/interfaces/userInfo.ts"],"names":[],"mappings":";;;AAEA,MAAa,QAAQ;IA2BjB;QACI,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC;QACrB,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;QAClB,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC;QACrB,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC;QACtB,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC;QACrB,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC;QACzB,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC;QAC1B,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC;QACtB,IAAI,CAAC,iCAAiC,GAAG,IAAI,KAAK,EAAqC,CAAC;QACxF,IAAI,CAAC,mBAAmB,GAAG,IAAI,CAAC;QAChC,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,GAAG,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC;QACrD,IAAI,CAAC,OAAO,GAAG,IAAI,KAAK,EAAU,CAAC;IACvC,CAAC;CACJ;AAzCD,4BAyCC"}
|
|
@@ -12,6 +12,9 @@ export declare const commonAppConfig: {
|
|
|
12
12
|
RedisEnable: boolean;
|
|
13
13
|
RedisConnectionConfigKey: string;
|
|
14
14
|
PublicJwtSecret: string;
|
|
15
|
+
ShareStorageAccountConnectionKey: string;
|
|
16
|
+
PublisherContainerName: string;
|
|
17
|
+
PublisherBlobName: string;
|
|
15
18
|
InternalJwtSecret: string;
|
|
16
19
|
Swagger: {
|
|
17
20
|
title: string;
|
|
@@ -25,4 +28,5 @@ export declare const commonAppConfig: {
|
|
|
25
28
|
SwaggerAdminRoleApiKey: string;
|
|
26
29
|
UserPublicRetrieve: string;
|
|
27
30
|
UserInternalRetrieve: string;
|
|
31
|
+
EnableExternal: boolean;
|
|
28
32
|
};
|
package/dist/utils/appConfig.js
CHANGED
|
@@ -23,6 +23,9 @@ exports.commonAppConfig = {
|
|
|
23
23
|
RedisEnable: process.env.REDIS_ENABLE === 'true',
|
|
24
24
|
RedisConnectionConfigKey: process.env.REDIS_CONNECTION_CONFIG_KEY,
|
|
25
25
|
PublicJwtSecret: process.env.PUBLIC_JWT_SECRET,
|
|
26
|
+
ShareStorageAccountConnectionKey: process.env.SHARE_STORAGE_ACCOUNT_CONNECTION_KEY,
|
|
27
|
+
PublisherContainerName: process.env.PUBLISHER_CONTAINER_NAME,
|
|
28
|
+
PublisherBlobName: process.env.PUBLISHER_BLOB_NAME,
|
|
26
29
|
InternalJwtSecret: process.env.INTERNAL_JWT_SECRET,
|
|
27
30
|
Swagger: {
|
|
28
31
|
title: process.env.SWAGGER_DOC_TITLE,
|
|
@@ -36,5 +39,6 @@ exports.commonAppConfig = {
|
|
|
36
39
|
SwaggerAdminRoleApiKey: process.env.SWAGGER_ADMIN_ROLE_API_KEY || null,
|
|
37
40
|
UserPublicRetrieve: process.env.USER_PUBLIC_RETRIEVE,
|
|
38
41
|
UserInternalRetrieve: process.env.USER_INTERNAL_RETRIEVE,
|
|
42
|
+
EnableExternal: Boolean(process.env.ENABLE_EXTERNAL) || false
|
|
39
43
|
};
|
|
40
44
|
//# sourceMappingURL=appConfig.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"appConfig.js","sourceRoot":"","sources":["../../src/utils/appConfig.ts"],"names":[],"mappings":";;;;;;AAAA,oDAA4B;AAC5B,IAAI,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,SAAS,EAAE;IACpC,gBAAM,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,MAAM,EAAE,CAAC,CAAC;CAC1D;AACD,gBAAM,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC;AAEnB,QAAA,eAAe,GAAG;IAC3B,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,gBAAgB;IACrC,IAAI,EAAE,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,IAAI;IACtC,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,QAAQ,IAAI,QAAQ;IACzC,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,QAAQ,IAAI,KAAK;IACtC,WAAW,EAAE,OAAO,CAAC,GAAG,CAAC,WAAW,IAAI,aAAa;IACrD,YAAY,EAAE,OAAO,CAAC,GAAG,CAAC,aAAa;IACvC,2BAA2B,EAAE,OAAO,CAAC,GAAG,CAAC,8BAA8B;IACvE,uBAAuB,EAAE,OAAO,CAAC,GAAG,CAAC,0BAA0B;IAC/D,SAAS,EAAE,OAAO,CAAC,GAAG,CAAC,UAAU,KAAK,MAAM;IAC5C,sBAAsB,EAAE,OAAO,CAAC,GAAG,CAAC,yBAAyB;IAC7D,WAAW,EAAE,OAAO,CAAC,GAAG,CAAC,YAAY,KAAK,MAAM;IAChD,wBAAwB,EAAE,OAAO,CAAC,GAAG,CAAC,2BAA2B;IACjE,eAAe,EAAE,OAAO,CAAC,GAAG,CAAC,iBAAiB;IAC9C,iBAAiB,EAAE,OAAO,CAAC,GAAG,CAAC,mBAAmB;IAClD,OAAO,EAAE;QACL,KAAK,EAAE,OAAO,CAAC,GAAG,CAAC,iBAAiB;QACpC,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,mBAAmB;QACxC,WAAW,EAAE,OAAO,CAAC,GAAG,CAAC,uBAAuB;KACnD;IACD,gBAAgB,EAAE,OAAO,CAAC,GAAG,CAAC,kBAAkB,IAAI,GAAG;IACvD,cAAc,EAAE,OAAO,CAAC,GAAG,CAAC,gBAAgB;IAC5C,WAAW,EAAE,OAAO,CAAC,GAAG,CAAC,aAAa;IACtC,kBAAkB,EAAE,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,IAAI,CAAC;IACjE,sBAAsB,EAAE,OAAO,CAAC,GAAG,CAAC,0BAA0B,IAAI,IAAI;IACtE,kBAAkB,EAAE,OAAO,CAAC,GAAG,CAAC,oBAAoB;IACpD,oBAAoB,EAAE,OAAO,CAAC,GAAG,CAAC,sBAAsB;
|
|
1
|
+
{"version":3,"file":"appConfig.js","sourceRoot":"","sources":["../../src/utils/appConfig.ts"],"names":[],"mappings":";;;;;;AAAA,oDAA4B;AAC5B,IAAI,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,SAAS,EAAE;IACpC,gBAAM,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,MAAM,EAAE,CAAC,CAAC;CAC1D;AACD,gBAAM,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC;AAEnB,QAAA,eAAe,GAAG;IAC3B,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,gBAAgB;IACrC,IAAI,EAAE,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,IAAI;IACtC,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,QAAQ,IAAI,QAAQ;IACzC,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,QAAQ,IAAI,KAAK;IACtC,WAAW,EAAE,OAAO,CAAC,GAAG,CAAC,WAAW,IAAI,aAAa;IACrD,YAAY,EAAE,OAAO,CAAC,GAAG,CAAC,aAAa;IACvC,2BAA2B,EAAE,OAAO,CAAC,GAAG,CAAC,8BAA8B;IACvE,uBAAuB,EAAE,OAAO,CAAC,GAAG,CAAC,0BAA0B;IAC/D,SAAS,EAAE,OAAO,CAAC,GAAG,CAAC,UAAU,KAAK,MAAM;IAC5C,sBAAsB,EAAE,OAAO,CAAC,GAAG,CAAC,yBAAyB;IAC7D,WAAW,EAAE,OAAO,CAAC,GAAG,CAAC,YAAY,KAAK,MAAM;IAChD,wBAAwB,EAAE,OAAO,CAAC,GAAG,CAAC,2BAA2B;IACjE,eAAe,EAAE,OAAO,CAAC,GAAG,CAAC,iBAAiB;IAC9C,gCAAgC,EAAE,OAAO,CAAC,GAAG,CAAC,oCAAoC;IAClF,sBAAsB,EAAE,OAAO,CAAC,GAAG,CAAC,wBAAwB;IAC5D,iBAAiB,EAAE,OAAO,CAAC,GAAG,CAAC,mBAAmB;IAClD,iBAAiB,EAAE,OAAO,CAAC,GAAG,CAAC,mBAAmB;IAClD,OAAO,EAAE;QACL,KAAK,EAAE,OAAO,CAAC,GAAG,CAAC,iBAAiB;QACpC,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,mBAAmB;QACxC,WAAW,EAAE,OAAO,CAAC,GAAG,CAAC,uBAAuB;KACnD;IACD,gBAAgB,EAAE,OAAO,CAAC,GAAG,CAAC,kBAAkB,IAAI,GAAG;IACvD,cAAc,EAAE,OAAO,CAAC,GAAG,CAAC,gBAAgB;IAC5C,WAAW,EAAE,OAAO,CAAC,GAAG,CAAC,aAAa;IACtC,kBAAkB,EAAE,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,IAAI,CAAC;IACjE,sBAAsB,EAAE,OAAO,CAAC,GAAG,CAAC,0BAA0B,IAAI,IAAI;IACtE,kBAAkB,EAAE,OAAO,CAAC,GAAG,CAAC,oBAAoB;IACpD,oBAAoB,EAAE,OAAO,CAAC,GAAG,CAAC,sBAAsB;IACxD,cAAc,EAAE,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,IAAI,KAAK;CAChE,CAAA"}
|
package/dist/utils/appConst.d.ts
CHANGED
package/dist/utils/appConst.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"appConst.js","sourceRoot":"","sources":["../../src/utils/appConst.ts"],"names":[],"mappings":";;;AAAa,QAAA,cAAc,GAAG;IAC7B,SAAS,EAAE,sCAAsC;IACjD,YAAY,EAAE;QACb,GAAG,EAAE,KAAK;QACV,OAAO,EAAE,SAAS;QAClB,OAAO,EAAE,SAAS;KAClB;IACD,YAAY,EAAE;QACb,IAAI,EAAE,MAAM;QACZ,GAAG,EAAE,KAAK;QACV,IAAI,EAAE,MAAM;QACZ,KAAK,EAAE,OAAO;KACd;IACD,UAAU,EAAE;QACX,GAAG,EAAE,KAAK;QACV,IAAI,EAAE,MAAM;QACZ,GAAG,EAAE,KAAK;QACV,MAAM,EAAE,QAAQ;KAChB;IACD,UAAU,EAAE;QACX,SAAS,EAAE,WAAW;QACtB,aAAa,EAAE,eAAe;QAC9B,MAAM,EAAE,QAAQ;QAChB,OAAO,EAAE,SAAS;QAChB,mBAAmB,EAAE,SAAS;QAChC,eAAe,EAAE,kBAAkB;KACnC;IACD,KAAK,EAAE;QACN,GAAG,EAAE,KAAK;QACV,IAAI,EAAE,MAAM;KACZ;IACD,cAAc,EAAE;QACf,EAAE,EAAE,IAAI;QACR,WAAW,EAAE,aAAa;QAC1B,gBAAgB,EAAE,kBAAkB;KACpC;IACD,KAAK,EAAE;QACN,UAAU,EAAE;YACX,SAAS,EAAE,IAAI;SACf;QACD,UAAU,EAAE,GAAG;QACf,OAAO,EAAE;YACR,aAAa,EAAE,IAAI;SACnB;KACD;IACD,OAAO,EAAE;QACR,MAAM,EAAE,QAAQ;QAChB,QAAQ,EAAE,UAAU;QACpB,
|
|
1
|
+
{"version":3,"file":"appConst.js","sourceRoot":"","sources":["../../src/utils/appConst.ts"],"names":[],"mappings":"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"}
|
|
@@ -42,7 +42,7 @@ function auth(req, res, next) {
|
|
|
42
42
|
try {
|
|
43
43
|
userInfo = yield jwtUtils_1.verifyJWT(headerInfo[1]);
|
|
44
44
|
const isPublicUser = userInfo.isPublicUser;
|
|
45
|
-
if (appConst_1.commonAppConst.userSVC.
|
|
45
|
+
if (appConfig_1.commonAppConfig.EnableExternal && !userInfo.internalUsage && appConst_1.commonAppConst.userSVC.accountRetrieve.indexOf(req.url) === -1) {
|
|
46
46
|
const userRetrieveURL = userInfo.isPublicUser ? appConfig_1.commonAppConfig.UserPublicRetrieve : appConfig_1.commonAppConfig.UserInternalRetrieve;
|
|
47
47
|
const response = yield httpClient_1.httpRequest(appConst_1.commonAppConst.httpMethod.POST, userRetrieveURL, null, { 'Content-Type': 'application/json', 'Authorization': authorizationHeader });
|
|
48
48
|
const data = yield response.json();
|
|
@@ -57,11 +57,12 @@ function auth(req, res, next) {
|
|
|
57
57
|
}
|
|
58
58
|
}
|
|
59
59
|
else if (req.headers[appConst_1.commonAppConst.httpHeader.API_USER_IDENTIFIER] && req.headers[appConst_1.commonAppConst.httpHeader.API_USER_SUBKEY]) {
|
|
60
|
-
if (!appConst_1.commonAppConst.userSVC.
|
|
60
|
+
if (appConfig_1.commonAppConfig.EnableExternal && !userInfo.internalUsage && appConst_1.commonAppConst.userSVC.accountRetrieve.indexOf(req.url) === -1) {
|
|
61
61
|
const response = yield httpClient_1.httpRequest(appConst_1.commonAppConst.httpMethod.POST, appConfig_1.commonAppConfig.UserPublicRetrieve, null, { 'Content-Type': 'application/json', 'subscription-key': req.headers[appConst_1.commonAppConst.httpHeader.API_USER_SUBKEY], 'user-id': req.headers[appConst_1.commonAppConst.httpHeader.API_USER_IDENTIFIER] });
|
|
62
62
|
const data = yield response.json();
|
|
63
63
|
userInfo = data.data;
|
|
64
64
|
userInfo.isPublicUser = true;
|
|
65
|
+
userInfo.isApiUser = true;
|
|
65
66
|
}
|
|
66
67
|
else {
|
|
67
68
|
let userGuid = req.headers[appConst_1.commonAppConst.httpHeader.API_USER_IDENTIFIER].toString().split("/").pop();
|
|
@@ -103,7 +104,7 @@ function auth(req, res, next) {
|
|
|
103
104
|
if (statusCode === 200) {
|
|
104
105
|
userInfo.requestOrganisation = ((_c = req.body.organisationGuid) === null || _c === void 0 ? void 0 : _c.toUpperCase()) || null;
|
|
105
106
|
let orgGuid = userInfo.isPublicUser ? userInfo.requestOrganisation : appConst_1.commonAppConst.emptyGuid;
|
|
106
|
-
if (requiredPermission.permissionCode !== skyeye_common_const_1.PermissionCodeConst.NO_REQUIRED) {
|
|
107
|
+
if (requiredPermission.permissionCode !== skyeye_common_const_1.PermissionCodeConst.NO_REQUIRED && !userInfo.internalUsage) {
|
|
107
108
|
let result = userInfo.subcriptionFeaturePermissionModel
|
|
108
109
|
.filter(o => ((userInfo.isPublicUser && orgGuid === null) || o.organisationGuid === orgGuid)
|
|
109
110
|
&& o.permissionList.indexOf(requiredPermission.permissionCode) >= 0);
|
|
@@ -113,6 +114,7 @@ function auth(req, res, next) {
|
|
|
113
114
|
}
|
|
114
115
|
}
|
|
115
116
|
userInfo.exp = Math.floor(Date.now() / 1000 + 3600);
|
|
117
|
+
userInfo.internalUsage = true;
|
|
116
118
|
res.locals.userInfo = userInfo;
|
|
117
119
|
yield apm_1.apmSetUserContext(userInfo);
|
|
118
120
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.js","sourceRoot":"","sources":["../../../src/utils/authentication/auth.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,iCAA+B;AAC/B,6CAA0C;AAC1C,6DAA6E;AAC7E,4CAA+C;AAC/C,0CAA6C;AAC7C,iDAA+E;AAC/E,sDAAoD;AACpD,2CAA8F;AAC9F,qDAAmD;AAEnD,SAAsB,IAAI,CAAC,GAAY,EAAE,GAAa,EAAE,IAAkB;;;QAEtE,IAAI,GAAG,CAAC,GAAG,KAAK,GAAG,EAAE;YACjB,MAAM,yBAAmB,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;SACvC;QACD,IAAI,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE;YAC7B,GAAG,CAAC,GAAG,GAAG,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;SACnC;QAED,IAAI,UAAU,GAAG,GAAG,CAAC;QACrB,IAAI,YAAY,GAAG,IAAI,CAAC;QAExB,MAAM,GAAG,GAAG,GAAG,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC;QAClC,IAAI,kBAAkB,GAAG,uCAAiB,CAAC,2BAAe,CAAC,OAAO,CAAC;aAC9D,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,aAAa,CAAC,WAAW,EAAE,KAAK,GAAG,IAAI,CAAC,CAAC,gBAAgB,KAAK,GAAG,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC,CAAC;QACzG,IAAI,kBAAkB,EAAE;YACpB,IAAI,CAAC,kBAAkB,CAAC,cAAc,EAAE;gBACpC,IAAI,QAAQ,GAAa,IAAI,qBAAQ,EAAE,CAAC;gBACxC,MAAM,mBAAmB,GAAW,CAAC,GAAG,CAAC,OAAO,CAAC,yBAAc,CAAC,UAAU,CAAC,aAAa,CAAC,IAAI,EAAE,CAAW,CAAC;gBAC3G,IAAI,UAAU,GAAa,mBAAmB,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;gBAC1D,IAAI,mBAAmB,CAAC,QAAQ,CAAC,yBAAc,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE;oBACzF,IAAI;wBACA,QAAQ,GAAG,MAAM,oBAAS,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC;wBAE1C,MAAM,YAAY,GAAG,QAAQ,CAAC,YAAY,CAAA;wBAC1C,IAAG,yBAAc,CAAC,OAAO,CAAC,
|
|
1
|
+
{"version":3,"file":"auth.js","sourceRoot":"","sources":["../../../src/utils/authentication/auth.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,iCAA+B;AAC/B,6CAA0C;AAC1C,6DAA6E;AAC7E,4CAA+C;AAC/C,0CAA6C;AAC7C,iDAA+E;AAC/E,sDAAoD;AACpD,2CAA8F;AAC9F,qDAAmD;AAEnD,SAAsB,IAAI,CAAC,GAAY,EAAE,GAAa,EAAE,IAAkB;;;QAEtE,IAAI,GAAG,CAAC,GAAG,KAAK,GAAG,EAAE;YACjB,MAAM,yBAAmB,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;SACvC;QACD,IAAI,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE;YAC7B,GAAG,CAAC,GAAG,GAAG,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;SACnC;QAED,IAAI,UAAU,GAAG,GAAG,CAAC;QACrB,IAAI,YAAY,GAAG,IAAI,CAAC;QAExB,MAAM,GAAG,GAAG,GAAG,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC;QAClC,IAAI,kBAAkB,GAAG,uCAAiB,CAAC,2BAAe,CAAC,OAAO,CAAC;aAC9D,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,aAAa,CAAC,WAAW,EAAE,KAAK,GAAG,IAAI,CAAC,CAAC,gBAAgB,KAAK,GAAG,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC,CAAC;QACzG,IAAI,kBAAkB,EAAE;YACpB,IAAI,CAAC,kBAAkB,CAAC,cAAc,EAAE;gBACpC,IAAI,QAAQ,GAAa,IAAI,qBAAQ,EAAE,CAAC;gBACxC,MAAM,mBAAmB,GAAW,CAAC,GAAG,CAAC,OAAO,CAAC,yBAAc,CAAC,UAAU,CAAC,aAAa,CAAC,IAAI,EAAE,CAAW,CAAC;gBAC3G,IAAI,UAAU,GAAa,mBAAmB,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;gBAC1D,IAAI,mBAAmB,CAAC,QAAQ,CAAC,yBAAc,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE;oBACzF,IAAI;wBACA,QAAQ,GAAG,MAAM,oBAAS,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC;wBAE1C,MAAM,YAAY,GAAG,QAAQ,CAAC,YAAY,CAAA;wBAC1C,IAAG,2BAAe,CAAC,cAAc,IAAI,CAAC,QAAQ,CAAC,aAAa,IAAI,yBAAc,CAAC,OAAO,CAAC,eAAe,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE;4BAC5H,MAAM,eAAe,GAAG,QAAQ,CAAC,YAAY,CAAA,CAAC,CAAC,2BAAe,CAAC,kBAAkB,CAAC,CAAC,CAAC,2BAAe,CAAC,oBAAoB,CAAC;4BACzH,MAAM,QAAQ,GAAG,MAAM,wBAAW,CAAC,yBAAc,CAAC,UAAU,CAAC,IAAI,EAAE,eAAe,EAAE,IAAI,EAAE,EAAC,cAAc,EAAE,kBAAkB,EAAE,eAAe,EAAC,mBAAmB,EAAC,CAAC,CAAA;4BACpK,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAA;4BAClC,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC;4BACrB,QAAQ,CAAC,YAAY,GAAG,YAAY,CAAC;yBACxC;qBACJ;oBAAC,OAAO,GAAG,EAAE;wBACV,eAAM,CAAC,KAAK,CAAC,mCAAmC,GAAG,EAAE,CAAC,CAAC;wBACvD,UAAU,GAAG,GAAG,CAAC;wBACjB,YAAY,GAAG,GAAG,CAAC;qBACtB;iBACJ;qBAAM,IAAI,GAAG,CAAC,OAAO,CAAC,yBAAc,CAAC,UAAU,CAAC,mBAAmB,CAAC,IAAI,GAAG,CAAC,OAAO,CAAC,yBAAc,CAAC,UAAU,CAAC,eAAe,CAAC,EAAE;oBAC7H,IAAG,2BAAe,CAAC,cAAc,IAAI,CAAC,QAAQ,CAAC,aAAa,IAAI,yBAAc,CAAC,OAAO,CAAC,eAAe,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE;wBACxH,MAAM,QAAQ,GAAG,MAAM,wBAAW,CAAC,yBAAc,CAAC,UAAU,CAAC,IAAI,EAAE,2BAAe,CAAC,kBAAkB,EAAE,IAAI,EAAE,EAAE,cAAc,EAAE,kBAAkB,EAAE,kBAAkB,EAAC,GAAG,CAAC,OAAO,CAAC,yBAAc,CAAC,UAAU,CAAC,eAAe,CAAC,EAAG,SAAS,EAAG,GAAG,CAAC,OAAO,CAAC,yBAAc,CAAC,UAAU,CAAC,mBAAmB,CAAC,EAAC,CAAC,CAAA;wBACvS,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAA;wBAClC,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC;wBACrB,QAAQ,CAAC,YAAY,GAAG,IAAI,CAAC;wBAC7B,QAAQ,CAAC,SAAS,GAAG,IAAI,CAAC;qBAC7B;yBAAM;wBACJ,IAAI,QAAQ,GAAG,GAAG,CAAC,OAAO,CAAC,yBAAc,CAAC,UAAU,CAAC,mBAAmB,CAAC,CAAC,QAAQ,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC;wBACtG,IAAI,MAAM,GAAG,GAAG,CAAC,OAAO,CAAC,yBAAc,CAAC,UAAU,CAAC,eAAe,CAAC,CAAC,QAAQ,EAAE,CAAA;wBAC9E,QAAQ,CAAC,QAAQ,GAAG,QAAQ,CAAA;wBAC5B,QAAQ,CAAC,OAAO,GAAG,CAAC,MAAM,CAAC,CAAA;qBAC7B;iBACR;qBAAM,IAAI,2BAAe,CAAC,kBAAkB,KAAK,CAAC,EAAE;oBACjD,eAAM,CAAC,IAAI,CAAC,8BAA8B,CAAC,CAAC;oBAC5C,MAAM,MAAM,GAAG,GAAG,CAAC,OAAO,CAAC,yBAAc,CAAC,UAAU,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC;oBACtE,IAAI,MAAM,KAAK,IAAI,IAAI,MAAM,KAAK,EAAE,EAAE;wBAClC,eAAM,CAAC,KAAK,CAAC,+BAA+B,CAAC,CAAC;wBAC9C,UAAU,GAAG,GAAG,CAAC;qBACpB;yBAAM;wBACH,MAAM,IAAI,GAAG,YAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,MAAM,CAAC,CAAC;wBAClD,IAAI,IAAI,EAAE;4BACN,eAAM,CAAC,IAAI,CAAC,sBAAsB,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;4BACnD,QAAQ,CAAC,QAAQ,SAAG,IAAI,CAAC,QAAQ,0CAAE,WAAW,EAAE,CAAC;4BACjD,QAAQ,CAAC,QAAQ,GAAG,yBAAc,CAAC,SAAS,CAAC;4BAC7C,IAAI,WAAW,GAAG,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,OAAA,IAAI,CAAC,gBAAgB,0CAAE,WAAW,OAAM,IAAI,CAAC,CAAC,CAAC,CAAC,yBAAc,CAAC,SAAS,CAAC;4BAChH,IAAI,kCAAkC,GAAsC,IAAI,8CAAiC,EAAE,CAAC;4BACpH,kCAAkC,CAAC,gBAAgB,GAAG,WAAW,CAAC;4BAClE,kCAAkC,CAAC,cAAc,GAAG,IAAI,CAAC,WAAW,CAAC;4BACrE,QAAQ,CAAC,iCAAiC,GAAG,CAAC,kCAAkC,CAAC,CAAC;4BAClF,QAAQ,CAAC,YAAY,GAAG,IAAI,CAAC,YAAY,CAAC;yBAC7C;6BAAM;4BACH,eAAM,CAAC,KAAK,CAAC,iCAAiC,CAAC,CAAC;4BAChD,UAAU,GAAG,GAAG,CAAC;yBACpB;qBACJ;iBACJ;qBAAM;oBACH,eAAM,CAAC,KAAK,CAAC,oCAAoC,CAAC,CAAC;oBACnD,UAAU,GAAG,GAAG,CAAC;iBACpB;gBAED,IAAI,UAAU,KAAK,GAAG,EAAE;oBACpB,QAAQ,CAAC,mBAAmB,GAAG,OAAA,GAAG,CAAC,IAAI,CAAC,gBAAgB,0CAAE,WAAW,OAAM,IAAI,CAAC;oBAEhF,IAAI,OAAO,GAAG,QAAQ,CAAC,YAAY,CAAC,CAAC,CAAC,QAAQ,CAAC,mBAAmB,CAAC,CAAC,CAAC,yBAAc,CAAC,SAAS,CAAC;oBAC9F,IAAI,kBAAkB,CAAC,cAAc,KAAK,yCAAmB,CAAC,WAAW,IAAI,CAAC,QAAQ,CAAC,aAAa,EAAE;wBAClG,IAAI,MAAM,GAAwC,QAAQ,CAAC,iCAAiC;6BACvF,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,YAAY,IAAI,OAAO,KAAK,IAAI,CAAC,IAAI,CAAC,CAAC,gBAAgB,KAAK,OAAO,CAAC;+BACrF,CAAC,CAAC,cAAc,CAAC,OAAO,CAAC,kBAAkB,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC;wBAC7E,IAAI,MAAM,KAAK,SAAS,IAAI,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,MAAM,IAAG,CAAC,EAAE;4BAC5C,eAAM,CAAC,KAAK,CAAC,qCAAqC,GAAG,EAAE,CAAC,CAAC;4BACzD,UAAU,GAAG,GAAG,CAAC;yBACpB;qBACJ;oBACD,QAAQ,CAAC,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,GAAG,IAAI,CAAC,CAAC;oBACpD,QAAQ,CAAC,aAAa,GAAG,IAAI,CAAC;oBAC9B,GAAG,CAAC,MAAM,CAAC,QAAQ,GAAG,QAAQ,CAAC;oBAC/B,MAAM,uBAAiB,CAAC,QAAQ,CAAC,CAAC;iBACrC;aACJ;SACJ;aAAM;YACH,eAAM,CAAC,KAAK,CAAC,eAAe,GAAG,YAAY,CAAC,CAAC;YAC7C,UAAU,GAAG,GAAG,CAAC;SACpB;QAED,IAAI,UAAU,KAAK,GAAG,EAAE;YACpB,OAAO,IAAI,EAAE,CAAC;SACjB;aAAM;YACH,IAAI,GAAG,CAAC,GAAG,KAAK,GAAG,EAAE;gBAAE,MAAM,uBAAiB,CAAC,GAAG,CAAC,CAAC;aAAE;YACtD,IAAI,YAAY,EAAE;gBACd,OAAO,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;aACpD;iBAAM;gBACH,OAAO,GAAG,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;aACrC;SACJ;;CACJ;AAhHD,oBAgHC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
export declare function overwriteConst(): Promise<void>;
|
|
1
|
+
export declare function overwriteConst(containerName: string, blobName: string, connectionKey: string): Promise<void>;
|
|
@@ -13,11 +13,11 @@ exports.overwriteConst = void 0;
|
|
|
13
13
|
const logger_1 = require("../logger/logger");
|
|
14
14
|
const azureBlobStorage_1 = require("../../lib/azure/azureBlobStorage");
|
|
15
15
|
const skyeye_common_const_1 = require("skyeye-common-const");
|
|
16
|
-
function overwriteConst() {
|
|
16
|
+
function overwriteConst(containerName, blobName, connectionKey) {
|
|
17
17
|
return __awaiter(this, void 0, void 0, function* () {
|
|
18
18
|
logger_1.logger.info(`start overwriteConst`);
|
|
19
19
|
// Overwrite newsConst
|
|
20
|
-
const publisherListStr = yield azureBlobStorage_1.downloadFile(
|
|
20
|
+
const publisherListStr = yield azureBlobStorage_1.downloadFile(containerName, blobName, connectionKey);
|
|
21
21
|
const publisherList = JSON.parse(publisherListStr);
|
|
22
22
|
skyeye_common_const_1.updateNewsConst(publisherList);
|
|
23
23
|
for (const publisher in publisherList) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"overwriteConst.js","sourceRoot":"","sources":["../../../src/utils/middleware/overwriteConst.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6CAA0C;AAC1C,uEAAgE;AAChE,6DAGqH;AAErH,SAAsB,cAAc;;
|
|
1
|
+
{"version":3,"file":"overwriteConst.js","sourceRoot":"","sources":["../../../src/utils/middleware/overwriteConst.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6CAA0C;AAC1C,uEAAgE;AAChE,6DAGqH;AAErH,SAAsB,cAAc,CAAC,aAAqB,EAAE,QAAgB,EAAE,aAAqB;;QAC/F,eAAM,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAC;QAEpC,sBAAsB;QACtB,MAAM,gBAAgB,GAAG,MAAM,+BAAY,CAAC,aAAa,EAAE,QAAQ,EAAE,aAAa,CAAC,CAAC;QACpF,MAAM,aAAa,GAAG,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC;QACnD,qCAAe,CAAC,aAAa,CAAC,CAAC;QAE/B,KAAK,MAAM,SAAS,IAAI,aAAa,EAAE;YACnC,0BAA0B;YAC1B,MAAM,UAAU,GAAe;gBAC3B,IAAI,EAAE,aAAa,CAAC,SAAS,CAAC,CAAC,IAAI;gBACnC,KAAK,EAAE,aAAa,CAAC,SAAS,CAAC,CAAC,KAAK;aACxC,CAAC;YACF,MAAM,iBAAiB,GAAG,aAAa,CAAC,SAAS,CAAC,CAAC,QAAQ,CAAC;YAC5D,QAAO,iBAAiB,EAAE;gBACtB,KAAK,uCAAiB,CAAC,OAAO;oBAAE,kDAA4B,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;oBAAC,MAAM;gBACrF,KAAK,uCAAiB,CAAC,WAAW;oBAAE,sDAAgC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;oBAAC,MAAM;gBAC7F,KAAK,uCAAiB,CAAC,eAAe;oBAAE,0DAAoC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;oBAAC,MAAM;gBACrG,KAAK,uCAAiB,CAAC,YAAY;oBAAE,+CAAyB,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;oBAAC,MAAM;gBACvF,KAAK,uCAAiB,CAAC,UAAU;oBAAE,6CAAuB,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;oBAAC,MAAM;gBACnF,KAAK,uCAAiB,CAAC,UAAU;oBAAE,6CAAuB,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;oBAAC,MAAM;gBACnF;oBAAS,+CAAyB,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;oBAAC,MAAM;aAC9D;YAED,sCAAsC;YACtC,MAAM,cAAc,GAAY;gBAC5B,WAAW,EAAE,aAAa,CAAC,SAAS,CAAC,CAAC,IAAI;gBAC1C,YAAY,EAAE,aAAa,CAAC,SAAS,CAAC,CAAC,KAAK;aAC/C,CAAC;YACF,+CAAyB,CAAC,QAAQ,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;YAExD,4CAA4C;YAC5C,MAAM,oBAAoB,GAAY;gBAClC,WAAW,EAAE,aAAa,CAAC,SAAS,CAAC,CAAC,IAAI,GAAG,oCAAc,CAAC,aAAa;gBACzE,YAAY,EAAE,aAAa,CAAC,SAAS,CAAC,CAAC,KAAK;aAC/C,CAAC;YACF,qDAA+B,CAAC,QAAQ,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;SACvE;QAED,eAAM,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;IACtC,CAAC;CAAA;AAzCD,wCAyCC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "skyeye-svc-common-utils",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "1.0.1",
|
|
4
4
|
"description": "",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
@@ -56,7 +56,7 @@
|
|
|
56
56
|
"node-fetch": "^2.6.0",
|
|
57
57
|
"nyc": "^15.1.0",
|
|
58
58
|
"rotating-file-stream": "^1.4.6",
|
|
59
|
-
"skyeye-common-const": "
|
|
59
|
+
"skyeye-common-const": "1.0.1",
|
|
60
60
|
"swagger-jsdoc": "^3.5.0",
|
|
61
61
|
"swagger-ui-express": "^4.1.3",
|
|
62
62
|
"ts-node": "^9.0.0",
|
|
@@ -19,6 +19,10 @@ export class UserInfo {
|
|
|
19
19
|
|
|
20
20
|
isPublicUser: boolean;
|
|
21
21
|
|
|
22
|
+
internalUsage: boolean;
|
|
23
|
+
|
|
24
|
+
isApiUser: boolean;
|
|
25
|
+
|
|
22
26
|
exp: number;
|
|
23
27
|
|
|
24
28
|
subKeys: string[];
|
|
@@ -30,6 +34,8 @@ export class UserInfo {
|
|
|
30
34
|
this.firstName = null;
|
|
31
35
|
this.lastName = null;
|
|
32
36
|
this.isPublicUser = null;
|
|
37
|
+
this.internalUsage = null;
|
|
38
|
+
this.isApiUser = null;
|
|
33
39
|
this.subcriptionFeaturePermissionModel = new Array<SubcriptionFeaturePermissionModel>();
|
|
34
40
|
this.requestOrganisation = null;
|
|
35
41
|
this.exp = Math.floor(Date.now() / 1000) + (60 * 60);
|
package/src/utils/appConfig.ts
CHANGED
|
@@ -18,6 +18,9 @@ export const commonAppConfig = {
|
|
|
18
18
|
RedisEnable: process.env.REDIS_ENABLE === 'true',
|
|
19
19
|
RedisConnectionConfigKey: process.env.REDIS_CONNECTION_CONFIG_KEY,
|
|
20
20
|
PublicJwtSecret: process.env.PUBLIC_JWT_SECRET,
|
|
21
|
+
ShareStorageAccountConnectionKey: process.env.SHARE_STORAGE_ACCOUNT_CONNECTION_KEY,
|
|
22
|
+
PublisherContainerName: process.env.PUBLISHER_CONTAINER_NAME,
|
|
23
|
+
PublisherBlobName: process.env.PUBLISHER_BLOB_NAME,
|
|
21
24
|
InternalJwtSecret: process.env.INTERNAL_JWT_SECRET,
|
|
22
25
|
Swagger: {
|
|
23
26
|
title: process.env.SWAGGER_DOC_TITLE,
|
|
@@ -31,4 +34,5 @@ export const commonAppConfig = {
|
|
|
31
34
|
SwaggerAdminRoleApiKey: process.env.SWAGGER_ADMIN_ROLE_API_KEY || null,
|
|
32
35
|
UserPublicRetrieve: process.env.USER_PUBLIC_RETRIEVE,
|
|
33
36
|
UserInternalRetrieve: process.env.USER_INTERNAL_RETRIEVE,
|
|
37
|
+
EnableExternal: Boolean(process.env.ENABLE_EXTERNAL) || false
|
|
34
38
|
}
|
package/src/utils/appConst.ts
CHANGED
|
@@ -34,7 +34,7 @@ export async function auth(req: Request, res: Response, next: NextFunction) {
|
|
|
34
34
|
userInfo = await verifyJWT(headerInfo[1]);
|
|
35
35
|
|
|
36
36
|
const isPublicUser = userInfo.isPublicUser
|
|
37
|
-
if(commonAppConst.userSVC.
|
|
37
|
+
if(commonAppConfig.EnableExternal && !userInfo.internalUsage && commonAppConst.userSVC.accountRetrieve.indexOf(req.url) === -1) {
|
|
38
38
|
const userRetrieveURL = userInfo.isPublicUser? commonAppConfig.UserPublicRetrieve : commonAppConfig.UserInternalRetrieve;
|
|
39
39
|
const response = await httpRequest(commonAppConst.httpMethod.POST, userRetrieveURL, null, {'Content-Type': 'application/json', 'Authorization':authorizationHeader})
|
|
40
40
|
const data = await response.json()
|
|
@@ -47,11 +47,12 @@ export async function auth(req: Request, res: Response, next: NextFunction) {
|
|
|
47
47
|
errorMessage = err;
|
|
48
48
|
}
|
|
49
49
|
} else if (req.headers[commonAppConst.httpHeader.API_USER_IDENTIFIER] && req.headers[commonAppConst.httpHeader.API_USER_SUBKEY]) {
|
|
50
|
-
|
|
50
|
+
if(commonAppConfig.EnableExternal && !userInfo.internalUsage && commonAppConst.userSVC.accountRetrieve.indexOf(req.url) === -1) {
|
|
51
51
|
const response = await httpRequest(commonAppConst.httpMethod.POST, commonAppConfig.UserPublicRetrieve, null, { 'Content-Type': 'application/json', 'subscription-key':req.headers[commonAppConst.httpHeader.API_USER_SUBKEY] , 'user-id' : req.headers[commonAppConst.httpHeader.API_USER_IDENTIFIER]})
|
|
52
52
|
const data = await response.json()
|
|
53
53
|
userInfo = data.data;
|
|
54
54
|
userInfo.isPublicUser = true;
|
|
55
|
+
userInfo.isApiUser = true;
|
|
55
56
|
} else {
|
|
56
57
|
let userGuid = req.headers[commonAppConst.httpHeader.API_USER_IDENTIFIER].toString().split("/").pop();
|
|
57
58
|
let subKey = req.headers[commonAppConst.httpHeader.API_USER_SUBKEY].toString()
|
|
@@ -90,7 +91,7 @@ export async function auth(req: Request, res: Response, next: NextFunction) {
|
|
|
90
91
|
userInfo.requestOrganisation = req.body.organisationGuid?.toUpperCase() || null;
|
|
91
92
|
|
|
92
93
|
let orgGuid = userInfo.isPublicUser ? userInfo.requestOrganisation : commonAppConst.emptyGuid;
|
|
93
|
-
if (requiredPermission.permissionCode !== PermissionCodeConst.NO_REQUIRED) {
|
|
94
|
+
if (requiredPermission.permissionCode !== PermissionCodeConst.NO_REQUIRED && !userInfo.internalUsage) {
|
|
94
95
|
let result: SubcriptionFeaturePermissionModel[] = userInfo.subcriptionFeaturePermissionModel
|
|
95
96
|
.filter(o => ((userInfo.isPublicUser && orgGuid === null) || o.organisationGuid === orgGuid)
|
|
96
97
|
&& o.permissionList.indexOf(requiredPermission.permissionCode) >= 0);
|
|
@@ -100,6 +101,7 @@ export async function auth(req: Request, res: Response, next: NextFunction) {
|
|
|
100
101
|
}
|
|
101
102
|
}
|
|
102
103
|
userInfo.exp = Math.floor(Date.now() / 1000 + 3600);
|
|
104
|
+
userInfo.internalUsage = true;
|
|
103
105
|
res.locals.userInfo = userInfo;
|
|
104
106
|
await apmSetUserContext(userInfo);
|
|
105
107
|
}
|
|
@@ -5,11 +5,11 @@ import { newsCategoryConst, updateNewsConst, newsCategorySourceMapping, reportsC
|
|
|
5
5
|
dataMiningSourceMapping, webContentSourceMapping, NewsSource,
|
|
6
6
|
contentApplicationFeature, lockedContentApplicationFeature, Feature, commonAppConst } from 'skyeye-common-const';
|
|
7
7
|
|
|
8
|
-
export async function overwriteConst() {
|
|
8
|
+
export async function overwriteConst(containerName: string, blobName: string, connectionKey: string) {
|
|
9
9
|
logger.info(`start overwriteConst`);
|
|
10
10
|
|
|
11
11
|
// Overwrite newsConst
|
|
12
|
-
const publisherListStr = await downloadFile(
|
|
12
|
+
const publisherListStr = await downloadFile(containerName, blobName, connectionKey);
|
|
13
13
|
const publisherList = JSON.parse(publisherListStr);
|
|
14
14
|
updateNewsConst(publisherList);
|
|
15
15
|
|