@raytio/decrypt-helper 6.3.4 → 6.4.0

package/dist/api/authedFetch.d.ts

@@ -1 +1 @@
-export declare function authedFetch<T>(apiToken: string, url: string, options?: RequestInit, retrying?: boolean): Promise<T>;
+export declare function authedFetch<T>(apiToken: string | null | undefined, url: string, options?: RequestInit, retrying?: boolean): Promise<T>;

package/dist/api/authedFetch.js

@@ -11,14 +11,20 @@ export function authedFetch(apiToken, url, options, retrying = false) {
     return __awaiter(this, void 0, void 0, function* () {
         console.log(`[API] ${retrying ? "Retry" : "Start"} ${url}`);
         const startTime = Date.now();
-        const response = yield fetch(url, Object.assign(Object.assign({}, options), { headers: { Authorization: `Bearer ${apiToken}` } }));
-        const apiResponse = yield response.json();
-        const error = apiResponse.message || apiResponse.error;
-        if (error) {
+        const headers = Object.assign(Object.assign({}, options === null || options === void 0 ? void 0 : options.headers), (apiToken ? { Authorization: `Bearer ${apiToken}` } : {}));
+        const response = yield fetch(url, Object.assign(Object.assign({}, options), { headers }));
+        let apiResponse = null;
+        const contentType = response.headers.get("content-type");
+        if (contentType === null || contentType === void 0 ? void 0 : contentType.startsWith("application/json")) {
+            const responseText = yield response.text();
+            apiResponse = responseText ? JSON.parse(responseText) : null;
+        }
+        if (!response.ok) {
             if (!retrying && response.status === 504) {
                 console.log(`[API] Error ${response.status} (will retry) ${url}`);
                 return authedFetch(apiToken, url, options, true);
             }
+            const error = (apiResponse === null || apiResponse === void 0 ? void 0 : apiResponse.message) || (apiResponse === null || apiResponse === void 0 ? void 0 : apiResponse.error) || "No error message provided";
             console.log(`[API] Error ${response.status} (no retry) ${url}`);
             throw new Error(`Failed due to API Error from ${url}: "${error}"`);
         }

package/dist/api/updateInstanceData.js

@@ -14,6 +14,10 @@ import { authedFetch } from "./authedFetch.js";
  */
 export function updateInstanceData(apiToken, envConfig, iId, instance) {
     return __awaiter(this, void 0, void 0, function* () {
-        yield authedFetch(apiToken, `${envConfig.api_url}/db/v1/dsm_access_application_instances_u?id=eq.${iId}`, { method: "PATCH", body: JSON.stringify(instance) });
+        yield authedFetch(apiToken, `${envConfig.api_url}/db/v1/dsm_access_application_instances_u?id=eq.${iId}`, {
+            method: "PATCH",
+            headers: { "Content-Type": "application/json" },
+            body: JSON.stringify(instance),
+        });
     });
 }

package/dist/api/uploadToObjectStore.d.ts

@@ -1,5 +1,5 @@
 import type { EnvConfig } from "./fetchEnvConfig.js";
-export declare function uploadToObjectStore(apiToken: string, envConfig: EnvConfig, dataUrl: string, expiryDate?: Date): Promise<{
+export declare function uploadToObjectStore(apiToken: string, envConfig: EnvConfig, dataUrl: string, expiryDate?: Date, storePermanently?: boolean): Promise<{
     objectStoreId: string;
     retrievalUrl: string;
 }>;

package/dist/api/uploadToObjectStore.js

@@ -12,15 +12,17 @@ import { authedFetch } from "./authedFetch.js";
 // this file is mostly copy-pasted from the client repo. If you make
 // a change here, consider making the same change in the client.
 //
-export function uploadToObjectStore(apiToken, envConfig, dataUrl, expiryDate) {
+export function uploadToObjectStore(apiToken, envConfig, dataUrl, expiryDate, storePermanently) {
     return __awaiter(this, void 0, void 0, function* () {
         const mimeType = dataUrl.split(";")[0].split(":")[1];
         const base64 = dataUrl.split(",")[1];
         // eslint-disable-next-line unicorn/prefer-code-point -- deliberate, this will only ever be ASCII
         const arrayBuffer = Uint8Array.from(atob(base64), (c) => c.charCodeAt(0));
         // this is a weird API that returns a double stringified string
-        const temporaryUrl = yield authedFetch(apiToken, `${envConfig.api_url}/org/v1/object/url${expiryDate ? `?expires=${+expiryDate}` : ""}`);
-        const { status, statusText } = yield fetch(temporaryUrl, {
+        const { presigned_url } = yield authedFetch(apiToken, expiryDate
+            ? `${envConfig.api_url}/persist/v2/generate-presigned-url?expires=${+expiryDate}${storePermanently ? "&store_permanently=true" : ""}`
+            : `${envConfig.api_url}/persist/v2/generate-presigned-url${storePermanently ? "?store_permanently=true" : ""}`);
+        const { status, statusText } = yield fetch(presigned_url, {
             method: "PUT",
             body: arrayBuffer,
             headers: { "Content-Type": mimeType },
@@ -29,7 +31,7 @@ export function uploadToObjectStore(apiToken, envConfig, dataUrl, expiryDate) {
             throw new Error(`Status ${status} from object store: ${statusText}`);
         }
         // the v4 API doesn't return the ID
-        const { pathname, origin } = new URL(temporaryUrl);
+        const { pathname, origin } = new URL(presigned_url);
         return {
             objectStoreId: pathname.slice(1),
             retrievalUrl: origin + pathname,

package/dist/helpers/formatOutput.js

@@ -27,7 +27,16 @@ const byPriority = (schema) => ([a], [b]) => {
 export function formatOutput(profileObjects, allSchemas, realVers, apiToken, envConfig) {
     return __awaiter(this, void 0, void 0, function* () {
         const locale = process.env.PDF_LANGUAGE || process.env.DATE_FORMAT || "en-NZ";
-        const PODetails = profileObjects.reduce((accumulatorPromiseOuter, PO) => __awaiter(this, void 0, void 0, function* () {
+        const tagsToHide = [
+            "type:client_only",
+            "type:globally_unique_field",
+        ];
+        const filteredPOs = profileObjects.filter((PO) => {
+            const schemaName = findSchemaLabel(PO.labels);
+            return (schemaName &&
+                !tagsToHide.some((tag) => { var _a, _b; return (_b = (_a = allSchemas.find((s) => s.name === schemaName)) === null || _a === void 0 ? void 0 : _a.tags) === null || _b === void 0 ? void 0 : _b.includes(tag); }));
+        });
+        const PODetails = filteredPOs.reduce((accumulatorPromiseOuter, PO) => __awaiter(this, void 0, void 0, function* () {
             var _a;
             const accumulatorOuter = yield accumulatorPromiseOuter;
             const schemaName = findSchemaLabel(PO.labels);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@raytio/decrypt-helper",
-  "version": "6.3.4",
+  "version": "6.4.0",
   "author": "Raytio",
   "type": "module",
   "description": "A helper to decrypt data shared by Raytio users",
@@ -23,9 +23,9 @@
   },
   "dependencies": {
     "@aws-amplify/auth": "3.4.25",
-    "@raytio/core": "^11.4.1",
+    "@raytio/core": "^11.5.0",
     "@raytio/maxcryptor": "^3.1.0",
-    "@raytio/types": "^7.3.0",
+    "@raytio/types": "^8.0.0",
     "aws-sdk": "^2.754.0",
     "jsx-pdf": "^2.3.0",
     "localstorage-polyfill": "^1.0.1",