@cobaltio/cobalt-js 8.9.2-beta.1 → 9.0.0-beta.1

package/cobalt.d.ts

@@ -283,6 +283,18 @@ export interface Execution {
     associated_event_id: string;
     custom_trigger_id?: string;
     custom_application_id?: string;
+    completion_percentage?: number;
+    nodes?: {
+        node_id: string;
+        node_name: string;
+        node_type: string;
+        node_status: "Success" | "Ready" | "Errored" | "Waiting" | "Stopped" | "Rejected" | "Errored_and_Skipped" | "Timed_Out";
+        is_batch?: boolean;
+        attempts_made: number;
+        maximum_attempts: number;
+        input_data: unknown;
+        latest_output: unknown;
+    }[];
     createdAt: string;
 }
 declare class Cobalt {
@@ -334,26 +346,34 @@ declare class Cobalt {
      */
     private getOAuthUrl;
     /**
-     * Handle OAuth for the specified native application.
+     * Handle OAuth for the specified application.
      * @private
      * @param {String} slug The application slug.
      * @param {Object.<string, string>} [params] The key value pairs of auth data.
      * @returns {Promise<Boolean>} Whether the user authenticated.
      */
     private oauth;
+    /**
+     * Save auth data for the specified keybased application.
+     * @param {String} slug The application slug.
+     * @param {Object.<string, string>} [payload] The key value pairs of auth data.
+     * @returns {Promise<Boolean>} Whether the auth data was saved successfully.
+     */
+    private keybased;
     /**
      * Connect the specified application, optionally with the auth data that user provides.
      * @param {String} slug The application slug.
+     * @param {AuthType} authType The auth type to use.
      * @param {Object.<string, string>} [payload] The key value pairs of auth data.
      * @returns {Promise<Boolean>} Whether the connection was successful.
      */
-    connect(slug: string, payload?: Record<string, string>): Promise<boolean>;
+    connect(slug: string, authType: AuthType, payload?: Record<string, string>): Promise<boolean>;
     /**
      * Disconnect the specified application and remove any associated data from Cobalt.
      * @param {String} slug The application slug.
-     * @returns {Promise<void>}
+     * @returns {Promise<unknown>}
      */
-    disconnect(slug: string): Promise<void>;
+    disconnect(slug: string): Promise<unknown>;
     /**
      * Returns the specified config, or creates one if it doesn't exist.
      * @param {ConfigPayload} payload The payload object for config.

package/cobalt.js

@@ -146,7 +146,7 @@ class Cobalt {
         });
     }
     /**
-     * Handle OAuth for the specified native application.
+     * Handle OAuth for the specified application.
      * @private
      * @param {String} slug The application slug.
      * @param {Object.<string, string>} [params] The key value pairs of auth data.
@@ -162,7 +162,8 @@ class Cobalt {
                     const interval = setInterval(() => {
                         this.getApp(slug)
                             .then(app => {
-                            if (app && app.connected === true && !app.reauth_required) {
+                            var _a;
+                            if (app && ((_a = app.connected_accounts) === null || _a === void 0 ? void 0 : _a.filter(a => a.auth_type === AuthType.OAuth2).some(a => a.status === AuthStatus.Active))) {
                                 // close auth window
                                 connectWindow && connectWindow.close();
                                 // clear interval
@@ -192,50 +193,53 @@ class Cobalt {
             });
         });
     }
+    /**
+     * Save auth data for the specified keybased application.
+     * @param {String} slug The application slug.
+     * @param {Object.<string, string>} [payload] The key value pairs of auth data.
+     * @returns {Promise<Boolean>} Whether the auth data was saved successfully.
+     */
+    keybased(slug, payload) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const res = yield fetch(`${this.baseUrl}/api/v2/app/${slug}/save`, {
+                method: "POST",
+                headers: {
+                    authorization: `Bearer ${this.token}`,
+                    "content-type": "application/json",
+                },
+                body: JSON.stringify(Object.assign({}, payload)),
+            });
+            if (res.status >= 400 && res.status < 600) {
+                const error = yield res.json();
+                throw error;
+            }
+            const data = yield res.json();
+            return data.success;
+        });
+    }
     /**
      * Connect the specified application, optionally with the auth data that user provides.
      * @param {String} slug The application slug.
+     * @param {AuthType} authType The auth type to use.
      * @param {Object.<string, string>} [payload] The key value pairs of auth data.
      * @returns {Promise<Boolean>} Whether the connection was successful.
      */
