roboto-js 1.9.4 → 1.9.7

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: 1.9.4
-export var version = '1.9.4';
+// Version: 1.9.7
+export var version = '1.9.7';

package/dist/index.js

@@ -1,3 +1,6 @@
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 function _regenerator() { /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/babel/babel/blob/main/packages/babel-helpers/LICENSE */ var e, t, r = "function" == typeof Symbol ? Symbol : {}, n = r.iterator || "@@iterator", o = r.toStringTag || "@@toStringTag"; function i(r, n, o, i) { var c = n && n.prototype instanceof Generator ? n : Generator, u = Object.create(c.prototype); return _regeneratorDefine2(u, "_invoke", function (r, n, o) { var i, c, u, f = 0, p = o || [], y = !1, G = { p: 0, n: 0, v: e, a: d, f: d.bind(e, 4), d: function d(t, r) { return i = t, c = 0, u = e, G.n = r, a; } }; function d(r, n) { for (c = r, u = n, t = 0; !y && f && !o && t < p.length; t++) { var o, i = p[t], d = G.p, l = i[2]; r > 3 ? (o = l === n) && (u = i[(c = i[4]) ? 5 : (c = 3, 3)], i[4] = i[5] = e) : i[0] <= d && ((o = r < 2 && d < i[1]) ? (c = 0, G.v = n, G.n = i[1]) : d < l && (o = r < 3 || i[0] > n || n > l) && (i[4] = r, i[5] = n, G.n = l, c = 0)); } if (o || r > 1) return a; throw y = !0, n; } return function (o, p, l) { if (f > 1) throw TypeError("Generator is already running"); for (y && 1 === p && d(p, l), c = p, u = l; (t = c < 2 ? e : u) || !y;) { i || (c ? c < 3 ? (c > 1 && (G.n = -1), d(c, u)) : G.n = u : G.v = u); try { if (f = 2, i) { if (c || (o = "next"), t = i[o]) { if (!(t = t.call(i, u))) throw TypeError("iterator result is not an object"); if (!t.done) return t; u = t.value, c < 2 && (c = 0); } else 1 === c && (t = i["return"]) && t.call(i), c < 2 && (u = TypeError("The iterator does not provide a '" + o + "' method"), c = 1); i = e; } else if ((t = (y = G.n < 0) ? u : r.call(n, G)) !== a) break; } catch (t) { i = e, c = 1, u = t; } finally { f = 1; } } return { value: t, done: y }; }; }(r, o, i), !0), u; } var a = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} t = Object.getPrototypeOf; var c = [][n] ? t(t([][n]())) : (_regeneratorDefine2(t = {}, n, function () { return this; }), t), u = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(c); function f(e) { return Object.setPrototypeOf ? Object.setPrototypeOf(e, GeneratorFunctionPrototype) : (e.__proto__ = GeneratorFunctionPrototype, _regeneratorDefine2(e, o, "GeneratorFunction")), e.prototype = Object.create(u), e; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, _regeneratorDefine2(u, "constructor", GeneratorFunctionPrototype), _regeneratorDefine2(GeneratorFunctionPrototype, "constructor", GeneratorFunction), GeneratorFunction.displayName = "GeneratorFunction", _regeneratorDefine2(GeneratorFunctionPrototype, o, "GeneratorFunction"), _regeneratorDefine2(u), _regeneratorDefine2(u, o, "Generator"), _regeneratorDefine2(u, n, function () { return this; }), _regeneratorDefine2(u, "toString", function () { return "[object Generator]"; }), (_regenerator = function _regenerator() { return { w: i, m: f }; })(); }
 function _regeneratorDefine2(e, r, n, t) { var i = Object.defineProperty; try { i({}, "", {}); } catch (e) { i = 0; } _regeneratorDefine2 = function _regeneratorDefine(e, r, n, t) { function o(r, n) { _regeneratorDefine2(e, r, function (e) { return this._invoke(r, n, e); }); } r ? i ? i(e, r, { value: n, enumerable: !t, configurable: !t, writable: !t }) : e[r] = n : (o("next", 0), o("throw", 1), o("return", 2)); }, _regeneratorDefine2(e, r, n, t); }
