fix oauth selector issue

Author: icecrasher321

apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/workspace-header/components/promote-workspace-modal/promote-workspace-modal.tsx

@@ -360,21 +360,14 @@ export function PromoteWorkspaceModal({
           ) : safeStep === 0 ? (
             <div className='flex flex-col gap-7 px-2'>
               <SettingsSection label='Sync'>
-                <div className='flex flex-col gap-2'>
-                  <ChipDropdown
-                    value={selectedKey}
-                    onChange={setSelectedKey}
-                    options={edgeOptions}
-                    placeholder='Select action'
-                    align='start'
-                    fullWidth
-                  />
-                  {diff.data?.drift ? (
-                    <span className='text-[var(--text-muted)] text-small'>
-                      Target changed since the last sync — syncing will overwrite those changes.
-                    </span>
-                  ) : null}
-                </div>
+                <ChipDropdown
+                  value={selectedKey}
+                  onChange={setSelectedKey}
+                  options={edgeOptions}
+                  placeholder='Select action'
+                  align='start'
+                  fullWidth
+                />
               </SettingsSection>
 
               {workflowChanges.length > 0 ? (

apps/sim/lib/workspaces/fork/lineage/authz.ts

@@ -46,35 +46,13 @@ export class ForkError extends HttpError {
 async function requireWorkspace(
   workspaceId: string,
   userId: string
-): Promise<{
-  workspace: WorkspaceWithOwner
-  hasAccess: boolean
-  canWrite: boolean
-  canAdmin: boolean
-}> {
+): Promise<{ workspace: WorkspaceWithOwner; canAdmin: boolean }> {
   const access = await checkWorkspaceAccess(workspaceId, userId)
   if (!access.exists || !access.workspace) {
     throw new ForkError('Workspace not found', 404)
   }
   await assertForkingEnabled(access.workspace.organizationId)
-  return {
-    workspace: access.workspace,
-    hasAccess: access.hasAccess,
-    canWrite: access.canWrite,
-    canAdmin: access.canAdmin,
-  }
-}
-
-/** Require at least read access; returns the (active) workspace. */
-export async function assertWorkspaceReadAccess(
-  workspaceId: string,
-  userId: string
-): Promise<WorkspaceWithOwner> {
-  const { workspace, hasAccess } = await requireWorkspace(workspaceId, userId)
-  if (!hasAccess) {
-    throw new ForkError('You do not have access to this workspace', 403)
-  }
-  return workspace
+  return { workspace: access.workspace, canAdmin: access.canAdmin }
 }
 
 /** Require admin access; returns the (active) workspace. */
@@ -128,9 +106,10 @@ export interface PromoteAuthorization {
 
 /**
  * Authorize a promote along the strict edge between `currentWorkspaceId` and
- * `otherWorkspaceId`. Requires read on the source and admin on the target (a
- * force replace is destructive). `push` sends current -> other; `pull` brings
- * other -> current.
+ * `otherWorkspaceId`. Requires admin on BOTH the source and the target: a sync
+ * reads the source's deployed workflows/resources and force-replaces the target's,
+ * and the sync surface is only ever offered to workspace admins. `push` sends
+ * current -> other; `pull` brings other -> current.
  */
 export async function assertCanPromote(
   currentWorkspaceId: string,
@@ -144,7 +123,7 @@ export async function assertCanPromote(
   }
   const sourceWorkspaceId = direction === 'push' ? currentWorkspaceId : otherWorkspaceId
   const targetWorkspaceId = direction === 'push' ? otherWorkspaceId : currentWorkspaceId
-  const source = await assertWorkspaceReadAccess(sourceWorkspaceId, userId)
+  const source = await assertWorkspaceAdminAccess(sourceWorkspaceId, userId)
   const target = await assertWorkspaceAdminAccess(targetWorkspaceId, userId)
   return { edge, source, target, sourceWorkspaceId, targetWorkspaceId }
 }

apps/sim/lib/workspaces/fork/mapping/mapping-service.ts

@@ -136,7 +136,16 @@ export async function getForkMappingView(
             (candidate) => candidate.providerId === sourceProviderId
           )
         : targetCandidates[reference.kind]
-    const currentTargetId = resolver(reference.kind, reference.sourceId)
+    // Drop a stored target that no longer exists in (or no longer qualifies for) the
+    // target workspace - e.g. the parent disconnected/deleted the resource since the
+    // mapping was set. The entry then resurfaces as needing a mapping (re-suggested or
+    // required-empty) instead of silently pointing at a dangling id, and the stale row
+    // is overwritten on the next sync.
+    const storedTargetId = resolver(reference.kind, reference.sourceId)
+    const currentTargetId =
+      storedTargetId && candidates.some((candidate) => candidate.id === storedTargetId)
+        ? storedTargetId
+        : null
     const targetId =
       currentTargetId ?? suggestTarget(reference.kind, sourceLabel, sourceProviderId, candidates)