diff --git a/package-lock.json b/package-lock.json index 8f4cd864..94bb6dff 100644 --- a/package-lock.json +++ b/package-lock.json @@ -65,6 +65,7 @@ "version": "7.15.8", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "@babel/code-frame": "^7.15.8", "@babel/generator": "^7.15.8", @@ -1461,6 +1462,7 @@ "version": "27.0.2", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "jest-diff": "^27.0.0", "pretty-format": "^27.0.0" @@ -1614,6 +1616,7 @@ "version": "4.17.0", "dev": true, "license": "BSD-2-Clause", + "peer": true, "dependencies": { "@typescript-eslint/scope-manager": "4.17.0", "@typescript-eslint/types": "4.17.0", @@ -1721,6 +1724,7 @@ "version": "8.5.0", "dev": true, "license": "MIT", + "peer": true, "bin": { "acorn": "bin/acorn" }, @@ -1909,25 +1913,24 @@ "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==" }, "node_modules/axios": { - "version": "0.30.0", - "resolved": "https://registry.npmjs.org/axios/-/axios-0.30.0.tgz", - "integrity": "sha512-Z4F3LjCgfjZz8BMYalWdMgAQUnEtKDmpwNHjh/C8pQZWde32TF64cqnSeyL3xD/aTIASRU30RHTNzRiV/NpGMg==", - "license": "MIT", + "version": "0.30.2", + "resolved": "https://registry.npmjs.org/axios/-/axios-0.30.2.tgz", + "integrity": "sha512-0pE4RQ4UQi1jKY6p7u6i1Tkzqmu+d+/tHS7Q7rKunWLB9WyilBTpHHpXzPNMDj5hTbK0B0PTLSz07yqMBiF6xg==", "dependencies": { "follow-redirects": "^1.15.4", - "form-data": "^4.0.0", + "form-data": "^4.0.4", "proxy-from-env": "^1.1.0" } }, "node_modules/axios/node_modules/form-data": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.2.tgz", - "integrity": "sha512-hGfm/slu0ZabnNt4oaRZ6uREyfCj6P4fT/n6A1rGV+Z0VdGXjfOhVUpkn6qVQONHGIFwmveGXyDs75+nr6FM8w==", - "license": "MIT", + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.4.tgz", + "integrity": "sha512-KrGhL9Q4zjj0kiUt5OO4Mr/A/jlI2jDYs5eHBpYHPcBEVSiipAvn2Ko2HnPe20rmcuuvMHNdZFp+4IlGTMF0Ow==", "dependencies": { "asynckit": "^0.4.0", "combined-stream": "^1.0.8", "es-set-tostringtag": "^2.1.0", + "hasown": "^2.0.2", "mime-types": "^2.1.12" }, "engines": { @@ -2172,7 +2175,6 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz", "integrity": "sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==", - "license": "MIT", "dependencies": { "es-errors": "^1.3.0", "function-bind": "^1.1.2" @@ -2511,7 +2513,6 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz", "integrity": "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==", - "license": "MIT", "dependencies": { "call-bind-apply-helpers": "^1.0.1", "es-errors": "^1.3.0", @@ -2567,7 +2568,6 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz", "integrity": "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==", - "license": "MIT", "engines": { "node": ">= 0.4" } @@ -2576,7 +2576,6 @@ "version": "1.3.0", "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz", "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==", - "license": "MIT", "engines": { "node": ">= 0.4" } @@ -2585,7 +2584,6 @@ "version": "1.1.1", "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.1.tgz", "integrity": "sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==", - "license": "MIT", "dependencies": { "es-errors": "^1.3.0" }, @@ -2597,7 +2595,6 @@ "version": "2.1.0", "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.1.0.tgz", "integrity": "sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==", - "license": "MIT", "dependencies": { "es-errors": "^1.3.0", "get-intrinsic": "^1.2.6", @@ -2658,6 +2655,7 @@ "version": "7.21.0", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "@babel/code-frame": "7.12.11", "@eslint/eslintrc": "^0.4.0", @@ -3189,7 +3187,6 @@ "version": "1.3.0", "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.3.0.tgz", "integrity": "sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==", - "license": "MIT", "dependencies": { "call-bind-apply-helpers": "^1.0.2", "es-define-property": "^1.0.1", @@ -3221,7 +3218,6 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/get-proto/-/get-proto-1.0.1.tgz", "integrity": "sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==", - "license": "MIT", "dependencies": { "dunder-proto": "^1.0.1", "es-object-atoms": "^1.0.0" @@ -3304,7 +3300,6 @@ "version": "1.2.0", "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz", "integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==", - "license": "MIT", "engines": { "node": ">= 0.4" }, @@ -3341,7 +3336,6 @@ "version": "1.1.0", "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.1.0.tgz", "integrity": "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==", - "license": "MIT", "engines": { "node": ">= 0.4" }, @@ -3353,7 +3347,6 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz", "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==", - "license": "MIT", "dependencies": { "has-symbols": "^1.0.3" }, @@ -3368,7 +3361,6 @@ "version": "2.0.2", "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz", "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==", - "license": "MIT", "dependencies": { "function-bind": "^1.1.2" }, @@ -3702,6 +3694,7 @@ "resolved": "https://registry.npmjs.org/jest/-/jest-27.5.1.tgz", "integrity": "sha512-Yn0mADZB89zTtjkPJEXwrac3LHudkQMR+Paqa8uxJHCBr9agxztUifWCyiYrjhMPBoUVBjyny0I7XH6ozDr7QQ==", "dev": true, + "peer": true, "dependencies": { "@jest/core": "^27.5.1", "import-local": "^3.0.2", @@ -5639,7 +5632,6 @@ "version": "1.1.0", "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz", "integrity": "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==", - "license": "MIT", "engines": { "node": ">= 0.4" } @@ -6814,6 +6806,7 @@ "version": "9.1.1", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "arg": "^4.1.0", "create-require": "^1.1.0", @@ -6937,6 +6930,7 @@ "version": "4.2.3", "dev": true, "license": "Apache-2.0", + "peer": true, "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" @@ -7282,7 +7276,7 @@ }, "packages/business-objects": { "name": "@dvelop-sdk/business-objects", - "version": "1.0.7", + "version": "2.0.0", "license": "Apache-2.0", "dependencies": { "@dvelop-sdk/core": "^2.2.0" @@ -7293,7 +7287,7 @@ "version": "2.2.0", "license": "Apache-2.0", "dependencies": { - "axios": "^0.30.0", + "axios": "^0.30.2", "lodash.merge": "^4.6.2", "uuid": "^8.3.2" }, @@ -7373,6 +7367,7 @@ "@babel/core": { "version": "7.15.8", "dev": true, + "peer": true, "requires": { "@babel/code-frame": "^7.15.8", "@babel/generator": "^7.15.8", @@ -7726,7 +7721,7 @@ "requires": { "@types/lodash.merge": "^4.6.7", "@types/uuid": "^8.3.1", - "axios": "^0.30.0", + "axios": "^0.30.2", "lodash.merge": "^4.6.2", "uuid": "^8.3.2" } @@ -8426,6 +8421,7 @@ "@types/jest": { "version": "27.0.2", "dev": true, + "peer": true, "requires": { "jest-diff": "^27.0.0", "pretty-format": "^27.0.0" @@ -8542,6 +8538,7 @@ "@typescript-eslint/parser": { "version": "4.17.0", "dev": true, + "peer": true, "requires": { "@typescript-eslint/scope-manager": "4.17.0", "@typescript-eslint/types": "4.17.0", @@ -8594,7 +8591,8 @@ }, "acorn": { "version": "8.5.0", - "dev": true + "dev": true, + "peer": true }, "acorn-globals": { "version": "6.0.0", @@ -8719,23 +8717,24 @@ "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==" }, "axios": { - "version": "0.30.0", - "resolved": "https://registry.npmjs.org/axios/-/axios-0.30.0.tgz", - "integrity": "sha512-Z4F3LjCgfjZz8BMYalWdMgAQUnEtKDmpwNHjh/C8pQZWde32TF64cqnSeyL3xD/aTIASRU30RHTNzRiV/NpGMg==", + "version": "0.30.2", + "resolved": "https://registry.npmjs.org/axios/-/axios-0.30.2.tgz", + "integrity": "sha512-0pE4RQ4UQi1jKY6p7u6i1Tkzqmu+d+/tHS7Q7rKunWLB9WyilBTpHHpXzPNMDj5hTbK0B0PTLSz07yqMBiF6xg==", "requires": { "follow-redirects": "^1.15.4", - "form-data": "^4.0.0", + "form-data": "^4.0.4", "proxy-from-env": "^1.1.0" }, "dependencies": { "form-data": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.2.tgz", - "integrity": "sha512-hGfm/slu0ZabnNt4oaRZ6uREyfCj6P4fT/n6A1rGV+Z0VdGXjfOhVUpkn6qVQONHGIFwmveGXyDs75+nr6FM8w==", + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.4.tgz", + "integrity": "sha512-KrGhL9Q4zjj0kiUt5OO4Mr/A/jlI2jDYs5eHBpYHPcBEVSiipAvn2Ko2HnPe20rmcuuvMHNdZFp+4IlGTMF0Ow==", "requires": { "asynckit": "^0.4.0", "combined-stream": "^1.0.8", "es-set-tostringtag": "^2.1.0", + "hasown": "^2.0.2", "mime-types": "^2.1.12" } } @@ -9250,6 +9249,7 @@ "eslint": { "version": "7.21.0", "dev": true, + "peer": true, "requires": { "@babel/code-frame": "7.12.11", "@eslint/eslintrc": "^0.4.0", @@ -9943,6 +9943,7 @@ "resolved": "https://registry.npmjs.org/jest/-/jest-27.5.1.tgz", "integrity": "sha512-Yn0mADZB89zTtjkPJEXwrac3LHudkQMR+Paqa8uxJHCBr9agxztUifWCyiYrjhMPBoUVBjyny0I7XH6ozDr7QQ==", "dev": true, + "peer": true, "requires": { "@jest/core": "^27.5.1", "import-local": "^3.0.2", @@ -12172,6 +12173,7 @@ "ts-node": { "version": "9.1.1", "dev": true, + "peer": true, "requires": { "arg": "^4.1.0", "create-require": "^1.1.0", @@ -12251,7 +12253,8 @@ }, "typescript": { "version": "4.2.3", - "dev": true + "dev": true, + "peer": true }, "universalify": { "version": "0.2.0", diff --git a/packages/business-objects/package.json b/packages/business-objects/package.json index 5d11075f..47642036 100644 --- a/packages/business-objects/package.json +++ b/packages/business-objects/package.json @@ -1,7 +1,7 @@ { "name": "@dvelop-sdk/business-objects", "description": "This package contains functionality for the BusinessObjects-App in the d.velop cloud.", - "version": "1.0.7", + "version": "2.0.0", "license": "Apache-2.0", "main": "lib/index.js", "types": "lib/index.d.ts", diff --git a/packages/business-objects/src/entities/get-entities/get-entities.spec.ts b/packages/business-objects/src/entities/get-entities/get-entities.spec.ts index a577cf61..21590823 100644 --- a/packages/business-objects/src/entities/get-entities/get-entities.spec.ts +++ b/packages/business-objects/src/entities/get-entities/get-entities.spec.ts @@ -1,5 +1,5 @@ import { DvelopContext, DvelopHttpResponse as HttpResponse } from "@dvelop-sdk/core"; -import { GetBoEntitiesParams, _getBoEntitiesDefaultTransformFunction, _getBoEntitiesFactory } from "./get-entities"; +import { GetBoEntitiesParams, _getBoEntitiesDefaultTransformFunctionFactory, _getBoEntitiesFactory, GetEntitiesResultPage } from "./get-entities"; describe("getBoEntitiesFactory", () => { @@ -18,7 +18,7 @@ describe("getBoEntitiesFactory", () => { }; params = { - modelName: "HOSPITALBASEDATA", + modelName: "HOSPITALBASEDATA", pluralEntityName: "employees" }; }); @@ -52,31 +52,92 @@ describe("getBoEntitiesFactory", () => { describe("getBoEntitiesDefaultTransformFunction", () => { - it("should transform correctly", async () => { - - const response: any = { value: [ - { - "employeeid": "1", - "firstName": "John", - "lastName": "Dorian", - "jobTitel": "senior physician" - }, - { - "employeeid": "2", - "firstName": "Christopher", - "lastName": "Turk", - "jobTitel": "chief surgeon" - } - ]}; + it("should set entities", async () => { + + const response: any = { + value: [ + { + "employeeid": "1", + "firstName": "John", + "lastName": "Dorian", + "jobTitel": "senior physician" + }, + { + "employeeid": "2", + "firstName": "Christopher", + "lastName": "Turk", + "jobTitel": "chief surgeon" + } + ] + }; mockHttpRequestFunction.mockResolvedValue({ data: response } as HttpResponse); - const getBoEntities = _getBoEntitiesFactory(mockHttpRequestFunction, _getBoEntitiesDefaultTransformFunction); - const result:any[] = await getBoEntities(context, params); + const getBoEntities = _getBoEntitiesFactory(mockHttpRequestFunction, _getBoEntitiesDefaultTransformFunctionFactory(mockHttpRequestFunction)); + const result: GetEntitiesResultPage = await getBoEntities(context, params); response.value.forEach((entity: any, i: number) => { - expect(result[i]).toHaveProperty("employeeid", entity.employeeid); + expect(result.value[i]).toHaveProperty("employeeid", entity.employeeid); }); + expect(result).not.toHaveProperty("getNextPage"); + }); + + it("should set getNextPage function on @odata.nextLink-property", async () => { + + const response: any = { + value: [ + { + "employeeid": "1", + "firstName": "John", + "lastName": "Dorian", + "jobTitel": "senior physician" + } + ], + "@odata.nextLink": "HiItsMeNextLink" + }; + + mockHttpRequestFunction.mockResolvedValue({ data: response } as HttpResponse); + + const getBoEntities = _getBoEntitiesFactory(mockHttpRequestFunction, _getBoEntitiesDefaultTransformFunctionFactory(mockHttpRequestFunction)); + const result: GetEntitiesResultPage = await getBoEntities(context, params); + + expect(result).toHaveProperty("getNextPage"); + + const response2: any = { + value: [ + { + "employeeid": "2", + "firstName": "Christopher", + "lastName": "Turk", + "jobTitel": "chief surgeon" + } + ] + }; + mockHttpRequestFunction.mockResolvedValue({ data: response2 } as HttpResponse); + + let page2 = await result.getNextPage(); + + expect(page2.value).toContain(response2.value[0]); + expect(mockHttpRequestFunction).toBeCalledTimes(2); + expect(mockHttpRequestFunction).toHaveBeenCalledWith(context, { + method: "GET", + url: "HiItsMeNextLink" + }); + }); + + it("should return empty array on no value", async () => { + + const response: any = { + value: [] + }; + + mockHttpRequestFunction.mockResolvedValue({ data: response } as HttpResponse); + + const getBoEntities = _getBoEntitiesFactory(mockHttpRequestFunction, _getBoEntitiesDefaultTransformFunctionFactory(mockHttpRequestFunction)); + const result: GetEntitiesResultPage = await getBoEntities(context, params); + + expect(result).toHaveProperty("value"); + expect(result.value).toHaveLength(0); }); }); }); diff --git a/packages/business-objects/src/entities/get-entities/get-entities.ts b/packages/business-objects/src/entities/get-entities/get-entities.ts index ef9cd0e3..e4cd8658 100644 --- a/packages/business-objects/src/entities/get-entities/get-entities.ts +++ b/packages/business-objects/src/entities/get-entities/get-entities.ts @@ -12,14 +12,42 @@ export interface GetBoEntitiesParams { pluralEntityName: string; } +/** + * Page of a searchResult. There might be more than one page. + * @category Entity + */ +export interface GetEntitiesResultPage { + /** Array of entitiess found */ + value: E[] + /** Function that returns the next page. Undefined if there is none. */ + getNextPage?: () => Promise>; +} + /** * Default transform-function provided to the {@link getBoEntities}-function. See [Advanced Topics](https://github.com/d-velop/dvelop-sdk-node#advanced-topics) for more information. * @template E Return type * @internal * @category Entity */ -export function _getBoEntitiesDefaultTransformFunction(response: HttpResponse, _: DvelopContext, __: GetBoEntitiesParams): E[] { - return response.data.value; +export function _getBoEntitiesDefaultTransformFunctionFactory(httpRequestFunction: (context: DvelopContext, config: HttpConfig) => Promise): (response: HttpResponse, context: DvelopContext, params: GetBoEntitiesParams) => GetEntitiesResultPage { + return (response: HttpResponse, context: DvelopContext, params: GetBoEntitiesParams) => { + + let result: GetEntitiesResultPage = { + value: response.data.value + }; + + if (response.data["@odata.nextLink"]) { + result.getNextPage = async () => { + const nextResponse: HttpResponse = await httpRequestFunction(context, { + method: "GET", + url: response.data["@odata.nextLink"] + }); + return _getBoEntitiesDefaultTransformFunctionFactory(httpRequestFunction)(nextResponse, context, params); + }; + } + + return result; + }; } /** @@ -30,8 +58,8 @@ export function _getBoEntitiesDefaultTransformFunction(response: HttpResponse */ export function _getBoEntitiesFactory( httpRequestFunction: (context: DvelopContext, config: HttpConfig) => Promise, - transformFunction: (response: HttpResponse, context: DvelopContext, params: GetBoEntitiesParams) => E[] -): (context: DvelopContext, params: GetBoEntitiesParams) => Promise { + transformFunction: (response: HttpResponse, context: DvelopContext, params: GetBoEntitiesParams) => GetEntitiesResultPage +): (context: DvelopContext, params: GetBoEntitiesParams) => Promise> { return async (context: DvelopContext, params: GetBoEntitiesParams) => { const response = await httpRequestFunction(context, { @@ -87,6 +115,6 @@ export function _getBoEntitiesFactory( * ``` */ /* istanbul ignore next */ -export async function getBoEntities(context: DvelopContext, params: GetBoEntitiesParams): Promise { - return await _getBoEntitiesFactory(_defaultHttpRequestFunction, _getBoEntitiesDefaultTransformFunction)(context, params); +export async function getBoEntities(context: DvelopContext, params: GetBoEntitiesParams): Promise> { + return await _getBoEntitiesFactory(_defaultHttpRequestFunction, _getBoEntitiesDefaultTransformFunctionFactory(_defaultHttpRequestFunction))(context, params); } \ No newline at end of file diff --git a/packages/business-objects/src/index.ts b/packages/business-objects/src/index.ts index f05ffd8f..292991b9 100644 --- a/packages/business-objects/src/index.ts +++ b/packages/business-objects/src/index.ts @@ -29,7 +29,7 @@ export { DvelopContext, BadInputError, UnauthorizedError, ForbiddenError, NotFou export { BusinessObjectsError } from "./utils/http"; export * as internals from "./internal"; -export { GetBoEntitiesParams, getBoEntities } from "./entities/get-entities/get-entities"; +export { GetBoEntitiesParams, getBoEntities, GetEntitiesResultPage } from "./entities/get-entities/get-entities"; export { GetBoEntityParams, getBoEntity } from "./entities/get-entity/get-entity"; export { CreateBoEntityParams, createBoEntity } from "./entities/create-entity/create-entity"; export { UpdateBoEntityParams, updateBoEntity } from "./entities/update-entity/update-entity"; diff --git a/packages/business-objects/src/internal.ts b/packages/business-objects/src/internal.ts index 657dc216..5ffe141c 100644 --- a/packages/business-objects/src/internal.ts +++ b/packages/business-objects/src/internal.ts @@ -1,6 +1,6 @@ export { _defaultHttpRequestFunctionFactory, _defaultHttpRequestFunction, BusinessObjectsErrorDto } from "./utils/http"; -export { _getBoEntitiesFactory, _getBoEntitiesDefaultTransformFunction } from "./entities/get-entities/get-entities"; +export { _getBoEntitiesFactory, _getBoEntitiesDefaultTransformFunctionFactory } from "./entities/get-entities/get-entities"; export { _getBoEntityFactory, _getBoEntityDefaultTransformFunction } from "./entities/get-entity/get-entity"; export { _createBoEntityFactory } from "./entities/create-entity/create-entity"; export { _updateBoEntityFactory } from "./entities/update-entity/update-entity"; diff --git a/packages/core/package.json b/packages/core/package.json index cd6b5ec0..cf65afa6 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -20,7 +20,7 @@ "access": "public" }, "dependencies": { - "axios": "^0.30.0", + "axios": "^0.30.2", "lodash.merge": "^4.6.2", "uuid": "^8.3.2" }, diff --git a/packages/express-utils/src/functions/redirect-to-login-page/redirect-to-login-page.ts b/packages/express-utils/src/functions/redirect-to-login-page/redirect-to-login-page.ts index 5ba8a7ad..378c2832 100644 --- a/packages/express-utils/src/functions/redirect-to-login-page/redirect-to-login-page.ts +++ b/packages/express-utils/src/functions/redirect-to-login-page/redirect-to-login-page.ts @@ -22,7 +22,7 @@ export function _redirectToLoginPageFactory(getLoginRedirectionUri: (sucessUri: * if (err instanceof UnauthorizedError && req.accepts("text/html")) { * redirectToLoginPage(req, res); * } else { - * res.status(401).send("Unauhtorized") // For Content-Types such as JSON return a 401 - Unauthorized + * res.status(401).send("Unauthorized") // For Content-Types such as JSON return a 401 - Unauthorized * } * }); * ``` @@ -30,4 +30,4 @@ export function _redirectToLoginPageFactory(getLoginRedirectionUri: (sucessUri: /* istanbul ignore next */ export function redirectToLoginPage(req: Request, res: Response) { _redirectToLoginPageFactory(_getLoginRedirectionUriDefaultFunction)(req, res); -} \ No newline at end of file +}