roboto-js 3.0.0 → 3.0.2

package/dist/esm/rbt_object.js

@@ -351,11 +351,47 @@ var RbtObject = /*#__PURE__*/function () {
       });
       return clonedObject;
     }
+
+    /**
+     * Rebuild read_ids/write_ids record meta from iac grant arrays.
+     * Keeps denormalized columns in sync with dataJson.iac for delta saves.
+     */
+  }, {
+    key: "_syncIacRecordMeta",
+    value: function _syncIacRecordMeta() {
+      var iac = _.get(this._data, 'iac');
+      if (!iac) return;
+      var readIds = new Set();
+      var writeIds = new Set();
+      if (this.type === '<@iac.user>') {
+        writeIds.add(this.id);
+        readIds.add(this.id);
+      }
+      if (iac.creator) {
+        writeIds.add(iac.creator);
+        readIds.add(iac.creator);
+      }
+      var collect = function collect(grants, target) {
+        if (!grants) return;
+        for (var _i = 0, _arr = ['users', 'userGroups', 'organizations', 'userSegments']; _i < _arr.length; _i++) {
+          var key = _arr[_i];
+          if (Array.isArray(grants[key])) {
+            grants[key].forEach(function (id) {
+              return target.add(id);
+            });
+          }
+        }
+      };
+      collect(iac.readGrants, readIds);
+      collect(iac.writeGrants, writeIds);
+      this._internalData.read_ids = Array.from(readIds).join(',');
+      this._internalData.write_ids = Array.from(writeIds).join(',');
+    }
   }, {
     key: "save",
     value: function () {
       var _save = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
-        var _response$data, _response$data2, record, response;
+        var _response$data, _response$data2, iacGrantChange, record, response;
         return _regeneratorRuntime().wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
@@ -366,28 +402,34 @@ var RbtObject = /*#__PURE__*/function () {
               throw new Error('Cannot save object without type');
             case 2:
               _context3.prev = 2;
+              iacGrantChange = (this.rpcMeta.changes || []).some(function (path) {
+                return path.startsWith('iac.readGrants') || path.startsWith('iac.writeGrants');
+              });
+              if (iacGrantChange) {
+                this._syncIacRecordMeta();
+              }
               if (this.rpcMeta.isNew) {
                 record = this.toRecord();
               } else {
                 record = this.toDeltaRecord();
               }
-              _context3.next = 6;
+              _context3.next = 8;
               return this._axios.post('/object_service/saveObject', [record]);
-            case 6:
+            case 8:
               response = _context3.sent;
               if (!(response.data.ok === false)) {
-                _context3.next = 9;
+                _context3.next = 11;
                 break;
               }
               throw new Error(response.data.message);
-            case 9:
+            case 11:
               if (!(((_response$data = response.data) === null || _response$data === void 0 ? void 0 : _response$data.result) == 'NO_CHANGES')) {
-                _context3.next = 12;
+                _context3.next = 14;
                 break;
               }
               this.rpcMeta.isNew = false;
               return _context3.abrupt("return", this);
-            case 12:
+            case 14:
               if ((_response$data2 = response.data) !== null && _response$data2 !== void 0 && _response$data2.newData) {
                 // apply new incoming data
                 this.setData(response.newData);
@@ -397,17 +439,17 @@ var RbtObject = /*#__PURE__*/function () {
               this.type = response.data.type;
               this.rpcMeta.isNew = false;
               return _context3.abrupt("return", this);
-            case 20:
-              _context3.prev = 20;
+            case 22:
+              _context3.prev = 22;
               _context3.t0 = _context3["catch"](2);
               this._error = _context3.t0;
               //console.log(e.response.data);
               throw _context3.t0;
-            case 24:
+            case 26:
             case "end":
               return _context3.stop();
           }
-        }, _callee3, this, [[2, 20]]);
+        }, _callee3, this, [[2, 22]]);
       }));
       function save() {
         return _save.apply(this, arguments);
@@ -524,19 +566,20 @@ var RbtObject = /*#__PURE__*/function () {
                   this.set(groupsPath, _toConsumableArray(new Set([].concat(_toConsumableArray(existingGroups), _toConsumableArray(groupIds)))));
                 }
               }
+              this._syncIacRecordMeta();
 
               // Save if requested
               if (!save) {
-                _context4.next = 15;
+                _context4.next = 16;
                 break;
               }
-              _context4.next = 14;
+              _context4.next = 15;
               return this.save();
-            case 14:
-              return _context4.abrupt("return", _context4.sent);
             case 15:
