@budibase/backend-core 2.29.8 → 2.29.13

package/dist/index.js

@@ -53704,7 +53704,10 @@ var require_strategy2 = __commonJS({
           var meta = state2;
           var callbackURL = meta.callbackURL;
           var oauth2 = self2._getOAuth2Client(meta);
-          var params2 = { grant_type: "authorization_code", redirect_uri: callbackURL };
+          var params2 = {
+            grant_type: "authorization_code",
+            redirect_uri: callbackURL
+          };
           if (state2.pkce) {
             params2.code_verifier = state2.params.verifier;
           }
@@ -53818,6 +53821,9 @@ var require_strategy2 = __commonJS({
                       try {
                         var json = JSON.parse(body2);
                         profile.id = json.sub;
+                        if (jwtClaims && jwtClaims.oid) {
+                          profile.id = jwtClaims.oid;
+                        }
                         if (!profile.id) {
                           profile.id = json.user_id;
                         }
@@ -54040,13 +54046,19 @@ var require_strategy2 = __commonJS({
             var verifier = base64url(crypto2.pseudoRandomBytes(32));
             switch (config.pkce) {
               case "S256":
-                params2.code_challenge = base64url(crypto2.createHash("sha256").update(verifier).digest());
+                params2.code_challenge = base64url(
+                  crypto2.createHash("sha256").update(verifier).digest()
+                );
                 break;
               case "plain":
                 params2.code_challenge = verifier;
                 break;
               default:
-                return self2.error(new Error("Unsupported code verifier transformation method: " + config.pkce));
+                return self2.error(
+                  new Error(
+                    "Unsupported code verifier transformation method: " + config.pkce
+                  )
+                );
             }
             params2.code_challenge_method = config.pkce;
             params2.verifier = verifier;
@@ -56098,7 +56110,10 @@ var environment = {
     environment[key] = value;
   },
   ROLLING_LOG_MAX_SIZE: process.env.ROLLING_LOG_MAX_SIZE || "10M",
-  DISABLE_SCIM_CALLS: process.env.DISABLE_SCIM_CALLS
+  DISABLE_SCIM_CALLS: process.env.DISABLE_SCIM_CALLS,
+  BB_ADMIN_USER_EMAIL: process.env.BB_ADMIN_USER_EMAIL,
+  BB_ADMIN_USER_PASSWORD: process.env.BB_ADMIN_USER_PASSWORD,
+  OPENAI_API_KEY: process.env.OPENAI_API_KEY
 };
 for (let [key, value] of Object.entries(environment)) {
   if (value === "0") {
@@ -56188,9 +56203,15 @@ var getCouchInfo = (connection) => {
     throw new Error("CouchDB password not set");
   }
   const authCookie = Buffer.from(`${username}:${password}`).toString("base64");
+  let sqlUrl = environment_default.COUCH_DB_SQL_URL;
+  if (!sqlUrl && urlInfo.url) {
+    const parsed = new URL(urlInfo.url);
+    sqlUrl = urlInfo.url.replace(parsed.port, "4984");
+  }
   return {
     url: urlInfo.url,
-    sqlUrl: environment_default.COUCH_DB_SQL_URL,
+    // clean out any auth credentials
+    sqlUrl: getUrlInfo(sqlUrl).url,
     auth: {
       username,
       password
@@ -56518,6 +56539,11 @@ var CouchDBError = class extends Error {
   }
 };
 function DatabaseWithConnection(dbName, connection, opts) {
+  if (!dbName || !connection) {
+    throw new Error(
+      "Unable to create database without database name or connection"
+    );
+  }
   const db = new DatabaseImpl(dbName, opts, connection);
   return new DDInstrumentedDatabase(db);
 }
@@ -64434,18 +64460,17 @@ var UserDB = class _UserDB {
     }
     const tenantId = getTenantId();
     const db = getGlobalDB();
-    let { email, _id, userGroups = [], roles } = user;
+    const { email, _id, userGroups = [], roles } = user;
     if (!email && !_id) {
       throw new Error("_id or email is required");
     }
     let dbUser;
     if (_id) {
       try {
-        dbUser = await db.get(_id);
-        if (email && dbUser.email !== email) {
-          throw "Email address cannot be changed";
+        dbUser = await getById(_id);
+        if (email && dbUser.email !== email && !opts.allowChangingEmail) {
+          throw new Error("Email address cannot be changed");
         }
-        email = dbUser.email;
       } catch (e) {
         if (e.status === 404) {
         } else {
@@ -64470,12 +64495,13 @@ var UserDB = class _UserDB {
       if (!dbUser && roles?.length) {
         builtUser.roles = { ...roles };
       }
-      let groupPromises = [];
+      const groupPromises = [];
       if (!_id) {
-        _id = builtUser._id;
         if (userGroups.length > 0) {
           for (let groupId of userGroups) {
-            groupPromises.push(_UserDB.groups.addUsers(groupId, [_id]));
+            groupPromises.push(
+              _UserDB.groups.addUsers(groupId, [builtUser._id])
+            );
           }
         }
       }
@@ -64483,6 +64509,9 @@ var UserDB = class _UserDB {
         let response = await db.put(builtUser);
         builtUser._rev = response.rev;
         await handleSaveEvents(builtUser, dbUser);
+        if (dbUser && builtUser.email !== dbUser.email) {
+          await users_exports2.removeUser({ email: dbUser.email });
+        }
         await users_exports2.addUser(
           tenantId,
           builtUser._id,