@nu-art/jira-backend 0.401.7 → 0.401.9

package/modules/JiraModule.js

@@ -127,94 +127,68 @@ export class ModuleBE_Jira_Class extends Module {
     addIssueAttachment = async (issue, file) => {
         return this.executeFormRequest(`/issue/${issue}/attachments`, file);
     };
-    executeFormRequest = async (url, buffer) => {
-        const request = {
+    executeFormRequest = async (path, buffer) => {
+        return this.executeRequest({
+            url: `${this.restUrl}${path}`,
+            method: HttpMethod.POST,
             headers: this.headersForm,
-            uri: `${this.restUrl}${url}`,
             formData: createFormData('logs.zip', buffer),
-            method: HttpMethod.POST,
-        };
-        return this.executeRequest(request);
+        });
     };
-    async executePostRequest(url, body, label) {
-        const request = {
-            headers: this.headersJson,
-            uri: `${this.restUrl}${url}`,
-            body,
+    async executePostRequest(path, body) {
+        return this.executeRequest({
+            url: `${this.restUrl}${path}`,
             method: HttpMethod.POST,
-            json: true
-        };
-        return this.executeRequest(request);
-    }
-    async executePutRequest(url, body) {
-        const request = {
             headers: this.headersJson,
-            uri: `${this.restUrl}${url}`,
-            body,
+            body: body,
+            json: true,
+        });
+    }
+    async executePutRequest(path, body) {
+        return this.executeRequest({
+            url: `${this.restUrl}${path}`,
             method: HttpMethod.PUT,
-            json: true
-        };
-        return this.executeRequest(request);
+            headers: this.headersJson,
+            body: body,
+            json: true,
+        });
     }
-    // async executeGetRequestNew<T>(url: string, _params?: { [k: string]: string }): Promise<T> {
-    // 	if (!this.restUrl)
-    // 		throw new ImplementationMissingException('Need a baseUrl');
-    //
-    // 	return AxiosHttpModule
-    // 		.createRequest(HttpMethod.GET, generateHex(8))
-    // 		.setOrigin(this.restUrl)
-    // 		.setUrl(url)
-    // 		.setUrlParams(_params)
-    // 		.setHeaders(this.headersJson)
-    // 		.executeSync();
-    // }
     async handleResponse(response) {
         if (!response.ok)
             throw new ApiException(response.status, await response.text());
         return response.json();
     }
-    async executeGetRequest(url, _params) {
-        const request = {
-            headers: this.headersJson,
-            uri: `${composeUrl(`${this.restUrl}${url}`, _params)}`,
+    async executeGetRequest(path, params) {
+        return this.executeRequest({
+            url: composeUrl(`${this.restUrl}${path}`, params),
             method: HttpMethod.GET,
-            json: true
-        };
-        return this.executeRequest(request);
+            headers: this.headersJson,
+            json: true,
+        });
     }
     async executeRequest(request) {
-        const { uri, method, headers, body, json, formData } = request;
-        // Ensure uri is a string
-        const url = typeof uri === 'string' ? uri : uri.toString();
+        const { url, method, headers, body, json, formData } = request;
         let fetchBody;
         const fetchHeaders = { ...headers };
         if (formData) {
-            // Handle formData (for file uploads)
             const form = new FormData();
             for (const [key, value] of Object.entries(formData)) {
                 if (value && typeof value === 'object' && 'value' in value) {
                     const fileData = value;
-                    // Convert Buffer to Uint8Array for Blob
                     const blob = new Blob([new Uint8Array(fileData.value)]);
                     form.append(key, blob, fileData.options?.filename);
                 }
             }
             fetchBody = form;
-            // Remove Content-Type header to let browser set it with boundary
             delete fetchHeaders[HeaderKey_ContentType];
         }
-        else if (body) {
-            if (json) {
-                fetchBody = JSON.stringify(body);
-            }
-            else {
-                fetchBody = body;
-            }
+        else if (body !== undefined) {
+            fetchBody = json ? JSON.stringify(body) : body;
         }
         const response = await fetch(url, {
             method: method || HttpMethod.GET,
             headers: fetchHeaders,
-            body: fetchBody
+            body: fetchBody,
         });
         return this.handleResponse(response);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nu-art/jira-backend",
-  "version": "0.401.7",
+  "version": "0.401.9",
   "description": "Jira api Module Backend",
   "keywords": [
     "TacB0sS",
@@ -20,12 +20,12 @@
   "license": "Apache-2.0",
   "author": "TacB0sS",
   "dependencies": {
-    "@nu-art/jira-shared": "0.401.7",
-    "@nu-art/firebase-backend": "0.401.7",
-    "@nu-art/firebase-shared": "0.401.7",
-    "@nu-art/thunderstorm-backend": "0.401.7",
-    "@nu-art/thunderstorm-shared": "0.401.7",
-    "@nu-art/ts-common": "0.401.7",
+    "@nu-art/jira-shared": "0.401.9",
+    "@nu-art/firebase-backend": "0.401.9",
+    "@nu-art/firebase-shared": "0.401.9",
+    "@nu-art/thunderstorm-backend": "0.401.9",
+    "@nu-art/thunderstorm-shared": "0.401.9",
+    "@nu-art/ts-common": "0.401.9",
     "body-parser": "^1.18.3",
     "compression": "^1.7.4",
     "express": "^4.18.2",
@@ -36,7 +36,6 @@
     "@types/debug": "^4.1.2",
     "@types/express": "^4.17.17",
     "@types/js-base64": "^2.3.1",
-    "@types/request": "^2.48.3",
     "@types/saml2-js": "^1.6.8"
   },
   "unitConfig": {