@budibase/server 2.0.26 → 2.0.28

package/dist/utilities/users.js

@@ -16,15 +16,16 @@ const { BUILTIN_ROLE_IDS } = require("@budibase/backend-core/roles");
 exports.getFullUser = (ctx, userId) => __awaiter(void 0, void 0, void 0, function* () {
     const global = yield getGlobalUser(userId);
     let metadata = {};
+    // always prefer the user metadata _id and _rev
+    delete global._id;
+    delete global._rev;
     try {
         // this will throw an error if the db doesn't exist, or there is no appId
         const db = getAppDB();
         metadata = yield db.get(userId);
     }
     catch (err) {
-        // it is fine if there is no user metadata, just remove global db info
-        delete global._id;
-        delete global._rev;
+        // it is fine if there is no user metadata yet
     }
     delete metadata.csrfToken;
     return Object.assign(Object.assign(Object.assign({}, metadata), global), { roleId: global.roleId || BUILTIN_ROLE_IDS.PUBLIC, tableId: InternalTables.USER_METADATA, 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "2.0.26",
+  "version": "2.0.28",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -77,11 +77,11 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "10.0.3",
-    "@budibase/backend-core": "^2.0.26",
-    "@budibase/client": "^2.0.26",
-    "@budibase/pro": "2.0.25",
-    "@budibase/string-templates": "^2.0.26",
-    "@budibase/types": "^2.0.26",
+    "@budibase/backend-core": "^2.0.28",
+    "@budibase/client": "^2.0.28",
+    "@budibase/pro": "2.0.27",
+    "@budibase/string-templates": "^2.0.28",
+    "@budibase/types": "^2.0.28",
     "@bull-board/api": "3.7.0",
     "@bull-board/koa": "3.9.4",
     "@elastic/elasticsearch": "7.10.0",
@@ -199,5 +199,5 @@
   "optionalDependencies": {
     "oracledb": "5.3.0"
   },
-  "gitHead": "15e6dc221adf6b7aff10d18f35719ccf2da2004a"
+  "gitHead": "fbc9af0c207dbc090438b7d35aeee9ad3229dfc4"
 }

package/src/utilities/users.js

@@ -7,14 +7,17 @@ const { BUILTIN_ROLE_IDS } = require("@budibase/backend-core/roles")
 exports.getFullUser = async (ctx, userId) => {
   const global = await getGlobalUser(userId)
   let metadata = {}
+
+  // always prefer the user metadata _id and _rev
+  delete global._id
+  delete global._rev
+
   try {
     // this will throw an error if the db doesn't exist, or there is no appId
     const db = getAppDB()
     metadata = await db.get(userId)
   } catch (err) {
-    // it is fine if there is no user metadata, just remove global db info
-    delete global._id
-    delete global._rev
+    // it is fine if there is no user metadata yet
   }
   delete metadata.csrfToken
   return {