@novo-learning/service-lib 0.0.27 → 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/modules/clients/auth-api/auth.service.js +1 -3
- package/dist/modules/clients/auth-api/auth.service.js.map +1 -1
- package/dist/modules/clients/publisher-api/publisher.service.d.ts +2 -4
- package/dist/modules/clients/publisher-api/publisher.service.js +11 -13
- package/dist/modules/clients/publisher-api/publisher.service.js.map +1 -1
- package/package.json +2 -2
|
@@ -43,9 +43,7 @@ let AuthService = AuthService_1 = class AuthService {
|
|
|
43
43
|
publisherToken: token,
|
|
44
44
|
userData: { userId: userId, permissions: permissions, publisherId: id },
|
|
45
45
|
}, { headers: { Authorization: `Bearer ${auth?.authData?.payload?.token}` } });
|
|
46
|
-
this.cacheManager.set(this.makeKey(id), new auth_1.Auth(sso.data.data),
|
|
47
|
-
ttl: sso.data.data.payload.refresh_token_expires_in / 1000,
|
|
48
|
-
});
|
|
46
|
+
this.cacheManager.set(this.makeKey(id), new auth_1.Auth(sso.data.data), sso.data.data.payload.refresh_token_expires_in / 1000);
|
|
49
47
|
return sso.data.data;
|
|
50
48
|
}
|
|
51
49
|
catch (err) {
|
|
@@ -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,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,
|
|
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,CACnB,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,EAChB,IAAI,WAAI,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,EACvB,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,wBAAwB,GAAG,IAAI,CACtD,CAAC;YAEF,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;AAzDY,WAAW;IADvB,IAAA,mBAAU,GAAE;IAOR,WAAA,IAAA,eAAM,EAAC,gBAAQ,CAAC,CAAA;IAChB,WAAA,IAAA,eAAM,EAAC,sBAAa,CAAC,CAAA;;GAPb,WAAW,CAyDvB;AAzDY,kCAAW"}
|
|
@@ -16,10 +16,8 @@ export declare class PublisherService {
|
|
|
16
16
|
private logger;
|
|
17
17
|
private makeKey;
|
|
18
18
|
constructor(authService: AuthService, apiUrl: string, cacheManager: Cache, cacheTtl: number, name: string, token: string);
|
|
19
|
-
_getPublisher
|
|
20
|
-
|
|
21
|
-
}>;
|
|
22
|
-
getPublisher(id: string, apiKey?: string, anonymous?: boolean): Promise<PublisherResponseDto | {
|
|
19
|
+
private _getPublisher;
|
|
20
|
+
getPublisher(id: string): Promise<PublisherResponseDto | {
|
|
23
21
|
error: string;
|
|
24
22
|
}>;
|
|
25
23
|
publisherAllowed(publisherId: string, languageCode: LanguageCode): Promise<boolean>;
|
|
@@ -29,31 +29,29 @@ let PublisherService = class PublisherService {
|
|
|
29
29
|
const url = this.apiUrl.includes('://') ? this.apiUrl : `http://${this.apiUrl}`;
|
|
30
30
|
this.api = new novo_sdk_1.PublisherApi(undefined, url);
|
|
31
31
|
}
|
|
32
|
-
async _getPublisher(id
|
|
32
|
+
async _getPublisher(id) {
|
|
33
|
+
this.logger.debug('Fetching publisher ' + id);
|
|
33
34
|
try {
|
|
34
|
-
const
|
|
35
|
+
const accessToken = await this.getReadonlyPublisherAccesstoken();
|
|
36
|
+
const { data: publisher } = await this.api.getAndValidatePublisher(id, undefined, undefined, {
|
|
35
37
|
headers: { Authorization: `Bearer ${accessToken}` },
|
|
36
38
|
});
|
|
39
|
+
await this.cacheManager.set(this.makeKey(id), publisher, this.cacheTtl);
|
|
40
|
+
setTimeout(() => this._getPublisher(id), 0.95 * this.cacheTtl);
|
|
37
41
|
return publisher;
|
|
38
42
|
}
|
|
39
43
|
catch (err) {
|
|
40
|
-
|
|
44
|
+
const error = `${PublisherService.name}: ${err.code || err.response?.statusText}`;
|
|
45
|
+
this.logger.error(error);
|
|
46
|
+
return { error };
|
|
41
47
|
}
|
|
42
48
|
}
|
|
43
|
-
async getPublisher(id
|
|
49
|
+
async getPublisher(id) {
|
|
44
50
|
const cachedPublisher = await this.cacheManager.get(this.makeKey(id));
|
|
45
51
|
if (cachedPublisher) {
|
|
46
52
|
return cachedPublisher;
|
|
47
53
|
}
|
|
48
|
-
|
|
49
|
-
const newPublisher = await this._getPublisher(id, apiKey, anonymous, accessToken);
|
|
50
|
-
if ('error' in newPublisher || newPublisher === undefined) {
|
|
51
|
-
return newPublisher;
|
|
52
|
-
}
|
|
53
|
-
await this.cacheManager.set(this.makeKey(id), newPublisher, {
|
|
54
|
-
ttl: this.cacheTtl,
|
|
55
|
-
});
|
|
56
|
-
return newPublisher;
|
|
54
|
+
return this._getPublisher(id);
|
|
57
55
|
}
|
|
58
56
|
async publisherAllowed(publisherId, languageCode) {
|
|
59
57
|
const publisher = await this.getPublisher(publisherId);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"publisher.service.js","sourceRoot":"","sources":["../../../../src/modules/clients/publisher-api/publisher.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAAgD;AAChD,sDAA2G;AAE3G,2DAAuD;AAOvD,IAAa,gBAAgB,GAA7B,MAAa,gBAAgB;IAO3B,YACmB,WAAwB,EACD,MAAc,EACrC,YAAmB,EACU,QAAgB,EACrB,IAAY,EACX,KAAa;QALtC,gBAAW,GAAX,WAAW,CAAa;QACD,WAAM,GAAN,MAAM,CAAQ;QACrC,iBAAY,GAAZ,YAAY,CAAO;QACU,aAAQ,GAAR,QAAQ,CAAQ;QACrB,SAAI,GAAJ,IAAI,CAAQ;QACX,UAAK,GAAL,KAAK,CAAQ;QAVjD,WAAM,GAAW,IAAI,eAAM,CAAC,kBAAkB,CAAC,CAAC;QAEhD,YAAO,GAAG,CAAC,EAAU,EAAU,EAAE,CAAC,GAAG,gBAAgB,CAAC,IAAI,IAAI,EAAE,EAAE,CAAC;QAUzE,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,uBAAY,CAAC,SAAS,EAAE,GAAG,CAAC,CAAC;IAC9C,CAAC;
|
|
1
|
+
{"version":3,"file":"publisher.service.js","sourceRoot":"","sources":["../../../../src/modules/clients/publisher-api/publisher.service.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@novo-learning/service-lib",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "1.0.1",
|
|
4
4
|
"description": "Common components for Novo services",
|
|
5
5
|
"license": "UNLICENSED",
|
|
6
6
|
"main": "dist/index.js",
|
|
@@ -22,7 +22,7 @@
|
|
|
22
22
|
"@nestjs/core": "^8.2.4",
|
|
23
23
|
"@nestjs/config": "^2.2.0",
|
|
24
24
|
"@nestjs/passport": "^8.0.1",
|
|
25
|
-
"@novo-learning/novo-sdk": "^0.0.
|
|
25
|
+
"@novo-learning/novo-sdk": "^0.0.38",
|
|
26
26
|
"@types/validator": "^13.7.1",
|
|
27
27
|
"babel-jest": "^27.5.1",
|
|
28
28
|
"buffer": "^6.0.3",
|