-    connect(slug, payload) {
+    connect(slug, authType, payload) {
         return __awaiter(this, void 0, void 0, function* () {
-            return new Promise((resolve, reject) => __awaiter(this, void 0, void 0, function* () {
-                try {
-                    const app = yield this.getApp(slug);
-                    // oauth
-                    if (app && app.auth_type === AuthType.OAuth2) {
-                        const connected = yield this.oauth(slug, payload);
-                        resolve(connected);
-                        // key based
-                    }
-                    else {
-                        const res = yield fetch(`${this.baseUrl}/api/v2/app/${slug}/save`, {
-                            method: "POST",
-                            headers: {
-                                authorization: `Bearer ${this.token}`,
-                                "content-type": "application/json",
-                            },
-                            body: JSON.stringify(Object.assign({}, payload)),
-                        });
-                        if (res.status >= 400 && res.status < 600) {
-                            const error = yield res.json();
-                            reject(error);
-                        }
-                        const data = yield res.json();
-                        resolve(data.success);
-                    }
-                }
-                catch (error) {
-                    reject(error);
-                }
-            }));
+            switch (authType) {
+                case AuthType.OAuth2:
+                    return this.oauth(slug, payload);
+                case AuthType.KeyBased:
+                    return this.keybased(slug, payload);
+                default:
+                    throw new Error(`Invalid auth type: ${authType}`);
+            }
         });
     }
     /**
      * Disconnect the specified application and remove any associated data from Cobalt.
      * @param {String} slug The application slug.
-     * @returns {Promise<void>}
+     * @returns {Promise<unknown>}
      */
     disconnect(slug) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -249,6 +253,7 @@ class Cobalt {
                 const error = yield res.json();
                 throw error;
             }
+            return yield res.json();
         });
     }
     /**

package/cobalt.ts

@@ -282,12 +282,12 @@ export interface Execution {
         _id: string;
         name: string;
         icon?: string;
-    },
-    status: "COMPLETED" | "RUNNING" | "ERRORED" | "STOPPED" | "STOPPING" | "TIMED_OUT",
+    };
+    status: "COMPLETED" | "RUNNING" | "ERRORED" | "STOPPED" | "STOPPING" | "TIMED_OUT";
     associated_workflow: {
         _id: string;
         name: string;
-    },
+    };
     associated_trigger_application: {
         _id: string;
         name: string;
@@ -297,7 +297,7 @@ export interface Execution {
             _id: string;
             name: string;
         }
-    },
+    };
     trigger_application_event?: string;
     linked_account_id: string;
     environment: "test" | "production";
@@ -305,6 +305,18 @@ export interface Execution {
     associated_event_id: string;
     custom_trigger_id?: string;
     custom_application_id?: string;
+    completion_percentage?: number;
+    nodes?: {
+        node_id: string;
+        node_name: string;
+        node_type: string;
+        node_status: "Success" | "Ready" | "Errored" | "Waiting" | "Stopped" | "Rejected"| "Errored_and_Skipped" | "Timed_Out";
+        is_batch?: boolean;
+        attempts_made: number;
+        maximum_attempts: number;
+        input_data: unknown;
+        latest_output: unknown;
+    }[];
     createdAt: string;
 }
 
@@ -456,7 +468,7 @@ class Cobalt {
     }
 
     /**
-     * Handle OAuth for the specified native application.
+     * Handle OAuth for the specified application.
      * @private
      * @param {String} slug The application slug.
      * @param {Object.<string, string>} [params] The key value pairs of auth data.
@@ -501,54 +513,57 @@ class Cobalt {
         });
     }
 
+    /**
+     * Save auth data for the specified keybased application.
+     * @param {String} slug The application slug.
+     * @param {Object.<string, string>} [payload] The key value pairs of auth data.
+     * @returns {Promise<Boolean>} Whether the auth data was saved successfully.
+     */
+    private async keybased(slug: string, payload?: Record<string, string>): Promise<boolean> {
+        const res = await fetch(`${this.baseUrl}/api/v2/app/${slug}/save`, {
+            method: "POST",
+            headers: {
+                authorization: `Bearer ${this.token}`,
+                "content-type": "application/json",
+            },
+            body: JSON.stringify({
+                ...payload,
+            }),
+        });
+
+        if (res.status >= 400 && res.status < 600) {
+            const error = await res.json();
+            throw error;
+        }
+
+        const data = await res.json();
+        return data.success;
+    }
+
     /**
      * Connect the specified application, optionally with the auth data that user provides.
      * @param {String} slug The application slug.
+     * @param {AuthType} authType The auth type to use.
      * @param {Object.<string, string>} [payload] The key value pairs of auth data.
      * @returns {Promise<Boolean>} Whether the connection was successful.
      */
-    public async connect(slug: string, payload?: Record<string, string>): Promise<boolean> {
-        return new Promise(async (resolve, reject) => {
-            try {
-                const app = await this.getApp(slug);
-
-                // oauth
-                if (app && app.auth_type === AuthType.OAuth2) {
-                    const connected = await this.oauth(slug, payload);
-                    resolve(connected);
-                // key based
-                } else {
-                    const res = await fetch(`${this.baseUrl}/api/v2/app/${slug}/save`, {
-                        method: "POST",
-                        headers: {
-                            authorization: `Bearer ${this.token}`,
-                            "content-type": "application/json",
-                        },
-                        body: JSON.stringify({
-                            ...payload,
-                        }),
-                    });
-
-                    if (res.status >= 400 && res.status < 600) {
-                        const error = await res.json();
-                        reject(error);
-                    }
-
-                    const data = await res.json();
-                    resolve(data.success);
-                }
-            } catch (error) {
-                reject(error);
-            }
-        });
+    public async connect(slug: string, authType: AuthType, payload?: Record<string, string>): Promise<boolean> {
+        switch (authType) {
+            case AuthType.OAuth2:
+                return this.oauth(slug, payload);
+            case AuthType.KeyBased:
+                return this.keybased(slug, payload);
+            default:
+                throw new Error(`Invalid auth type: ${authType}`);
+        }
     }
 
     /**
      * Disconnect the specified application and remove any associated data from Cobalt.
      * @param {String} slug The application slug.
-     * @returns {Promise<void>}
+     * @returns {Promise<unknown>}
      */
-    public async disconnect(slug: string): Promise<void> {
+    public async disconnect(slug: string): Promise<unknown> {
         const res = await fetch(`${this.baseUrl}/api/v1/linked-acc/integration/${slug}`, {
             method: "DELETE",
             headers: {
@@ -560,6 +575,8 @@ class Cobalt {
             const error = await res.json();
             throw error;
         }
+
+        return await res.json();
     }
 
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cobaltio/cobalt-js",
-  "version": "8.9.2-beta.1",
+  "version": "9.0.0-beta.1",
   "description": "Cobalt frontend SDK",
   "main": "./cobalt.js",
   "typings": "./cobalt.d.ts",