fix(clerk-js): Revert navigation changes from TaskChooseOrganization

Author: octoper

.changeset/thick-dancers-battle.md

@@ -0,0 +1,5 @@
+---
+'@clerk/backend': minor
+---
+
+Introducing `users.__experimental_passwordUntrusted` action

.changeset/yummy-geese-work.md

@@ -0,0 +1,5 @@
+---
+'@clerk/clerk-react': minor
+---
+
+Expose `buildTasksUrl` parameters

packages/clerk-js/src/ui/components/SessionTasks/tasks/TaskChooseOrganization/ChooseOrganizationScreen.tsx

@@ -122,16 +122,8 @@ const MembershipPreview = (props: { organization: OrganizationResource }) => {
       try {
         await setActive({
           organization,
-          navigate: async ({ session }) => {
-            const task = session.currentTask;
-            if (task && task.key !== 'choose-organization') {
-              await navigate(
-                clerk.buildTasksUrl({
-                  redirectUrl: redirectUrlComplete,
-                }),
-              );
-              return;
-            }
+          navigate: async () => {
+            // TODO(after-auth) ORGS-779 - Handle next tasks
             await navigate(redirectUrlComplete);
           },
         });

packages/clerk-js/src/ui/components/SessionTasks/tasks/TaskChooseOrganization/CreateOrganizationScreen.tsx

@@ -1,4 +1,4 @@
-import { useClerk, useOrganizationList } from '@clerk/shared/react';
+import { useOrganizationList } from '@clerk/shared/react';
 import type { CreateOrganizationParams } from '@clerk/shared/types';
 
 import { useEnvironment } from '@/ui/contexts';
@@ -22,7 +22,6 @@ type CreateOrganizationScreenProps = {
 
 export const CreateOrganizationScreen = (props: CreateOrganizationScreenProps) => {
   const card = useCardState();
-  const clerk = useClerk();
   const { navigate } = useRouter();
   const { redirectUrlComplete } = useTaskChooseOrganizationContext();
   const { createOrganization, isLoaded, setActive } = useOrganizationList({
@@ -61,16 +60,8 @@ export const CreateOrganizationScreen = (props: CreateOrganizationScreenProps) =
 
       await setActive({
         organization,
-        navigate: async ({ session }) => {
-          const task = session.currentTask;
-          if (task && task.key !== 'choose-organization') {
-            await navigate(
-              clerk.buildTasksUrl({
-                redirectUrl: redirectUrlComplete,
-              }),
-            );
-            return;
-          }
+        navigate: async () => {
+          // TODO(after-auth) ORGS-779 - Handle next tasks
           await navigate(redirectUrlComplete);
         },
       });

packages/clerk-js/src/ui/components/SessionTasks/tasks/TaskResetPassword/index.tsx

@@ -75,34 +75,37 @@ const TaskResetPasswordInternal = () => {
   };
 
   const resetPassword = async () => {
-    if (!clerk.user) {
-      return;
-    }
-    passwordField.clearFeedback();
-    confirmField.clearFeedback();
-    try {
-      await updatePasswordWithReverification(clerk.user, [
-        {
-          newPassword: passwordField.value,
-          signOutOfOtherSessions: sessionsField.checked,
-        },
-      ]);
-
-      // Handle the next task if it exists or redirect to the complete url
-      const task = clerk.session?.currentTask;
-      if (task && task.key !== 'reset-password') {
-        await navigate(
-          clerk.buildTasksUrl({
-            redirectUrl: redirectUrlComplete,
-          }),
-        );
+    await card.runAsync(async () => {
+      if (!clerk.user) {
         return;
       }
 
-      await navigate(redirectUrlComplete);
-    } catch (e) {
-      return handleError(e, [passwordField, confirmField], card.setError);
-    }
+      passwordField.clearFeedback();
+      confirmField.clearFeedback();
+      try {
+        await updatePasswordWithReverification(clerk.user, [
+          {
+            newPassword: passwordField.value,
+            signOutOfOtherSessions: sessionsField.checked,
+          },
+        ]);
+
+        // Handle the next task if it exists or redirect to the complete url
+        const task = clerk.session?.currentTask;
+        if (task && task.key !== 'reset-password') {
+          await navigate(
+            clerk.buildTasksUrl({
+              redirectUrl: redirectUrlComplete,
+            }),
+          );
+          return;
+        }
+
+        await navigate(redirectUrlComplete);
+      } catch (e) {
+        return handleError(e, [passwordField, confirmField], card.setError);
+      }
+    });
   };
 
   const identifier = clerk.user?.primaryEmailAddress?.emailAddress ?? clerk.user?.username;