@@ -232,6 +235,53 @@ var Roboto = /*#__PURE__*/function () {
     value: function recordToInstance(recordHash) {
       return new RbtObject(recordHash, this.api.axios);
     }
+
+    /**
+     * Wraps raw API response data as RbtObject(s)
+     * Use this when receiving raw JSON from custom API endpoints (e.g., /api/tasks/*)
+     * that return database objects instead of using roboto's built-in query methods.
+     * 
+     * @param {Object|Array|null} data - Raw response data (single object or array)
+     * @returns {RbtObject|Array<RbtObject>|null} - Wrapped RbtObject(s) or original value if null/already wrapped
+     * 
+     * @example
+     * // Wrapping a single object
+     * const response = await fetch('/api/tasks/boards/123');
+     * const data = await response.json();
+     * const board = roboto.wrapAsRbtObjects(data.board);
+     * board.set('title', 'New Title');  // Now you can use RbtObject methods
+     * 
+     * @example
+     * // Wrapping an array
+     * const response = await fetch('/api/tasks/boards');
+     * const data = await response.json();
+     * const boards = roboto.wrapAsRbtObjects(data.boards);
+     * boards.forEach(board => console.log(board.get('title')));
+     */
+  }, {
+    key: "wrapAsRbtObjects",
+    value: function wrapAsRbtObjects(data) {
+      var _this2 = this;
+      if (!data) return data;
+
+      // If it's already an RbtObject, return as-is (idempotent)
+      if (typeof data.get === 'function') {
+        return data;
+      }
+
+      // If it's an array, wrap each item
+      if (Array.isArray(data)) {
+        return data.map(function (item) {
+          if (typeof (item === null || item === void 0 ? void 0 : item.get) === 'function') {
+            return item;
+          }
+          return new RbtObject(item, _this2.api.axios);
+        });
+      }
+
+      // Single object - wrap it
+      return new RbtObject(data, this.api.axios);
+    }
   }, {
     key: "_stripHttpsForDomains",
     value: function _stripHttpsForDomains(baseUrl, domains) {
@@ -585,17 +635,77 @@ var Roboto = /*#__PURE__*/function () {
         return _pollTaskProgress.apply(this, arguments);
       }
       return pollTaskProgress;
-    }() //
+    }()
+    /**
+     * Helper to detect if an object looks like a doctree object
+     * @private
+     */
+  }, {
+    key: "_isDoctreeObject",
+    value: function _isDoctreeObject(obj) {
+      if (!obj || _typeof(obj) !== 'object') return false;
+      // Check for standard doctree fields
+      return obj.hasOwnProperty('id') && obj.hasOwnProperty('type') && obj.hasOwnProperty('timeCreated');
+    }
+
+    /**
+     * Auto-wraps response data if it contains doctree objects
+     * @private
+     */
+  }, {
+    key: "_autoWrapResponse",
+    value: function _autoWrapResponse(data) {
+      if (!data) return data;
+
+      // If response has an 'items' array (common pattern), wrap those
+      if (data.items && Array.isArray(data.items)) {
+        if (data.items.length > 0 && this._isDoctreeObject(data.items[0])) {
+          return _objectSpread(_objectSpread({}, data), {}, {
+            items: this.wrapAsRbtObjects(data.items)
+          });
+        }
+      }
+
+      // If response has a single object property that looks like doctree
+      // Check common property names: board, ticket, task, note, etc.
+      for (var _i = 0, _Object$keys = Object.keys(data); _i < _Object$keys.length; _i++) {
+        var key = _Object$keys[_i];
+        if (this._isDoctreeObject(data[key])) {
+          return _objectSpread(_objectSpread({}, data), {}, _defineProperty({}, key, this.wrapAsRbtObjects(data[key])));
+        }
+        // Check if it's an array of doctree objects
+        if (Array.isArray(data[key]) && data[key].length > 0 && this._isDoctreeObject(data[key][0])) {
+          return _objectSpread(_objectSpread({}, data), {}, _defineProperty({}, key, this.wrapAsRbtObjects(data[key])));
+        }
+      }
+
+      // If the root data itself is a doctree object or array of them
+      if (this._isDoctreeObject(data)) {
+        return this.wrapAsRbtObjects(data);
+      }
+      if (Array.isArray(data) && data.length > 0 && this._isDoctreeObject(data[0])) {
+        return this.wrapAsRbtObjects(data);
+      }
+      return data;
+    }
+
+    //
     // Get/Post to endpoint with Roboto authtoken
+    // Automatically wraps doctree objects in responses as RbtObjects
     //
   }, {
     key: "get",
     value: function () {
       var _get = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee18(endpoint, params) {
+        var result;
         return _regenerator().w(function (_context18) {
           while (1) switch (_context18.n) {
             case 0:
-              return _context18.a(2, this.api.get(endpoint, params));
+              _context18.n = 1;
+              return this.api.get(endpoint, params);
+            case 1:
+              result = _context18.v;
+              return _context18.a(2, this._autoWrapResponse(result));
           }
         }, _callee18, this);
       }));
