Merge pull request #2344 from appwrite/fix-SER-351-Incorrect-otp-options

Author: ItzNotABug

src/lib/components/mfaChallengeFormList.svelte

@@ -69,6 +69,8 @@
                 await createChallenge(AuthenticationFactor.Phone);
             } else if (factors.email) {
                 await createChallenge(AuthenticationFactor.Email);
+            } else if (factors.totp) {
+                challengeType = AuthenticationFactor.Totp;
             }
         }
     });
@@ -98,35 +100,47 @@
 {#if enabledFactors.length > 1}
     <span class="with-separators eyebrow-heading-3">or</span>
     <div class="u-flex-vertical u-gap-8">
-        {#if factors.totp && challengeType !== null && challengeType !== AuthenticationFactor.Totp}
-            <Button
-                secondary
-                fullWidth
-                {disabled}
-                on:click={() => createChallenge(AuthenticationFactor.Totp)}>
-                <Icon icon={IconDeviceMobile} slot="start" size="s" />
-                Authenticator app
-            </Button>
-        {/if}
-        {#if factors.email && challengeType !== AuthenticationFactor.Email}
-            <Button
-                secondary
-                fullWidth
-                {disabled}
-                on:click={() => createChallenge(AuthenticationFactor.Email)}>
-                <Icon icon={IconMail} slot="start" size="s" />
-                Email verification
-            </Button>
-        {/if}
-        {#if factors.phone && challengeType !== AuthenticationFactor.Phone}
-            <Button
-                secondary
-                fullWidth
-                {disabled}
-                on:click={() => createChallenge(AuthenticationFactor.Phone)}>
-                <Icon icon={IconChatAlt} slot="start" size="s" />
-                Phone verification
-            </Button>
+        {#if factors.totp}
+            {#if (challengeType === null || challengeType === AuthenticationFactor.Totp || challengeType === AuthenticationFactor.Recoverycode) && factors.email}
+                <Button
+                    secondary
+                    fullWidth
+                    {disabled}
+                    on:click={() => createChallenge(AuthenticationFactor.Email)}>
+                    <Icon icon={IconMail} slot="start" size="s" />
+                    Email verification
+                </Button>
+            {:else if (challengeType === AuthenticationFactor.Recoverycode && !factors.email) || challengeType === AuthenticationFactor.Email}
+                <Button
+                    secondary
+                    fullWidth
+                    {disabled}
+                    on:click={() => createChallenge(AuthenticationFactor.Totp)}>
+                    <Icon icon={IconDeviceMobile} slot="start" size="s" />
+                    Authenticator app
+                </Button>
+            {/if}
+        {:else}
+            {#if factors.email && challengeType !== AuthenticationFactor.Email}
+                <Button
+                    secondary
+                    fullWidth
+                    {disabled}
+                    on:click={() => createChallenge(AuthenticationFactor.Email)}>
+                    <Icon icon={IconMail} slot="start" size="s" />
+                    Email verification
+                </Button>
+            {/if}
+            {#if factors.phone && challengeType !== AuthenticationFactor.Phone}
+                <Button
+                    secondary
+                    fullWidth
+                    {disabled}
+                    on:click={() => createChallenge(AuthenticationFactor.Phone)}>
+                    <Icon icon={IconChatAlt} slot="start" size="s" />
+                    Phone verification
+                </Button>
+            {/if}
         {/if}
         {#if factors.recoveryCode && challengeType !== AuthenticationFactor.Recoverycode}
             <Button