@nu-art/jira-backend 0.401.9 → 0.500.0

package/index.d.ts

@@ -1,3 +1,3 @@
-export * from "./core/module-pack.js";
-export * from "./modules/JiraModule.js";
-export * from "./modules/utils.js";
+export * from './core/module-pack.js';
+export * from './modules/JiraModule.js';
+export * from './modules/utils.js';

package/index.js

@@ -16,6 +16,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-export * from "./core/module-pack.js";
-export * from "./modules/JiraModule.js";
-export * from "./modules/utils.js";
+export * from './core/module-pack.js';
+export * from './modules/JiraModule.js';
+export * from './modules/utils.js';

package/modules/JiraModule.js

@@ -18,7 +18,8 @@
  */
 import { ApiException, BadImplementationException, composeUrl, ImplementationMissingException, MimeType_json, Module } from '@nu-art/ts-common';
 import { JiraUtils } from './utils.js';
-import { HeaderKey_ContentType, HttpMethod } from '@nu-art/thunderstorm-shared';
+import { HttpMethod } from '@nu-art/api-types';
+const HeaderKey_ContentType = 'content-type';
 const createFormData = (filename, buffer) => ({ file: { value: buffer, options: { filename } } });
 export class ModuleBE_Jira_Class extends Module {
     headersJson;
@@ -127,68 +128,94 @@ export class ModuleBE_Jira_Class extends Module {
     addIssueAttachment = async (issue, file) => {
         return this.executeFormRequest(`/issue/${issue}/attachments`, file);
     };
-    executeFormRequest = async (path, buffer) => {
-        return this.executeRequest({
-            url: `${this.restUrl}${path}`,
-            method: HttpMethod.POST,
+    executeFormRequest = async (url, buffer) => {
+        const request = {
             headers: this.headersForm,
+            uri: `${this.restUrl}${url}`,
             formData: createFormData('logs.zip', buffer),
-        });
-    };
-    async executePostRequest(path, body) {
-        return this.executeRequest({
-            url: `${this.restUrl}${path}`,
             method: HttpMethod.POST,
+        };
+        return this.executeRequest(request);
+    };
+    async executePostRequest(url, body, label) {
+        const request = {
             headers: this.headersJson,
-            body: body,
-            json: true,
-        });
+            uri: `${this.restUrl}${url}`,
+            body,
+            method: HttpMethod.POST,
+            json: true
+        };
+        return this.executeRequest(request);
     }
-    async executePutRequest(path, body) {
-        return this.executeRequest({
-            url: `${this.restUrl}${path}`,
-            method: HttpMethod.PUT,
+    async executePutRequest(url, body) {
+        const request = {
             headers: this.headersJson,
-            body: body,
-            json: true,
-        });
+            uri: `${this.restUrl}${url}`,
+            body,
+            method: HttpMethod.PUT,
+            json: true
+        };
+        return this.executeRequest(request);
     }
+    // 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(path, params) {
-        return this.executeRequest({
-            url: composeUrl(`${this.restUrl}${path}`, params),
-            method: HttpMethod.GET,
+    async executeGetRequest(url, _params) {
+        const request = {
             headers: this.headersJson,
-            json: true,
-        });
+            uri: `${composeUrl(`${this.restUrl}${url}`, _params)}`,
+            method: HttpMethod.GET,
+            json: true
+        };
+        return this.executeRequest(request);
     }
     async executeRequest(request) {
-        const { url, method, headers, body, json, formData } = request;
+        const { uri, method, headers, body, json, formData } = request;
+        // Ensure uri is a string
+        const url = typeof uri === 'string' ? uri : uri.toString();
         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 !== undefined) {
-            fetchBody = json ? JSON.stringify(body) : body;
+        else if (body) {
+            if (json) {
+                fetchBody = JSON.stringify(body);
+            }
+            else {
+                fetchBody = body;
+            }
         }
         const response = await fetch(url, {
             method: method || HttpMethod.GET,
             headers: fetchHeaders,
-            body: fetchBody,
+            body: fetchBody
         });
         return this.handleResponse(response);
     }

package/modules/utils.d.ts

@@ -1,4 +1,4 @@
-import { JiraQuery } from "./JiraModule.js";
+import { JiraQuery } from './JiraModule.js';
 export type JiraIssueText = string | {
     href: string;
     text: string;

package/modules/utils.js

@@ -16,26 +16,26 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { _keys } from "@nu-art/ts-common";
+import { _keys } from '@nu-art/ts-common';
 function createText(...texts) {
     return {
-        type: "doc",
+        type: 'doc',
         version: 1,
         content: [
             {
-                type: "paragraph",
+                type: 'paragraph',
                 content: texts.map(text => {
-                    if (typeof text === "string")
+                    if (typeof text === 'string')
                         return {
-                            type: "text",
+                            type: 'text',
                             text
                         };
                     return {
-                        type: "text",
+                        type: 'text',
                         text: text.text,
                         marks: [
                             {
-                                type: "link",
+                                type: 'link',
                                 attrs: {
                                     href: text.href
                                 }
@@ -52,7 +52,7 @@ function buildJQL(query) {
         let queryValue;
         let operator = '=';
         if (Array.isArray(query[key])) {
-            queryValue = query[key].map(value => `"${value}"`).join(",");
+            queryValue = query[key].map(value => `"${value}"`).join(',');
             queryValue = `(${queryValue})`;
         }
         else if (typeof query[key] === 'object') {
@@ -64,7 +64,7 @@ function buildJQL(query) {
             queryValue = `"${query[key]}"`;
         return `${key}${operator}${queryValue}`;
     });
-    return params.join(" and ");
+    return params.join(' and ');
 }
 export const JiraUtils = {
     createText,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nu-art/jira-backend",
-  "version": "0.401.9",
+  "version": "0.500.0",
   "description": "Jira api Module Backend",
   "keywords": [
     "TacB0sS",
@@ -20,22 +20,22 @@
   "license": "Apache-2.0",
   "author": "TacB0sS",
   "dependencies": {
-    "@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",
+    "@nu-art/jira-shared": "0.500.0",
+    "@nu-art/firebase-backend": "0.500.0",
+    "@nu-art/firebase-shared": "0.500.0",
+    "@nu-art/ts-common": "0.500.0",
     "body-parser": "^1.18.3",
     "compression": "^1.7.4",
     "express": "^4.18.2",
     "firebase-admin": "13.4.0",
-    "moment": "^2.29.4"
+    "moment": "^2.29.4",
+    "@nu-art/api-types": "{{THUNDERSTORM_VERSION}}"
   },
   "devDependencies": {
     "@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": {