mftsccs-browser 2.1.239-dev → 2.1.240-dev

package/dist/serviceWorker.bundle.js

@@ -15272,7 +15272,7 @@ class BaseUrl {
     //////////////////////////////////////////////////////////////////////
     //////////////////////API FOR IMAGE UPLOAD //////////////////////
     static uploadImageUrl() {
-        return this.BASE_URL + '/api/Image/UploadImage';
+        return this.uploadR2StorageUrl();
     }
     static uploadImageUrlWithSmall() {
         return this.BASE_URL + '/api/Image/UploadImageV2';
@@ -15280,7 +15280,13 @@ class BaseUrl {
     //////////////////////////////////////////////////////////////////////
     //////////////////////API FOR FILE UPLOAD //////////////////////
     static uploadFileUrl() {
-        return this.BASE_URL + '/api/Image/UploadFile';
+        return this.uploadR2StorageUrl();
+    }
+    static uploadR2StorageUrl() {
+        return this.BASE_URL + '/api/R2Storage/upload';
+    }
+    static r2PresignedUploadUrl() {
+        return this.BASE_URL + '/api/R2Storage/presigned-upload-url';
     }
     //////////////////////////////////////////////////////////////////////
     //////////////////////// API FOR SENDING MAIL ////////////////////////
@@ -15290,6 +15296,9 @@ class BaseUrl {
     static sendBulkMail() {
         return this.BASE_URL + '/api/sendmail/bulk';
     }
+    static sendPersonalMail() {
+        return this.BASE_URL + '/api/sendmail/personal';
+    }
     static getWidgetData() {
         return this.BASE_URL + '/api/get-widget';
     }
@@ -15333,6 +15342,8 @@ BaseUrl.FLAGS = {
     accessTracker: false,
     isTest: false
 };
+BaseUrl.RECAPTCHA_SITE_KEY = "";
+BaseUrl.RECAPTCHA_ACTION = "send_mail";
 BaseUrl.BASE_RANDOMIZER = 999;
 
 
@@ -28727,6 +28738,7 @@ function GetCompositionFromConnectionsWithDataId() {
         // let oldConnections = await FindConnectionsOfCompositionsBulkInMemory(conceptIds);
         //CheckForConnectionDeletionWithIds(connectionIds,oldConnections);
         let compositions = [];
+        yield (0,_app__WEBPACK_IMPORTED_MODULE_2__.GetConceptBulk)(conceptIds);
         for (let i = 0; i < conceptIds.length; i++) {
             let comp = yield (0,_GetComposition__WEBPACK_IMPORTED_MODULE_5__.GetCompositionWithIdFromMemory)(conceptIds[i]);
             compositions.push(comp);
@@ -28762,6 +28774,7 @@ function GetCompositionFromConnectionsWithDataIdFromConnections() {
             }
         }
         let newConnections = yield (0,_Api_GetConnectionBulk__WEBPACK_IMPORTED_MODULE_1__.GetConnectionBulk)(connectionIds);
+        yield (0,_app__WEBPACK_IMPORTED_MODULE_2__.GetConceptBulk)(conceptIds);
         //CheckForConnectionDeletionWithIds(connectionIds,oldConnections);
         let compositions = [];
         for (let i = 0; i < conceptIds.length; i++) {
@@ -32933,7 +32946,8 @@ function LogEvent(EventName, EventDescription, event) {
 
 __webpack_require__.r(__webpack_exports__);
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
-/* harmony export */   sendEmail: () => (/* binding */ sendEmail)
+/* harmony export */   sendEmail: () => (/* binding */ sendEmail),
+/* harmony export */   sendPersonalEmail: () => (/* binding */ sendPersonalEmail)
 /* harmony export */ });
 /* harmony import */ var _app__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../app */ "./src/app.ts");
 var __awaiter = (undefined && undefined.__awaiter) || function (thisArg, _arguments, P, generator) {
@@ -32946,45 +32960,169 @@ var __awaiter = (undefined && undefined.__awaiter) || function (thisArg, _argume
     });
 };
 
+const DEFAULT_RECAPTCHA_FIELD_NAME = 'CaptchaToken';
+const DEFAULT_RECAPTCHA_ACTION_FIELD_NAME = 'recaptchaAction';
+const DEFAULT_RECAPTCHA_HEADER_NAME = 'X-Recaptcha-Token';
+let recaptchaScriptPromise = null;
+function normalizeSendEmailOptions(bulkOrOptions = false, recaptchaToken) {
+    var _a;
+    if (typeof bulkOrOptions === 'boolean') {
+        return {
+            bulk: bulkOrOptions,
+            recaptcha: recaptchaToken,
+        };
+    }
+    return Object.assign(Object.assign({}, bulkOrOptions), { recaptcha: (_a = bulkOrOptions.recaptcha) !== null && _a !== void 0 ? _a : recaptchaToken });
+}
+function normalizeRecaptchaOptions(recaptcha) {
+    if (!recaptcha)
+        return null;
+    if (typeof recaptcha === 'string') {
+        return { token: recaptcha };
+    }
+    return recaptcha;
+}
+function getBrowserGrecaptcha() {
+    if (typeof window === 'undefined')
+        return undefined;
+    return window.grecaptcha;
+}
+function loadRecaptchaScript(siteKey) {
+    if (getBrowserGrecaptcha())
+        return Promise.resolve();
+    if (typeof document === 'undefined') {
+        return Promise.reject(new Error('reCAPTCHA requires a browser document'));
+    }
+    if (!recaptchaScriptPromise) {
+        recaptchaScriptPromise = new Promise((resolve, reject) => {
+            const script = document.createElement('script');
+            script.src = `https://www.google.com/recaptcha/api.js?render=${encodeURIComponent(siteKey)}`;
+            script.async = true;
+            script.defer = true;
+            script.onload = () => resolve();
+            script.onerror = () => reject(new Error('Failed to load reCAPTCHA script'));
+            document.head.appendChild(script);
+        });
+    }
+    return recaptchaScriptPromise;
+}
+function executeRecaptcha(siteKey, action) {
+    return __awaiter(this, void 0, void 0, function* () {
+        yield loadRecaptchaScript(siteKey);
+        const grecaptcha = getBrowserGrecaptcha();
+        if (!grecaptcha)
+            throw new Error('reCAPTCHA is not available');
+        yield new Promise((resolve) => {
+            grecaptcha.ready(resolve);
+        });
+        return grecaptcha.execute(siteKey, { action });
+    });
+}
+function resolveRecaptchaOptions(recaptcha) {
+    return __awaiter(this, void 0, void 0, function* () {
+        var _a;
+        if (recaptcha === null || recaptcha === void 0 ? void 0 : recaptcha.token)
+            return recaptcha;
+        if (!_app__WEBPACK_IMPORTED_MODULE_0__.BaseUrl.RECAPTCHA_SITE_KEY)
+            return recaptcha;
+        const action = (_a = recaptcha === null || recaptcha === void 0 ? void 0 : recaptcha.action) !== null && _a !== void 0 ? _a : _app__WEBPACK_IMPORTED_MODULE_0__.BaseUrl.RECAPTCHA_ACTION;
+        const token = yield executeRecaptcha(_app__WEBPACK_IMPORTED_MODULE_0__.BaseUrl.RECAPTCHA_SITE_KEY, action);
+        return Object.assign(Object.assign({}, recaptcha), { token,
+            action });
+    });
+}
+function getMailUrl(options) {
+    if (options.personal)
+        return _app__WEBPACK_IMPORTED_MODULE_0__.BaseUrl.sendPersonalMail();
+    if (options.bulk)
+        return _app__WEBPACK_IMPORTED_MODULE_0__.BaseUrl.sendBulkMail();
+    return _app__WEBPACK_IMPORTED_MODULE_0__.BaseUrl.sendMail();
+}
+function withRecaptchaBody(body, recaptcha) {
+    var _a, _b, _c, _d;
+    if (body instanceof FormData) {
+        if (!(recaptcha === null || recaptcha === void 0 ? void 0 : recaptcha.token))
+            return body;
+        const tokenFieldName = (_a = recaptcha.fieldName) !== null && _a !== void 0 ? _a : DEFAULT_RECAPTCHA_FIELD_NAME;
+        const actionFieldName = (_b = recaptcha.actionFieldName) !== null && _b !== void 0 ? _b : DEFAULT_RECAPTCHA_ACTION_FIELD_NAME;
+        if (!body.has(tokenFieldName))
+            body.append(tokenFieldName, recaptcha.token);
+        if (recaptcha.action && !body.has(actionFieldName))
+            body.append(actionFieldName, recaptcha.action);
+        return body;
+    }
+    const payload = Object.assign({}, body);
+    if (recaptcha === null || recaptcha === void 0 ? void 0 : recaptcha.token) {
+        const tokenFieldName = (_c = recaptcha.fieldName) !== null && _c !== void 0 ? _c : DEFAULT_RECAPTCHA_FIELD_NAME;
+        const actionFieldName = (_d = recaptcha.actionFieldName) !== null && _d !== void 0 ? _d : DEFAULT_RECAPTCHA_ACTION_FIELD_NAME;
+        if (payload[tokenFieldName] === undefined)
+            payload[tokenFieldName] = recaptcha.token;
+        if (recaptcha.action && payload[actionFieldName] === undefined) {
+            payload[actionFieldName] = recaptcha.action;
+        }
+    }
+    return JSON.stringify(payload);
+}
+function getHeaders(isFormData, token, recaptcha) {
+    var _a;
+    const headers = {
+        Authorization: `Bearer ${token}`,
+    };
+    if (!isFormData)
+        headers['Content-Type'] = 'application/json';
+    if (recaptcha === null || recaptcha === void 0 ? void 0 : recaptcha.token) {
+        headers[(_a = recaptcha.headerName) !== null && _a !== void 0 ? _a : DEFAULT_RECAPTCHA_HEADER_NAME] = recaptcha.token;
+    }
+    return headers;
+}
 /**
  * Method to send Email to user
  * @param body FormData | EmailBody
  * @param token string
- * @param bulk boolean
+ * @param bulkOrOptions boolean | SendEmailOptions
+ * @param recaptchaToken string
  * @returns JSON | string | null
  */
-const sendEmail = (body_1, token_1, ...args_1) => __awaiter(void 0, [body_1, token_1, ...args_1], void 0, function* (body, token, bulk = false) {
+const sendEmail = (body_1, token_1, ...args_1) => __awaiter(void 0, [body_1, token_1, ...args_1], void 0, function* (body, token, bulkOrOptions = false, recaptchaToken) {
+    var _a;
     try {
-        let url = _app__WEBPACK_IMPORTED_MODULE_0__.BaseUrl.sendMail();
-        if (bulk)
-            url = _app__WEBPACK_IMPORTED_MODULE_0__.BaseUrl.sendBulkMail();
+        const options = normalizeSendEmailOptions(bulkOrOptions, recaptchaToken);
+        const recaptcha = yield resolveRecaptchaOptions(normalizeRecaptchaOptions(options.recaptcha));
+        const isFormData = body instanceof FormData;
+        const url = getMailUrl(options);
         const response = yield fetch(url, {
             method: 'POST',
-            body: body instanceof FormData ? body : JSON.stringify(body),
-            headers: {
-                'Content-Type': 'application/json',
-                Authorization: `Bearer ${token}`,
-            },
+            body: withRecaptchaBody(body, recaptcha),
+            headers: getHeaders(isFormData, token, recaptcha),
         });
-        const contentType = response.headers.get('content-type');
+        const contentType = (_a = response.headers.get('content-type')) !== null && _a !== void 0 ? _a : '';
         if (!response.ok) {
-            // console.log(response.status)
-            const errorData = yield response.json();
-            // console.log(errorData) // Log error response data
+            const errorData = contentType.includes('application/json')
+                ? yield response.json()
+                : yield response.text();
             console.info(`${response.status} ${errorData}`);
             return null;
         }
-        const responseData = yield response.json();
-        if (contentType && contentType.includes('text/plain')) {
+        if (contentType.includes('text/plain')) {
             return yield response.text();
         }
-        return responseData;
+        return yield response.json();
     }
     catch (err) {
         console.error(err);
         return null;
     }
 });
+/**
+ * Method to send a personal Email to user.
+ * @param body FormData | EmailBody
+ * @param token string
+ * @param options SendEmailOptions
+ * @returns JSON | string | null
+ */
+const sendPersonalEmail = (body_1, token_1, ...args_1) => __awaiter(void 0, [body_1, token_1, ...args_1], void 0, function* (body, token, options = {}) {
+    return sendEmail(body, token, Object.assign(Object.assign({}, options), { personal: true }));
+});
 
 
 /***/ }),
@@ -36388,11 +36526,15 @@ function UpdateComposition(patcherStructure) {
 
 __webpack_require__.r(__webpack_exports__);
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
+/* harmony export */   getR2PresignedUploadUrl: () => (/* binding */ getR2PresignedUploadUrl),
 /* harmony export */   getUploadFileLimit: () => (/* binding */ getUploadFileLimit),
 /* harmony export */   uploadAttachment: () => (/* binding */ uploadAttachment),
 /* harmony export */   uploadFile: () => (/* binding */ uploadFile),
 /* harmony export */   uploadImage: () => (/* binding */ uploadImage),
 /* harmony export */   uploadImageV2: () => (/* binding */ uploadImageV2),
+/* harmony export */   uploadR2Storage: () => (/* binding */ uploadR2Storage),
+/* harmony export */   uploadToR2PresignedUrl: () => (/* binding */ uploadToR2PresignedUrl),
+/* harmony export */   uploadWithR2PresignedUrl: () => (/* binding */ uploadWithR2PresignedUrl),
 /* harmony export */   validDocumentFormats: () => (/* binding */ validDocumentFormats),
 /* harmony export */   validImageFormats: () => (/* binding */ validImageFormats)
 /* harmony export */ });
@@ -36424,6 +36566,126 @@ const validDocumentFormats = [
     "text/plain",
     "application/pdf",
 ];
+function getUploadResponseUrl(response) {
+    const data = response === null || response === void 0 ? void 0 : response.data;
+    if (typeof data === "string")
+        return data;
+    if (data && typeof data.url === "string")
+        return data.url;
+    if (typeof (response === null || response === void 0 ? void 0 : response.url) === "string")
+        return response.url;
+    return undefined;
+}
+function formDataHasField(body, fieldName) {
+    return typeof body.has === "function" && body.has(fieldName);
+}
+function getFormDataField(body, fieldName) {
+    return typeof body.get === "function" ? body.get(fieldName) : undefined;
+}
+function getUploadFileFromFormData(body) {
+    var _a;
+    return (_a = getFormDataField(body, "file")) !== null && _a !== void 0 ? _a : getFormDataField(body, "image");
+}
+function appendFileField(body, value) {
+    const fileName = typeof value === "object" && value ? value.name : undefined;
+    if (fileName) {
+        body.append("file", value, fileName);
+    }
+    else {
+        body.append("file", value);
+    }
+}
+function ensureR2FileField(body) {
+    if (formDataHasField(body, "file"))
+        return body;
+    const imageField = getFormDataField(body, "image");
+    if (imageField !== undefined && imageField !== null) {
+        appendFileField(body, imageField);
+    }
+    return body;
+}
+function postUploadFormData(url_1, body_1) {
+    return __awaiter(this, arguments, void 0, function* (url, body, token = "") {
+        try {
+            const headers = yield (0,_Security_GetRequestHeader__WEBPACK_IMPORTED_MODULE_2__.GetRequestHeaderWithAuthorization)("", token);
+            delete headers["Content-Type"];
+            const response = yield fetch(url, {
+                method: "POST",
+                body,
+                headers,
+            });
+            if (!response.ok) {
+                const errorData = yield response.text();
+                console.error(`${response.status} ${errorData}`);
+                return null;
+            }
+            return yield response.json();
+        }
+        catch (err) {
+            console.error(err);
+            return null;
+        }
+    });
+}
+function postUploadJson(url_1, body_1) {
+    return __awaiter(this, arguments, void 0, function* (url, body, token = "") {
+        try {
+            const response = yield fetch(url, {
+                method: "POST",
+                body: JSON.stringify(body),
+                headers: yield (0,_Security_GetRequestHeader__WEBPACK_IMPORTED_MODULE_2__.GetRequestHeaderWithAuthorization)("application/json", token),
+            });
+            if (!response.ok) {
+                const errorData = yield response.text();
+                console.error(`${response.status} ${errorData}`);
+                return null;
+            }
+            return yield response.json();
+        }
+        catch (err) {
+            console.error(err);
+            return null;
+        }
+    });
+}
+function isBlobLike(file) {
+    return typeof Blob !== "undefined" && file instanceof Blob;
+}
+function getFileName(file, options) {
+    if (options.fileName)
+        return options.fileName;
+    if (typeof (file === null || file === void 0 ? void 0 : file.name) === "string" && file.name)
+        return file.name;
+    if (typeof (file === null || file === void 0 ? void 0 : file.uri) === "string") {
+        const [path] = file.uri.split("?");
+        const name = path.split("/").pop();
+        if (name)
+            return name;
+    }
+    return "upload";
+}
+function getFileContentType(file, options) {
+    return options.contentType || (file === null || file === void 0 ? void 0 : file.type) || "application/octet-stream";
+}
+function getPresignedUploadBody(file) {
+    return __awaiter(this, void 0, void 0, function* () {
+        if (isBlobLike(file) || typeof file === "string")
+            return file;
+        if (file instanceof ArrayBuffer)
+            return file;
+        if (typeof (file === null || file === void 0 ? void 0 : file.uri) === "string") {
+            try {
+                const response = yield fetch(file.uri);
+                if (response.ok)
+                    return yield response.blob();
+            }
+            catch (_a) {
+                // Some runtimes support { uri, name, type } directly as a fetch body.
+            }
+        }
+        return file;
+    });
+}
 /**
  * Generic method to upload file or image
  * @param file File
@@ -36434,28 +36696,19 @@ function uploadAttachment(file, token) {
         const logData = _app__WEBPACK_IMPORTED_MODULE_0__.Logger.logfunction("uploadAttachment");
         try {
             console.log("File Type", file.type);
-            const formData = new FormData();
-            let response;
             const isDocument = validDocumentFormats.includes(file.type) ||
                 file.name.toLowerCase().endsWith(".md"); // fallback extension check
-            if (isDocument) {
-                // File
-                formData.append("file", file, file.name);
-                response = yield uploadFile(formData, token);
-            }
-            else if (validImageFormats.includes(file.type)) {
-                // Image
-                formData.append("image", file, file.name);
-                response = yield uploadImage(formData, token);
-            }
-            else {
+            const isImage = validImageFormats.includes(file.type);
+            if (!isDocument && !isImage) {
                 return { message: "Invalid File Format", success: false };
             }
-            if (!(response === null || response === void 0 ? void 0 : response.data)) {
-                return { message: "File Upload Failed", success: false };
+            const response = yield uploadWithR2PresignedUrl(file, {}, token);
+            const uploadUrl = getUploadResponseUrl(response);
+            if (!uploadUrl) {
+                return { message: response.message || "File Upload Failed", success: false };
             }
             _app__WEBPACK_IMPORTED_MODULE_0__.Logger.logUpdate(logData);
-            return { message: "Upload Success", success: true, url: response.data };
+            return { message: response.message || "Upload Success", success: true, url: uploadUrl };
         }
         catch (err) {
             console.error(err);
@@ -36464,6 +36717,93 @@ function uploadAttachment(file, token) {
         }
     });
 }
+/**
+ * Method to upload a file or image to R2 storage.
+ * @param body FormData. Append the file under the "file" key.
+ * @param token string?
+ * @returns UploadResponse<R2UploadData> | null
+ */
+function uploadR2Storage(body_1) {
+    return __awaiter(this, arguments, void 0, function* (body, token = "") {
+        return postUploadFormData(_app__WEBPACK_IMPORTED_MODULE_0__.BaseUrl.uploadR2StorageUrl(), ensureR2FileField(body), token);
+    });
+}
+/**
+ * Method to request an R2 pre-signed upload URL from the backend.
+ * @param body Request metadata for the file to upload.
+ * @param token string?
+ * @returns UploadResponse<R2PresignedUploadUrlData> | null
+ */
+function getR2PresignedUploadUrl(body_1) {
+    return __awaiter(this, arguments, void 0, function* (body, token = "") {
+        return postUploadJson(_app__WEBPACK_IMPORTED_MODULE_0__.BaseUrl.r2PresignedUploadUrl(), body, token);
+    });
+}
+/**
+ * Method to upload a file body to a pre-signed R2 URL.
+ * @param uploadUrl URL returned by getR2PresignedUploadUrl
+ * @param file Blob/File, raw body, or compatible file-like object
+ * @param contentType Must match the contentType used when creating the signed URL.
+ * @returns Response from R2
+ */
+function uploadToR2PresignedUrl(uploadUrl, file, contentType) {
+    return __awaiter(this, void 0, void 0, function* () {
+        return fetch(uploadUrl, {
+            method: "PUT",
+            headers: {
+                "Content-Type": contentType,
+            },
+            body: yield getPresignedUploadBody(file),
+        });
+    });
+}
+/**
+ * Full R2 pre-signed upload workflow: create URL, PUT file to R2, return public URL.
+ * @param file Blob/File, raw body, or compatible file-like object
+ * @param options Optional fileName/contentType/folder/expiresInSeconds overrides.
+ * @param token string?
+ * @returns R2PresignedUploadResult
+ */
+function uploadWithR2PresignedUrl(file_1) {
+    return __awaiter(this, arguments, void 0, function* (file, options = {}, token = "") {
+        var _a, _b, _c, _d;
+        const contentType = getFileContentType(file, options);
+        const presignedResponse = yield getR2PresignedUploadUrl({
+            fileName: getFileName(file, options),
+            contentType,
+            folder: (_a = options.folder) !== null && _a !== void 0 ? _a : "",
+            expiresInSeconds: (_b = options.expiresInSeconds) !== null && _b !== void 0 ? _b : 900,
+        }, token);
+        if (!(presignedResponse === null || presignedResponse === void 0 ? void 0 : presignedResponse.success) || !((_c = presignedResponse.data) === null || _c === void 0 ? void 0 : _c.uploadUrl)) {
+            return {
+                message: (_d = presignedResponse === null || presignedResponse === void 0 ? void 0 : presignedResponse.message) !== null && _d !== void 0 ? _d : "Unable to create pre-signed R2 upload URL.",
+                success: false,
+            };
+        }
+        const uploadResponse = yield uploadToR2PresignedUrl(presignedResponse.data.uploadUrl, file, presignedResponse.data.contentType || contentType);
+        if (!uploadResponse.ok) {
+            let details = "";
+            try {
+                details = yield uploadResponse.text();
+            }
+            catch (_e) {
+                details = "";
+            }
+            return {
+                message: `R2 upload failed with HTTP ${uploadResponse.status}${details ? `: ${details}` : ""}`,
+                success: false,
+                data: presignedResponse.data,
+            };
+        }
+        return {
+            message: "Upload Success",
+            success: true,
+            url: presignedResponse.data.publicUrl,
+            data: presignedResponse.data,
+            eTag: uploadResponse.headers.get("etag"),
+        };
+    });
+}
 /**
  * Method to upload image to server
  * @param body FormData
@@ -36474,30 +36814,19 @@ function uploadImage(body_1) {
     return __awaiter(this, arguments, void 0, function* (body, token = "") {
         const logData = _app__WEBPACK_IMPORTED_MODULE_0__.Logger.logfunction("uploadImage");
         try {
-            const response = yield fetch(_app__WEBPACK_IMPORTED_MODULE_0__.BaseUrl.uploadImageUrl(), {
-                method: "POST",
-                body,
-                headers: {
-                    Authorization: `Bearer ${token}`,
-                },
-            });
-            if (!response.ok) {
-                // Check content type before parsing
-                const contentType = response.headers.get("content-type");
-                if (contentType && contentType.includes("text/plain")) {
-                    console.info(response === null || response === void 0 ? void 0 : response.text());
-                }
-                const errorData = yield (response === null || response === void 0 ? void 0 : response.text());
-                console.error(`${response.status} ${errorData}`); // Log error response data
+            const file = getUploadFileFromFormData(body);
+            if (file === undefined || file === null) {
                 _app__WEBPACK_IMPORTED_MODULE_0__.Logger.logUpdate(logData);
-                return null;
+                return { message: "Missing image file", success: false };
             }
-            return yield response.json();
+            const response = yield uploadWithR2PresignedUrl(file, {}, token);
+            _app__WEBPACK_IMPORTED_MODULE_0__.Logger.logUpdate(logData);
+            return response;
         }
         catch (err) {
             console.error(err);
             (0,_Common_ErrorPosting__WEBPACK_IMPORTED_MODULE_1__.UpdatePackageLogWithError)(logData, 'uploadImage', err);
-            return null;
+            return { message: "File Upload Failed", success: false };
         }
     });
 }
@@ -36511,25 +36840,9 @@ function uploadImageV2(body_1) {
     return __awaiter(this, arguments, void 0, function* (body, token = "") {
         const logData = _app__WEBPACK_IMPORTED_MODULE_0__.Logger.logfunction("uploadImageV2");
         try {
-            const response = yield fetch(_app__WEBPACK_IMPORTED_MODULE_0__.BaseUrl.uploadImageUrlWithSmall(), {
-                method: "POST",
-                body,
-                headers: {
-                    Authorization: `Bearer ${token}`,
-                },
-            });
-            if (!response.ok) {
-                // Check content type before parsing
-                const contentType = response.headers.get("content-type");
-                if (contentType && contentType.includes("text/plain")) {
-                    console.info(response === null || response === void 0 ? void 0 : response.text());
-                }
-                const errorData = yield (response === null || response === void 0 ? void 0 : response.text());
-                console.error(`${response.status} ${errorData}`); // Log error response data
-                _app__WEBPACK_IMPORTED_MODULE_0__.Logger.logUpdate(logData);
-                return null;
-            }
-            return yield response.json();
+            const response = yield postUploadFormData(_app__WEBPACK_IMPORTED_MODULE_0__.BaseUrl.uploadImageUrlWithSmall(), body, token);
+            _app__WEBPACK_IMPORTED_MODULE_0__.Logger.logUpdate(logData);
+            return response;
         }
         catch (err) {
             console.error(err);
@@ -36548,25 +36861,9 @@ function uploadFile(body_1) {
     return __awaiter(this, arguments, void 0, function* (body, token = "") {
         const logData = _app__WEBPACK_IMPORTED_MODULE_0__.Logger.logfunction("uploadFile");
         try {
-            const response = yield fetch(_app__WEBPACK_IMPORTED_MODULE_0__.BaseUrl.uploadFileUrl(), {
-                method: "POST",
-                body,
-                headers: {
-                    Authorization: `Bearer ${token}`,
-                },
-            });
-            if (!response.ok) {
-                // Check content type before parsing
-                const contentType = response.headers.get("content-type");
-                if (contentType && contentType.includes("text/plain")) {
-                    console.info(response.text());
-                }
-                const errorData = yield response.text();
-                console.error(`${response.status} ${errorData}`); // Log error response data
-                return null;
-            }
+            const response = yield uploadR2Storage(body, token);
             _app__WEBPACK_IMPORTED_MODULE_0__.Logger.logUpdate(logData);
-            return yield response.json();
+            return response;
         }
         catch (err) {
             console.error(err);
@@ -43098,6 +43395,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */   dispatchIdEvent: () => (/* binding */ dispatchIdEvent),
 /* harmony export */   getFromDatabaseWithType: () => (/* reexport safe */ _Database_NoIndexDb__WEBPACK_IMPORTED_MODULE_17__.getFromDatabaseWithType),
 /* harmony export */   getObjectsFromIndexDb: () => (/* reexport safe */ _Database_NoIndexDb__WEBPACK_IMPORTED_MODULE_17__.getObjectsFromIndexDb),
+/* harmony export */   getR2PresignedUploadUrl: () => (/* reexport safe */ _Services_Upload__WEBPACK_IMPORTED_MODULE_32__.getR2PresignedUploadUrl),
 /* harmony export */   getUploadFileLimit: () => (/* reexport safe */ _Services_Upload__WEBPACK_IMPORTED_MODULE_32__.getUploadFileLimit),
 /* harmony export */   getUserDetails: () => (/* reexport safe */ _Services_User_UserFromLocalStorage__WEBPACK_IMPORTED_MODULE_131__.getUserDetails),
 /* harmony export */   getUserDetailsWithRefresh: () => (/* reexport safe */ _Services_User_UserFromLocalStorage__WEBPACK_IMPORTED_MODULE_131__.getUserDetailsWithRefresh),
@@ -43119,6 +43417,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */   searchLinkMultipleListener: () => (/* reexport safe */ _WrapperFunctions_SearchLinkMultipleAllObservable__WEBPACK_IMPORTED_MODULE_72__.searchLinkMultipleListener),
 /* harmony export */   sendEmail: () => (/* reexport safe */ _Services_Mail__WEBPACK_IMPORTED_MODULE_112__.sendEmail),
 /* harmony export */   sendMessage: () => (/* binding */ sendMessage),
+/* harmony export */   sendPersonalEmail: () => (/* reexport safe */ _Services_Mail__WEBPACK_IMPORTED_MODULE_112__.sendPersonalEmail),
 /* harmony export */   serviceWorker: () => (/* binding */ serviceWorker),
 /* harmony export */   setHasActivatedSW: () => (/* binding */ setHasActivatedSW),
 /* harmony export */   storeToDatabase: () => (/* reexport safe */ _Database_NoIndexDb__WEBPACK_IMPORTED_MODULE_17__.storeToDatabase),
@@ -43129,6 +43428,9 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */   uploadFile: () => (/* reexport safe */ _Services_Upload__WEBPACK_IMPORTED_MODULE_32__.uploadFile),
 /* harmony export */   uploadImage: () => (/* reexport safe */ _Services_Upload__WEBPACK_IMPORTED_MODULE_32__.uploadImage),
 /* harmony export */   uploadImageV2: () => (/* reexport safe */ _Services_Upload__WEBPACK_IMPORTED_MODULE_32__.uploadImageV2),
+/* harmony export */   uploadR2Storage: () => (/* reexport safe */ _Services_Upload__WEBPACK_IMPORTED_MODULE_32__.uploadR2Storage),
+/* harmony export */   uploadToR2PresignedUrl: () => (/* reexport safe */ _Services_Upload__WEBPACK_IMPORTED_MODULE_32__.uploadToR2PresignedUrl),
+/* harmony export */   uploadWithR2PresignedUrl: () => (/* reexport safe */ _Services_Upload__WEBPACK_IMPORTED_MODULE_32__.uploadWithR2PresignedUrl),
 /* harmony export */   validDocumentFormats: () => (/* reexport safe */ _Services_Upload__WEBPACK_IMPORTED_MODULE_32__.validDocumentFormats),
 /* harmony export */   validImageFormats: () => (/* reexport safe */ _Services_Upload__WEBPACK_IMPORTED_MODULE_32__.validImageFormats)
 /* harmony export */ });
@@ -43658,13 +43960,15 @@ function updateAccessToken(accessToken = "", session, refreshToken = "") {
  */
 function init() {
     return __awaiter(this, arguments, void 0, function* (url = "", aiurl = "", accessToken = "", nodeUrl = "", enableAi = true, applicationName = "", enableSW = undefined, flags = {}, parameters = {}) {
-        var _a, _b, _c;
+        var _a, _b, _c, _d, _e;
         try {
             _DataStructures_BaseUrl__WEBPACK_IMPORTED_MODULE_103__.BaseUrl.BASE_URL = url;
             _DataStructures_BaseUrl__WEBPACK_IMPORTED_MODULE_103__.BaseUrl.AI_URL = aiurl;
             _DataStructures_BaseUrl__WEBPACK_IMPORTED_MODULE_103__.BaseUrl.NODE_URL = nodeUrl;
             _DataStructures_BaseUrl__WEBPACK_IMPORTED_MODULE_103__.BaseUrl.BASE_APPLICATION = applicationName;
             _DataStructures_BaseUrl__WEBPACK_IMPORTED_MODULE_103__.BaseUrl.LOG_SERVER = (_a = parameters.logserver) !== null && _a !== void 0 ? _a : "https://logdev.freeschema.com";
+            _DataStructures_BaseUrl__WEBPACK_IMPORTED_MODULE_103__.BaseUrl.RECAPTCHA_SITE_KEY = (_b = parameters.recaptchaSiteKey) !== null && _b !== void 0 ? _b : "";
+            _DataStructures_BaseUrl__WEBPACK_IMPORTED_MODULE_103__.BaseUrl.RECAPTCHA_ACTION = (_c = parameters.recaptchaAction) !== null && _c !== void 0 ? _c : "send_mail";
             updateAccessToken(accessToken);
             //TokenStorage.BearerAccessToken = accessToken;
             // Decrypt stored profile into memory so getUserDetails() works synchronously
@@ -43673,8 +43977,8 @@ function init() {
             // BaseUrl.BASE_RANDOMIZER = randomizer;
             // BaseUrl.BASE_RANDOMIZER = 999;
             _DataStructures_BaseUrl__WEBPACK_IMPORTED_MODULE_103__.BaseUrl.setRandomizer(randomizer);
-            _DataStructures_BaseUrl__WEBPACK_IMPORTED_MODULE_103__.BaseUrl.isPwa = (_b = parameters.isPwa) !== null && _b !== void 0 ? _b : false;
-            _DataStructures_environments_environments__WEBPACK_IMPORTED_MODULE_105__.Environments.setValue('enableCache', (_c = parameters.enableCache) !== null && _c !== void 0 ? _c : true);
+            _DataStructures_BaseUrl__WEBPACK_IMPORTED_MODULE_103__.BaseUrl.isPwa = (_d = parameters.isPwa) !== null && _d !== void 0 ? _d : false;
+            _DataStructures_environments_environments__WEBPACK_IMPORTED_MODULE_105__.Environments.setValue('enableCache', (_e = parameters.enableCache) !== null && _e !== void 0 ? _e : true);
             // Change Default Flags
             const defaultFlags = {
                 logApplication: false,