unleash-server 5.0.5 → 5.0.6
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.
|
@@ -1,5 +1,9 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
2
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
const notfound_error_1 = __importDefault(require("../error/notfound-error"));
|
|
3
7
|
/* eslint-disable @typescript-eslint/explicit-module-boundary-types */
|
|
4
8
|
const patMiddleware = ({ getLogger }, { accountService }) => {
|
|
5
9
|
const logger = getLogger('/middleware/pat-middleware.ts');
|
|
@@ -14,7 +18,12 @@ const patMiddleware = ({ getLogger }, { accountService }) => {
|
|
|
14
18
|
}
|
|
15
19
|
}
|
|
16
20
|
catch (error) {
|
|
17
|
-
|
|
21
|
+
if (error instanceof notfound_error_1.default) {
|
|
22
|
+
logger.warn('Tried to use a PAT token for user that no longer existed', error);
|
|
23
|
+
}
|
|
24
|
+
else {
|
|
25
|
+
logger.error(error);
|
|
26
|
+
}
|
|
18
27
|
}
|
|
19
28
|
next();
|
|
20
29
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pat-middleware.js","sourceRoot":"","sources":["../../../src/lib/middleware/pat-middleware.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"pat-middleware.js","sourceRoot":"","sources":["../../../src/lib/middleware/pat-middleware.ts"],"names":[],"mappings":";;;;;AAEA,6EAAoD;AAEpD,sEAAsE;AACtE,MAAM,aAAa,GAAG,CAClB,EAAE,SAAS,EAAqC,EAChD,EAAE,cAAc,EAAO,EACpB,EAAE;IACL,MAAM,MAAM,GAAG,SAAS,CAAC,+BAA+B,CAAC,CAAC;IAC1D,MAAM,CAAC,KAAK,CAAC,yBAAyB,CAAC,CAAC;IAExC,OAAO,KAAK,EAAE,GAAiB,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;QAC1C,IAAI;YACA,MAAM,QAAQ,GAAG,GAAG,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC;YAC7C,IAAI,QAAQ,EAAE,UAAU,CAAC,OAAO,CAAC,EAAE;gBAC/B,MAAM,IAAI,GACN,MAAM,cAAc,CAAC,+BAA+B,CAChD,QAAQ,CACX,CAAC;gBACN,GAAG,CAAC,IAAI,GAAG,IAAI,CAAC;gBAChB,cAAc,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;aACvC;SACJ;QAAC,OAAO,KAAK,EAAE;YACZ,IAAI,KAAK,YAAY,wBAAa,EAAE;gBAChC,MAAM,CAAC,IAAI,CACP,0DAA0D,EAC1D,KAAK,CACR,CAAC;aACL;iBAAM;gBACH,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;aACvB;SACJ;QACD,IAAI,EAAE,CAAC;IACX,CAAC,CAAC;AACN,CAAC,CAAC;AAEF,kBAAe,aAAa,CAAC"}
|
|
@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
6
6
|
const no_logger_1 = __importDefault(require("../../test/fixtures/no-logger"));
|
|
7
7
|
const pat_middleware_1 = __importDefault(require("./pat-middleware"));
|
|
8
8
|
const user_1 = __importDefault(require("../types/user"));
|
|
9
|
+
const notfound_error_1 = __importDefault(require("../error/notfound-error"));
|
|
9
10
|
let config;
|
|
10
11
|
beforeEach(() => {
|
|
11
12
|
config = {
|
|
@@ -85,4 +86,35 @@ test('should call next if accountService throws exception', async () => {
|
|
|
85
86
|
expect(cb).toHaveBeenCalled();
|
|
86
87
|
no_logger_1.default.setMuteError(false);
|
|
87
88
|
});
|
|
89
|
+
test('Should not log at error level if user not found', async () => {
|
|
90
|
+
let fakeLogger = {
|
|
91
|
+
debug: () => { },
|
|
92
|
+
info: () => { },
|
|
93
|
+
warn: jest.fn(),
|
|
94
|
+
error: jest.fn(),
|
|
95
|
+
fatal: console.error,
|
|
96
|
+
};
|
|
97
|
+
const conf = {
|
|
98
|
+
getLogger: () => {
|
|
99
|
+
return fakeLogger;
|
|
100
|
+
},
|
|
101
|
+
flagResolver: {
|
|
102
|
+
isEnabled: jest.fn().mockReturnValue(true),
|
|
103
|
+
},
|
|
104
|
+
};
|
|
105
|
+
const accountService = {
|
|
106
|
+
getAccountByPersonalAccessToken: jest.fn().mockImplementation(() => {
|
|
107
|
+
throw new notfound_error_1.default('Could not find pat');
|
|
108
|
+
}),
|
|
109
|
+
};
|
|
110
|
+
let mw = (0, pat_middleware_1.default)(conf, { accountService });
|
|
111
|
+
const cb = jest.fn();
|
|
112
|
+
const req = {
|
|
113
|
+
header: jest.fn().mockReturnValue('user:some-token'),
|
|
114
|
+
user: undefined,
|
|
115
|
+
};
|
|
116
|
+
await mw(req, undefined, cb);
|
|
117
|
+
expect(fakeLogger.error).not.toHaveBeenCalled();
|
|
118
|
+
expect(fakeLogger.warn).toHaveBeenCalled();
|
|
119
|
+
});
|
|
88
120
|
//# sourceMappingURL=pat-middleware.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pat-middleware.test.js","sourceRoot":"","sources":["../../../src/lib/middleware/pat-middleware.test.ts"],"names":[],"mappings":";;;;;AAAA,8EAAsD;AACtD,sEAA6C;AAC7C,yDAAiC;
|
|
1
|
+
{"version":3,"file":"pat-middleware.test.js","sourceRoot":"","sources":["../../../src/lib/middleware/pat-middleware.test.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED