roboto-js 1.1.6 → 1.1.8

package/package.json

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

package/src/index.js

@@ -82,6 +82,9 @@ export default class Roboto{
   async loadCurrentUser(){
     return this.api.loadCurrentUser();
   }
+  async confirmUserEmail(params){
+    return this.api.confirmUserEmail(params);
+  }
 
   //
   // create and upload files

package/src/rbt_api.js

@@ -61,6 +61,7 @@ export default class RbtApi {
       }
 
       this.iac_session = response.data;
+      this.currentUser = (this.iac_session)? new RbtUser(this.iac_session.user, this.axios): null;
       // update axios instance headers with authtoken
       this.axios.defaults.headers.common['authtoken'] = response.data.authToken;
       
@@ -87,6 +88,7 @@ export default class RbtApi {
 
       // Clear the iac_session and remove the auth token from axios headers
       this.iac_session = null;
+      this.currentUser = null;
       if (this.axios.defaults.headers.common['authtoken']) {
         delete this.axios.defaults.headers.common['authtoken'];
       }
@@ -105,17 +107,48 @@ export default class RbtApi {
 
   async loadCurrentUser(){
 
-    // TODO - get the actual user from the session
-    let params = { id: 'superuser_tom' };
+    try {
+        
+      if(this.currentUser){
+        return this.currentUser;
+      }
+
+      if(this.authtoken){
+
+        let response = await this.refreshAuthToken(this.authtoken);
+        this.currentUser = new RbtUser({ id: response.user.id }, this.axios);
+        this.currentUser.setData(response.user);
+        return this.currentUser;
+        
+        //this.currentOrg = new RbtObject(response.organization, this.axios);
+        //this.currentOrg.type = '<@iac.organization>';
+
+      }
+
+      this.currentUser = null;
+      return null;
+
+    }
+    catch(e){
+      return this._handleError(e);
+    }
+
+  }
+
+
+  async confirmUserEmail(confirmCode){
+
+    let params = { emailConfirmCode: confirmCode };
 
     try {
       
-      const response = await this.axios.post('/user_service/loadUser', [params]);
-      let userData = response?.data?.user;
+      const response = await this.axios.post('/user_service/confirmUserEmail', [params]);
+      
+      if (response.data.ok === false) {
+        return this._handleError(response);
+      }
 
-      let User = new RbtUser({ id: userData.id }, this.axios);
-      User.setData(userData);
-      return User;
+      return response.data;
 
     } catch (e) {
       return this._handleError(e);
@@ -123,6 +156,7 @@ export default class RbtApi {
 
   }
 
+
   async loadUser(userId){
 
     let params = { id: userId };
@@ -148,6 +182,8 @@ export default class RbtApi {
     try {
 
       const response = await this.axios.post('/user_service/refreshAuthToken', [authtoken]);
+
+      debugger;
       return response.data;
 
     } catch (e) {
@@ -167,11 +203,8 @@ export default class RbtApi {
   async registerUser(dataHash={}) {
     try {
       const response = await this.axios.post('/user_service/registerUser', [dataHash]);
-      const record = response.data;
 
-      if(dataHash){
-        record.data = dataHash;
-      }
+      const record = response.data;
       return new RbtUser(record, this.axios);
     } catch (e) {
       debugger;