@novo-learning/service-lib 0.0.16 → 0.0.19
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/index.d.ts +1 -0
- package/dist/index.js +1 -0
- package/dist/index.js.map +1 -1
- package/dist/modules/clients/auth-api/auth.service.d.ts +1 -1
- package/dist/modules/clients/auth-api/auth.service.js +2 -2
- package/dist/modules/clients/auth-api/auth.service.js.map +1 -1
- package/dist/modules/nest/logger/index.d.ts +2 -0
- package/dist/modules/nest/logger/index.js +19 -0
- package/dist/modules/nest/logger/index.js.map +1 -0
- package/dist/modules/nest/logger/iso-logger.d.ts +8 -0
- package/dist/modules/nest/logger/iso-logger.js +44 -0
- package/dist/modules/nest/logger/iso-logger.js.map +1 -0
- package/dist/modules/nest/logger/logger.module.d.ts +2 -0
- package/dist/modules/nest/logger/logger.module.js +23 -0
- package/dist/modules/nest/logger/logger.module.js.map +1 -0
- package/package.json +6 -4
package/dist/index.d.ts
CHANGED
package/dist/index.js
CHANGED
|
@@ -16,5 +16,6 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
|
16
16
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
17
|
__exportStar(require("./modules/clients"), exports);
|
|
18
18
|
__exportStar(require("./modules/nest/jwt"), exports);
|
|
19
|
+
__exportStar(require("./modules/nest/logger"), exports);
|
|
19
20
|
__exportStar(require("./validators"), exports);
|
|
20
21
|
//# sourceMappingURL=index.js.map
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,oDAAkC;AAClC,qDAAmC;AACnC,+CAA6B"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,oDAAkC;AAClC,qDAAmC;AACnC,wDAAsC;AACtC,+CAA6B"}
|
|
@@ -7,7 +7,7 @@ export declare class AuthService {
|
|
|
7
7
|
private makeKey;
|
|
8
8
|
private readonly api;
|
|
9
9
|
constructor(apiUrl: string, cacheManager: Cache);
|
|
10
|
-
login(id: string, token: string, permissions: PermissionType[]): Promise<AuthenticationDataDtoV1 | {
|
|
10
|
+
login(id: string, token: string, permissions: PermissionType[], userId?: string): Promise<AuthenticationDataDtoV1 | {
|
|
11
11
|
error: string;
|
|
12
12
|
}>;
|
|
13
13
|
}
|
|
@@ -25,7 +25,7 @@ let AuthService = AuthService_1 = class AuthService {
|
|
|
25
25
|
const url = this.apiUrl.includes('://') ? this.apiUrl : `http://${this.apiUrl}`;
|
|
26
26
|
this.api = new novo_sdk_1.AuthApi(undefined, url);
|
|
27
27
|
}
|
|
28
|
-
async login(id, token, permissions) {
|
|
28
|
+
async login(id, token, permissions, userId = 'default') {
|
|
29
29
|
const auth = await this.cacheManager.get(this.makeKey(id));
|
|
30
30
|
if (auth?.accessTokenValid()) {
|
|
31
31
|
return auth.authData;
|
|
@@ -41,7 +41,7 @@ let AuthService = AuthService_1 = class AuthService {
|
|
|
41
41
|
await this.api.sso({
|
|
42
42
|
publisherId: id,
|
|
43
43
|
publisherToken: token,
|
|
44
|
-
userData: { userId:
|
|
44
|
+
userData: { userId: userId, permissions: permissions, publisherId: id },
|
|
45
45
|
}, { headers: { Authorization: `Bearer ${auth?.authData?.payload?.token}` } });
|
|
46
46
|
this.cacheManager.set(this.makeKey(id), new auth_1.Auth(sso.data.data), {
|
|
47
47
|
ttl: sso.data.data.payload.refresh_token_expires_in / 1000,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.service.js","sourceRoot":"","sources":["../../../../src/modules/clients/auth-api/auth.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,2CAAmE;AACnE,sDAA2F;AAE3F,iCAA8B;AAI9B,IAAa,WAAW,mBAAxB,MAAa,WAAW;IAKtB,YACqC,MAAc,EACT,YAAmB;QADxB,WAAM,GAAN,MAAM,CAAQ;QACT,iBAAY,GAAZ,YAAY,CAAO;QANrD,YAAO,GAAG,CAAC,EAAU,EAAU,EAAE,CAAC,GAAG,aAAW,CAAC,IAAI,IAAI,EAAE,EAAE,CAAC;QAQpE,MAAM,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,UAAU,IAAI,CAAC,MAAM,EAAE,CAAC;QAChF,IAAI,CAAC,GAAG,GAAG,IAAI,kBAAO,CAAC,SAAS,EAAE,GAAG,CAAC,CAAC;IACzC,CAAC;IAEM,KAAK,CAAC,KAAK,CAChB,EAAU,EACV,KAAa,EACb,WAA6B;
|
|
1
|
+
{"version":3,"file":"auth.service.js","sourceRoot":"","sources":["../../../../src/modules/clients/auth-api/auth.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,2CAAmE;AACnE,sDAA2F;AAE3F,iCAA8B;AAI9B,IAAa,WAAW,mBAAxB,MAAa,WAAW;IAKtB,YACqC,MAAc,EACT,YAAmB;QADxB,WAAM,GAAN,MAAM,CAAQ;QACT,iBAAY,GAAZ,YAAY,CAAO;QANrD,YAAO,GAAG,CAAC,EAAU,EAAU,EAAE,CAAC,GAAG,aAAW,CAAC,IAAI,IAAI,EAAE,EAAE,CAAC;QAQpE,MAAM,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,UAAU,IAAI,CAAC,MAAM,EAAE,CAAC;QAChF,IAAI,CAAC,GAAG,GAAG,IAAI,kBAAO,CAAC,SAAS,EAAE,GAAG,CAAC,CAAC;IACzC,CAAC;IAEM,KAAK,CAAC,KAAK,CAChB,EAAU,EACV,KAAa,EACb,WAA6B,EAC7B,MAAM,GAAG,SAAS;QAElB,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,GAAG,CAAO,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC;QACjE,IAAI,IAAI,EAAE,gBAAgB,EAAE,EAAE;YAC5B,OAAO,IAAI,CAAC,QAAQ,CAAC;SACtB;QACD,IAAI,IAAI,CAAC,MAAM,KAAK,SAAS,EAAE;YAC7B,OAAO,EAAE,KAAK,EAAE,uBAAuB,EAAE,CAAC;SAC3C;QAED,IAAI;YACF,MAAM,GAAG,GAAG,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,aAAa;gBAChD,CAAC;oBACC,MAAM,IAAI,CAAC,GAAG,CAAC,OAAO,CACpB,EAAE,aAAa,EAAE,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,aAAa,EAAE,EACtD,EAAE,OAAO,EAAE,EAAE,aAAa,EAAE,UAAU,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,EAAE,CAC3E;gBACH,CAAC;oBACC,MAAM,IAAI,CAAC,GAAG,CAAC,GAAG,CAChB;wBACE,WAAW,EAAE,EAAE;wBACf,cAAc,EAAE,KAAK;wBACrB,QAAQ,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,WAAW,EAAE,WAAW,EAAE,EAAE,EAAE;qBACxE,EACD,EAAE,OAAO,EAAE,EAAE,aAAa,EAAE,UAAU,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,EAAE,CAC3E,CAAC;YAEN,IAAI,CAAC,YAAY,CAAC,GAAG,CAAO,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE,IAAI,WAAI,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;gBACrE,GAAG,EAAE,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,wBAAwB,GAAG,IAAI;aAC3D,CAAC,CAAC;YAEH,OAAO,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC;SAGtB;QAAC,OAAO,GAAQ,EAAE;YACjB,OAAO,EAAE,KAAK,EAAE,GAAG,aAAW,CAAC,IAAI,KAAK,GAAG,CAAC,IAAI,IAAI,GAAG,CAAC,QAAQ,EAAE,UAAU,EAAE,EAAE,CAAC;SAClF;IACH,CAAC;CACF,CAAA;AAvDY,WAAW;IADvB,IAAA,mBAAU,GAAE;IAOR,WAAA,IAAA,eAAM,EAAC,gBAAQ,CAAC,CAAA;IAChB,WAAA,IAAA,eAAM,EAAC,sBAAa,CAAC,CAAA;;GAPb,WAAW,CAuDvB;AAvDY,kCAAW"}
|
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
14
|
+
for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
|
|
15
|
+
};
|
|
16
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
|
+
__exportStar(require("./iso-logger"), exports);
|
|
18
|
+
__exportStar(require("./logger.module"), exports);
|
|
19
|
+
//# sourceMappingURL=index.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/modules/nest/logger/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,+CAA6B;AAC7B,kDAAgC"}
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
import { ConsoleLogger, LogLevel } from '@nestjs/common';
|
|
2
|
+
import { ConfigService } from '@nestjs/config';
|
|
3
|
+
export declare class IsoLogger extends ConsoleLogger {
|
|
4
|
+
private configService;
|
|
5
|
+
constructor(configService: ConfigService);
|
|
6
|
+
getTimestamp(): string;
|
|
7
|
+
setLogLevel(logLevel: LogLevel): void;
|
|
8
|
+
}
|
|
@@ -0,0 +1,44 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
3
|
+
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
4
|
+
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
5
|
+
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
6
|
+
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
7
|
+
};
|
|
8
|
+
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
9
|
+
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
10
|
+
};
|
|
11
|
+
var IsoLogger_1;
|
|
12
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
13
|
+
exports.IsoLogger = void 0;
|
|
14
|
+
const common_1 = require("@nestjs/common");
|
|
15
|
+
const config_1 = require("@nestjs/config");
|
|
16
|
+
const logLevels = ['log', 'error', 'warn', 'debug', 'verbose'];
|
|
17
|
+
const defaultLevel = 'warn';
|
|
18
|
+
let IsoLogger = IsoLogger_1 = class IsoLogger extends common_1.ConsoleLogger {
|
|
19
|
+
constructor(configService) {
|
|
20
|
+
super();
|
|
21
|
+
this.configService = configService;
|
|
22
|
+
const logLevel = configService.get('LOG_LEVEL', defaultLevel).toLowerCase();
|
|
23
|
+
this.setLogLevel(logLevel);
|
|
24
|
+
}
|
|
25
|
+
getTimestamp() {
|
|
26
|
+
return new Date().toISOString();
|
|
27
|
+
}
|
|
28
|
+
setLogLevel(logLevel) {
|
|
29
|
+
const logLevelIndex = logLevels.indexOf(logLevel);
|
|
30
|
+
if (logLevelIndex < 0) {
|
|
31
|
+
this.setLogLevels(logLevels.slice(0, logLevels.indexOf(defaultLevel)));
|
|
32
|
+
this.warn(`Invalid log level '${logLevel}', using '${defaultLevel}'. Valid log levels are ${JSON.stringify(logLevels)}`, IsoLogger_1.name);
|
|
33
|
+
}
|
|
34
|
+
else {
|
|
35
|
+
this.setLogLevels(logLevels.slice(0, logLevelIndex + 1));
|
|
36
|
+
}
|
|
37
|
+
}
|
|
38
|
+
};
|
|
39
|
+
IsoLogger = IsoLogger_1 = __decorate([
|
|
40
|
+
(0, common_1.Injectable)(),
|
|
41
|
+
__metadata("design:paramtypes", [config_1.ConfigService])
|
|
42
|
+
], IsoLogger);
|
|
43
|
+
exports.IsoLogger = IsoLogger;
|
|
44
|
+
//# sourceMappingURL=iso-logger.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"iso-logger.js","sourceRoot":"","sources":["../../../../src/modules/nest/logger/iso-logger.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,2CAAqE;AACrE,2CAA+C;AAG/C,MAAM,SAAS,GAAe,CAAC,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,SAAS,CAAC,CAAC;AAC3E,MAAM,YAAY,GAAa,MAAM,CAAC;AAGtC,IAAa,SAAS,iBAAtB,MAAa,SAAU,SAAQ,sBAAa;IAC1C,YAAoB,aAA4B;QAC9C,KAAK,EAAE,CAAC;QADU,kBAAa,GAAb,aAAa,CAAe;QAG9C,MAAM,QAAQ,GAAG,aAAa,CAAC,GAAG,CAAS,WAAW,EAAE,YAAY,CAAC,CAAC,WAAW,EAAc,CAAC;QAChG,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;IAC7B,CAAC;IAED,YAAY;QACV,OAAO,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;IAClC,CAAC;IAED,WAAW,CAAC,QAAkB;QAC5B,MAAM,aAAa,GAAG,SAAS,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QAClD,IAAI,aAAa,GAAG,CAAC,EAAE;YACrB,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,EAAE,SAAS,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;YACvE,IAAI,CAAC,IAAI,CACP,sBAAsB,QAAQ,aAAa,YAAY,2BAA2B,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,EAAE,EAC7G,WAAS,CAAC,IAAI,CACf,CAAC;SACH;aAAM;YACL,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,EAAE,aAAa,GAAG,CAAC,CAAC,CAAC,CAAC;SAC1D;IACH,CAAC;CACF,CAAA;AAxBY,SAAS;IADrB,IAAA,mBAAU,GAAE;qCAEwB,sBAAa;GADrC,SAAS,CAwBrB;AAxBY,8BAAS"}
|
|
@@ -0,0 +1,23 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
3
|
+
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
4
|
+
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
5
|
+
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
6
|
+
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
7
|
+
};
|
|
8
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
9
|
+
exports.LoggerModule = void 0;
|
|
10
|
+
const common_1 = require("@nestjs/common");
|
|
11
|
+
const config_1 = require("@nestjs/config");
|
|
12
|
+
const iso_logger_1 = require("./iso-logger");
|
|
13
|
+
let LoggerModule = class LoggerModule {
|
|
14
|
+
};
|
|
15
|
+
LoggerModule = __decorate([
|
|
16
|
+
(0, common_1.Module)({
|
|
17
|
+
imports: [config_1.ConfigModule],
|
|
18
|
+
providers: [iso_logger_1.IsoLogger],
|
|
19
|
+
exports: [iso_logger_1.IsoLogger],
|
|
20
|
+
})
|
|
21
|
+
], LoggerModule);
|
|
22
|
+
exports.LoggerModule = LoggerModule;
|
|
23
|
+
//# sourceMappingURL=logger.module.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"logger.module.js","sourceRoot":"","sources":["../../../../src/modules/nest/logger/logger.module.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAAwC;AACxC,2CAA8C;AAC9C,6CAAyC;AAOzC,IAAa,YAAY,GAAzB,MAAa,YAAY;CAAG,CAAA;AAAf,YAAY;IALxB,IAAA,eAAM,EAAC;QACN,OAAO,EAAE,CAAC,qBAAY,CAAC;QACvB,SAAS,EAAE,CAAC,sBAAS,CAAC;QACtB,OAAO,EAAE,CAAC,sBAAS,CAAC;KACrB,CAAC;GACW,YAAY,CAAG;AAAf,oCAAY"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@novo-learning/service-lib",
|
|
3
|
-
"version": "0.0.
|
|
3
|
+
"version": "0.0.19",
|
|
4
4
|
"description": "Common components for Novo services",
|
|
5
5
|
"license": "UNLICENSED",
|
|
6
6
|
"main": "dist/index.js",
|
|
@@ -20,16 +20,17 @@
|
|
|
20
20
|
"@babel/preset-typescript": "^7.16.7",
|
|
21
21
|
"@nestjs/common": "^8.4.4",
|
|
22
22
|
"@nestjs/core": "^8.2.4",
|
|
23
|
+
"@nestjs/config": "^2.2.0",
|
|
23
24
|
"@nestjs/passport": "^8.0.1",
|
|
24
|
-
"@novo-learning/novo-sdk": "^0.0.
|
|
25
|
+
"@novo-learning/novo-sdk": "^0.0.21",
|
|
25
26
|
"@types/validator": "^13.7.1",
|
|
26
27
|
"babel-jest": "^27.5.1",
|
|
27
28
|
"buffer": "^6.0.3",
|
|
28
|
-
"cache-manager": "^
|
|
29
|
+
"cache-manager": "^4.1.0",
|
|
29
30
|
"class-transformer": "^0.5.1",
|
|
30
31
|
"class-validator": "^0.13.2",
|
|
31
32
|
"form-data": "^4.0.0",
|
|
32
|
-
"passport": "^0.
|
|
33
|
+
"passport": "^0.6.0",
|
|
33
34
|
"passport-jwt": "^4.0.0"
|
|
34
35
|
},
|
|
35
36
|
"peerDependencies": {
|
|
@@ -52,6 +53,7 @@
|
|
|
52
53
|
"@types/passport": "^1.0.7",
|
|
53
54
|
"@types/passport-jwt": "^3.0.6",
|
|
54
55
|
"@typescript-eslint/eslint-plugin": "^5.8.0",
|
|
56
|
+
"@typescript-eslint/parser": "^5.30.6",
|
|
55
57
|
"eslint": "^8.4.1",
|
|
56
58
|
"eslint-config-prettier": "^8.3.0",
|
|
57
59
|
"eslint-plugin-prettier": "^4.0.0",
|