roboto-js 1.5.5 → 1.6.0

package/dist/esm/index.js

@@ -8,7 +8,7 @@ export { RbtApi, RbtObject, RbtFile
 export default class Roboto {
   constructor({
     host,
-    apiKey,
+    accessKey,
     localStorageAdaptor
   }, proxyReq = null) {
     if (Roboto.instance && !proxyReq) {
@@ -18,8 +18,8 @@ export default class Roboto {
     }
     const isBrowser = typeof window !== "undefined";
     this.config = {
-      apiKey: apiKey,
-      // Use passed apiKey
+      accessKey: accessKey,
+      // Use passed accessKey
       baseUrl: `https://${host}`,
       // Use passed host
       localStorageAdaptor: localStorageAdaptor
@@ -32,10 +32,14 @@ export default class Roboto {
     if (proxyReq && proxyReq.headers) {
       const authtoken = proxyReq.headers.authtoken;
       const accesskey = proxyReq.headers.accesskey;
+      const apikey = proxyReq.headers.apikey;
       // Optionally add more headers as needed
       if (authtoken) {
         this.config.authtoken = authtoken; // Set the authtoken in the config
       }
+      if (apikey) {
+        this.config.apikey = apikey; // Set the authtoken in the config
+      }
       if (accesskey) {
         this.config.accesskey = accesskey; // Set the accesskey in the config
       }

package/dist/esm/rbt_api.js

@@ -7,17 +7,16 @@ import _ from 'lodash';
 import { openDB } from 'idb';
 export default class RbtApi {
   constructor({
-    apiKey,
     baseUrl,
+    accesskey,
     authtoken = null,
-    accesskey = null,
+    apikey = null,
     localStorageAdaptor = null
   }) {
     this.axios = axios.create({
       baseURL: baseUrl,
       headers: {
-        'accesskey': accesskey || apiKey
-        //'authtoken': authTokenToUse
+        'accesskey': accesskey
       }
     });
     if (localStorageAdaptor) {
@@ -37,7 +36,12 @@ export default class RbtApi {
     this.requestCache = {};
 
     // Use the storageAdaptor to get the authToken, if available
-    this.initAuthToken(authtoken);
+    if (authtoken) {
+      this.initAuthToken(authtoken);
+    }
+    if (apikey) {
+      this.initApiKey(apikey);
+    }
   }
   async initAuthToken(authtoken) {
     if (!authtoken && this.localStorageAdaptor) {
@@ -46,6 +50,13 @@ export default class RbtApi {
     this.authtoken = authtoken;
     this.axios.defaults.headers.common['authtoken'] = this.authtoken;
   }
+  async initApiKey(apikey) {
+    if (!apikey && this.localStorageAdaptor) {
+      apikey = await this.localStorageAdaptor.getItem('apikey');
+    }
+    this.apikey = apikey;
+    this.axios.defaults.headers.common['apikey'] = this.apikey;
+  }
   async initLocalDb() {
     this.localDb = await openDB('RBTFileDatabase', 1, {
       upgrade(db) {
@@ -170,7 +181,10 @@ export default class RbtApi {
       if (this.currentUser) {
         return this.currentUser;
       }
-      if (this.authtoken) {
+      if (this.apikey) {
+        // NOT IMPLEMENTED
+        return null;
+      } else if (this.authtoken) {
         let response = await this.refreshAuthToken(this.authtoken);
         if (!response) return null;
         if (response?.user) {
@@ -815,14 +829,25 @@ export default class RbtApi {
       const msg = _.get(err, 'response.data.message', 'Error in API response');
       if (msg.key) {
         //throw new Error(msg.key);
-        throw msg.key;
+        throw {
+          message: msg.key
+        };
       } else {
         //throw new Error(msg);
-        throw msg;
+        throw {
+          message: msg
+        };
       }
     } else {
       //throw new Error(err.message || 'Unknown error');
-      throw err.message || err || 'Unknown error';
+      throw {
+        code: err.code,
+        message: err.message
+      } || {
+        message: err
+      } || {
+        message: 'Unknown error'
+      };
     }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "roboto-js",
-  "version": "1.5.5",
+  "version": "1.6.0",
   "type": "module",
   "description": "",
   "main": "dist/cjs/index.cjs",

package/src/index.js

@@ -13,7 +13,7 @@ export {
 
 export default class Roboto{
 
-  constructor({ host, apiKey, localStorageAdaptor }, proxyReq = null) {
+  constructor({ host, accessKey, localStorageAdaptor }, proxyReq = null) {
 
     if (Roboto.instance && !proxyReq) {
       // if on client, there can only be one instance
@@ -24,7 +24,7 @@ export default class Roboto{
     const isBrowser = typeof window !== "undefined";
 
     this.config = {
-      apiKey: apiKey, // Use passed apiKey
+      accessKey: accessKey, // Use passed accessKey
       baseUrl: `https://${host}`, // Use passed host
       localStorageAdaptor: localStorageAdaptor
     };
@@ -36,13 +36,18 @@ export default class Roboto{
     if (proxyReq && proxyReq.headers) {
       const authtoken = proxyReq.headers.authtoken;
       const accesskey = proxyReq.headers.accesskey;
+      const apikey = proxyReq.headers.apikey;
       // Optionally add more headers as needed
       if (authtoken) {
         this.config.authtoken = authtoken; // Set the authtoken in the config
       }
+      if (apikey) {
+        this.config.apikey = apikey; // Set the authtoken in the config
+      }
       if (accesskey) {
         this.config.accesskey = accesskey; // Set the accesskey in the config
       }
+
     }
 
     this.api = new RbtApi(this.config);

package/src/rbt_api.js

@@ -8,13 +8,12 @@ import { openDB } from 'idb';
 
 export default class RbtApi {
 
-  constructor({ apiKey, baseUrl, authtoken=null, accesskey=null, localStorageAdaptor=null }) {
+  constructor({ baseUrl, accesskey, authtoken=null, apikey=null, localStorageAdaptor=null }) {
     
     this.axios = axios.create({
       baseURL: baseUrl,
       headers: {
-        'accesskey': accesskey || apiKey,
-        //'authtoken': authTokenToUse
+        'accesskey': accesskey
       }
     });
 
@@ -36,7 +35,12 @@ export default class RbtApi {
     this.requestCache = {};
 
     // Use the storageAdaptor to get the authToken, if available
-    this.initAuthToken(authtoken);
+    if(authtoken){
+      this.initAuthToken(authtoken);
+    }
+    if(apikey){
+      this.initApiKey(apikey);
+    }
 
   }
 
@@ -51,6 +55,17 @@ export default class RbtApi {
     
   }
 
+  async initApiKey(apikey) {
+
+    if(!apikey && this.localStorageAdaptor){
+      apikey = await this.localStorageAdaptor.getItem('apikey');
+    }
+
+    this.apikey = apikey;
+    this.axios.defaults.headers.common['apikey'] = this.apikey;
+    
+  }
+
   async initLocalDb(){
 
     this.localDb = await openDB('RBTFileDatabase', 1, {
@@ -215,7 +230,13 @@ export default class RbtApi {
         return this.currentUser;
       }
 
-      if(this.authtoken){
+      if(this.apikey){
+
+        // NOT IMPLEMENTED
+        return null;
+
+      }
+      else if(this.authtoken){
 
         let response = await this.refreshAuthToken(this.authtoken);
         if(!response) return null;
@@ -878,16 +899,16 @@ export default class RbtApi {
 
       if(msg.key){
         //throw new Error(msg.key);
-        throw msg.key;
+        throw { message: msg.key };
       }
       else{
         //throw new Error(msg);
-        throw msg;
+        throw { message: msg };
       }
 
     } else {
       //throw new Error(err.message || 'Unknown error');
-      throw err.message || err || 'Unknown error';
+      throw { code: err.code, message: err.message } || { message: err } || { message: 'Unknown error'};
     }
   }