Merge branch 'master' into dependabot/npm_and_yarn/examples/nextjs-api-sales/next-14.2.25

2025-03-25 10:52:25 +00:00 · 2025-03-25 10:52:25 +00:00 · 3e92941a18
parent 2e1d2a6606 8592ca82ac
commit 3e92941a18
3 changed files with 8 additions and 4 deletions
--- a/packages/backend-core/src/users/db.ts
+++ b/packages/backend-core/src/users/db.ts
@ -261,9 +261,13 @@ export class UserDB {
      }
    }

-    const change = dbUser ? 0 : 1 // no change if there is existing user
-
+    let change = 1
    let creatorsChange = 0
+    if (opts.isAccountHolder || dbUser) {
+      change = 0
+      creatorsChange = 1
+    }
+
    if (dbUser) {
      const [isDbUserCreator, isUserCreator] = await creatorsInList([
        dbUser,
--- a/packages/builder/src/components/integration/rest/AuthPicker.svelte
+++ b/packages/builder/src/components/integration/rest/AuthPicker.svelte
@ -65,7 +65,7 @@
 </script>

 <DetailPopover bind:this={popover} {title} align={PopoverAlignment.Right}>
-  <div slot="anchor" class:display-new={!authConfig}>
+  <div slot="anchor" class:display-new={!authConfig && oauth2Enabled}>
    <ActionButton icon="LockClosed" quiet selected>
      {#if !authConfig}
        Authentication
--- a/packages/pro
+++ b/packages/pro
@ -1 +1 @@
-Subproject commit 2991addf939f2b6fb1a258616056f2931348c09b
+Subproject commit 761ec71e1543ef04887d6515f99a2c2911999ebf