bruce-models 2.3.1 → 2.3.3

package/dist/bruce-models.umd.js

@@ -1294,15 +1294,35 @@
                                 api: guardian
                             });
                             if (host === null || host === void 0 ? void 0 : host.location) {
+                                const settings = host.location.Settings;
                                 // Attempt to load regional base url.
-                                if (host.location.BruceAPIURL) {
-                                    const regionalUrl = host.location.BruceAPIURL.replace("<ACCOUNT>", this.accountId).replace("<DOMAIN>", domain);
+                                // First try go through settings.
+                                let urlSet = false;
+                                if (settings === null || settings === void 0 ? void 0 : settings.BruceAPIURL) {
+                                    let envUrl = settings.BruceAPIURL[env];
+                                    if (envUrl) {
+                                        envUrl = envUrl
+                                            .replace("<ACCOUNTID>", this.accountId)
+                                            .replace("<ACCOUNT>", this.accountId);
+                                        if (envUrl && envUrl.length > 1) {
+                                            this.baseUrl = envUrl;
+                                            urlSet = true;
+                                        }
+                                    }
+                                }
+                                // Try go through host location's base url.
+                                // This may be wrong env which is why it's used as fallback right now.
+                                if (!urlSet && host.location.BruceAPIURL) {
+                                    const regionalUrl = host.location.BruceAPIURL
+                                        .replace("<ACCOUNTID>", this.accountId)
+                                        .replace("<ACCOUNT>", this.accountId)
+                                        .replace("<DOMAIN>", domain);
                                     if (regionalUrl && regionalUrl.length > 1) {
                                         this.baseUrl = regionalUrl;
+                                        urlSet = true;
                                     }
                                 }
                                 // Attempt to load CDN settings.
-                                const settings = host.location.Settings;
                                 if (settings === null || settings === void 0 ? void 0 : settings.CDN) {
                                     this.EntityCdnUrl = (_a = settings.CDN.entityURL) === null || _a === void 0 ? void 0 : _a[env];
                                     // We need to fix our configs.
@@ -5200,6 +5220,15 @@
                         req,
                         onProgress
                     });
+                    // TODO: Check if we can add it to the request like the small file upload.
+                    if ((clientFile === null || clientFile === void 0 ? void 0 : clientFile.ID) && purpose) {
+                        yield UpdatePurpose({
+                            api,
+                            fileId: clientFile.ID,
+                            purpose,
+                            req
+                        });
+                    }
                 }
                 else {
                     req.onProgress = (progress) => {
@@ -5209,16 +5238,13 @@
                             uploaded: false
                         });
                     };
+                    if (purpose) {
+                        req.formData = {
+                            Purpose: purpose
+                        };
+                    }
                     clientFile = yield api.UPLOAD("file/uploadNew", file, req);
                 }
-                if ((clientFile === null || clientFile === void 0 ? void 0 : clientFile.ID) && purpose) {
-                    yield UpdatePurpose({
-                        api,
-                        fileId: clientFile.ID,
-                        purpose,
-                        req
-                    });
-                }
                 onProgress === null || onProgress === void 0 ? void 0 : onProgress({
                     percent: 100,
                     uploaded: true