@furystack/rest-service 5.0.3 → 6.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/actions/get-current-user.js +2 -1
- package/dist/actions/get-current-user.js.map +1 -1
- package/dist/actions/is-authenticated.js +3 -2
- package/dist/actions/is-authenticated.js.map +1 -1
- package/dist/actions/login.js +1 -1
- package/dist/actions/login.js.map +1 -1
- package/dist/authenticate.js +4 -4
- package/dist/authenticate.js.map +1 -1
- package/dist/authorize.js +2 -1
- package/dist/authorize.js.map +1 -1
- package/dist/endpoint-generators/create-delete-endpoint.js +2 -1
- package/dist/endpoint-generators/create-delete-endpoint.js.map +1 -1
- package/dist/endpoint-generators/create-delete-endpoint.spec.js +7 -4
- package/dist/endpoint-generators/create-delete-endpoint.spec.js.map +1 -1
- package/dist/endpoint-generators/create-get-collection-endpoint.js +2 -1
- package/dist/endpoint-generators/create-get-collection-endpoint.js.map +1 -1
- package/dist/endpoint-generators/create-get-collection-endpoint.spec.js +23 -16
- package/dist/endpoint-generators/create-get-collection-endpoint.spec.js.map +1 -1
- package/dist/endpoint-generators/create-get-entity-endpoint.js +2 -1
- package/dist/endpoint-generators/create-get-entity-endpoint.js.map +1 -1
- package/dist/endpoint-generators/create-get-entity-endpoint.spec.js +10 -5
- package/dist/endpoint-generators/create-get-entity-endpoint.spec.js.map +1 -1
- package/dist/endpoint-generators/create-patch-endpoint.js +2 -1
- package/dist/endpoint-generators/create-patch-endpoint.js.map +1 -1
- package/dist/endpoint-generators/create-patch-endpoint.spec.js +7 -4
- package/dist/endpoint-generators/create-patch-endpoint.spec.js.map +1 -1
- package/dist/endpoint-generators/create-post-endpoint.js +2 -1
- package/dist/endpoint-generators/create-post-endpoint.js.map +1 -1
- package/dist/endpoint-generators/create-post-endpoint.spec.js +5 -2
- package/dist/endpoint-generators/create-post-endpoint.spec.js.map +1 -1
- package/dist/endpoint-generators/utils.js +5 -4
- package/dist/endpoint-generators/utils.js.map +1 -1
- package/dist/helpers.js +25 -0
- package/dist/helpers.js.map +1 -0
- package/dist/helpers.spec.js +19 -0
- package/dist/helpers.spec.js.map +1 -0
- package/dist/http-user-context.js +2 -2
- package/dist/http-user-context.js.map +1 -1
- package/dist/http-user-context.spec.js +4 -6
- package/dist/http-user-context.spec.js.map +1 -1
- package/dist/index.js +1 -1
- package/dist/index.js.map +1 -1
- package/dist/rest-service.integration.spec.js +33 -32
- package/dist/rest-service.integration.spec.js.map +1 -1
- package/dist/rest.integration.test.js +7 -6
- package/dist/rest.integration.test.js.map +1 -1
- package/dist/validate.integration.spec.js +4 -2
- package/dist/validate.integration.spec.js.map +1 -1
- package/package.json +14 -15
- package/src/actions/get-current-user.ts +2 -2
- package/src/actions/is-authenticated.ts +3 -2
- package/src/actions/login.ts +1 -1
- package/src/authenticate.ts +4 -4
- package/src/authorize.ts +2 -1
- package/src/endpoint-generators/create-delete-endpoint.spec.ts +7 -4
- package/src/endpoint-generators/create-delete-endpoint.ts +2 -1
- package/src/endpoint-generators/create-get-collection-endpoint.spec.ts +23 -16
- package/src/endpoint-generators/create-get-collection-endpoint.ts +2 -1
- package/src/endpoint-generators/create-get-entity-endpoint.spec.ts +10 -5
- package/src/endpoint-generators/create-get-entity-endpoint.ts +2 -1
- package/src/endpoint-generators/create-patch-endpoint.spec.ts +7 -4
- package/src/endpoint-generators/create-patch-endpoint.ts +2 -1
- package/src/endpoint-generators/create-post-endpoint.spec.ts +5 -2
- package/src/endpoint-generators/create-post-endpoint.ts +2 -1
- package/src/endpoint-generators/utils.ts +23 -23
- package/src/helpers.spec.ts +24 -0
- package/src/helpers.ts +28 -0
- package/src/http-user-context.spec.ts +6 -10
- package/src/http-user-context.ts +3 -3
- package/src/index.ts +1 -1
- package/src/rest-service.integration.spec.ts +36 -36
- package/src/rest.integration.test.ts +7 -6
- package/src/validate.integration.spec.ts +5 -3
- package/{dist → types}/actions/error-action.d.ts +0 -0
- package/{dist → types}/actions/error-action.d.ts.map +0 -0
- package/{dist → types}/actions/error-action.spec.d.ts +0 -0
- package/{dist → types}/actions/error-action.spec.d.ts.map +0 -0
- package/{dist → types}/actions/get-current-user.d.ts +0 -0
- package/types/actions/get-current-user.d.ts.map +1 -0
- package/{dist → types}/actions/get-current-user.spec.d.ts +0 -0
- package/{dist → types}/actions/get-current-user.spec.d.ts.map +0 -0
- package/{dist → types}/actions/index.d.ts +0 -0
- package/{dist → types}/actions/index.d.ts.map +0 -0
- package/{dist → types}/actions/is-authenticated.d.ts +0 -0
- package/{dist → types}/actions/is-authenticated.d.ts.map +1 -1
- package/{dist → types}/actions/is-authenticated.spec.d.ts +0 -0
- package/{dist → types}/actions/is-authenticated.spec.d.ts.map +0 -0
- package/{dist → types}/actions/login-action.spec.d.ts +0 -0
- package/{dist → types}/actions/login-action.spec.d.ts.map +0 -0
- package/{dist → types}/actions/login.d.ts +1 -1
- package/types/actions/login.d.ts.map +1 -0
- package/{dist → types}/actions/logout-action.spec.d.ts +0 -0
- package/{dist → types}/actions/logout-action.spec.d.ts.map +0 -0
- package/{dist → types}/actions/logout.d.ts +0 -0
- package/{dist → types}/actions/logout.d.ts.map +0 -0
- package/{dist → types}/actions/not-found-action.d.ts +0 -0
- package/{dist → types}/actions/not-found-action.d.ts.map +0 -0
- package/{dist → types}/actions/not-found-action.spec.d.ts +0 -0
- package/{dist → types}/actions/not-found-action.spec.d.ts.map +0 -0
- package/{dist → types}/add-cors-header.spec.d.ts +0 -0
- package/{dist → types}/add-cors-header.spec.d.ts.map +0 -0
- package/{dist → types}/api-manager.d.ts +0 -0
- package/{dist → types}/api-manager.d.ts.map +0 -0
- package/{dist → types}/authenticate.d.ts +0 -0
- package/{dist → types}/authenticate.d.ts.map +1 -1
- package/{dist → types}/authenticate.spec.d.ts +0 -0
- package/{dist → types}/authenticate.spec.d.ts.map +0 -0
- package/{dist → types}/authorize.d.ts +0 -0
- package/{dist → types}/authorize.d.ts.map +1 -1
- package/{dist → types}/authorize.spec.d.ts +0 -0
- package/{dist → types}/authorize.spec.d.ts.map +0 -0
- package/{dist → types}/endpoint-generators/create-delete-endpoint.d.ts +0 -0
- package/{dist → types}/endpoint-generators/create-delete-endpoint.d.ts.map +1 -1
- package/{dist → types}/endpoint-generators/create-delete-endpoint.spec.d.ts +0 -0
- package/{dist → types}/endpoint-generators/create-delete-endpoint.spec.d.ts.map +0 -0
- package/{dist → types}/endpoint-generators/create-get-collection-endpoint.d.ts +0 -0
- package/{dist → types}/endpoint-generators/create-get-collection-endpoint.d.ts.map +1 -1
- package/{dist → types}/endpoint-generators/create-get-collection-endpoint.spec.d.ts +0 -0
- package/{dist → types}/endpoint-generators/create-get-collection-endpoint.spec.d.ts.map +0 -0
- package/{dist → types}/endpoint-generators/create-get-entity-endpoint.d.ts +0 -0
- package/{dist → types}/endpoint-generators/create-get-entity-endpoint.d.ts.map +1 -1
- package/{dist → types}/endpoint-generators/create-get-entity-endpoint.spec.d.ts +0 -0
- package/{dist → types}/endpoint-generators/create-get-entity-endpoint.spec.d.ts.map +0 -0
- package/{dist → types}/endpoint-generators/create-patch-endpoint.d.ts +0 -0
- package/{dist → types}/endpoint-generators/create-patch-endpoint.d.ts.map +1 -1
- package/{dist → types}/endpoint-generators/create-patch-endpoint.spec.d.ts +0 -0
- package/{dist → types}/endpoint-generators/create-patch-endpoint.spec.d.ts.map +0 -0
- package/{dist → types}/endpoint-generators/create-post-endpoint.d.ts +0 -0
- package/{dist → types}/endpoint-generators/create-post-endpoint.d.ts.map +1 -1
- package/{dist → types}/endpoint-generators/create-post-endpoint.spec.d.ts +0 -0
- package/{dist → types}/endpoint-generators/create-post-endpoint.spec.d.ts.map +0 -0
- package/{dist → types}/endpoint-generators/index.d.ts +0 -0
- package/{dist → types}/endpoint-generators/index.d.ts.map +0 -0
- package/{dist → types}/endpoint-generators/utils.d.ts +1 -1
- package/{dist → types}/endpoint-generators/utils.d.ts.map +1 -1
- package/types/helpers.d.ts +21 -0
- package/types/helpers.d.ts.map +1 -0
- package/types/helpers.spec.d.ts +2 -0
- package/types/helpers.spec.d.ts.map +1 -0
- package/{dist → types}/http-authentication-settings.d.ts +0 -0
- package/{dist → types}/http-authentication-settings.d.ts.map +0 -0
- package/{dist → types}/http-user-context.d.ts +1 -1
- package/{dist → types}/http-user-context.d.ts.map +1 -1
- package/{dist → types}/http-user-context.spec.d.ts +0 -1
- package/{dist → types}/http-user-context.spec.d.ts.map +1 -1
- package/{dist → types}/incoming-message-extensions.d.ts +0 -0
- package/{dist → types}/incoming-message-extensions.d.ts.map +0 -0
- package/{dist → types}/incoming-message-extensions.spec.d.ts +0 -0
- package/{dist → types}/incoming-message-extensions.spec.d.ts.map +0 -0
- package/{dist → types}/index.d.ts +1 -1
- package/types/index.d.ts.map +1 -0
- package/{dist → types}/models/cors-options.d.ts +0 -0
- package/{dist → types}/models/cors-options.d.ts.map +0 -0
- package/{dist → types}/models/default-session.d.ts +0 -0
- package/{dist → types}/models/default-session.d.ts.map +0 -0
- package/{dist → types}/models/index.d.ts +0 -0
- package/{dist → types}/models/index.d.ts.map +0 -0
- package/{dist → types}/request-action-implementation.d.ts +0 -0
- package/{dist → types}/request-action-implementation.d.ts.map +0 -0
- package/types/rest-service.integration.spec.d.ts +2 -0
- package/{dist → types}/rest-service.integration.spec.d.ts.map +1 -1
- package/{dist → types}/rest.integration.test.d.ts +1 -1
- package/types/rest.integration.test.d.ts.map +1 -0
- package/{dist → types}/schema-validator/index.d.ts +0 -0
- package/{dist → types}/schema-validator/index.d.ts.map +0 -0
- package/{dist → types}/schema-validator/schema-validation-error.d.ts +0 -0
- package/{dist → types}/schema-validator/schema-validation-error.d.ts.map +0 -0
- package/{dist → types}/schema-validator/schema-validator.d.ts +0 -0
- package/{dist → types}/schema-validator/schema-validator.d.ts.map +0 -0
- package/{dist → types}/schema-validator/schema-validator.test.d.ts +0 -0
- package/{dist → types}/schema-validator/schema-validator.test.d.ts.map +0 -0
- package/{dist → types}/schema-validator/validate-examples.d.ts +0 -0
- package/{dist → types}/schema-validator/validate-examples.d.ts.map +0 -0
- package/{dist → types}/server-manager.d.ts +0 -0
- package/{dist → types}/server-manager.d.ts.map +0 -0
- package/{dist → types}/server-response-extensions.d.ts +0 -0
- package/{dist → types}/server-response-extensions.d.ts.map +0 -0
- package/{dist → types}/server-response-extensions.spec.d.ts +0 -0
- package/{dist → types}/server-response-extensions.spec.d.ts.map +0 -0
- package/{dist → types}/utils.d.ts +0 -0
- package/{dist → types}/utils.d.ts.map +0 -0
- package/{dist → types}/validate.d.ts +0 -0
- package/{dist → types}/validate.d.ts.map +0 -0
- package/{dist → types}/validate.integration.schema.d.ts +0 -0
- package/{dist → types}/validate.integration.schema.d.ts.map +0 -0
- package/types/validate.integration.spec.d.ts +2 -0
- package/{dist → types}/validate.integration.spec.d.ts.map +1 -1
- package/dist/actions/get-current-user.d.ts.map +0 -1
- package/dist/actions/login.d.ts.map +0 -1
- package/dist/index.d.ts.map +0 -1
- package/dist/injector-extensions.d.ts +0 -21
- package/dist/injector-extensions.d.ts.map +0 -1
- package/dist/injector-extensions.js +0 -14
- package/dist/injector-extensions.js.map +0 -1
- package/dist/injector-extensions.spec.d.ts +0 -2
- package/dist/injector-extensions.spec.d.ts.map +0 -1
- package/dist/injector-extensions.spec.js +0 -19
- package/dist/injector-extensions.spec.js.map +0 -1
- package/dist/rest-service.integration.spec.d.ts +0 -2
- package/dist/rest.integration.test.d.ts.map +0 -1
- package/dist/validate.integration.spec.d.ts +0 -2
- package/src/injector-extensions.spec.ts +0 -19
- package/src/injector-extensions.ts +0 -35
|
@@ -4,13 +4,13 @@ exports.setupContext = exports.MockClass = void 0;
|
|
|
4
4
|
const core_1 = require("@furystack/core");
|
|
5
5
|
const default_session_1 = require("../models/default-session");
|
|
6
6
|
require("@furystack/repository");
|
|
7
|
-
require("../
|
|
7
|
+
require("../helpers");
|
|
8
|
+
const repository_1 = require("@furystack/repository");
|
|
8
9
|
class MockClass {
|
|
9
10
|
}
|
|
10
11
|
exports.MockClass = MockClass;
|
|
11
12
|
const setupContext = (i) => {
|
|
12
|
-
|
|
13
|
-
.addStore(new core_1.InMemoryStore({
|
|
13
|
+
(0, core_1.addStore)(i, new core_1.InMemoryStore({
|
|
14
14
|
model: MockClass,
|
|
15
15
|
primaryKey: 'id',
|
|
16
16
|
}))
|
|
@@ -21,7 +21,8 @@ const setupContext = (i) => {
|
|
|
21
21
|
.addStore(new core_1.InMemoryStore({
|
|
22
22
|
model: default_session_1.DefaultSession,
|
|
23
23
|
primaryKey: 'sessionId',
|
|
24
|
-
}))
|
|
24
|
+
}));
|
|
25
|
+
(0, repository_1.getRepository)(i).createDataSet(MockClass, 'id');
|
|
25
26
|
};
|
|
26
27
|
exports.setupContext = setupContext;
|
|
27
28
|
//# sourceMappingURL=utils.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/endpoint-generators/utils.ts"],"names":[],"mappings":";;;AACA,
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/endpoint-generators/utils.ts"],"names":[],"mappings":";;;AACA,0CAA+D;AAC/D,+DAA0D;AAC1D,iCAA8B;AAC9B,sBAAmB;AACnB,sDAAqD;AAErD,MAAa,SAAS;CAGrB;AAHD,8BAGC;AAEM,MAAM,YAAY,GAAG,CAAC,CAAW,EAAE,EAAE;IAC1C,IAAA,eAAQ,EACN,CAAC,EACD,IAAI,oBAAa,CAAC;QAChB,KAAK,EAAE,SAAS;QAChB,UAAU,EAAE,IAAI;KACjB,CAAC,CACH;SACE,QAAQ,CACP,IAAI,oBAAa,CAAC;QAChB,KAAK,EAAE,WAAI;QACX,UAAU,EAAE,UAAU;KACvB,CAAC,CACH;SACA,QAAQ,CACP,IAAI,oBAAa,CAAC;QAChB,KAAK,EAAE,gCAAc;QACrB,UAAU,EAAE,WAAW;KACxB,CAAC,CACH,CAAA;IACH,IAAA,0BAAa,EAAC,CAAC,CAAC,CAAC,aAAa,CAAC,SAAS,EAAE,IAAI,CAAC,CAAA;AACjD,CAAC,CAAA;AArBY,QAAA,YAAY,gBAqBxB"}
|
package/dist/helpers.js
ADDED
|
@@ -0,0 +1,25 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.useHttpAuthentication = exports.useRestService = void 0;
|
|
4
|
+
const http_authentication_settings_1 = require("./http-authentication-settings");
|
|
5
|
+
const api_manager_1 = require("./api-manager");
|
|
6
|
+
/**
|
|
7
|
+
* Sets up the @furystack/rest-service with the provided settings
|
|
8
|
+
*
|
|
9
|
+
* @param api The API implementation details
|
|
10
|
+
*/
|
|
11
|
+
const useRestService = async (api) => {
|
|
12
|
+
await api.injector.getInstance(api_manager_1.ApiManager).addApi({ ...api });
|
|
13
|
+
return this;
|
|
14
|
+
};
|
|
15
|
+
exports.useRestService = useRestService;
|
|
16
|
+
/**
|
|
17
|
+
* Sets up the HTTP Authentication
|
|
18
|
+
*
|
|
19
|
+
* @param injector The Injector instance
|
|
20
|
+
* @param settings Settings for HTTP Authentication
|
|
21
|
+
* @returns void
|
|
22
|
+
*/
|
|
23
|
+
const useHttpAuthentication = (injector, settings) => injector.setExplicitInstance({ ...new http_authentication_settings_1.HttpAuthenticationSettings(), ...settings }, http_authentication_settings_1.HttpAuthenticationSettings);
|
|
24
|
+
exports.useHttpAuthentication = useHttpAuthentication;
|
|
25
|
+
//# sourceMappingURL=helpers.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../src/helpers.ts"],"names":[],"mappings":";;;AAEA,iFAA2E;AAE3E,+CAA+D;AAG/D;;;;GAIG;AACI,MAAM,cAAc,GAAG,KAAK,EAAqB,GAA2B,EAAE,EAAE;IACrF,MAAM,GAAG,CAAC,QAAQ,CAAC,WAAW,CAAC,wBAAU,CAAC,CAAC,MAAM,CAAC,EAAE,GAAG,GAAG,EAAE,CAAC,CAAA;IAC7D,OAAO,IAAI,CAAA;AACb,CAAC,CAAA;AAHY,QAAA,cAAc,kBAG1B;AAED;;;;;;GAMG;AACI,MAAM,qBAAqB,GAAG,CACnC,QAAkB,EAClB,QAA+D,EAC/D,EAAE,CAAC,QAAQ,CAAC,mBAAmB,CAAC,EAAE,GAAG,IAAI,yDAA0B,EAAE,EAAE,GAAG,QAAQ,EAAE,EAAE,yDAA0B,CAAC,CAAA;AAHtG,QAAA,qBAAqB,yBAGiF"}
|
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const inject_1 = require("@furystack/inject");
|
|
4
|
+
const utils_1 = require("@furystack/utils");
|
|
5
|
+
const helpers_1 = require("./helpers");
|
|
6
|
+
describe('Injector extensions', () => {
|
|
7
|
+
describe('useHttpAuthentication', () => {
|
|
8
|
+
it('Should set up HTTP Authentication', async () => {
|
|
9
|
+
await (0, utils_1.usingAsync)(new inject_1.Injector(), async (i) => {
|
|
10
|
+
(0, helpers_1.useHttpAuthentication)(i);
|
|
11
|
+
// TODO: Check if HTTP Auth has been set up
|
|
12
|
+
});
|
|
13
|
+
});
|
|
14
|
+
});
|
|
15
|
+
describe('useRestService()', () => {
|
|
16
|
+
it.todo('Should set up a REST service');
|
|
17
|
+
});
|
|
18
|
+
});
|
|
19
|
+
//# sourceMappingURL=helpers.spec.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"helpers.spec.js","sourceRoot":"","sources":["../src/helpers.spec.ts"],"names":[],"mappings":";;AAAA,8CAA4C;AAC5C,4CAA6C;AAC7C,uCAAiD;AAEjD,QAAQ,CAAC,qBAAqB,EAAE,GAAG,EAAE;IACnC,QAAQ,CAAC,uBAAuB,EAAE,GAAG,EAAE;QACrC,EAAE,CAAC,mCAAmC,EAAE,KAAK,IAAI,EAAE;YACjD,MAAM,IAAA,kBAAU,EAAC,IAAI,iBAAQ,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE;gBAC3C,IAAA,+BAAqB,EAAC,CAAC,CAAC,CAAA;gBACxB,2CAA2C;YAC7C,CAAC,CAAC,CAAA;QACJ,CAAC,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;IAEF,QAAQ,CAAC,kBAAkB,EAAE,GAAG,EAAE;QAChC,EAAE,CAAC,IAAI,CACL,8BAA8B,CAK/B,CAAA;IACH,CAAC,CAAC,CAAA;AACJ,CAAC,CAAC,CAAA"}
|
|
@@ -4,9 +4,9 @@ exports.HttpUserContext = void 0;
|
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const core_1 = require("@furystack/core");
|
|
6
6
|
const inject_1 = require("@furystack/inject");
|
|
7
|
-
const uuid_1 = require("uuid");
|
|
8
7
|
const http_authentication_settings_1 = require("./http-authentication-settings");
|
|
9
8
|
const security_1 = require("@furystack/security");
|
|
9
|
+
const crypto_1 = require("crypto");
|
|
10
10
|
/**
|
|
11
11
|
* Injectable UserContext for FuryStack HTTP Api
|
|
12
12
|
*/
|
|
@@ -133,7 +133,7 @@ let HttpUserContext = class HttpUserContext {
|
|
|
133
133
|
* @returns the current User
|
|
134
134
|
*/
|
|
135
135
|
async cookieLogin(user, serverResponse) {
|
|
136
|
-
const sessionId = (0,
|
|
136
|
+
const sessionId = (0, crypto_1.randomBytes)(32).toString('hex');
|
|
137
137
|
await this.getSessionStore().add({ sessionId, username: user.username });
|
|
138
138
|
serverResponse.setHeader('Set-Cookie', `${this.authentication.cookieName}=${sessionId}; Path=/; HttpOnly`);
|
|
139
139
|
this.user = user;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"http-user-context.js","sourceRoot":"","sources":["../src/http-user-context.ts"],"names":[],"mappings":";;;;AACA,0CAAoD;AACpD,8CAA8C;AAC9C
|
|
1
|
+
{"version":3,"file":"http-user-context.js","sourceRoot":"","sources":["../src/http-user-context.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,15 +6,13 @@ const inject_1 = require("@furystack/inject");
|
|
|
6
6
|
const core_1 = require("@furystack/core");
|
|
7
7
|
const default_session_1 = require("./models/default-session");
|
|
8
8
|
const http_user_context_1 = require("./http-user-context");
|
|
9
|
-
require("./injector-extensions");
|
|
10
9
|
const security_1 = require("@furystack/security");
|
|
10
|
+
const helpers_1 = require("./helpers");
|
|
11
11
|
const prepareInjector = async (i) => {
|
|
12
|
-
i.
|
|
13
|
-
.addStore(new core_1.InMemoryStore({ model: core_1.User, primaryKey: 'username' }))
|
|
12
|
+
(0, core_1.addStore)(i, new core_1.InMemoryStore({ model: core_1.User, primaryKey: 'username' }))
|
|
14
13
|
.addStore(new core_1.InMemoryStore({ model: default_session_1.DefaultSession, primaryKey: 'sessionId' }))
|
|
15
|
-
.addStore(new core_1.InMemoryStore({ model: security_1.PasswordCredential, primaryKey: 'userName' }))
|
|
16
|
-
|
|
17
|
-
// await i.getInstance(ServerManager).getOrCreate({ port: 19999 })
|
|
14
|
+
.addStore(new core_1.InMemoryStore({ model: security_1.PasswordCredential, primaryKey: 'userName' }));
|
|
15
|
+
(0, helpers_1.useHttpAuthentication)(i);
|
|
18
16
|
};
|
|
19
17
|
exports.prepareInjector = prepareInjector;
|
|
20
18
|
const setupUser = async (i, userName, password) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"http-user-context.spec.js","sourceRoot":"","sources":["../src/http-user-context.spec.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"http-user-context.spec.js","sourceRoot":"","sources":["../src/http-user-context.spec.ts"],"names":[],"mappings":"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"}
|
package/dist/index.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
const tslib_1 = require("tslib");
|
|
4
|
-
require("./
|
|
4
|
+
tslib_1.__exportStar(require("./helpers"), exports);
|
|
5
5
|
tslib_1.__exportStar(require("./api-manager"), exports);
|
|
6
6
|
tslib_1.__exportStar(require("./actions"), exports);
|
|
7
7
|
tslib_1.__exportStar(require("./authenticate"), exports);
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AAAA,oDAAyB;AACzB,wDAA6B;AAC7B,oDAAyB;AACzB,yDAA8B;AAC9B,sDAA2B;AAC3B,yEAA8C;AAC9C,8DAAmC;AACnC,wEAA6C;AAC7C,2DAAgC;AAChC,uEAA4C;AAC5C,kDAAuB;AACvB,mDAAwB;AACxB,gEAAqC;AACrC,6DAAkC;AAClC,0EAA+C;AAC/C,qDAA0B"}
|
|
@@ -2,52 +2,53 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
const tslib_1 = require("tslib");
|
|
4
4
|
const inject_1 = require("@furystack/inject");
|
|
5
|
-
require("./
|
|
5
|
+
require("./helpers");
|
|
6
6
|
const utils_1 = require("@furystack/utils");
|
|
7
7
|
const actions_1 = require("./actions");
|
|
8
8
|
const core_1 = require("@furystack/core");
|
|
9
9
|
const default_session_1 = require("./models/default-session");
|
|
10
10
|
const got_1 = tslib_1.__importDefault(require("got"));
|
|
11
11
|
const request_action_implementation_1 = require("./request-action-implementation");
|
|
12
|
+
const helpers_1 = require("./helpers");
|
|
12
13
|
class UserWithPassword extends core_1.User {
|
|
13
14
|
}
|
|
14
15
|
const port = 19090;
|
|
15
16
|
const hostName = 'localhost';
|
|
16
17
|
const root = 'test-api';
|
|
17
|
-
const prepareInjector = (i) =>
|
|
18
|
-
.
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
headers: ['cache', 'content-type'],
|
|
33
|
-
},
|
|
34
|
-
api: {
|
|
35
|
-
GET: {
|
|
36
|
-
'/currentUser': actions_1.GetCurrentUser,
|
|
37
|
-
'/isAuthenticated': actions_1.IsAuthenticated,
|
|
38
|
-
'/testQuery': async (options) => (0, request_action_implementation_1.JsonResult)({ param1Value: options.getQuery().param1 }),
|
|
39
|
-
'/testUrlParams/:urlParam': async (options) => (0, request_action_implementation_1.JsonResult)({ urlParamValue: options.getUrlParams().urlParam }),
|
|
18
|
+
const prepareInjector = async (i) => {
|
|
19
|
+
(0, core_1.addStore)(i, new core_1.InMemoryStore({ model: core_1.User, primaryKey: 'username' })).addStore(new core_1.InMemoryStore({ model: default_session_1.DefaultSession, primaryKey: 'sessionId' }));
|
|
20
|
+
(0, helpers_1.useHttpAuthentication)(i, {
|
|
21
|
+
getUserStore: (sm) => sm.getStoreFor(UserWithPassword, 'username'),
|
|
22
|
+
getSessionStore: (sm) => sm.getStoreFor(default_session_1.DefaultSession, 'sessionId'),
|
|
23
|
+
});
|
|
24
|
+
await (0, helpers_1.useRestService)({
|
|
25
|
+
injector: i,
|
|
26
|
+
root,
|
|
27
|
+
port,
|
|
28
|
+
hostName,
|
|
29
|
+
cors: {
|
|
30
|
+
credentials: true,
|
|
31
|
+
origins: ['http://localhost:8080'],
|
|
32
|
+
headers: ['cache', 'content-type'],
|
|
40
33
|
},
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
34
|
+
api: {
|
|
35
|
+
GET: {
|
|
36
|
+
'/currentUser': actions_1.GetCurrentUser,
|
|
37
|
+
'/isAuthenticated': actions_1.IsAuthenticated,
|
|
38
|
+
'/testQuery': async (options) => (0, request_action_implementation_1.JsonResult)({ param1Value: options.getQuery().param1 }),
|
|
39
|
+
'/testUrlParams/:urlParam': async (options) => (0, request_action_implementation_1.JsonResult)({ urlParamValue: options.getUrlParams().urlParam }),
|
|
40
|
+
},
|
|
41
|
+
POST: {
|
|
42
|
+
'/login': actions_1.LoginAction,
|
|
43
|
+
'/logout': actions_1.LogoutAction,
|
|
44
|
+
'/testPostBody': async (options) => {
|
|
45
|
+
const body = await options.getBody();
|
|
46
|
+
return (0, request_action_implementation_1.JsonResult)({ bodyValue: body.value });
|
|
47
|
+
},
|
|
47
48
|
},
|
|
48
49
|
},
|
|
49
|
-
}
|
|
50
|
-
}
|
|
50
|
+
});
|
|
51
|
+
};
|
|
51
52
|
const apiUrl = utils_1.PathHelper.joinPaths(`http://${hostName}:${port}`, root);
|
|
52
53
|
describe('@furystack/rest-service inregration tests', () => {
|
|
53
54
|
it('Should be started and disposed', async () => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rest-service.integration.spec.js","sourceRoot":"","sources":["../src/rest-service.integration.spec.ts"],"names":[],"mappings":";;;AAAA,8CAA4C;AAC5C,
|
|
1
|
+
{"version":3,"file":"rest-service.integration.spec.js","sourceRoot":"","sources":["../src/rest-service.integration.spec.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,13 +4,14 @@ const inject_1 = require("@furystack/inject");
|
|
|
4
4
|
const rest_client_got_1 = require("@furystack/rest-client-got");
|
|
5
5
|
const utils_1 = require("@furystack/utils");
|
|
6
6
|
const request_action_implementation_1 = require("./request-action-implementation");
|
|
7
|
-
|
|
8
|
-
require("./
|
|
7
|
+
require("./helpers");
|
|
8
|
+
const helpers_1 = require("./helpers");
|
|
9
9
|
const createEchoApiServer = async () => {
|
|
10
10
|
const port = Math.round(Math.random() * 1000) + 10000;
|
|
11
11
|
const root = '/api';
|
|
12
12
|
const injector = new inject_1.Injector();
|
|
13
|
-
await
|
|
13
|
+
await (0, helpers_1.useRestService)({
|
|
14
|
+
injector,
|
|
14
15
|
port,
|
|
15
16
|
root,
|
|
16
17
|
api: {
|
|
@@ -48,7 +49,7 @@ describe('REST Integration tests with GOT client', () => {
|
|
|
48
49
|
});
|
|
49
50
|
it('Should execute a request with headers', async () => {
|
|
50
51
|
await (0, utils_1.usingAsync)(await createEchoApiServer(), async ({ client }) => {
|
|
51
|
-
const value =
|
|
52
|
+
const value = 'value';
|
|
52
53
|
const result = await client({
|
|
53
54
|
method: 'GET',
|
|
54
55
|
action: '/headers',
|
|
@@ -62,7 +63,7 @@ describe('REST Integration tests with GOT client', () => {
|
|
|
62
63
|
});
|
|
63
64
|
it('Should execute a request with query', async () => {
|
|
64
65
|
await (0, utils_1.usingAsync)(await createEchoApiServer(), async ({ client }) => {
|
|
65
|
-
const value =
|
|
66
|
+
const value = 'value2';
|
|
66
67
|
const result = await client({
|
|
67
68
|
method: 'GET',
|
|
68
69
|
action: '/query',
|
|
@@ -78,7 +79,7 @@ describe('REST Integration tests with GOT client', () => {
|
|
|
78
79
|
});
|
|
79
80
|
it('Should execute a request with URL parameters', async () => {
|
|
80
81
|
await (0, utils_1.usingAsync)(await createEchoApiServer(), async ({ client }) => {
|
|
81
|
-
const value =
|
|
82
|
+
const value = 'value3';
|
|
82
83
|
const result = await client({
|
|
83
84
|
method: 'GET',
|
|
84
85
|
action: '/urlParams/:id',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rest.integration.test.js","sourceRoot":"","sources":["../src/rest.integration.test.ts"],"names":[],"mappings":";;AAAA,8CAA4C;AAE5C,gEAAyD;AACzD,4CAA6C;AAC7C,mFAA4D;AAC5D
|
|
1
|
+
{"version":3,"file":"rest.integration.test.js","sourceRoot":"","sources":["../src/rest.integration.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,13 +7,15 @@ const utils_1 = require("@furystack/utils");
|
|
|
7
7
|
const source_1 = require("got/dist/source");
|
|
8
8
|
const request_action_implementation_1 = require("./request-action-implementation");
|
|
9
9
|
const validate_1 = require("./validate");
|
|
10
|
-
require("./
|
|
10
|
+
require("./helpers");
|
|
11
11
|
const validate_integration_spec_schema_json_1 = tslib_1.__importDefault(require("./validate.integration.spec.schema.json"));
|
|
12
|
+
const helpers_1 = require("./helpers");
|
|
12
13
|
// To recreate: yarn ts-json-schema-generator -f tsconfig.json --no-type-check -p packages/rest-service/src/validate.integration.schema.ts -o packages/rest-service/src/validate.integration.spec.schema.json
|
|
13
14
|
const createValidateApi = async () => {
|
|
14
15
|
const injector = new inject_1.Injector();
|
|
15
16
|
const port = Math.round(Math.random() * 1000) + 10000;
|
|
16
|
-
|
|
17
|
+
(0, helpers_1.useRestService)({
|
|
18
|
+
injector,
|
|
17
19
|
api: {
|
|
18
20
|
GET: {
|
|
19
21
|
'/validate-query': (0, validate_1.Validate)({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validate.integration.spec.js","sourceRoot":"","sources":["../src/validate.integration.spec.ts"],"names":[],"mappings":";;;AAAA,8CAA4C;AAC5C,gEAAyD;AACzD,4CAA6C;AAC7C,4CAA8C;AAC9C,mFAA4D;AAC5D,yCAAqC;AACrC,
|
|
1
|
+
{"version":3,"file":"validate.integration.spec.js","sourceRoot":"","sources":["../src/validate.integration.spec.ts"],"names":[],"mappings":";;;AAAA,8CAA4C;AAC5C,gEAAyD;AACzD,4CAA6C;AAC7C,4CAA8C;AAC9C,mFAA4D;AAC5D,yCAAqC;AACrC,qBAAkB;AAElB,4HAA4D;AAE5D,uCAA0C;AAE1C,6MAA6M;AAE7M,MAAM,iBAAiB,GAAG,KAAK,IAAI,EAAE;IACnC,MAAM,QAAQ,GAAG,IAAI,iBAAQ,EAAE,CAAA;IAC/B,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,IAAI,CAAC,GAAG,KAAK,CAAA;IACrD,IAAA,wBAAc,EAAgB;QAC5B,QAAQ;QACR,GAAG,EAAE;YACH,GAAG,EAAE;gBACH,iBAAiB,EAAE,IAAA,mBAAQ,EAAC;oBAC1B,MAAM,EAAN,+CAAM;oBACN,UAAU,EAAE,eAAe;iBAC5B,CAAC,CAAC,KAAK,EAAE,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC,IAAA,0CAAU,EAAC,EAAE,GAAG,QAAQ,EAAE,EAAE,CAAC,CAAC;gBACzD,mBAAmB,EAAE,IAAA,mBAAQ,EAAC;oBAC5B,MAAM,EAAN,+CAAM;oBACN,UAAU,EAAE,aAAa;iBAC1B,CAAC,CAAC,KAAK,EAAE,EAAE,YAAY,EAAE,EAAE,EAAE,CAAC,IAAA,0CAAU,EAAC,EAAE,GAAG,YAAY,EAAE,EAAE,CAAC,CAAC;gBACjE,mBAAmB,EAAE,IAAA,mBAAQ,EAAC;oBAC5B,MAAM,EAAN,+CAAM;oBACN,UAAU,EAAE,iBAAiB;iBAC9B,CAAC,CAAC,KAAK,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC,IAAA,0CAAU,EAAC,EAAE,GAAG,OAAO,EAAE,CAAC,CAAC;gBACrD,OAAO,EAAE,SAAgB;gBACzB,WAAW,EAAE,SAAgB,EAAE,2BAA2B;aAC3D;YACD,IAAI,EAAE;gBACJ,gBAAgB,EAAE,IAAA,mBAAQ,EAAC;oBACzB,MAAM,EAAN,+CAAM;oBACN,UAAU,EAAE,cAAc;iBAC3B,CAAC,CAAC,KAAK,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE;oBACvB,MAAM,IAAI,GAAG,MAAM,OAAO,EAAE,CAAA;oBAC5B,OAAO,IAAA,0CAAU,EAAC,EAAE,GAAG,IAAI,EAAE,CAAC,CAAA;gBAChC,CAAC,CAAC;gBACF,OAAO,EAAE,SAAgB,EAAE,2BAA2B;aACvD;YACD,KAAK,EAAE;gBACL,WAAW,EAAE,SAAgB,EAAE,2BAA2B;aAC3D;YACD,MAAM,EAAE;gBACN,WAAW,EAAE,SAAgB,EAAE,2BAA2B;aAC3D;SACF;QACD,IAAI;QACJ,IAAI,EAAE,MAAM;KACb,CAAC,CAAA;IACF,MAAM,MAAM,GAAG,IAAA,8BAAY,EAAgB;QACzC,WAAW,EAAE,oBAAoB,IAAI,MAAM;KAC5C,CAAC,CAAA;IACF,OAAO;QACL,OAAO,EAAE,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC;QACxC,MAAM;KACP,CAAA;AACH,CAAC,CAAA;AAED,QAAQ,CAAC,8BAA8B,EAAE,GAAG,EAAE;IAC5C,QAAQ,CAAC,mBAAmB,EAAE,GAAG,EAAE;QACjC,EAAE,CAAC,uBAAuB,EAAE,KAAK,IAAI,EAAE;YACrC,MAAM,IAAA,kBAAU,EAAC,MAAM,iBAAiB,EAAE,EAAE,KAAK,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE;;gBAC/D,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC,CAAA;gBACpB,IAAI;oBACF,MAAM,MAAM,CAAC;wBACX,MAAM,EAAE,KAAK;wBACb,MAAM,EAAE,iBAAiB;wBACzB,KAAK,EAAE,SAAgB;qBACxB,CAAC,CAAA;iBACH;gBAAC,OAAO,KAAK,EAAE;oBACd,IAAI,KAAK,YAAY,qBAAY,EAAE;wBACjC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,iCAAiC,CAAC,CAAA;wBAC7D,MAAM,CAAC,MAAA,KAAK,CAAC,QAAQ,0CAAE,UAAU,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;wBAC5C,MAAM,YAAY,GAAG,IAAI,CAAC,KAAK,CAAC,MAAA,KAAK,CAAC,QAAQ,0CAAE,IAAc,CAAC,CAAA;wBAC/D,MAAM,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;wBACpE,MAAM,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;wBACpE,MAAM,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;qBACrE;iBACF;YACH,CAAC,CAAC,CAAA;QACJ,CAAC,CAAC,CAAA;QACF,EAAE,CAAC,qBAAqB,EAAE,KAAK,IAAI,EAAE;YACnC,MAAM,IAAA,kBAAU,EAAC,MAAM,iBAAiB,EAAE,EAAE,KAAK,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE;;gBAC/D,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC,CAAA;gBACpB,IAAI;oBACF,MAAM,MAAM,CAAC;wBACX,MAAM,EAAE,KAAK;wBACb,MAAM,EAAE,mBAAmB;wBAC3B,GAAG,EAAE,SAAgB;qBACtB,CAAC,CAAA;iBACH;gBAAC,OAAO,KAAK,EAAE;oBACd,IAAI,KAAK,YAAY,qBAAY,EAAE;wBACjC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,iCAAiC,CAAC,CAAA;wBAC7D,MAAM,CAAC,MAAA,KAAK,CAAC,QAAQ,0CAAE,UAAU,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;wBAC5C,MAAM,YAAY,GAAG,IAAI,CAAC,KAAK,CAAC,MAAA,KAAK,CAAC,QAAQ,0CAAE,IAAc,CAAC,CAAA;wBAC/D,MAAM,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAA;wBAC5D,MAAM,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,CAAA;qBAC/D;iBACF;YACH,CAAC,CAAC,CAAA;QACJ,CAAC,CAAC,CAAA;QACF,EAAE,CAAC,yBAAyB,EAAE,KAAK,IAAI,EAAE;YACvC,MAAM,IAAA,kBAAU,EAAC,MAAM,iBAAiB,EAAE,EAAE,KAAK,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE;;gBAC/D,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC,CAAA;gBACpB,IAAI;oBACF,MAAM,MAAM,CAAC;wBACX,MAAM,EAAE,KAAK;wBACb,MAAM,EAAE,mBAAmB;wBAC3B,OAAO,EAAE,SAAgB;qBAC1B,CAAC,CAAA;iBACH;gBAAC,OAAO,KAAK,EAAE;oBACd,IAAI,KAAK,YAAY,qBAAY,EAAE;wBACjC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,iCAAiC,CAAC,CAAA;wBAC7D,MAAM,CAAC,MAAA,KAAK,CAAC,QAAQ,0CAAE,UAAU,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;wBAC5C,MAAM,YAAY,GAAG,IAAI,CAAC,KAAK,CAAC,MAAA,KAAK,CAAC,QAAQ,0CAAE,IAAc,CAAC,CAAA;wBAC/D,MAAM,CACJ,YAAY,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,KAAK,UAAU,IAAI,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAC5F,CAAC,WAAW,EAAE,CAAA;qBAChB;iBACF;YACH,CAAC,CAAC,CAAA;QACJ,CAAC,CAAC,CAAA;QACF,EAAE,CAAC,sBAAsB,EAAE,KAAK,IAAI,EAAE;YACpC,MAAM,IAAA,kBAAU,EAAC,MAAM,iBAAiB,EAAE,EAAE,KAAK,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE;;gBAC/D,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC,CAAA;gBACpB,IAAI;oBACF,MAAM,MAAM,CAAC;wBACX,MAAM,EAAE,MAAM;wBACd,MAAM,EAAE,gBAAgB;wBACxB,IAAI,EAAE,SAAgB;qBACvB,CAAC,CAAA;iBACH;gBAAC,OAAO,KAAK,EAAE;oBACd,IAAI,KAAK,YAAY,qBAAY,EAAE;wBACjC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,iCAAiC,CAAC,CAAA;wBAC7D,MAAM,CAAC,MAAA,KAAK,CAAC,QAAQ,0CAAE,UAAU,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;wBAC5C,MAAM,YAAY,GAAG,IAAI,CAAC,KAAK,CAAC,MAAA,KAAK,CAAC,QAAQ,0CAAE,IAAc,CAAC,CAAA;wBAC/D,MAAM,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CAAA;qBACtE;iBACF;YACH,CAAC,CAAC,CAAA;QACJ,CAAC,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;IAEF,QAAQ,CAAC,oBAAoB,EAAE,GAAG,EAAE;QAClC,EAAE,CAAC,uBAAuB,EAAE,KAAK,IAAI,EAAE;YACrC,MAAM,IAAA,kBAAU,EAAC,MAAM,iBAAiB,EAAE,EAAE,KAAK,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE;gBAC/D,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC;oBAC1B,MAAM,EAAE,KAAK;oBACb,MAAM,EAAE,iBAAiB;oBACzB,KAAK,EAAE;wBACL,GAAG,EAAE,KAAK;wBACV,GAAG,EAAE,CAAC;wBACN,GAAG,EAAE,KAAK;qBACX;iBACF,CAAC,CAAA;gBACF,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;gBAC5C,MAAM,YAAY,GAAG,MAAM,CAAC,OAAO,EAAE,CAAA;gBACrC,MAAM,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;gBACpC,MAAM,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;gBAChC,MAAM,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;YACtC,CAAC,CAAC,CAAA;QACJ,CAAC,CAAC,CAAA;QACF,EAAE,CAAC,qBAAqB,EAAE,KAAK,IAAI,EAAE;YACnC,MAAM,IAAA,kBAAU,EAAC,MAAM,iBAAiB,EAAE,EAAE,KAAK,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE;gBAC/D,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC;oBAC1B,MAAM,EAAE,KAAK;oBACb,MAAM,EAAE,mBAAmB;oBAC3B,GAAG,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE;iBACf,CAAC,CAAA;gBACF,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;gBAC5C,MAAM,YAAY,GAAG,MAAM,CAAC,OAAO,EAAE,CAAA;gBACrC,MAAM,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;YACjC,CAAC,CAAC,CAAA;QACJ,CAAC,CAAC,CAAA;QACF,EAAE,CAAC,yBAAyB,EAAE,KAAK,IAAI,EAAE;YACvC,MAAM,IAAA,kBAAU,EAAC,MAAM,iBAAiB,EAAE,EAAE,KAAK,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE;gBAC/D,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC;oBAC1B,MAAM,EAAE,KAAK;oBACb,MAAM,EAAE,mBAAmB;oBAC3B,OAAO,EAAE;wBACP,GAAG,EAAE,KAAK;wBACV,GAAG,EAAE,EAAE;wBACP,GAAG,EAAE,IAAI;qBACV;iBACF,CAAC,CAAA;gBACF,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;gBAC5C,MAAM,YAAY,GAAG,MAAM,CAAC,OAAO,EAAE,CAAA;gBACrC,MAAM,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;gBACpC,MAAM,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;gBACjC,MAAM,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;YACrC,CAAC,CAAC,CAAA;QACJ,CAAC,CAAC,CAAA;QACF,EAAE,CAAC,sBAAsB,EAAE,KAAK,IAAI,EAAE;YACpC,MAAM,IAAA,kBAAU,EAAC,MAAM,iBAAiB,EAAE,EAAE,KAAK,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE;gBAC/D,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC;oBAC1B,MAAM,EAAE,MAAM;oBACd,MAAM,EAAE,gBAAgB;oBACxB,IAAI,EAAE;wBACJ,GAAG,EAAE,KAAK;wBACV,GAAG,EAAE,EAAE;wBACP,GAAG,EAAE,IAAI;qBACV;iBACF,CAAC,CAAA;gBAEF,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;gBAC5C,MAAM,YAAY,GAAG,MAAM,CAAC,OAAO,EAAE,CAAA;gBACrC,MAAM,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;gBACpC,MAAM,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;gBACjC,MAAM,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;YACrC,CAAC,CAAC,CAAA;QACJ,CAAC,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;AACJ,CAAC,CAAC,CAAA"}
|
package/package.json
CHANGED
|
@@ -1,10 +1,11 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@furystack/rest-service",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "6.0.1",
|
|
4
4
|
"description": "Repository implementation for FuryStack",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"files": [
|
|
7
7
|
"dist",
|
|
8
|
+
"types",
|
|
8
9
|
"src"
|
|
9
10
|
],
|
|
10
11
|
"repository": {
|
|
@@ -28,27 +29,25 @@
|
|
|
28
29
|
},
|
|
29
30
|
"homepage": "https://github.com/furystack/furystack",
|
|
30
31
|
"dependencies": {
|
|
31
|
-
"@furystack/core": "^
|
|
32
|
-
"@furystack/inject": "^
|
|
33
|
-
"@furystack/logging": "^
|
|
34
|
-
"@furystack/repository": "^
|
|
35
|
-
"@furystack/rest": "^
|
|
36
|
-
"@furystack/security": "^
|
|
37
|
-
"@furystack/utils": "^
|
|
32
|
+
"@furystack/core": "^11.0.1",
|
|
33
|
+
"@furystack/inject": "^6.0.1",
|
|
34
|
+
"@furystack/logging": "^3.0.1",
|
|
35
|
+
"@furystack/repository": "^6.0.1",
|
|
36
|
+
"@furystack/rest": "^4.0.1",
|
|
37
|
+
"@furystack/security": "^2.0.1",
|
|
38
|
+
"@furystack/utils": "^3.0.1",
|
|
38
39
|
"ajv": "^8.11.0",
|
|
39
40
|
"ajv-formats": "^2.1.1",
|
|
40
41
|
"path-to-regexp": "^6.2.0",
|
|
41
42
|
"semaphore-async-await": "^1.5.1",
|
|
42
|
-
"tslib": "^2.
|
|
43
|
-
"uuid": "^8.3.2"
|
|
43
|
+
"tslib": "^2.4.0"
|
|
44
44
|
},
|
|
45
45
|
"devDependencies": {
|
|
46
|
-
"@furystack/rest-client-got": "^
|
|
47
|
-
"@types/jest": "^27.
|
|
48
|
-
"@types/node": "^17.0.
|
|
49
|
-
"@types/uuid": "^8.3.4",
|
|
46
|
+
"@furystack/rest-client-got": "^2.0.1",
|
|
47
|
+
"@types/jest": "^27.5.0",
|
|
48
|
+
"@types/node": "^17.0.31",
|
|
50
49
|
"got": "^11.8.3"
|
|
51
50
|
},
|
|
52
|
-
"typings": "./
|
|
51
|
+
"typings": "./types/index.d.ts",
|
|
53
52
|
"gitHead": "1045d854bfd8c475b7035471d130d401417a2321"
|
|
54
53
|
}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { User } from '@furystack/core'
|
|
1
|
+
import { getCurrentUser, User } from '@furystack/core'
|
|
2
2
|
import { Authenticate } from '../authenticate'
|
|
3
3
|
import { JsonResult, RequestAction } from '../request-action-implementation'
|
|
4
4
|
|
|
@@ -10,6 +10,6 @@ import { JsonResult, RequestAction } from '../request-action-implementation'
|
|
|
10
10
|
export const GetCurrentUser: RequestAction<{
|
|
11
11
|
result: User
|
|
12
12
|
}> = Authenticate()(async ({ injector }) => {
|
|
13
|
-
const user = await
|
|
13
|
+
const user = await getCurrentUser(injector)
|
|
14
14
|
return JsonResult(user)
|
|
15
15
|
})
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { isAuthenticated } from '@furystack/core'
|
|
1
2
|
import { JsonResult, RequestAction } from '../request-action-implementation'
|
|
2
3
|
|
|
3
4
|
/**
|
|
@@ -8,6 +9,6 @@ import { JsonResult, RequestAction } from '../request-action-implementation'
|
|
|
8
9
|
* @returns A standard authentication result
|
|
9
10
|
*/
|
|
10
11
|
export const IsAuthenticated: RequestAction<{ result: { isAuthenticated: boolean } }> = async ({ injector }) => {
|
|
11
|
-
const
|
|
12
|
-
return JsonResult({ isAuthenticated })
|
|
12
|
+
const isAuthenticatedResult = await isAuthenticated(injector)
|
|
13
|
+
return JsonResult({ isAuthenticated: isAuthenticatedResult })
|
|
13
14
|
}
|
package/src/actions/login.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { HttpUserContext } from '../http-user-context'
|
|
2
|
-
import '../
|
|
2
|
+
import '../helpers'
|
|
3
3
|
import { User } from '@furystack/core'
|
|
4
4
|
import { RequestError } from '@furystack/rest'
|
|
5
5
|
import { JsonResult, RequestAction } from '../request-action-implementation'
|
package/src/authenticate.ts
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { isAuthenticated } from '@furystack/core'
|
|
1
2
|
import { sleepAsync } from '@furystack/utils'
|
|
2
3
|
import { HttpUserContext } from './http-user-context'
|
|
3
4
|
import { ActionResult, JsonResult, RequestAction, RequestActionOptions } from './request-action-implementation'
|
|
@@ -6,15 +7,14 @@ export const Authenticate =
|
|
|
6
7
|
() =>
|
|
7
8
|
<T extends { result: unknown }>(action: RequestAction<T>): RequestAction<T> => {
|
|
8
9
|
return async (args: RequestActionOptions<T>): Promise<ActionResult<T>> => {
|
|
9
|
-
const
|
|
10
|
+
const { injector } = args
|
|
11
|
+
const authenticated = await isAuthenticated(injector)
|
|
10
12
|
if (!authenticated) {
|
|
11
13
|
await sleepAsync(Math.random() * 1000)
|
|
12
14
|
return JsonResult(
|
|
13
15
|
{ error: 'unauthorized' },
|
|
14
16
|
401,
|
|
15
|
-
|
|
16
|
-
? { 'WWW-Authenticate': 'Basic' }
|
|
17
|
-
: {},
|
|
17
|
+
injector.getInstance(HttpUserContext).authentication.enableBasicAuth ? { 'WWW-Authenticate': 'Basic' } : {},
|
|
18
18
|
) as unknown as ActionResult<T>
|
|
19
19
|
}
|
|
20
20
|
return (await action(args)) as any
|
package/src/authorize.ts
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { isAuthorized } from '@furystack/core'
|
|
1
2
|
import { sleepAsync } from '@furystack/utils'
|
|
2
3
|
import { ActionResult, JsonResult, RequestAction, RequestActionOptions } from './request-action-implementation'
|
|
3
4
|
|
|
@@ -6,7 +7,7 @@ export const Authorize =
|
|
|
6
7
|
<T extends { result: unknown }>(action: RequestAction<T>): RequestAction<T> => {
|
|
7
8
|
return async (options: RequestActionOptions<T>): Promise<ActionResult<T>> => {
|
|
8
9
|
try {
|
|
9
|
-
const authorized = await options.injector
|
|
10
|
+
const authorized = await isAuthorized(options.injector, ...roles)
|
|
10
11
|
if (!authorized) {
|
|
11
12
|
await sleepAsync(Math.random() * 1000)
|
|
12
13
|
return JsonResult({ error: 'forbidden' }, 403) as any
|