-              return _context4.abrupt("return", this);
+              return _context4.abrupt("return", _context4.sent);
             case 16:
+              return _context4.abrupt("return", this);
+            case 17:
             case "end":
               return _context4.stop();
           }
@@ -769,19 +812,20 @@ var RbtObject = /*#__PURE__*/function () {
                   return !groupIds.includes(id);
                 }));
               }
+              this._syncIacRecordMeta();
 
               // Save if requested
               if (!save) {
-                _context7.next = 15;
+                _context7.next = 16;
                 break;
               }
-              _context7.next = 14;
+              _context7.next = 15;
               return this.save();
-            case 14:
-              return _context7.abrupt("return", _context7.sent);
             case 15:
-              return _context7.abrupt("return", this);
+              return _context7.abrupt("return", _context7.sent);
             case 16:
+              return _context7.abrupt("return", this);
+            case 17:
             case "end":
               return _context7.stop();
           }

package/dist/esm/version.js

@@ -1,4 +1,4 @@
 // Auto-generated version file
 // DO NOT EDIT - This file is automatically updated from package.json
-// Version: 3.0.0
-export var version = '3.0.0';
+// Version: 3.0.2
+export var version = '3.0.2';

package/package.json

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

package/src/index.js

@@ -298,10 +298,18 @@ export default class Roboto{
   async confirmUserEmail(params){
     return this.api.confirmUserEmail(params);
   }
-
-  //
-  // Organization management
-  //
+  async sendResetEmailViaFlows(email) {
+    return this.api.sendResetEmailViaFlows(email);
+  }
+  async sendRegistrationVerificationEmail(email) {
+    return this.api.sendRegistrationVerificationEmail(email);
+  }
+  async resendRegistrationCode(email) {
+    return this.api.resendRegistrationCode(email);
+  }
+  async completePasswordReset(params) {
+    return this.api.completePasswordReset(params);
+  }
   async loadCurrentOrganization(forceReload = false){
     return this.api.loadCurrentOrganization(forceReload);
   }
@@ -315,7 +323,7 @@ export default class Roboto{
     return this.api.getCurrentOrganization();
   }
   get currentOrganization(){
-    return this.api.currentOrganization;
+    return this.api.getCurrentOrganization();
   }
 
   //

package/src/rbt_api.js

@@ -1,11 +1,36 @@
 import axios from 'axios';
-import CryptoJS from 'crypto-js';
 import RbtObject from './rbt_object.js';
 import RbtUser from './rbt_user.js';
 import RbtFile from './rbt_file.js'; 
 import _ from 'lodash';
 import { openDB } from 'idb';
 
+/** IAC working org preference lives under module-scoped settings (`mod.iac`). Legacy reads still honor `mod.currentOrgId`. */
+const USER_MOD_CURRENT_ORG_IAC = 'mod.iac.currentOrgId';
+const USER_MOD_CURRENT_ORG_LEGACY = 'mod.currentOrgId';
+
+/** @param {import('./rbt_user.js').default|null|undefined} user */
+function readUserCurrentOrgPreference(user) {
+  if (!user || typeof user.get !== 'function') return '';
+
+  let v = user.get(USER_MOD_CURRENT_ORG_IAC);
+  if (v != null && String(v).trim() !== '') return String(v).trim();
+  v = user.get(USER_MOD_CURRENT_ORG_LEGACY);
+  if (v != null && String(v).trim() !== '') return String(v).trim();
+
+  const d = typeof user.getData === 'function' ? user.getData() : {};
+  v = _.get(d, 'mod.iac.currentOrgId') ?? _.get(d, 'mod.currentOrgId');
+  if (v != null && String(v).trim() !== '') return String(v).trim();
+
+  return '';
+}
+
+/** @param {import('./rbt_user.js').default} user */
+function persistUserCurrentOrgPreference(user, orgId) {
+  if (!user?.set || orgId == null || String(orgId).trim() === '') return;
+  user.set(USER_MOD_CURRENT_ORG_IAC, String(orgId).trim());
+}
+
 export default class RbtApi {
 
   constructor({ baseUrl, accesskey, authtoken=null, apikey=null, localStorageAdaptor=null, withCredentials=true }) {
@@ -299,12 +324,11 @@ export default class RbtApi {
 
     try {
        
-      const response = await this.axios.post('/api/iac/loginUser', [{
+      const response = await this.axios.post('/api/iac/login', {
         email: params.email,
-        password: (params.password)? CryptoJS.MD5(params.password).toString(CryptoJS.enc.Hex): null,  // legacy hash password (md5)
-        passwd: params.password || null,  // current password
-        code: params.code || null         // single-use signon code (password resets)
-      }]);
+        password: params.password || null,
+        code: params.code || null,
+      });
 
       if (response.data.ok === false) {
         return this._handleError(response);
@@ -471,24 +495,64 @@ export default class RbtApi {
   }
 
 
-  async confirmUserEmail(confirmCode){
-
-    let params = { emailConfirmCode: confirmCode };
+  /**
+   * Confirm email with either legacy composite string or { email, code } (6-digit from mod-iac-flows).
+   * @param {string|{ email: string, code: string }|{ emailConfirmCode: string }} confirmCodeOrParams
+   */
+  async confirmUserEmail(confirmCodeOrParams) {
+    let params;
+    if (typeof confirmCodeOrParams === 'string') {
+      params = { emailConfirmCode: confirmCodeOrParams };
+    } else if (confirmCodeOrParams && typeof confirmCodeOrParams === 'object') {
+      const { email, code, emailConfirmCode } = confirmCodeOrParams;
+      if (email && code != null && String(code).length > 0) {
+        params = { email, code: String(code) };
+      } else if (emailConfirmCode) {
+        params = { emailConfirmCode };
+      } else {
+        const err = new Error('confirmUserEmail: pass a legacy string, { emailConfirmCode }, or { email, code }');
+        return this._handleError(err);
+      }
+    } else {
+      const err = new Error('confirmUserEmail: invalid argument');
+      return this._handleError(err);
+    }
 
     try {
-      
       const response = await this.axios.post('/api/iac/confirmUserEmail', [params]);
-      
       if (response.data.ok === false) {
         return this._handleError(response);
       }
-
       return response.data;
-
     } catch (e) {
       return this._handleError(e);
     }
+  }
+
+  /** Password reset email — use mod-iac-flows (not deprecated /api/iac/sendPasswordReset). */
+  async sendResetEmailViaFlows(email) {
+    const response = await this.axios.post('/api/iac-flows/sendResetEmail', { email });
+    return response.data;
+  }
+
+  async sendRegistrationVerificationEmail(email) {
+    const response = await this.axios.post('/api/iac-flows/sendRegistrationVerification', { email });
+    return response.data;
+  }
 
+  async resendRegistrationCode(email) {
+    const response = await this.axios.post('/api/iac-flows/resendRegistrationCode', { email });
+    return response.data;
+  }
+
+  async completePasswordReset({ email, code, newPassword }) {
+    const response = await this.axios.post('/api/iac/completePasswordReset', [
+      { email, code, newPassword },
+    ]);
+    if (response.data?.ok === false) {
+      return this._handleError(response);
+    }
+    return response.data;
   }
 
   async loadCurrentUserExtended(){
@@ -516,55 +580,55 @@ export default class RbtApi {
   }
 
   /**
-   * Load current organization for the authenticated user
-   * Organization is determined by:
-   * 1. User's mod.currentOrgId preference
-   * 2. First organization in user.organizations array
-   * 3. null if user has no organizations
-   * 
-   * @param {boolean} forceReload - Force reload from server even if cached
+   * Load current organization for the authenticated user.
+   *
+   * Returns an organization **only when** `user.mod.iac.currentOrgId` is set (explicit selection via
+   * `switchOrganization` / `selectCurrentOrganization`; legacy reads also accept `mod.currentOrgId`).
+   * There is no fallback to “first org”; callers must guide the user to select an org first.
+   *
+   * @param {boolean} forceReload - Force reload from server even if cached ID matches preference
    * @returns {Promise<RbtObject|null>} Organization object or null
    */
   async loadCurrentOrganization(forceReload = false) {
     try {
-      // Return cached if available and not forcing reload
-      if (this.currentOrganization && !forceReload) {
-        //console.log('[RbtApi] Returning cached currentOrganization:', this.currentOrganization.get('name'));
-        return this.currentOrganization;
-      }
-
       // Prevent duplicate concurrent loads
       if (this._loadCurrentOrgPromise) {
-        //console.log('[RbtApi] Organization load already in progress');
         return this._loadCurrentOrgPromise;
       }
 
       this._loadCurrentOrgPromise = (async () => {
         try {
-          // Ensure user is loaded first
           const user = await this.loadCurrentUser();
           if (!user) {
-            //console.log('[RbtApi] No current user, cannot load organization');
+            this.currentOrganization = null;
             return null;
           }
 
-          // Get organization ID from user preferences or first org
-          const userData = user.getData();
-          // organizations array format: [{ id: 'org123', roles: ['owner'] }, ...]
-          const firstOrg = userData.organizations?.[0];
-          const orgId = userData.mod?.currentOrgId || (typeof firstOrg === 'object' ? firstOrg?.id : firstOrg);
-          
+          const orgId = readUserCurrentOrgPreference(user);
+
           if (!orgId) {
-            //console.log('[RbtApi] User has no organizations');
+            //console.log('[RbtApi] No current organization selected (mod.iac.currentOrgId unset)');
+            this.currentOrganization = null;
+            if (this.localStorageAdaptor) {
+              try {
+                await this.localStorageAdaptor.removeItem('currentOrgId');
+              } catch (_) {
+                /* noop */
+              }
+            }
             return null;
           }
-          
-          console.log('[RbtApi] Resolved organization ID:', orgId, 'from:', {
-            modCurrentOrgId: userData.mod?.currentOrgId,
-            firstOrg: firstOrg
-          });
 
-          // Check if we have a cached org ID and it matches
+          if (
+            !forceReload &&
+            this.currentOrganization &&
+            String(this.currentOrganization.id) === orgId
+          ) {
+            return this.currentOrganization;
+          }
+
+          console.log('[RbtApi] Resolved organization ID:', orgId);
+
           if (this.localStorageAdaptor) {
             const cachedOrgId = await this.localStorageAdaptor.getItem('currentOrgId');
             if (cachedOrgId && cachedOrgId !== orgId) {
@@ -572,20 +636,16 @@ export default class RbtApi {
             }
           }
 
-          // Load the organization object
-          //console.log('[RbtApi] Loading organization:', orgId);
-          const org = await this.get('<@iac.organization>', orgId);
-          
+          const org = await this.load('<@iac.organization>', orgId);
+
           if (org) {
-            this.currentOrganization = org; // Already an RbtObject
-            //console.log('[RbtApi] Current organization loaded:', org.get('name'));
-            
-            // Cache in storage if available
+            this.currentOrganization = org;
             if (this.localStorageAdaptor) {
               await this.localStorageAdaptor.setItem('currentOrgId', orgId);
             }
           } else {
             console.warn('[RbtApi] Organization not found or not accessible:', orgId);
+            this.currentOrganization = null;
           }
 
           return this.currentOrganization;
@@ -621,7 +681,7 @@ export default class RbtApi {
       //console.log('[RbtApi] Switching to organization:', orgId);
 
       // Load the new organization
-      const org = await this.get('<@iac.organization>', orgId);
+      const org = await this.load('<@iac.organization>', orgId);
       if (!org) {
         throw new Error(`Organization ${orgId} not found or not accessible`);
       }
@@ -631,7 +691,7 @@ export default class RbtApi {
       // Save preference to user
       try {
         const userObj = await this.loadUser(this.currentUser.id);
-        userObj.set('mod.currentOrgId', orgId);
+        persistUserCurrentOrgPreference(userObj, orgId);
         await userObj.save();
         
         // Update cache
@@ -652,13 +712,17 @@ export default class RbtApi {
   }
 
   /**
-   * Get current organization (null-safe)
-   * Returns cached organization without triggering a load
-   * 
-   * @returns {RbtObject|null} Current organization or null
+   * Get cached current organization (sync, null-safe).
+   * Returns **null** unless `mod.iac.currentOrgId` (or legacy `mod.currentOrgId`) matches `currentOrganization`.
    */
   getCurrentOrganization() {
-    return this.currentOrganization;
+    const org = this.currentOrganization;
+    if (!org) return null;
+    const user = this.currentUser;
+    const selected = readUserCurrentOrgPreference(user);
+    if (!selected) return null;
+    if (String(org.id) !== selected) return null;
+    return org;
   }
 
   /**
@@ -683,8 +747,8 @@ export default class RbtApi {
 
       //console.log('[RbtApi] Selecting organization:', orgId);
 
-      // Load the organization to verify access
-      const org = await this.get('<@iac.organization>', orgId);
+      // Load the organization via object load (not HTTP `get` — passing orgId as params breaks axios).
+      const org = await this.load('<@iac.organization>', orgId);
       if (!org) {
         throw new Error(`Organization ${orgId} not found or not accessible`);
       }
@@ -709,11 +773,9 @@ export default class RbtApi {
         //console.log('[RbtApi] Organization already in user organizations array');
       }
       
-      // Set as current organization preference - handle both nested path formats
-      const modData = user.get('mod') || {};
-      modData.currentOrgId = orgId;
-      user.set('mod', modData);
-      
+      // Set current organization preference under mod.iac (module-namespaced settings)
+      persistUserCurrentOrgPreference(user, orgId);
+
       // Save user record
       //console.log('[RbtApi] Saving user with organization:', orgId);
       await user.save();
@@ -956,6 +1018,7 @@ export default class RbtApi {
    * - excludeAttrs: An array of attribute paths to exclude from the response (e.g., ['details.log', 'internalData']).
    *                 Excludes the specified paths and all their subpaths.
    * - resolveReferences: An array of attribute names whose references should be resolved in the returned objects.
+   * - resolveAttrs: Attribute paths whose mod / reference values should be resolved (e.g., ['configs.mod.guide.completion']).
    * - timeout: A numerical value in milliseconds to set a maximum time limit for the query execution.
    * - cache: Boolean. When true, enables a 10-second response cache for identical queries. Default: false (no caching).
    *
@@ -967,6 +1030,7 @@ export default class RbtApi {
    *     requestAttrs: ['id', 'configs.title'],
    *     excludeAttrs: ['details.log'],
    *     resolveReferences: ['translatableContent'],
+   *     resolveAttrs: ['configs.mod.guide.completion'],
    *     cache: true  // opt-in to 10s response caching
    *   });
    *
@@ -980,7 +1044,7 @@ export default class RbtApi {
       //console.log('RBTAPI.query INIT', type, params);
       
       // Validate parameters - reject invalid parameter names
-      const validParams = ['type', 'where', 'orderBy', 'limit', 'resolveReferences', 'requestAttrs', 'excludeAttrs', 'timeout', 'enableRealtime', 'cache'];
+      const validParams = ['type', 'where', 'orderBy', 'limit', 'resolveReferences', 'resolveAttrs', 'requestAttrs', 'excludeAttrs', 'timeout', 'enableRealtime', 'cache'];
       const invalidParams = Object.keys(params).filter(key => !validParams.includes(key));
       if (invalidParams.length > 0) {
         throw new Error(`Invalid query parameter(s): ${invalidParams.join(', ')}. Valid parameters are: ${validParams.join(', ')}`);

package/src/rbt_object.js

@@ -259,12 +259,54 @@ export default class RbtObject{
     return clonedObject;
   }
 
+  /**
+   * Rebuild read_ids/write_ids record meta from iac grant arrays.
+   * Keeps denormalized columns in sync with dataJson.iac for delta saves.
+   */
+  _syncIacRecordMeta() {
+    const iac = _.get(this._data, 'iac');
+    if (!iac) return;
+
+    const readIds = new Set();
+    const writeIds = new Set();
+
+    if (this.type === '<@iac.user>') {
+      writeIds.add(this.id);
+      readIds.add(this.id);
+    }
+
+    if (iac.creator) {
+      writeIds.add(iac.creator);
+      readIds.add(iac.creator);
+    }
+
+    const collect = (grants, target) => {
+      if (!grants) return;
+      for (const key of ['users', 'userGroups', 'organizations', 'userSegments']) {
+        if (Array.isArray(grants[key])) {
+          grants[key].forEach((id) => target.add(id));
+        }
+      }
+    };
+    collect(iac.readGrants, readIds);
+    collect(iac.writeGrants, writeIds);
+
+    this._internalData.read_ids = Array.from(readIds).join(',');
+    this._internalData.write_ids = Array.from(writeIds).join(',');
+  }
+
   async save() {
     if (!this._internalData.type) {
       throw new Error('Cannot save object without type');
     }
 
     try {
+      const iacGrantChange = (this.rpcMeta.changes || []).some(
+        (path) => path.startsWith('iac.readGrants') || path.startsWith('iac.writeGrants')
+      );
+      if (iacGrantChange) {
+        this._syncIacRecordMeta();
+      }
 
       let record;
       if(this.rpcMeta.isNew){
@@ -399,6 +441,8 @@ export default class RbtObject{
       }
     }
 
+    this._syncIacRecordMeta();
+
     // Save if requested
     if (save) {
       return await this.save();
@@ -558,6 +602,8 @@ export default class RbtObject{
       this.set(groupsPath, existingGroups.filter(id => !groupIds.includes(id)));
     }
 
+    this._syncIacRecordMeta();
+
     // Save if requested
     if (save) {
       return await this.save();

package/src/version.js

@@ -1,4 +1,4 @@
 // Auto-generated version file
 // DO NOT EDIT - This file is automatically updated from package.json
-// Version: 3.0.0
-export const version = '3.0.0';
+// Version: 3.0.2
+export const version = '3.0.2';