@moreapp/common-nodejs 0.6.0 → 0.7.1

package/dist/MoreAppClient.d.ts

@@ -15,8 +15,8 @@ export default class MoreAppClient {
     private readonly client;
     constructor(options: Options);
     getBinary(path: string): Promise<BinaryFile>;
-    get(path: string): Promise<any>;
-    post(path: string, payload: Record<string, any>): Promise<any>;
+    get<T>(path: string): Promise<T>;
+    post<T>(path: string, payload: Record<string, any>): Promise<T>;
     delete(path: string): Promise<any>;
 }
 export {};

package/dist/MoreAppClient.js

@@ -4,6 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const axios_1 = __importDefault(require("axios"));
+const content_disposition_parser_1 = __importDefault(require("content-disposition-parser"));
 class MoreAppClient {
     constructor(options) {
         this.client = axios_1.default.create({
@@ -48,11 +49,5 @@ class MoreAppClient {
 exports.default = MoreAppClient;
 function getFilename(res) {
     const contentDispositionHeader = res.headers["content-disposition"];
-    if (contentDispositionHeader) {
-        const execParts = /filename="(.*)"/gi.exec(contentDispositionHeader);
-        if (execParts && execParts.length > 1) {
-            return execParts[1];
-        }
-    }
-    return undefined;
+    return (0, content_disposition_parser_1.default)(contentDispositionHeader)?.filename;
 }

package/dist/MoreAppClient.test.js

@@ -13,7 +13,7 @@ test("download binary file", async () => {
         .matchHeader("x-more-seal", "my-seal")
         .reply(200, file, {
         "Content-Type": "image/jpg",
-        "content-disposition": 'filename="my-photo.jpg"',
+        "content-disposition": 'attachment; filename="my-photo.jpg"',
     });
     const client = new MoreAppClient_1.default({
         serviceName: "Common Test",
@@ -44,3 +44,36 @@ test("unable to connect", async () => {
     });
     await expect(client.getBinary("/download")).rejects.toThrowError("getaddrinfo ENOTFOUND non-existing.moreapp.com");
 });
+const client = new MoreAppClient_1.default({
+    serviceName: "Common Test",
+    prefix: "https://api.moreapp.com",
+    seal: "my-seal",
+});
+test("Handle non existing file", async () => {
+    const apiMock = (0, nock_1.default)("https://api.moreapp.com").get("/download").reply(404);
+    await expect(client.getBinary("/download")).rejects.toThrow("Request failed with status code 404");
+    apiMock.done();
+});
+test("Handle missing 'content-type' header", async () => {
+    const apiMock = (0, nock_1.default)("https://api.moreapp.com").get("/download").reply(200);
+    const binaryFile = await client.getBinary("/download");
+    expect(binaryFile).not.toBeNull();
+    expect(binaryFile.contentType).toBe("unknown");
+    apiMock.done();
+});
+test("Handle missing 'content-disposition' header", async () => {
+    const apiMock = (0, nock_1.default)("https://api.moreapp.com").get("/download").reply(200);
+    const binaryFile = await client.getBinary("/download");
+    expect(binaryFile).not.toBeNull();
+    expect(binaryFile.filename).toBeUndefined();
+    apiMock.done();
+});
+test("Handle invalid 'content-disposition' header", async () => {
+    const apiMock = (0, nock_1.default)("https://api.moreapp.com").get("/download").reply(200, {}, {
+        "content-disposition": "filename=my-photo.png",
+    });
+    const binaryFile = await client.getBinary("/download");
+    expect(binaryFile).not.toBeNull();
+    expect(binaryFile.filename).toBeUndefined();
+    apiMock.done();
+});

package/dist/types.d.ts

@@ -3,20 +3,21 @@ import { FormVersionFieldSchema, SubmissionSchema } from "./schema";
 export declare type Submission = z.infer<typeof SubmissionSchema>;
 export declare type FormVersionField = z.infer<typeof FormVersionFieldSchema>;
 export declare type IntegrationTestResponse = {
-    status: "VALID" | "SUCCESS";
+    status: "VALID";
 } | {
     status: "INVALID";
     globalError: string;
     fieldErrors?: Record<string, any>;
 };
 export declare type IntegrationHandleResponse = {
-    status: "VALID" | "SUCCESS";
+    status: "SUCCESS";
     files?: {
         type: string;
         name: string;
         data: string;
     }[];
+    data?: Record<string, any>;
 } | {
-    status: "INVALID";
+    status: "ERROR";
     message: string;
 };

package/dist/utils.d.ts

@@ -1,2 +1,3 @@
 export declare function environmentVariable(key: string, fallback?: string | number): string;
 export declare function currentTraceId(): string | undefined;
+export declare function isValidEmail(email: string): boolean;

package/dist/utils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.currentTraceId = exports.environmentVariable = void 0;
+exports.isValidEmail = exports.currentTraceId = exports.environmentVariable = void 0;
 const context_utils_1 = require("@opentelemetry/api/build/src/trace/context-utils");
 const api_1 = require("@opentelemetry/api");
 function environmentVariable(key, fallback) {
@@ -15,3 +15,8 @@ function currentTraceId() {
     return (0, context_utils_1.getSpanContext)(api_1.context.active())?.traceId;
 }
 exports.currentTraceId = currentTraceId;
+const validEmailPattern = /^[A-Z0-9._&%+-]+@[A-Z0-9.-]+\.[A-Z]{2,}$/i;
+function isValidEmail(email) {
+    return validEmailPattern.test(email);
+}
+exports.isValidEmail = isValidEmail;

package/dist/utils.test.js

@@ -13,3 +13,13 @@ describe("environmentVariable", () => {
         expect(() => (0, utils_1.environmentVariable)("COMMONS_NODEJS_TEST_NON_EXISTING")).toThrow("Missing environment variable 'COMMONS_NODEJS_TEST_NON_EXISTING'");
     });
 });
+describe("isValidEmail", () => {
+    test("Should return true on valid email addresses", () => {
+        expect((0, utils_1.isValidEmail)("john@example.com")).toBe(true);
+        expect((0, utils_1.isValidEmail)("sbe-vsv.ch@schindler.com")).toEqual(true);
+    });
+    test("Should return false on invalid email addresses", () => {
+        expect((0, utils_1.isValidEmail)("john")).toBe(false);
+        expect((0, utils_1.isValidEmail)("john@example")).toBe(false);
+    });
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@moreapp/common-nodejs",
-  "version": "0.6.0",
+  "version": "0.7.1",
   "license": "UNLICENSED",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -29,6 +29,7 @@
     "@opentelemetry/sdk-node": "0.36.1",
     "@opentelemetry/sdk-trace-node": "1.10.1",
     "axios": "1.3.4",
+    "content-disposition-parser": "1.0.2",
     "date-and-time": "2.4.3",
     "winston": "3.8.2",
     "zod": "3.21.4"