@@ -608,10 +718,15 @@ var Roboto = /*#__PURE__*/function () {
     key: "post",
     value: function () {
       var _post = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee19(endpoint, data) {
+        var result;
         return _regenerator().w(function (_context19) {
           while (1) switch (_context19.n) {
             case 0:
-              return _context19.a(2, this.api.post(endpoint, data));
+              _context19.n = 1;
+              return this.api.post(endpoint, data);
+            case 1:
+              result = _context19.v;
+              return _context19.a(2, this._autoWrapResponse(result));
           }
         }, _callee19, this);
       }));

package/dist/rbt_object.js

@@ -473,6 +473,7 @@ var RbtObject = /*#__PURE__*/function () {
           replace,
           _options$save,
           save,
+          currentIac,
           iac,
           grantType,
           existingUsers,
@@ -497,8 +498,9 @@ var RbtObject = /*#__PURE__*/function () {
               }
               throw new Error('groupIds must be an array');
             case 2:
-              // Get current IAC settings
-              iac = this.get('iac') || {}; // Determine which grant type to update (read or write)
+              // Get current IAC settings and create a deep clone to ensure change detection
+              currentIac = this.get('iac') || {};
+              iac = _.cloneDeep(currentIac); // Determine which grant type to update (read or write)
               grantType = write ? 'writeGrants' : 'readGrants'; // Initialize grants if they don't exist
               if (!iac[grantType]) {
                 iac[grantType] = {};
@@ -733,6 +735,7 @@ var RbtObject = /*#__PURE__*/function () {
           write,
           _options$save3,
           save,
+          currentIac,
           iac,
           grantType,
           _args7 = arguments;
@@ -753,8 +756,9 @@ var RbtObject = /*#__PURE__*/function () {
               }
               throw new Error('groupIds must be an array');
             case 2:
-              // Get current IAC settings
-              iac = this.get('iac') || {}; // Determine which grant type to update (read or write)
+              // Get current IAC settings and create a deep clone to ensure change detection
+              currentIac = this.get('iac') || {};
+              iac = _.cloneDeep(currentIac); // Determine which grant type to update (read or write)
               grantType = write ? 'writeGrants' : 'readGrants'; // Initialize grants if they don't exist
               if (!iac[grantType]) {
                 iac[grantType] = {};

package/dist/version.js

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

package/package.json

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

package/src/cookie_storage_adaptor.js

@@ -25,7 +25,7 @@ export default class CookieStorageAdaptor {
       
       ...options
     }
-    
+    /*
     console.log('[CookieStorageAdaptor] Initialized with options:', {
       secure: this.options.secure,
       sameSite: this.options.sameSite,
@@ -34,7 +34,7 @@ export default class CookieStorageAdaptor {
       domain: this.options.domain,
       prefix: this.options.prefix,
       serverAccessKeys: this.options.serverAccessKeys
-    })
+    })*/
   }
 
   /**
@@ -42,7 +42,6 @@ export default class CookieStorageAdaptor {
    */
   async getItem(key) {
     if (typeof document === 'undefined') {
-      console.log(`[CookieStorageAdaptor] getItem(${key}): document undefined, returning null`)
       return null
     }
     
@@ -53,28 +52,28 @@ export default class CookieStorageAdaptor {
     const decodedCookie = decodeURIComponent(document.cookie)
     const cookies = decodedCookie.split(';')
     
-    console.log(`[CookieStorageAdaptor] getItem(${key}): looking for cookie "${cookieName}" ${usePrefix ? '(prefixed)' : '(server-accessible)'}`)
-    console.log(`[CookieStorageAdaptor] Available cookies:`, cookies.map(c => c.trim().split('=')[0]).join(', '))
+    //console.log(`[CookieStorageAdaptor] getItem(${key}): looking for cookie "${cookieName}" ${usePrefix ? '(prefixed)' : '(server-accessible)'}`)
+    //console.log(`[CookieStorageAdaptor] Available cookies:`, cookies.map(c => c.trim().split('=')[0]).join(', '))
     
     for (let cookie of cookies) {
       cookie = cookie.trim()
       if (cookie.indexOf(name) === 0) {
         const rawValue = cookie.substring(name.length, cookie.length)
-        console.log(`[CookieStorageAdaptor] Found cookie "${cookieName}" with raw value:`, rawValue)
+        //console.log(`[CookieStorageAdaptor] Found cookie "${cookieName}" with raw value:`, rawValue)
         
         // Handle JSON values (like rbtUser)
         try {
           const parsedValue = JSON.parse(rawValue)
-          console.log(`[CookieStorageAdaptor] getItem(${key}): returning parsed JSON:`, parsedValue)
+          //console.log(`[CookieStorageAdaptor] getItem(${key}): returning parsed JSON:`, parsedValue)
           return parsedValue
         } catch {
-          console.log(`[CookieStorageAdaptor] getItem(${key}): returning string value:`, rawValue)
+          //console.log(`[CookieStorageAdaptor] getItem(${key}): returning string value:`, rawValue)
           return rawValue
         }
       }
     }
     
-    console.log(`[CookieStorageAdaptor] getItem(${key}): cookie "${cookieName}" not found, returning null`)
+    //.log(`[CookieStorageAdaptor] getItem(${key}): cookie "${cookieName}" not found, returning null`)
     return null
   }
 
@@ -94,9 +93,9 @@ export default class CookieStorageAdaptor {
     // Stringify objects/arrays like localStorage does
     const cookieValue = typeof value === 'object' ? JSON.stringify(value) : String(value)
     
-    console.log(`[CookieStorageAdaptor] setItem(${key}): storing as "${cookieName}" ${usePrefix ? '(prefixed)' : '(server-accessible)'}`)
-    console.log(`[CookieStorageAdaptor] Original value:`, value)
-    console.log(`[CookieStorageAdaptor] Cookie value:`, cookieValue)
+    //console.log(`[CookieStorageAdaptor] setItem(${key}): storing as "${cookieName}" ${usePrefix ? '(prefixed)' : '(server-accessible)'}`)
+    //console.log(`[CookieStorageAdaptor] Original value:`, value)
+    //console.log(`[CookieStorageAdaptor] Cookie value:`, cookieValue)
     
     // Build cookie string with security options
     const secureFlag = this.options.secure ? '; Secure' : ''
@@ -105,7 +104,7 @@ export default class CookieStorageAdaptor {
     
     const cookieString = `${cookieName}=${encodeURIComponent(cookieValue)}; path=${this.options.path}; max-age=${this.options.maxAge}; SameSite=${this.options.sameSite}${secureFlag}${domainFlag}${httpOnlyFlag}`
     
-    console.log(`[CookieStorageAdaptor] Full cookie string:`, cookieString)
+    //console.log(`[CookieStorageAdaptor] Full cookie string:`, cookieString)
     
     document.cookie = cookieString
     
@@ -131,7 +130,7 @@ export default class CookieStorageAdaptor {
     const usePrefix = !this.options.serverAccessKeys.includes(key)
     const cookieName = usePrefix ? this.options.prefix + key : key
     
-    console.log(`[CookieStorageAdaptor] removeItem(${key}): removing cookie "${cookieName}" ${usePrefix ? '(prefixed)' : '(server-accessible)'}`)
+    //console.log(`[CookieStorageAdaptor] removeItem(${key}): removing cookie "${cookieName}" ${usePrefix ? '(prefixed)' : '(server-accessible)'}`)
     
     // Check if cookie exists before removal
     const existingValue = await this.getItem(key)
@@ -145,7 +144,7 @@ export default class CookieStorageAdaptor {
     const domainFlag = this.options.domain ? `; Domain=${this.options.domain}` : ''
     
     const removalString = `${cookieName}=; path=${this.options.path}; expires=Thu, 01 Jan 1970 00:00:00 GMT; SameSite=${this.options.sameSite}${secureFlag}${domainFlag}`
-    console.log(`[CookieStorageAdaptor] Removal cookie string:`, removalString)
+    //console.log(`[CookieStorageAdaptor] Removal cookie string:`, removalString)
     
     document.cookie = removalString
     

package/src/index.js

@@ -205,6 +205,50 @@ export default class Roboto{
 
   }
 
+  /**
+   * Wraps raw API response data as RbtObject(s)
+   * Use this when receiving raw JSON from custom API endpoints (e.g., /api/tasks/*)
+   * that return database objects instead of using roboto's built-in query methods.
+   * 
+   * @param {Object|Array|null} data - Raw response data (single object or array)
+   * @returns {RbtObject|Array<RbtObject>|null} - Wrapped RbtObject(s) or original value if null/already wrapped
+   * 
+   * @example
+   * // Wrapping a single object
+   * const response = await fetch('/api/tasks/boards/123');
+   * const data = await response.json();
+   * const board = roboto.wrapAsRbtObjects(data.board);
+   * board.set('title', 'New Title');  // Now you can use RbtObject methods
+   * 
+   * @example
+   * // Wrapping an array
+   * const response = await fetch('/api/tasks/boards');
+   * const data = await response.json();
+   * const boards = roboto.wrapAsRbtObjects(data.boards);
+   * boards.forEach(board => console.log(board.get('title')));
+   */
+  wrapAsRbtObjects(data) {
+    if (!data) return data;
+    
+    // If it's already an RbtObject, return as-is (idempotent)
+    if (typeof data.get === 'function') {
+      return data;
+    }
+    
+    // If it's an array, wrap each item
+    if (Array.isArray(data)) {
+      return data.map(item => {
+        if (typeof item?.get === 'function') {
+          return item;
+        }
+        return new RbtObject(item, this.api.axios);
+      });
+    }
+    
+    // Single object - wrap it
+    return new RbtObject(data, this.api.axios);
+  }
+
   _stripHttpsForDomains(baseUrl, domains) {
     return baseUrl.replace(new RegExp(`^https://(${domains.map(domain => domain.replace(/\./g, '\\.')).join('|')})`), 'http://$1');
   }
@@ -255,6 +299,22 @@ export default class Roboto{
     return this.api.confirmUserEmail(params);
   }
 
+  //
+  // Organization management
+  //
+  async loadCurrentOrganization(forceReload = false){
+    return this.api.loadCurrentOrganization(forceReload);
+  }
+  async switchOrganization(orgId){
+    return this.api.switchOrganization(orgId);
+  }
+  getCurrentOrganization(){
+    return this.api.getCurrentOrganization();
+  }
+  get currentOrganization(){
+    return this.api.currentOrganization;
+  }
+
   //
   // create and upload files
   //
@@ -306,15 +366,76 @@ export default class Roboto{
     return this.api.pollTaskProgress(params);
   }
 
+  /**
+   * Helper to detect if an object looks like a doctree object
+   * @private
+   */
+  _isDoctreeObject(obj) {
+    if (!obj || typeof obj !== 'object') return false;
+    // Check for standard doctree fields
+    return obj.hasOwnProperty('id') && 
+           obj.hasOwnProperty('type') && 
+           obj.hasOwnProperty('timeCreated');
+  }
+
+  /**
+   * Auto-wraps response data if it contains doctree objects
+   * @private
+   */
+  _autoWrapResponse(data) {
+    if (!data) return data;
+    
+    // If response has an 'items' array (common pattern), wrap those
+    if (data.items && Array.isArray(data.items)) {
+      if (data.items.length > 0 && this._isDoctreeObject(data.items[0])) {
+        return {
+          ...data,
+          items: this.wrapAsRbtObjects(data.items)
+        };
+      }
+    }
+    
+    // If response has a single object property that looks like doctree
+    // Check common property names: board, ticket, task, note, etc.
+    for (const key of Object.keys(data)) {
+      if (this._isDoctreeObject(data[key])) {
+        return {
+          ...data,
+          [key]: this.wrapAsRbtObjects(data[key])
+        };
+      }
+      // Check if it's an array of doctree objects
+      if (Array.isArray(data[key]) && data[key].length > 0 && this._isDoctreeObject(data[key][0])) {
+        return {
+          ...data,
+          [key]: this.wrapAsRbtObjects(data[key])
+        };
+      }
+    }
+    
+    // If the root data itself is a doctree object or array of them
+    if (this._isDoctreeObject(data)) {
+      return this.wrapAsRbtObjects(data);
+    }
+    if (Array.isArray(data) && data.length > 0 && this._isDoctreeObject(data[0])) {
+      return this.wrapAsRbtObjects(data);
+    }
+    
+    return data;
+  }
+
   //
   // Get/Post to endpoint with Roboto authtoken
+  // Automatically wraps doctree objects in responses as RbtObjects
   //
   async get(endpoint, params){
-    return this.api.get(endpoint, params);
+    const result = await this.api.get(endpoint, params);
+    return this._autoWrapResponse(result);
   }
 
   async post(endpoint, data){
-    return this.api.post(endpoint, data);
+    const result = await this.api.post(endpoint, data);
+    return this._autoWrapResponse(result);
   }
 
 

package/src/rbt_api.js

@@ -55,6 +55,8 @@ export default class RbtApi {
     this.requestCache = {};
     this._loadCurrentUserPromise = null;
     this._loadCurrentUserExtendedPromise = null;
+    this.currentOrganization = null;
+    this._loadCurrentOrgPromise = null;
 
     // Use the storageAdaptor to get the authToken, if available
     this.initAuthToken(authtoken);
@@ -320,6 +322,14 @@ export default class RbtApi {
         // authtoken is automatically stored for server-side access by the adapter
       }
 
+      // Optionally load organization after login (can be disabled with loadOrganization: false)
+      if (params.loadOrganization !== false) {
+        // Kick off org load asynchronously but don't wait for it
+        this.loadCurrentOrganization().catch(err => 
+          console.warn('[RbtApi] Failed to load organization on login:', err)
+        );
+      }
+
       return response.data;
       
     } catch (e) {
@@ -348,6 +358,11 @@ export default class RbtApi {
       if(this.localStorageAdaptor){
         await this.localStorageAdaptor.setItem('authtoken', response.authToken);
       }
+
+      // Load organization after OAuth login
+      this.loadCurrentOrganization().catch(err => 
+        console.warn('[RbtApi] Failed to load organization on OAuth login:', err)
+      );
   
       return response;
       
@@ -371,6 +386,7 @@ export default class RbtApi {
       // Clear the iac_session and remove the auth token from axios headers
       this.iac_session = null;
       this.currentUser = null;
+      this.currentOrganization = null;
       this.authtoken = null;
       if (this.axios.defaults.headers.common['authtoken']) {
         delete this.axios.defaults.headers.common['authtoken'];
@@ -379,6 +395,8 @@ export default class RbtApi {
       // Clear localStorage if it's being used
       if (this.localStorageAdaptor) {
         await this.localStorageAdaptor.removeItem('authtoken');
+        await this.localStorageAdaptor.removeItem('rbtUser');
+        await this.localStorageAdaptor.removeItem('currentOrgId');
       }
 
       // Return some kind of success response or the response from the server
@@ -494,6 +512,152 @@ 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
+   * @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');
+            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);
+          
+          if (!orgId) {
+            console.log('[RbtApi] User has no organizations');
+            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 (this.localStorageAdaptor) {
+            const cachedOrgId = await this.localStorageAdaptor.getItem('currentOrgId');
+            if (cachedOrgId && cachedOrgId !== orgId) {
+              console.log('[RbtApi] Organization changed from cache:', cachedOrgId, '→', orgId);
+            }
+          }
+
+          // Load the organization object
+          console.log('[RbtApi] Loading organization:', orgId);
+          const org = await this.get('<@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
+            if (this.localStorageAdaptor) {
+              await this.localStorageAdaptor.setItem('currentOrgId', orgId);
+            }
+          } else {
+            console.warn('[RbtApi] Organization not found or not accessible:', orgId);
+          }
+
+          return this.currentOrganization;
+        } catch (error) {
+          console.error('[RbtApi] Failed to load current organization:', error);
+          this.currentOrganization = null;
+          return null;
+        }
+      })();
+
+      const result = await this._loadCurrentOrgPromise;
+      this._loadCurrentOrgPromise = null;
+      return result;
+    } catch (error) {
+      this._loadCurrentOrgPromise = null;
+      return this._handleError(error);
+    }
+  }
+
+  /**
+   * Switch to a different organization
+   * Updates user preference and loads the new organization
+   * 
+   * @param {string} orgId - Organization ID to switch to
+   * @returns {Promise<RbtObject>} The new current organization
+   */
+  async switchOrganization(orgId) {
+    try {
+      if (!this.currentUser) {
+        throw new Error('Must be logged in to switch organization');
+      }
+
+      console.log('[RbtApi] Switching to organization:', orgId);
+
+      // Load the new organization
+      const org = await this.get('<@iac.organization>', orgId);
+      if (!org) {
+        throw new Error(`Organization ${orgId} not found or not accessible`);
+      }
+
+      this.currentOrganization = org;
+
+      // Save preference to user
+      try {
+        const userObj = await this.loadUser(this.currentUser.id);
+        userObj.set('mod.currentOrgId', orgId);
+        await userObj.save();
+        
+        // Update cache
+        if (this.localStorageAdaptor) {
+          await this.localStorageAdaptor.setItem('currentOrgId', orgId);
+        }
+        
+        console.log('[RbtApi] Switched to organization:', org.get('name'));
+      } catch (error) {
+        console.warn('[RbtApi] Failed to save organization preference:', error);
+        // Don't throw - switch succeeded even if preference save failed
+      }
+
+      return org;
+    } catch (error) {
+      return this._handleError(error);
+    }
+  }
+
+  /**
+   * Get current organization (null-safe)
+   * Returns cached organization without triggering a load
+   * 
+   * @returns {RbtObject|null} Current organization or null
+   */
+  getCurrentOrganization() {
+    return this.currentOrganization;
+  }
+
 
   async loadUser(userId){