@novo-learning/service-lib 1.8.1 → 1.9.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/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 -0
- package/dist/modules/clients/auth-api/auth.service.js +5 -3
- package/dist/modules/clients/auth-api/auth.service.js.map +1 -1
- package/dist/modules/clients/auth-api/auth.service.spec.d.ts +1 -0
- package/dist/modules/clients/auth-api/auth.service.spec.js +121 -0
- package/dist/modules/clients/auth-api/auth.service.spec.js.map +1 -0
- package/dist/modules/clients/index.d.ts +0 -2
- package/dist/modules/clients/index.js +1 -5
- package/dist/modules/clients/index.js.map +1 -1
- package/dist/modules/clients/pronunciation-api/pronunciation.service.d.ts +1 -0
- package/dist/modules/clients/pronunciation-api/pronunciation.service.js +7 -8
- package/dist/modules/clients/pronunciation-api/pronunciation.service.js.map +1 -1
- package/dist/modules/clients/pronunciation-api/pronunciation.service.spec.d.ts +1 -0
- package/dist/modules/clients/pronunciation-api/pronunciation.service.spec.js +79 -0
- package/dist/modules/clients/pronunciation-api/pronunciation.service.spec.js.map +1 -0
- package/dist/modules/clients/publisher-api/publisher.service.spec.d.ts +1 -0
- package/dist/modules/clients/publisher-api/publisher.service.spec.js +136 -0
- package/dist/modules/clients/publisher-api/publisher.service.spec.js.map +1 -0
- package/dist/modules/nest/exceptions/index.d.ts +2 -0
- package/dist/modules/nest/exceptions/index.js +19 -0
- package/dist/modules/nest/exceptions/index.js.map +1 -0
- package/dist/modules/nest/exceptions/invalid-request.filter.d.ts +4 -0
- package/dist/modules/nest/exceptions/invalid-request.filter.js +33 -0
- package/dist/modules/nest/exceptions/invalid-request.filter.js.map +1 -0
- package/dist/modules/nest/exceptions/invalid-request.filter.spec.d.ts +1 -0
- package/dist/modules/nest/exceptions/invalid-request.filter.spec.js +49 -0
- package/dist/modules/nest/exceptions/invalid-request.filter.spec.js.map +1 -0
- package/dist/modules/nest/exceptions/request-aborted.filter.d.ts +4 -0
- package/dist/modules/nest/exceptions/request-aborted.filter.js +26 -0
- package/dist/modules/nest/exceptions/request-aborted.filter.js.map +1 -0
- package/dist/modules/nest/exceptions/request-aborted.filter.spec.d.ts +1 -0
- package/dist/modules/nest/exceptions/request-aborted.filter.spec.js +26 -0
- package/dist/modules/nest/exceptions/request-aborted.filter.spec.js.map +1 -0
- package/dist/modules/nest/exceptions/unsupported-encoding.filter.d.ts +4 -0
- package/dist/modules/nest/exceptions/unsupported-encoding.filter.js +31 -0
- package/dist/modules/nest/exceptions/unsupported-encoding.filter.js.map +1 -0
- package/dist/modules/nest/exceptions/unsupported-encoding.filter.spec.d.ts +1 -0
- package/dist/modules/nest/exceptions/unsupported-encoding.filter.spec.js +49 -0
- package/dist/modules/nest/exceptions/unsupported-encoding.filter.spec.js.map +1 -0
- package/dist/modules/nest/http/http.service.d.ts +1 -1
- package/dist/modules/nest/http/http.service.js +3 -3
- package/dist/modules/nest/http/http.service.js.map +1 -1
- package/dist/modules/nest/http/http.service.spec.d.ts +1 -0
- package/dist/modules/nest/http/http.service.spec.js +68 -0
- package/dist/modules/nest/http/http.service.spec.js.map +1 -0
- package/dist/modules/nest/jwt/guards/has-permission.guard.js.map +1 -1
- package/dist/modules/nest/jwt/guards/has-permission.guard.spec.d.ts +1 -0
- package/dist/modules/nest/jwt/guards/has-permission.guard.spec.js +55 -0
- package/dist/modules/nest/jwt/guards/has-permission.guard.spec.js.map +1 -0
- package/dist/modules/nest/jwt/guards/jwt-auth.guard.js +1 -1
- package/dist/modules/nest/jwt/guards/jwt-auth.guard.js.map +1 -1
- package/dist/modules/nest/jwt/guards/jwt-auth.guard.spec.d.ts +1 -0
- package/dist/modules/nest/jwt/guards/jwt-auth.guard.spec.js +68 -0
- package/dist/modules/nest/jwt/guards/jwt-auth.guard.spec.js.map +1 -0
- package/dist/modules/nest/jwt/strategies/jwt.strategy.spec.d.ts +1 -0
- package/dist/modules/nest/jwt/strategies/jwt.strategy.spec.js +48 -0
- package/dist/modules/nest/jwt/strategies/jwt.strategy.spec.js.map +1 -0
- package/dist/modules/nest/logger/iso-logger.js +1 -1
- package/dist/modules/nest/logger/iso-logger.js.map +1 -1
- package/dist/modules/nest/logger/iso-logger.spec.d.ts +1 -0
- package/dist/modules/nest/logger/iso-logger.spec.js +44 -0
- package/dist/modules/nest/logger/iso-logger.spec.js.map +1 -0
- package/dist/validators/exercise-type.validator.spec.js +8 -0
- package/dist/validators/exercise-type.validator.spec.js.map +1 -1
- package/dist/validators/language-code.validator.spec.js +8 -0
- package/dist/validators/language-code.validator.spec.js.map +1 -1
- package/dist/validators/phone-set.validator.spec.js +8 -0
- package/dist/validators/phone-set.validator.spec.js.map +1 -1
- package/package.json +4 -4
package/dist/index.d.ts
CHANGED
package/dist/index.js
CHANGED
|
@@ -16,6 +16,7 @@ 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/db-migration"), exports);
|
|
19
|
+
__exportStar(require("./modules/nest/exceptions"), exports);
|
|
19
20
|
__exportStar(require("./modules/nest/jwt"), exports);
|
|
20
21
|
__exportStar(require("./modules/nest/logger"), exports);
|
|
21
22
|
__exportStar(require("./validators"), exports);
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,oDAAkC;AAClC,yDAAuC;AACvC,qDAAmC;AACnC,wDAAsC;AACtC,+CAA6B"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,oDAAkC;AAClC,yDAAuC;AACvC,4DAA0C;AAC1C,qDAAmC;AACnC,wDAAsC;AACtC,+CAA6B"}
|
|
@@ -8,6 +8,7 @@ export declare class AuthService {
|
|
|
8
8
|
private readonly cacheManager;
|
|
9
9
|
private readonly makeKey;
|
|
10
10
|
private readonly api;
|
|
11
|
+
private readonly logger;
|
|
11
12
|
constructor(httpService: NovoHttpService, apiUrl: string, cacheManager: Cache);
|
|
12
13
|
login(id: string, token: string, permissions: PermissionType[], userId?: string): Promise<AuthenticationDataDtoV1 | {
|
|
13
14
|
error: string;
|
|
@@ -25,8 +25,9 @@ let AuthService = AuthService_1 = class AuthService {
|
|
|
25
25
|
this.apiUrl = apiUrl;
|
|
26
26
|
this.cacheManager = cacheManager;
|
|
27
27
|
this.makeKey = (id) => `${AuthService_1.name}-${id}`;
|
|
28
|
+
this.logger = new common_1.Logger(AuthService_1.name);
|
|
28
29
|
const url = this.apiUrl.includes('://') ? this.apiUrl : `http://${this.apiUrl}`;
|
|
29
|
-
this.api = new novo_sdk_1.AuthApi(undefined, url, httpService.axiosRef);
|
|
30
|
+
this.api = new novo_sdk_1.AuthApi(undefined, url, this.httpService.axiosRef);
|
|
30
31
|
}
|
|
31
32
|
async login(id, token, permissions, userId = 'default') {
|
|
32
33
|
const auth = await this.cacheManager.get(this.makeKey(id));
|
|
@@ -50,8 +51,9 @@ let AuthService = AuthService_1 = class AuthService {
|
|
|
50
51
|
return sso.data.data;
|
|
51
52
|
}
|
|
52
53
|
catch (err) {
|
|
53
|
-
const
|
|
54
|
-
|
|
54
|
+
const error = `${AuthService_1.name}: ${(0, novo_sdk_1.formatError)(err)}`;
|
|
55
|
+
this.logger.error(error);
|
|
56
|
+
return { error };
|
|
55
57
|
}
|
|
56
58
|
}
|
|
57
59
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.service.js","sourceRoot":"","sources":["../../../../src/modules/clients/auth-api/auth.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,yDAAsD;AACtD,
|
|
1
|
+
{"version":3,"file":"auth.service.js","sourceRoot":"","sources":["../../../../src/modules/clients/auth-api/auth.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,yDAAsD;AACtD,2CAA4D;AAC5D,sDAAwG;AAExG,0CAAkD;AAClD,iCAA8B;AAIvB,IAAM,WAAW,mBAAjB,MAAM,WAAW;IAMtB,YACmB,WAA4B,EAC3B,MAA+B,EAC1B,YAAoC;QAF1C,gBAAW,GAAX,WAAW,CAAiB;QACV,WAAM,GAAN,MAAM,CAAQ;QACT,iBAAY,GAAZ,YAAY,CAAO;QAR5C,YAAO,GAAG,CAAC,EAAU,EAAU,EAAE,CAAC,GAAG,aAAW,CAAC,IAAI,IAAI,EAAE,EAAE,CAAC;QAG9D,WAAM,GAAG,IAAI,eAAM,CAAC,aAAW,CAAC,IAAI,CAAC,CAAC;QAOrD,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,EAAE,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;IACpE,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,CAAC;YAC7B,OAAO,IAAI,CAAC,QAAQ,CAAC;QACvB,CAAC;QACD,IAAI,IAAI,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;YAC9B,OAAO,EAAE,KAAK,EAAE,uBAAuB,EAAE,CAAC;QAC5C,CAAC;QAED,IAAI,CAAC;YACH,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;YACN,IAAI,CAAC,YAAY,CAAC,GAAG,CACnB,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,EAChB,IAAI,WAAI,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,EACvB,EAAE,GAAG,EAAE,CAAC,IAAI,GAAG,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,wBAAwB,CAAC,GAAG,IAAI,EAAE,CACxE,CAAC;YAEF,OAAO,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC;QACvB,CAAC;QAAC,OAAO,GAAY,EAAE,CAAC;YACtB,MAAM,KAAK,GAAG,GAAG,aAAW,CAAC,IAAI,KAAK,IAAA,sBAAW,EAAC,GAAG,CAAC,EAAE,CAAC;YACzD,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YACzB,OAAO,EAAE,KAAK,EAAE,CAAC;QACnB,CAAC;IACH,CAAC;CACF,CAAA;AA1DY,kCAAW;sBAAX,WAAW;IADvB,IAAA,mBAAU,GAAE;IASR,WAAA,IAAA,eAAM,EAAC,gBAAQ,CAAC,CAAA;IAChB,WAAA,IAAA,eAAM,EAAC,6BAAa,CAAC,CAAA;qCAFQ,sBAAe;GAPpC,WAAW,CA0DvB"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
|
@@ -0,0 +1,121 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
jest.mock('@novo-learning/novo-sdk', () => {
|
|
4
|
+
const original = jest.requireActual('@novo-learning/novo-sdk');
|
|
5
|
+
return {
|
|
6
|
+
...original,
|
|
7
|
+
AuthApi: jest.fn().mockImplementation(() => ({
|
|
8
|
+
sso: jest.fn(),
|
|
9
|
+
refresh: jest.fn(),
|
|
10
|
+
})),
|
|
11
|
+
};
|
|
12
|
+
});
|
|
13
|
+
const novo_sdk_1 = require("@novo-learning/novo-sdk");
|
|
14
|
+
const auth_service_1 = require("./auth.service");
|
|
15
|
+
describe('AuthService', () => {
|
|
16
|
+
let service;
|
|
17
|
+
let cache;
|
|
18
|
+
let http;
|
|
19
|
+
let api;
|
|
20
|
+
const apiUrl = 'http://auth.example.com';
|
|
21
|
+
beforeEach(() => {
|
|
22
|
+
jest.clearAllMocks();
|
|
23
|
+
cache = {
|
|
24
|
+
get: jest.fn(),
|
|
25
|
+
set: jest.fn(),
|
|
26
|
+
};
|
|
27
|
+
http = {
|
|
28
|
+
axiosRef: {},
|
|
29
|
+
};
|
|
30
|
+
service = new auth_service_1.AuthService(http, apiUrl, cache);
|
|
31
|
+
api = novo_sdk_1.AuthApi.mock.results[0].value;
|
|
32
|
+
});
|
|
33
|
+
afterEach(() => {
|
|
34
|
+
jest.clearAllMocks();
|
|
35
|
+
});
|
|
36
|
+
it('returns cached auth data when access token is still valid', async () => {
|
|
37
|
+
const authData = { payload: { token: 'abc' } };
|
|
38
|
+
const auth = {
|
|
39
|
+
accessTokenValid: () => true,
|
|
40
|
+
authData,
|
|
41
|
+
};
|
|
42
|
+
cache.get.mockResolvedValue(auth);
|
|
43
|
+
const result = await service.login('pub1', 'token', []);
|
|
44
|
+
expect(result).toBe(authData);
|
|
45
|
+
expect(api.sso).not.toHaveBeenCalled();
|
|
46
|
+
expect(api.refresh).not.toHaveBeenCalled();
|
|
47
|
+
});
|
|
48
|
+
it('calls sso when no cached auth exists', async () => {
|
|
49
|
+
cache.get.mockResolvedValue(undefined);
|
|
50
|
+
const ssoResponse = {
|
|
51
|
+
data: {
|
|
52
|
+
data: {
|
|
53
|
+
payload: {
|
|
54
|
+
token: 'new-token',
|
|
55
|
+
refresh_token: 'refresh',
|
|
56
|
+
refresh_token_expires_in: 10000,
|
|
57
|
+
},
|
|
58
|
+
},
|
|
59
|
+
},
|
|
60
|
+
};
|
|
61
|
+
api.sso.mockResolvedValue(ssoResponse);
|
|
62
|
+
const result = await service.login('pub1', 'token', [], 'user1');
|
|
63
|
+
expect(api.sso).toHaveBeenCalledWith({
|
|
64
|
+
publisherId: 'pub1',
|
|
65
|
+
publisherToken: 'token',
|
|
66
|
+
userData: {
|
|
67
|
+
userId: 'user1',
|
|
68
|
+
permissions: [],
|
|
69
|
+
publisherId: 'pub1',
|
|
70
|
+
},
|
|
71
|
+
}, expect.objectContaining({
|
|
72
|
+
headers: expect.any(Object),
|
|
73
|
+
}));
|
|
74
|
+
expect(cache.set).toHaveBeenCalled();
|
|
75
|
+
expect(result).toEqual(ssoResponse.data.data);
|
|
76
|
+
});
|
|
77
|
+
it('calls refresh when cached auth exists but needs refresh', async () => {
|
|
78
|
+
const cached = {
|
|
79
|
+
accessTokenValid: () => false,
|
|
80
|
+
authData: {
|
|
81
|
+
payload: {
|
|
82
|
+
token: 'old-token',
|
|
83
|
+
refresh_token: 'refresh-token',
|
|
84
|
+
},
|
|
85
|
+
},
|
|
86
|
+
};
|
|
87
|
+
cache.get.mockResolvedValue(cached);
|
|
88
|
+
const refreshResponse = {
|
|
89
|
+
data: {
|
|
90
|
+
data: {
|
|
91
|
+
payload: {
|
|
92
|
+
token: 'new-token',
|
|
93
|
+
refresh_token: 'refresh-token',
|
|
94
|
+
refresh_token_expires_in: 10000,
|
|
95
|
+
},
|
|
96
|
+
},
|
|
97
|
+
},
|
|
98
|
+
};
|
|
99
|
+
api.refresh.mockResolvedValue(refreshResponse);
|
|
100
|
+
const result = await service.login('pub1', 'token', []);
|
|
101
|
+
expect(api.refresh).toHaveBeenCalledWith({ refresh_token: 'refresh-token' }, expect.objectContaining({
|
|
102
|
+
headers: expect.objectContaining({
|
|
103
|
+
Authorization: 'Bearer old-token',
|
|
104
|
+
}),
|
|
105
|
+
}));
|
|
106
|
+
expect(cache.set).toHaveBeenCalled();
|
|
107
|
+
expect(result).toEqual(refreshResponse.data.data);
|
|
108
|
+
});
|
|
109
|
+
it('returns error when API throws', async () => {
|
|
110
|
+
cache.get.mockResolvedValue(undefined);
|
|
111
|
+
api.sso.mockRejectedValue({
|
|
112
|
+
isAxiosError: true,
|
|
113
|
+
message: 'Invalid token',
|
|
114
|
+
response: { data: { data: { message: 'Invalid token' } } },
|
|
115
|
+
});
|
|
116
|
+
const result = await service.login('pub1', 'token', []);
|
|
117
|
+
expect(result).toHaveProperty('error');
|
|
118
|
+
expect(result.error).toContain('Invalid token');
|
|
119
|
+
});
|
|
120
|
+
});
|
|
121
|
+
//# sourceMappingURL=auth.service.spec.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"auth.service.spec.js","sourceRoot":"","sources":["../../../../src/modules/clients/auth-api/auth.service.spec.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,8 +2,6 @@ export { AuthApiModule } from './auth-api/auth-api.module';
|
|
|
2
2
|
export { AuthService } from './auth-api/auth.service';
|
|
3
3
|
export { DataApiModule } from './data-api/data-api.module';
|
|
4
4
|
export { DataService } from './data-api/data.service';
|
|
5
|
-
export { ExerciseApiModule } from './exercise-api/exercise-api.module';
|
|
6
|
-
export { ExerciseService } from './exercise-api/exercise.service';
|
|
7
5
|
export { PronunciationApiModule } from './pronunciation-api/pronunciation-api.module';
|
|
8
6
|
export { PronunciationService } from './pronunciation-api/pronunciation.service';
|
|
9
7
|
export { PublisherApiModule } from './publisher-api/publisher-api.module';
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.PublisherService = exports.DEFAULT_PUBLISHER_SETTINGS = exports.PublisherApiModule = exports.PronunciationService = exports.PronunciationApiModule = exports.
|
|
3
|
+
exports.PublisherService = exports.DEFAULT_PUBLISHER_SETTINGS = exports.PublisherApiModule = exports.PronunciationService = exports.PronunciationApiModule = exports.DataService = exports.DataApiModule = exports.AuthService = exports.AuthApiModule = void 0;
|
|
4
4
|
var auth_api_module_1 = require("./auth-api/auth-api.module");
|
|
5
5
|
Object.defineProperty(exports, "AuthApiModule", { enumerable: true, get: function () { return auth_api_module_1.AuthApiModule; } });
|
|
6
6
|
var auth_service_1 = require("./auth-api/auth.service");
|
|
@@ -9,10 +9,6 @@ var data_api_module_1 = require("./data-api/data-api.module");
|
|
|
9
9
|
Object.defineProperty(exports, "DataApiModule", { enumerable: true, get: function () { return data_api_module_1.DataApiModule; } });
|
|
10
10
|
var data_service_1 = require("./data-api/data.service");
|
|
11
11
|
Object.defineProperty(exports, "DataService", { enumerable: true, get: function () { return data_service_1.DataService; } });
|
|
12
|
-
var exercise_api_module_1 = require("./exercise-api/exercise-api.module");
|
|
13
|
-
Object.defineProperty(exports, "ExerciseApiModule", { enumerable: true, get: function () { return exercise_api_module_1.ExerciseApiModule; } });
|
|
14
|
-
var exercise_service_1 = require("./exercise-api/exercise.service");
|
|
15
|
-
Object.defineProperty(exports, "ExerciseService", { enumerable: true, get: function () { return exercise_service_1.ExerciseService; } });
|
|
16
12
|
var pronunciation_api_module_1 = require("./pronunciation-api/pronunciation-api.module");
|
|
17
13
|
Object.defineProperty(exports, "PronunciationApiModule", { enumerable: true, get: function () { return pronunciation_api_module_1.PronunciationApiModule; } });
|
|
18
14
|
var pronunciation_service_1 = require("./pronunciation-api/pronunciation.service");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/modules/clients/index.ts"],"names":[],"mappings":";;;AAAA,8DAA2D;AAAlD,gHAAA,aAAa,OAAA;AACtB,wDAAsD;AAA7C,2GAAA,WAAW,OAAA;AACpB,8DAA2D;AAAlD,gHAAA,aAAa,OAAA;AACtB,wDAAsD;AAA7C,2GAAA,WAAW,OAAA;AACpB,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/modules/clients/index.ts"],"names":[],"mappings":";;;AAAA,8DAA2D;AAAlD,gHAAA,aAAa,OAAA;AACtB,wDAAsD;AAA7C,2GAAA,WAAW,OAAA;AACpB,8DAA2D;AAAlD,gHAAA,aAAa,OAAA;AACtB,wDAAsD;AAA7C,2GAAA,WAAW,OAAA;AACpB,yFAAsF;AAA7E,kIAAA,sBAAsB,OAAA;AAC/B,mFAAiF;AAAxE,6HAAA,oBAAoB,OAAA;AAC7B,6EAA0E;AAAjE,0HAAA,kBAAkB,OAAA;AAC3B,yFAAwF;AAA/E,wIAAA,0BAA0B,OAAA;AACnC,uEAAqE;AAA5D,qHAAA,gBAAgB,OAAA"}
|
|
@@ -13,6 +13,7 @@ export declare class PronunciationService {
|
|
|
13
13
|
private readonly apiUrl;
|
|
14
14
|
private readonly api;
|
|
15
15
|
private readonly metadataApi;
|
|
16
|
+
private readonly logger;
|
|
16
17
|
constructor(httpService: NovoHttpService, apiUrl: string);
|
|
17
18
|
getPronunciation(prompt: {
|
|
18
19
|
phrase: string;
|
|
@@ -21,6 +21,7 @@ let PronunciationService = PronunciationService_1 = class PronunciationService {
|
|
|
21
21
|
constructor(httpService, apiUrl) {
|
|
22
22
|
this.httpService = httpService;
|
|
23
23
|
this.apiUrl = apiUrl;
|
|
24
|
+
this.logger = new common_1.Logger(PronunciationService_1.name);
|
|
24
25
|
const url = this.apiUrl.includes('://') ? this.apiUrl : `http://${this.apiUrl}`;
|
|
25
26
|
this.api = new novo_sdk_1.PronunciationApi(undefined, url, this.httpService.axiosRef);
|
|
26
27
|
this.metadataApi = new novo_sdk_1.MetadataApi(undefined, url, this.httpService.axiosRef);
|
|
@@ -42,10 +43,9 @@ let PronunciationService = PronunciationService_1 = class PronunciationService {
|
|
|
42
43
|
return data;
|
|
43
44
|
}
|
|
44
45
|
catch (err) {
|
|
45
|
-
const
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
};
|
|
46
|
+
const error = `${PronunciationService_1.name}: ${(0, novo_sdk_1.formatError)(err)}`;
|
|
47
|
+
this.logger.error(error);
|
|
48
|
+
return { error };
|
|
49
49
|
}
|
|
50
50
|
}
|
|
51
51
|
async getPronunciationMetadata(words, language, accessToken, secret, userData) {
|
|
@@ -59,10 +59,9 @@ let PronunciationService = PronunciationService_1 = class PronunciationService {
|
|
|
59
59
|
return data;
|
|
60
60
|
}
|
|
61
61
|
catch (err) {
|
|
62
|
-
const
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
};
|
|
62
|
+
const error = `${PronunciationService_1.name}: ${(0, novo_sdk_1.formatError)(err)}`;
|
|
63
|
+
this.logger.error(error);
|
|
64
|
+
return { error };
|
|
66
65
|
}
|
|
67
66
|
}
|
|
68
67
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pronunciation.service.js","sourceRoot":"","sources":["../../../../src/modules/clients/pronunciation-api/pronunciation.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"pronunciation.service.js","sourceRoot":"","sources":["../../../../src/modules/clients/pronunciation-api/pronunciation.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
|
@@ -0,0 +1,79 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const novo_sdk_1 = require("@novo-learning/novo-sdk");
|
|
4
|
+
const pronunciation_service_1 = require("./pronunciation.service");
|
|
5
|
+
jest.mock('@novo-learning/novo-sdk', () => ({
|
|
6
|
+
...jest.requireActual('@novo-learning/novo-sdk'),
|
|
7
|
+
PronunciationApi: jest.fn().mockImplementation(() => ({
|
|
8
|
+
getPronunciationsV2: jest.fn(),
|
|
9
|
+
})),
|
|
10
|
+
MetadataApi: jest.fn().mockImplementation(() => ({
|
|
11
|
+
getMetadataV1: jest.fn(),
|
|
12
|
+
getPronunciationMetadataV1: jest.fn(),
|
|
13
|
+
})),
|
|
14
|
+
formatError: (err) => String(err),
|
|
15
|
+
}));
|
|
16
|
+
describe('PronunciationService', () => {
|
|
17
|
+
let service;
|
|
18
|
+
let httpService;
|
|
19
|
+
let apiMock;
|
|
20
|
+
let metadataApiMock;
|
|
21
|
+
const urls = ['http://api-url', 'https://api-url', 'api-url'];
|
|
22
|
+
let urlIdx = 0;
|
|
23
|
+
beforeEach(() => {
|
|
24
|
+
httpService = { axiosRef: {} };
|
|
25
|
+
service = new pronunciation_service_1.PronunciationService(httpService, urls[urlIdx]);
|
|
26
|
+
urlIdx = (urlIdx + 1) % urls.length;
|
|
27
|
+
apiMock = service.api;
|
|
28
|
+
metadataApiMock = service.metadataApi;
|
|
29
|
+
});
|
|
30
|
+
describe('getPronunciation', () => {
|
|
31
|
+
it('returns pronunciation data when API succeeds', async () => {
|
|
32
|
+
const mockPronunciation = { phrase: 'kat' };
|
|
33
|
+
apiMock.getPronunciationsV2.mockResolvedValue({ data: mockPronunciation });
|
|
34
|
+
const result = await service.getPronunciation({ phrase: 'kat' }, novo_sdk_1.LanguageCode.nl, 'token');
|
|
35
|
+
expect(result).toEqual(mockPronunciation);
|
|
36
|
+
expect(apiMock.getPronunciationsV2).toHaveBeenCalledWith({ phrase: 'kat', targetLanguage: novo_sdk_1.LanguageCode.nl }, { headers: { Authorization: 'Bearer token' } });
|
|
37
|
+
});
|
|
38
|
+
it('returns error object when API throws', async () => {
|
|
39
|
+
apiMock.getPronunciationsV2.mockRejectedValue(new Error('fail'));
|
|
40
|
+
const result = await service.getPronunciation({ phrase: 'kat' }, novo_sdk_1.LanguageCode.nl, 'token');
|
|
41
|
+
expect(result.error).toContain('fail');
|
|
42
|
+
});
|
|
43
|
+
});
|
|
44
|
+
describe('getMetadata', () => {
|
|
45
|
+
it('returns metadata when API succeeds', async () => {
|
|
46
|
+
const mockMetadata = [{ id: '1' }];
|
|
47
|
+
metadataApiMock.getMetadataV1.mockResolvedValue({ data: mockMetadata });
|
|
48
|
+
const result = await service.getMetadata('kat', novo_sdk_1.LanguageCode.nl, 'token');
|
|
49
|
+
expect(result).toEqual(mockMetadata);
|
|
50
|
+
expect(metadataApiMock.getMetadataV1).toHaveBeenCalledWith({ phrase: 'kat', targetLanguage: novo_sdk_1.LanguageCode.nl, secret: undefined, userData: undefined }, { headers: { Authorization: 'Bearer token' } });
|
|
51
|
+
});
|
|
52
|
+
it('returns error object when API throws', async () => {
|
|
53
|
+
metadataApiMock.getMetadataV1.mockRejectedValue(new Error('bad'));
|
|
54
|
+
const result = await service.getMetadata('kat', novo_sdk_1.LanguageCode.nl, 'token');
|
|
55
|
+
expect(result.error).toContain('bad');
|
|
56
|
+
});
|
|
57
|
+
});
|
|
58
|
+
describe('getPronunciationMetadata', () => {
|
|
59
|
+
it('returns pronunciation metadata when API succeeds', async () => {
|
|
60
|
+
const mockData = [{ id: '1', metadata: [] }];
|
|
61
|
+
metadataApiMock.getPronunciationMetadataV1.mockResolvedValue({ data: mockData });
|
|
62
|
+
const words = [{ word: 'kat', pronunciation: { phonemes: [] } }];
|
|
63
|
+
const result = await service.getPronunciationMetadata(words, novo_sdk_1.LanguageCode.nl, 'token');
|
|
64
|
+
expect(result).toEqual(mockData);
|
|
65
|
+
expect(metadataApiMock.getPronunciationMetadataV1).toHaveBeenCalledWith({
|
|
66
|
+
words: [{ word: 'kat', pronunciation: [{ phonemes: [] }] }],
|
|
67
|
+
language: novo_sdk_1.LanguageCode.nl,
|
|
68
|
+
secret: undefined,
|
|
69
|
+
userData: undefined,
|
|
70
|
+
}, { headers: { Authorization: 'Bearer token' } });
|
|
71
|
+
});
|
|
72
|
+
it('returns error object when API throws', async () => {
|
|
73
|
+
metadataApiMock.getPronunciationMetadataV1.mockRejectedValue(new Error('bad'));
|
|
74
|
+
const result = await service.getPronunciationMetadata([], novo_sdk_1.LanguageCode.nl, 'token');
|
|
75
|
+
expect(result.error).toContain('bad');
|
|
76
|
+
});
|
|
77
|
+
});
|
|
78
|
+
});
|
|
79
|
+
//# sourceMappingURL=pronunciation.service.spec.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"pronunciation.service.spec.js","sourceRoot":"","sources":["../../../../src/modules/clients/pronunciation-api/pronunciation.service.spec.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
|
@@ -0,0 +1,136 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const novo_sdk_1 = require("@novo-learning/novo-sdk");
|
|
4
|
+
const axios_1 = require("axios");
|
|
5
|
+
const publisher_settings_default_1 = require("./publisher-settings.default");
|
|
6
|
+
const publisher_service_1 = require("./publisher.service");
|
|
7
|
+
jest.mock('@novo-learning/novo-sdk', () => ({
|
|
8
|
+
...jest.requireActual('@novo-learning/novo-sdk'),
|
|
9
|
+
PublisherApi: jest.fn().mockImplementation(() => ({
|
|
10
|
+
getAndValidatePublisher: jest.fn(),
|
|
11
|
+
})),
|
|
12
|
+
ConfigurationsApi: jest.fn().mockImplementation(() => ({
|
|
13
|
+
getAllConfigurations: jest.fn(),
|
|
14
|
+
})),
|
|
15
|
+
formatError: (err) => String(err),
|
|
16
|
+
}));
|
|
17
|
+
describe('PublisherService', () => {
|
|
18
|
+
let service;
|
|
19
|
+
let httpService;
|
|
20
|
+
let authService;
|
|
21
|
+
let cacheManager;
|
|
22
|
+
const urls = ['http://api-url', 'https://api-url', 'api-url'];
|
|
23
|
+
let urlIdx = 0;
|
|
24
|
+
beforeAll(() => {
|
|
25
|
+
jest.spyOn(global, 'setTimeout').mockImplementation(() => {
|
|
26
|
+
return {};
|
|
27
|
+
});
|
|
28
|
+
});
|
|
29
|
+
afterAll(() => {
|
|
30
|
+
global.setTimeout.mockRestore();
|
|
31
|
+
});
|
|
32
|
+
beforeEach(() => {
|
|
33
|
+
httpService = { axiosRef: axios_1.default.create() };
|
|
34
|
+
authService = { login: jest.fn() };
|
|
35
|
+
cacheManager = {
|
|
36
|
+
get: jest.fn(),
|
|
37
|
+
set: jest.fn(),
|
|
38
|
+
};
|
|
39
|
+
service = new publisher_service_1.PublisherService(httpService, authService, urls[urlIdx], cacheManager, 10, 'publisherName', 'publisherToken');
|
|
40
|
+
});
|
|
41
|
+
urlIdx = (urlIdx + 1) % urls.length;
|
|
42
|
+
const user = {
|
|
43
|
+
userId: 'user',
|
|
44
|
+
publisherId: 'publisher',
|
|
45
|
+
};
|
|
46
|
+
const payload = {
|
|
47
|
+
token: 'token',
|
|
48
|
+
type: 'type',
|
|
49
|
+
access_token_expires_in: 200,
|
|
50
|
+
refresh_token_expires_in: 400,
|
|
51
|
+
};
|
|
52
|
+
describe('getPublisher', () => {
|
|
53
|
+
it('returns cached publisher if available', async () => {
|
|
54
|
+
const settings = { ...publisher_settings_default_1.DEFAULT_PUBLISHER_SETTINGS, allowedLanguages: [novo_sdk_1.LanguageCode.nl] };
|
|
55
|
+
const cached = { id: '123', settings };
|
|
56
|
+
cacheManager.get.mockResolvedValue(cached);
|
|
57
|
+
const result = await service.getPublisher('123');
|
|
58
|
+
expect(result).toBe(cached);
|
|
59
|
+
});
|
|
60
|
+
it('fetches publisher via API if not cached', async () => {
|
|
61
|
+
cacheManager.get.mockResolvedValue(undefined);
|
|
62
|
+
authService.login.mockResolvedValue({ payload, user });
|
|
63
|
+
service.api.getAndValidatePublisher.mockResolvedValue({
|
|
64
|
+
data: { id: '123', settings: { allowedLanguages: [novo_sdk_1.LanguageCode.nl] } },
|
|
65
|
+
});
|
|
66
|
+
const result = await service.getPublisher('123');
|
|
67
|
+
expect(result.id).toBe('123');
|
|
68
|
+
expect(cacheManager.set).toHaveBeenCalledWith('PublisherService-123', result, { ttl: 10 });
|
|
69
|
+
});
|
|
70
|
+
it('returns default settings if API fails and nothing cached', async () => {
|
|
71
|
+
cacheManager.get.mockResolvedValue(undefined);
|
|
72
|
+
authService.login.mockResolvedValue({ payload, user });
|
|
73
|
+
service.api.getAndValidatePublisher.mockRejectedValue(new Error('fail'));
|
|
74
|
+
const result = await service.getPublisher('123');
|
|
75
|
+
expect(result.settings).toEqual(publisher_settings_default_1.DEFAULT_PUBLISHER_SETTINGS);
|
|
76
|
+
});
|
|
77
|
+
});
|
|
78
|
+
describe('publisherAllowed', () => {
|
|
79
|
+
it('returns true if language is allowed', async () => {
|
|
80
|
+
const settings = { ...publisher_settings_default_1.DEFAULT_PUBLISHER_SETTINGS, allowedLanguages: [novo_sdk_1.LanguageCode.nl] };
|
|
81
|
+
const publisher = { id: '123', settings };
|
|
82
|
+
jest.spyOn(service, 'getPublisher').mockResolvedValue(publisher);
|
|
83
|
+
const result = await service.publisherAllowed('123', novo_sdk_1.LanguageCode.nl);
|
|
84
|
+
expect(result).toBe(true);
|
|
85
|
+
});
|
|
86
|
+
it('returns false if language not allowed', async () => {
|
|
87
|
+
const settings = { ...publisher_settings_default_1.DEFAULT_PUBLISHER_SETTINGS, allowedLanguages: [novo_sdk_1.LanguageCode.en] };
|
|
88
|
+
const publisher = { id: '123', settings };
|
|
89
|
+
jest.spyOn(service, 'getPublisher').mockResolvedValue(publisher);
|
|
90
|
+
const result = await service.publisherAllowed('123', novo_sdk_1.LanguageCode.nl);
|
|
91
|
+
expect(result).toBe(false);
|
|
92
|
+
});
|
|
93
|
+
it('returns true if settings missing', async () => {
|
|
94
|
+
const publisher = { id: '123', settings: undefined };
|
|
95
|
+
jest.spyOn(service, 'getPublisher').mockResolvedValue(publisher);
|
|
96
|
+
const result = await service.publisherAllowed('123', novo_sdk_1.LanguageCode.nl);
|
|
97
|
+
expect(result).toBe(true);
|
|
98
|
+
});
|
|
99
|
+
});
|
|
100
|
+
describe('getConfigurations', () => {
|
|
101
|
+
it('returns cached configurations if available', async () => {
|
|
102
|
+
const cached = [{ id: 'c1' }];
|
|
103
|
+
cacheManager.get.mockResolvedValue(cached);
|
|
104
|
+
const result = await service.getConfigurations(novo_sdk_1.LanguageCode.nl);
|
|
105
|
+
expect(result).toBe(cached);
|
|
106
|
+
});
|
|
107
|
+
it('fetches configurations via API if not cached', async () => {
|
|
108
|
+
cacheManager.get.mockResolvedValue(undefined);
|
|
109
|
+
authService.login.mockResolvedValue({ payload, user });
|
|
110
|
+
service.configApi.getAllConfigurations.mockResolvedValue({ data: [{ id: 'c1' }] });
|
|
111
|
+
const result = await service.getConfigurations(novo_sdk_1.LanguageCode.nl);
|
|
112
|
+
expect(Array.isArray(result)).toBe(true);
|
|
113
|
+
expect(cacheManager.set).toHaveBeenCalledWith('lang_' + novo_sdk_1.LanguageCode.nl, result, { ttl: 10 });
|
|
114
|
+
});
|
|
115
|
+
it('returns error object if API fails', async () => {
|
|
116
|
+
cacheManager.get.mockResolvedValue(undefined);
|
|
117
|
+
authService.login.mockResolvedValue({ payload, user });
|
|
118
|
+
service.configApi.getAllConfigurations.mockRejectedValue(new Error('fail'));
|
|
119
|
+
const result = await service.getConfigurations(novo_sdk_1.LanguageCode.nl);
|
|
120
|
+
expect(result.error).toContain('fail');
|
|
121
|
+
});
|
|
122
|
+
});
|
|
123
|
+
describe('getReadonlyPublisherAccesstoken', () => {
|
|
124
|
+
it('returns token when login succeeds', async () => {
|
|
125
|
+
const pl = { ...payload, token: 'abc' };
|
|
126
|
+
authService.login.mockResolvedValue({ payload: pl, user });
|
|
127
|
+
const token = await service.getReadonlyPublisherAccesstoken();
|
|
128
|
+
expect(token).toBe('abc');
|
|
129
|
+
});
|
|
130
|
+
it('throws when login returns error', async () => {
|
|
131
|
+
authService.login.mockResolvedValue({ error: 'bad' });
|
|
132
|
+
await expect(service.getReadonlyPublisherAccesstoken()).rejects.toThrow(/bad/);
|
|
133
|
+
});
|
|
134
|
+
});
|
|
135
|
+
});
|
|
136
|
+
//# sourceMappingURL=publisher.service.spec.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"publisher.service.spec.js","sourceRoot":"","sources":["../../../../src/modules/clients/publisher-api/publisher.service.spec.ts"],"names":[],"mappings":"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"}
|
|
@@ -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("./invalid-request.filter"), exports);
|
|
18
|
+
__exportStar(require("./request-aborted.filter"), exports);
|
|
19
|
+
//# sourceMappingURL=index.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/modules/nest/exceptions/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,2DAAyC;AACzC,2DAAyC"}
|
|
@@ -0,0 +1,33 @@
|
|
|
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.InvalidRequestFilter = void 0;
|
|
10
|
+
const common_1 = require("@nestjs/common");
|
|
11
|
+
const suppressedPatterns = ['too many parameters', 'entity too large', 'unsupported content encoding'];
|
|
12
|
+
let InvalidRequestFilter = class InvalidRequestFilter {
|
|
13
|
+
catch(exception, host) {
|
|
14
|
+
if (exception instanceof Error) {
|
|
15
|
+
const message = exception.message;
|
|
16
|
+
const lower = message.toLowerCase();
|
|
17
|
+
if (suppressedPatterns.some((p) => lower.includes(p))) {
|
|
18
|
+
const ctx = host.switchToHttp();
|
|
19
|
+
const response = ctx.getResponse();
|
|
20
|
+
return response.status(400).json({
|
|
21
|
+
error: 'Invalid request',
|
|
22
|
+
message: 'The request could not be processed: ' + message,
|
|
23
|
+
});
|
|
24
|
+
}
|
|
25
|
+
}
|
|
26
|
+
throw exception;
|
|
27
|
+
}
|
|
28
|
+
};
|
|
29
|
+
exports.InvalidRequestFilter = InvalidRequestFilter;
|
|
30
|
+
exports.InvalidRequestFilter = InvalidRequestFilter = __decorate([
|
|
31
|
+
(0, common_1.Catch)()
|
|
32
|
+
], InvalidRequestFilter);
|
|
33
|
+
//# sourceMappingURL=invalid-request.filter.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"invalid-request.filter.js","sourceRoot":"","sources":["../../../../src/modules/nest/exceptions/invalid-request.filter.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAAuE;AAEvE,MAAM,kBAAkB,GAAG,CAAC,qBAAqB,EAAE,kBAAkB,EAAE,8BAA8B,CAAU,CAAC;AAMzG,IAAM,oBAAoB,GAA1B,MAAM,oBAAoB;IAC/B,KAAK,CAAC,SAAkB,EAAE,IAAmB;QAC3C,IAAI,SAAS,YAAY,KAAK,EAAE,CAAC;YAC/B,MAAM,OAAO,GAAG,SAAS,CAAC,OAAO,CAAC;YAClC,MAAM,KAAK,GAAG,OAAO,CAAC,WAAW,EAAE,CAAC;YACpC,IAAI,kBAAkB,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;gBACtD,MAAM,GAAG,GAAG,IAAI,CAAC,YAAY,EAAE,CAAC;gBAChC,MAAM,QAAQ,GAAG,GAAG,CAAC,WAAW,EAAE,CAAC;gBACnC,OAAO,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;oBAC/B,KAAK,EAAE,iBAAiB;oBACxB,OAAO,EAAE,sCAAsC,GAAG,OAAO;iBAC1D,CAAC,CAAC;YACL,CAAC;QACH,CAAC;QACD,MAAM,SAAS,CAAC;IAClB,CAAC;CACF,CAAA;AAhBY,oDAAoB;+BAApB,oBAAoB;IADhC,IAAA,cAAK,GAAE;GACK,oBAAoB,CAgBhC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|