@cobaltio/cobalt-js 6.0.0 → 7.0.1

package/README.md

@@ -1,4 +1,4 @@
-# cobalt.js
+# Cobalt Javascript SDK
 Cobalt frontend SDK.
 
 ## Install
@@ -22,10 +22,10 @@ yarn add @cobaltio/cobalt-js
 #### Browser
 ```html
 <!-- use a specific version -->
-<script src="https://cdn.jsdelivr.net/npm/@cobaltio/cobalt-js@3.0.1"></script>
+<script src="https://cdn.jsdelivr.net/npm/@cobaltio/cobalt-js@7.0.0"></script>
 <!-- use a version range instead of a specific version -->
-<script src="https://cdn.jsdelivr.net/npm/@cobaltio/cobalt-js@3"></script>
-<script src="https://cdn.jsdelivr.net/npm/@cobaltio/cobalt-js@3.0"></script>
+<script src="https://cdn.jsdelivr.net/npm/@cobaltio/cobalt-js@7"></script>
+<script src="https://cdn.jsdelivr.net/npm/@cobaltio/cobalt-js@7.0"></script>
 <!-- omit the version completely to use the latest one -->
 <!-- you should NOT use this in production -->
 <script src="https://cdn.jsdelivr.net/npm/@cobaltio/cobalt-js"></script>
@@ -217,6 +217,7 @@ An application in Cobalt.
 | [slug] | <code>String</code> | The application slug for custom apps. |
 | auth_type | <code>&quot;oauth2&quot;</code> \| <code>&quot;keybased&quot;</code> | The type of auth used by application. |
 | [connected] | <code>Boolean</code> | Whether the user has connected the application. |
+| [reauth_required] | <code>Boolean</code> | Whether the connection has expired and re-auth is required. |
 | [auth_input_map] | [<code>Array.&lt;InputField&gt;</code>](#InputField) | The fields required from the user to connect the application (for `keybased` auth type). |
 
 <a name="InputField"></a>

package/cobalt.js

@@ -11,6 +11,7 @@
  * @property {String} [slug] The application slug for custom apps.
  * @property {"oauth2"|"keybased"} auth_type The type of auth used by application.
  * @property {Boolean} [connected] Whether the user has connected the application.
+ * @property {Boolean} [reauth_required] Whether the connection has expired and re-auth is required.
  * @property {InputField[]} [auth_input_map] The fields required from the user to connect the application (for `keybased` auth type).
  */
 
@@ -118,10 +119,11 @@ class Cobalt {
      * specified application.
      * @private
      * @param {String} slug The application slug.
+     * @param {Object.<string, string | number | boolean>} [params={}] The key value pairs of auth data.
      * @returns {Promise<String>} The auth URL where users can authenticate themselves.
      */
-    async getOAuthUrl(slug) {
-        const res = await fetch(`${this.baseUrl}/api/v1/${slug}/integrate`, {
+    async getOAuthUrl(slug, params) {
+        const res = await fetch(`${this.baseUrl}/api/v1/${slug}/integrate?${new URLSearchParams(params).toString()}`, {
             headers: {
                 authorization: `Bearer ${this.token}`,
             },
@@ -139,11 +141,12 @@ class Cobalt {
      * Handle OAuth for the specified native application.
      * @private
      * @param {String} slug The application slug.
+     * @param {Object.<string, string | number | boolean>} [params={}] The key value pairs of auth data.
      * @returns {Promise<Boolean>} Whether the user authenticated.
      */
-    async oauth(slug) {
+    async oauth(slug, params) {
         return new Promise((resolve, reject) => {
-            this.getOAuthUrl(slug)
+            this.getOAuthUrl(slug, params)
             .then(oauthUrl => {
                 const connectWindow = window.open(oauthUrl);
 
@@ -151,7 +154,7 @@ class Cobalt {
                 const interval = setInterval(() => {
                     this.getApp(slug)
                     .then(app => {
-                        if (app && app.connected === true) {
+                        if (app && app.connected === true && !app.reauth_required) {
                             // close auth window
                             connectWindow && connectWindow.close();
                             // clear interval
@@ -186,29 +189,38 @@ class Cobalt {
      * @returns {Promise<Boolean>} Whether the connection was successful.
      */
     async connect(slug, payload) {
-        if (payload) {
-            // save auth
-            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) {
-                throw new Error(res.statusText);
-            }
+        return new Promise(async (resolve, reject) => {
+            try {
+                const app = await this.getApp(slug);
+
+                // oauth
+                if (app?.auth_type ==="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,
+                        }),
+                    });
 
-            const data = await res.json();
-            return data.success;
-        } else {
-            // oauth
-            return this.oauth(slug);
-        }
+                    if (res.status >= 400 && res.status < 600) {
+                        reject(new Error(res.statusText));
+                    }
+
+                    const data = await res.json();
+                    resolve(data.success);
+                }
+            } catch (error) {
+                reject(error);
+            }
+        });
     }
 
     /**

package/docs.md

@@ -159,6 +159,7 @@ An application in Cobalt.
 | [slug] | <code>String</code> | The application slug for custom apps. |
 | auth_type | <code>&quot;oauth2&quot;</code> \| <code>&quot;keybased&quot;</code> | The type of auth used by application. |
 | [connected] | <code>Boolean</code> | Whether the user has connected the application. |
+| [reauth_required] | <code>Boolean</code> | Whether the connection has expired and re-auth is required. |
 | [auth_input_map] | [<code>Array.&lt;InputField&gt;</code>](#InputField) | The fields required from the user to connect the application (for `keybased` auth type). |
 
 <a name="InputField"></a>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cobaltio/cobalt-js",
-  "version": "6.0.0",
+  "version": "7.0.1",
   "description": "Cobalt frontend SDK",
   "main": "./cobalt.js",
   "scripts": {