From 1f138f096c331114b1f846811ccbb650860f8351 Mon Sep 17 00:00:00 2001
From: Liana Harris <46411498+LianaHarris360@users.noreply.github.com>
Date: Tue, 18 Jun 2024 15:49:56 -0500
Subject: [PATCH 1/9] Adds string requesting to user to lot in with existing
 username or create new account

---
 kolibri/plugins/user_auth/assets/src/views/SignUpPage.vue | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/kolibri/plugins/user_auth/assets/src/views/SignUpPage.vue b/kolibri/plugins/user_auth/assets/src/views/SignUpPage.vue
index 19fbf58fe2..f341dbb95f 100644
--- a/kolibri/plugins/user_auth/assets/src/views/SignUpPage.vue
+++ b/kolibri/plugins/user_auth/assets/src/views/SignUpPage.vue
@@ -332,6 +332,11 @@
         context:
           'Link to open the Kolibri usage and privacy modal. It will be displayed alongside the text describing collection of demographic user information.',
       },
+      /* eslint-disable kolibri/vue-no-unused-translations */
+      SignInOrCreateAccount: {
+        message: 'Sign in as {username} or start over and create a new account.',
+        context: 'Message prompting user to sign in with existing username or create new account.',
+      },
     },
   };
 

From 02aaf1bcb1809d18c3b7c6512de922e767169ad8 Mon Sep 17 00:00:00 2001
From: Liana Harris <46411498+LianaHarris360@users.noreply.github.com>
Date: Wed, 19 Jun 2024 14:04:39 -0500
Subject: [PATCH 2/9] Update string and link to prompt users to sign in with
 existing username

---
 .../onboarding-forms/UserCredentialsForm.vue  | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/kolibri/plugins/setup_wizard/assets/src/views/onboarding-forms/UserCredentialsForm.vue b/kolibri/plugins/setup_wizard/assets/src/views/onboarding-forms/UserCredentialsForm.vue
index 4faaf9a9b2..fe0738c504 100644
--- a/kolibri/plugins/setup_wizard/assets/src/views/onboarding-forms/UserCredentialsForm.vue
+++ b/kolibri/plugins/setup_wizard/assets/src/views/onboarding-forms/UserCredentialsForm.vue
@@ -42,6 +42,14 @@
         :isUniqueValidator="!selectedUser ? uniqueUsernameValidator : () => true"
       />
 
+      <KRouterLink
+        v-if="usernameNotUnique"
+        :text="$tr('SignInInstead')"
+        :to="SignInRoute"
+        appearance="basic-link"
+        class="link"
+      />
+
       <PasswordTextbox
         ref="passwordTextbox"
         :value.sync="password"
@@ -84,6 +92,7 @@
   import PasswordTextbox from 'kolibri.coreVue.components.PasswordTextbox';
   import PrivacyLinkAndModal from 'kolibri.coreVue.components.PrivacyLinkAndModal';
   import commonSyncElements from 'kolibri.coreVue.mixins.commonSyncElements';
+  import { ERROR_CONSTANTS } from 'kolibri.coreVue.vuex.constants';
   import OnboardingStepBase from '../OnboardingStepBase';
 
   export default {
@@ -192,6 +201,12 @@
           return every([this.usernameValid, this.fullNameValid, this.passwordValid]);
         }
       },
+      usernameNotUnique() {
+        return this.caughtErrors.includes(ERROR_CONSTANTS.USERNAME_ALREADY_EXISTS);
+      },
+      SignInRoute() {
+        return { name: 'LOD_IMPORT_USER_AUTH' };
+      },
     },
     watch: {
       selectedUser(user) {
@@ -287,6 +302,10 @@
         context:
           'The learner is creating their account for an existing facility and is told what that is',
       },
+      SignInInstead: {
+        message: 'Sign in instead?',
+        context: 'Text prompting user to sign in with existing username.',
+      },
     },
   };
 
@@ -317,4 +336,8 @@
     margin: 18px 0 36px;
   }
 
+  .link {
+    padding-bottom: 15px;
+  }
+
 </style>

From b8d7315e9d9d392d1097af552036cb430835977b Mon Sep 17 00:00:00 2001
From: Liana Harris <46411498+LianaHarris360@users.noreply.github.com>
Date: Tue, 18 Jun 2024 15:49:56 -0500
Subject: [PATCH 3/9] Adds string requesting to user to lot in with existing
 username or create new account

---
 kolibri/plugins/user_auth/assets/src/views/SignUpPage.vue | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/kolibri/plugins/user_auth/assets/src/views/SignUpPage.vue b/kolibri/plugins/user_auth/assets/src/views/SignUpPage.vue
index 2329530624..3c9dedfbad 100644
--- a/kolibri/plugins/user_auth/assets/src/views/SignUpPage.vue
+++ b/kolibri/plugins/user_auth/assets/src/views/SignUpPage.vue
@@ -333,6 +333,11 @@
         context:
           'Link to open the Kolibri usage and privacy modal. It will be displayed alongside the text describing collection of demographic user information.',
       },
+      /* eslint-disable kolibri/vue-no-unused-translations */
+      SignInOrCreateAccount: {
+        message: 'Sign in as {username} or start over and create a new account.',
+        context: 'Message prompting user to sign in with existing username or create new account.',
+      },
     },
   };
 

From 3df4723e176ad4ff285c49a033234e774b89e28b Mon Sep 17 00:00:00 2001
From: Liana Harris <46411498+LianaHarris360@users.noreply.github.com>
Date: Wed, 19 Jun 2024 14:04:39 -0500
Subject: [PATCH 4/9] Update string and link to prompt users to sign in with
 existing username

---
 .../onboarding-forms/UserCredentialsForm.vue  | 23 ++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/kolibri/plugins/setup_wizard/assets/src/views/onboarding-forms/UserCredentialsForm.vue b/kolibri/plugins/setup_wizard/assets/src/views/onboarding-forms/UserCredentialsForm.vue
index 76fcd5a07b..dff28f1a82 100644
--- a/kolibri/plugins/setup_wizard/assets/src/views/onboarding-forms/UserCredentialsForm.vue
+++ b/kolibri/plugins/setup_wizard/assets/src/views/onboarding-forms/UserCredentialsForm.vue
@@ -42,6 +42,14 @@
         :isUniqueValidator="!selectedUser ? uniqueUsernameValidator : () => true"
       />
 
+      <KRouterLink
+        v-if="usernameNotUnique"
+        :text="$tr('SignInInstead')"
+        :to="SignInRoute"
+        appearance="basic-link"
+        class="link"
+      />
+
       <PasswordTextbox
         ref="passwordTextbox"
         :value.sync="password"
@@ -83,6 +91,7 @@
   import PasswordTextbox from 'kolibri.coreVue.components.PasswordTextbox';
   import PrivacyLinkAndModal from 'kolibri.coreVue.components.PrivacyLinkAndModal';
   import commonSyncElements from 'kolibri.coreVue.mixins.commonSyncElements';
+  import { ERROR_CONSTANTS } from 'kolibri.coreVue.vuex.constants';
   import OnboardingStepBase from '../OnboardingStepBase';
 
   export default {
@@ -191,6 +200,12 @@
           return every([this.usernameValid, this.fullNameValid, this.passwordValid]);
         }
       },
+      usernameNotUnique() {
+        return this.caughtErrors.includes(ERROR_CONSTANTS.USERNAME_ALREADY_EXISTS);
+      },
+      SignInRoute() {
+        return { name: 'LOD_IMPORT_USER_AUTH' };
+      },
     },
     watch: {
       selectedUser(user) {
@@ -286,12 +301,10 @@
         context:
           'The learner is creating their account for an existing facility and is told what that is',
       },
-      /* eslint-disable kolibri/vue-no-unused-translations */
-      signInInstead: {
+      SignInInstead: {
         message: 'Sign in instead?',
         context: 'Text prompting user to sign in with existing username.',
       },
-      /* eslint-enable kolibri/vue-no-unused-translations */
     },
   };
 
@@ -322,4 +335,8 @@
     margin: 18px 0 36px;
   }
 
+  .link {
+    padding-bottom: 15px;
+  }
+
 </style>

From 1580291d9b3659a7721e8d872a2ed3726d995782 Mon Sep 17 00:00:00 2001
From: "pre-commit-ci-lite[bot]"
 <117423508+pre-commit-ci-lite[bot]@users.noreply.github.com>
Date: Mon, 24 Jun 2024 16:03:30 +0000
Subject: [PATCH 5/9] [pre-commit.ci lite] apply automatic fixes

---
 .../onboarding-forms/UserCredentialsForm.vue  | 441 +++++++++---------
 1 file changed, 217 insertions(+), 224 deletions(-)

diff --git a/kolibri/plugins/setup_wizard/assets/src/views/onboarding-forms/UserCredentialsForm.vue b/kolibri/plugins/setup_wizard/assets/src/views/onboarding-forms/UserCredentialsForm.vue
index 2c9d179209..1623d65d0b 100644
--- a/kolibri/plugins/setup_wizard/assets/src/views/onboarding-forms/UserCredentialsForm.vue
+++ b/kolibri/plugins/setup_wizard/assets/src/views/onboarding-forms/UserCredentialsForm.vue
@@ -1,5 +1,4 @@
 <template>
-
   <OnboardingStepBase
     dir="auto"
     :title="header"
@@ -77,251 +76,246 @@
       </div>
     </slot>
   </OnboardingStepBase>
-
 </template>
 
-
 <script>
 
-  import every from 'lodash/every';
-  import get from 'lodash/get';
-  import commonCoreStrings from 'kolibri.coreVue.mixins.commonCoreStrings';
-  import FullNameTextbox from 'kolibri.coreVue.components.FullNameTextbox';
-  import UsernameTextbox from 'kolibri.coreVue.components.UsernameTextbox';
-  import PasswordTextbox from 'kolibri.coreVue.components.PasswordTextbox';
-  import PrivacyLinkAndModal from 'kolibri.coreVue.components.PrivacyLinkAndModal';
-  import commonSyncElements from 'kolibri.coreVue.mixins.commonSyncElements';
-  import { ERROR_CONSTANTS } from 'kolibri.coreVue.vuex.constants';
-  import OnboardingStepBase from '../OnboardingStepBase';
+    import every from 'lodash/every';
+    import get from 'lodash/get';
+    import commonCoreStrings from 'kolibri.coreVue.mixins.commonCoreStrings';
+    import FullNameTextbox from 'kolibri.coreVue.components.FullNameTextbox';
+    import UsernameTextbox from 'kolibri.coreVue.components.UsernameTextbox';
+    import PasswordTextbox from 'kolibri.coreVue.components.PasswordTextbox';
+    import PrivacyLinkAndModal from 'kolibri.coreVue.components.PrivacyLinkAndModal';
+    import commonSyncElements from 'kolibri.coreVue.mixins.commonSyncElements';
+    import { ERROR_CONSTANTS } from 'kolibri.coreVue.vuex.constants';
+    import OnboardingStepBase from '../OnboardingStepBase';
 
-  export default {
-    name: 'UserCredentialsForm',
-    components: {
-      OnboardingStepBase,
-      FullNameTextbox,
-      UsernameTextbox,
-      PasswordTextbox,
-      PrivacyLinkAndModal,
-    },
-    mixins: [commonCoreStrings, commonSyncElements],
-    inject: ['wizardService'],
-    props: {
-      disabled: {
-        type: Boolean,
-        default: false,
-      },
-      // Pass this as true if you want to handle the continue on your own from a parent component
-      doNotContinue: {
-        type: Boolean,
-        default: false,
-      },
-      step: {
-        type: Number,
-        default: null,
-      },
-      steps: {
-        type: Number,
-        default: null,
-      },
-      footerMessageType: {
-        type: String,
-        default: null,
-      },
-      // A passthrough to the onboarding step base to hide "GO BACK" when needed
-      noBackAction: {
-        type: Boolean,
-        default: false,
-      },
-      uniqueUsernameValidator: {
-        type: Function,
-        default: null,
-      },
-      hidePrivacyLink: {
-        type: Boolean,
-        default: false,
-      },
-      /** Will use learner-focused labels if false -- the data flow is the same in any case **/
-      adminUserLabels: {
-        type: Boolean,
-        default: true,
+    export default {
+      name: 'UserCredentialsForm',
+      components: {
+        OnboardingStepBase,
+        FullNameTextbox,
+        UsernameTextbox,
+        PasswordTextbox,
+        PrivacyLinkAndModal,
       },
-      /**
-       * The user given which will prefill the data for fullName and username
-       */
-      selectedUser: {
-        type: Object,
-        required: false,
-        default: null,
+      mixins: [commonCoreStrings, commonSyncElements],
+      inject: ['wizardService'],
+      props: {
+        disabled: {
+          type: Boolean,
+          default: false,
+        },
+        // Pass this as true if you want to handle the continue on your own from a parent component
+        doNotContinue: {
+          type: Boolean,
+          default: false,
+        },
+        step: {
+          type: Number,
+          default: null,
+        },
+        steps: {
+          type: Number,
+          default: null,
+        },
+        footerMessageType: {
+          type: String,
+          default: null,
+        },
+        // A passthrough to the onboarding step base to hide "GO BACK" when needed
+        noBackAction: {
+          type: Boolean,
+          default: false,
+        },
+        uniqueUsernameValidator: {
+          type: Function,
+          default: null,
+        },
+        hidePrivacyLink: {
+          type: Boolean,
+          default: false,
+        },
+        /** Will use learner-focused labels if false -- the data flow is the same in any case **/
+        adminUserLabels: {
+          type: Boolean,
+          default: true,
+        },
+        /**
+         * The user given which will prefill the data for fullName and username
+         */
+        selectedUser: {
+          type: Object,
+          required: false,
+          default: null,
+        },
+        // Pass in errors with .sync modifier
+        errors: {
+          type: Array,
+          required: false,
+          default: () => [],
+        },
       },
-      // Pass in errors with .sync modifier
-      errors: {
-        type: Array,
-        required: false,
-        default: () => [],
-      },
-    },
-    data() {
-      let user;
-      if (this.selectedUser) {
-        user = this.selectedUser;
-      } else {
-        user = this.$store.state.onboardingData.user;
-      }
-      return {
-        fullName: user.full_name,
-        fullNameValid: false,
-        username: user.username,
-        usernameValid: false,
-        password: '',
-        passwordValid: false,
-        formSubmitted: false,
-        // Property to wrap props.errors and avoid warnings about mutating props
-        caughtErrors: [],
-      };
-    },
-    computed: {
-      header() {
-        return this.adminUserLabels
-          ? this.$tr('adminAccountCreationHeader')
-          : this.$tr('learnerAccountCreationHeader');
-      },
-      description() {
-        return this.adminUserLabels
-          ? this.getCommonSyncString('superAdminPermissionsDescription')
-          : this.$tr('learnerAccountCreationDescription', { facility: this.selectedFacilityName });
-      },
-      selectedFacilityName() {
-        return get(this, 'wizardService.state.context.selectedFacility.name', '');
-      },
-      formIsValid() {
+      data() {
+        let user;
         if (this.selectedUser) {
-          return this.passwordValid;
-        } else {
-          return every([this.usernameValid, this.fullNameValid, this.passwordValid]);
-        }
-      },
-      usernameNotUnique() {
-        return this.caughtErrors.includes(ERROR_CONSTANTS.USERNAME_ALREADY_EXISTS);
-      },
-      SignInRoute() {
-        return { name: 'LOD_IMPORT_USER_AUTH' };
-      },
-    },
-    watch: {
-      selectedUser(user) {
-        // user will be null unless an existing user is selected
-        if (user) {
-          this.fullName = user.full_name;
-          this.username = user.username;
+          user = this.selectedUser;
         } else {
-          // We should clear the form because this is where the user creates a new superuser
-          this.fullName = '';
-          this.username = '';
-        }
-        // Always clear the password field on change
-        this.$nextTick(() => {
-          this.syncOnboardingData();
-          this.focusOnInvalidField();
-        });
-      },
-      errors() {
-        if (this.errors && this.errors.length) {
-          this.focusOnInvalidField();
+          user = this.$store.state.onboardingData.user;
         }
-        this.caughtErrors = this.errors;
-      },
-      caughtErrors() {
-        this.$emit('update:errors', this.caughtErrors);
-      },
-    },
-    mounted() {
-      this.syncOnboardingData();
-    },
-    methods: {
-      syncOnboardingData() {
-        // Set vuex state w/ the form data
-        const payload = {
-          password: this.password,
-          username: this.username,
-          full_name: this.fullName,
+        return {
+          fullName: user.full_name,
+          fullNameValid: false,
+          username: user.username,
+          usernameValid: false,
+          password: '',
+          passwordValid: false,
+          formSubmitted: false,
+          // Property to wrap props.errors and avoid warnings about mutating props
+          caughtErrors: [],
         };
-        this.$store.commit('SET_USER_CREDENTIALS', payload);
       },
-      handleContinue() {
-        // Here we will do some final handoff from Vuex to the XState machine
-        // We syncOnboardingData (to Vuex)
-        // Then we will send the data set in Vuex there into the wizard machine's superuser context
-        // value.
-        // This will ensure that users' selections persist across page reloads as well.
-        this.syncOnboardingData();
-        if (!this.formIsValid) {
-          this.focusOnInvalidField();
-          return;
-        } else {
-          this.$emit('submit');
-
-          if (!this.doNotContinue) {
-            this.wizardService.send({
-              type: 'CONTINUE',
-              value: this.$store.state.onboardingData.user,
-            });
+      computed: {
+        header() {
+          return this.adminUserLabels
+            ? this.$tr('adminAccountCreationHeader')
+            : this.$tr('learnerAccountCreationHeader');
+        },
+        description() {
+          return this.adminUserLabels
+            ? this.getCommonSyncString('superAdminPermissionsDescription')
+            : this.$tr('learnerAccountCreationDescription', { facility: this.selectedFacilityName });
+        },
+        selectedFacilityName() {
+          return get(this, 'wizardService.state.context.selectedFacility.name', '');
+        },
+        formIsValid() {
+          if (this.selectedUser) {
+            return this.passwordValid;
           } else {
-            // still set the onboarding data for the superuser
-            this.wizardService.send({
-              type: 'SET_SUPERUSER',
-              value: this.$store.state.onboardingData.user,
-            });
+            return every([this.usernameValid, this.fullNameValid, this.passwordValid]);
           }
-        }
+        },
+        usernameNotUnique() {
+          return this.caughtErrors.includes(ERROR_CONSTANTS.USERNAME_ALREADY_EXISTS);
+        },
+        SignInRoute() {
+          return { name: 'LOD_IMPORT_USER_AUTH' };
+        },
       },
-      focusOnInvalidField() {
-        this.$nextTick().then(() => {
-          if (!this.fullNameValid) {
-            this.$refs.fullNameTextbox.focus();
-          } else if (!this.usernameValid) {
-            this.$refs.usernameTextbox.focus();
-          } else if (!this.passwordValid) {
-            this.$refs.passwordTextbox.focus();
+      watch: {
+        selectedUser(user) {
+          // user will be null unless an existing user is selected
+          if (user) {
+            this.fullName = user.full_name;
+            this.username = user.username;
+          } else {
+            // We should clear the form because this is where the user creates a new superuser
+            this.fullName = '';
+            this.username = '';
           }
-        });
-      },
-    },
-    $trs: {
-      adminAccountCreationHeader: {
-        message: 'Create super admin',
-        context:
-          "The title of the 'Create a super admin account' section. A super admin can manage all the content and all other Kolibri users on the device.",
-      },
-      learnerAccountCreationHeader: {
-        message: 'Create your account',
-        context: "The title of the 'Create your account' section.",
+          // Always clear the password field on change
+          this.$nextTick(() => {
+            this.syncOnboardingData();
+            this.focusOnInvalidField();
+          });
+        },
+        errors() {
+          if (this.errors && this.errors.length) {
+            this.focusOnInvalidField();
+          }
+          this.caughtErrors = this.errors;
+        },
+        caughtErrors() {
+          this.$emit('update:errors', this.caughtErrors);
+        },
       },
-      learnerAccountCreationDescription: {
-        message: "New account for '{facility}' learning facility",
-        context:
-          'The learner is creating their account for an existing facility and is told what that is',
+      mounted() {
+        this.syncOnboardingData();
       },
-<<<<<<< username-exists-string
-      SignInInstead: {
-        message: 'Sign in instead?',
-        context: 'Text prompting user to sign in with existing username.',
+      methods: {
+        syncOnboardingData() {
+          // Set vuex state w/ the form data
+          const payload = {
+            password: this.password,
+            username: this.username,
+            full_name: this.fullName,
+          };
+          this.$store.commit('SET_USER_CREDENTIALS', payload);
+        },
+        handleContinue() {
+          // Here we will do some final handoff from Vuex to the XState machine
+          // We syncOnboardingData (to Vuex)
+          // Then we will send the data set in Vuex there into the wizard machine's superuser context
+          // value.
+          // This will ensure that users' selections persist across page reloads as well.
+          this.syncOnboardingData();
+          if (!this.formIsValid) {
+            this.focusOnInvalidField();
+            return;
+          } else {
+            this.$emit('submit');
+
+            if (!this.doNotContinue) {
+              this.wizardService.send({
+                type: 'CONTINUE',
+                value: this.$store.state.onboardingData.user,
+              });
+            } else {
+              // still set the onboarding data for the superuser
+              this.wizardService.send({
+                type: 'SET_SUPERUSER',
+                value: this.$store.state.onboardingData.user,
+              });
+            }
+          }
+        },
+        focusOnInvalidField() {
+          this.$nextTick().then(() => {
+            if (!this.fullNameValid) {
+              this.$refs.fullNameTextbox.focus();
+            } else if (!this.usernameValid) {
+              this.$refs.usernameTextbox.focus();
+            } else if (!this.passwordValid) {
+              this.$refs.passwordTextbox.focus();
+            }
+          });
+        },
       },
-=======
-      /* eslint-disable kolibri/vue-no-unused-translations */
-      signInInstead: {
-        message: 'Sign in instead?',
-        context: 'Text prompting user to sign in with existing username.',
+      $trs: {
+        adminAccountCreationHeader: {
+          message: 'Create super admin',
+          context:
+            "The title of the 'Create a super admin account' section. A super admin can manage all the content and all other Kolibri users on the device.",
+        },
+        learnerAccountCreationHeader: {
+          message: 'Create your account',
+          context: "The title of the 'Create your account' section.",
+        },
+        learnerAccountCreationDescription: {
+          message: "New account for '{facility}' learning facility",
+          context:
+            'The learner is creating their account for an existing facility and is told what that is',
+        },
+  <<<<<<< username-exists-string
+        SignInInstead: {
+          message: 'Sign in instead?',
+          context: 'Text prompting user to sign in with existing username.',
+        },
+  =======
+        /* eslint-disable kolibri/vue-no-unused-translations */
+        signInInstead: {
+          message: 'Sign in instead?',
+          context: 'Text prompting user to sign in with existing username.',
+        },
+        /* eslint-enable kolibri/vue-no-unused-translations */
+  >>>>>>> develop
       },
-      /* eslint-enable kolibri/vue-no-unused-translations */
->>>>>>> develop
-    },
-  };
-
+    };
 </script>
 
-
 <style lang="scss" scoped>
-
   .reminder {
     display: table;
     max-width: 480px;
@@ -347,5 +341,4 @@
   .link {
     padding-bottom: 15px;
   }
-
 </style>

From 289b4f3edd2cc5aedc8622e6de28032f1e37fb4c Mon Sep 17 00:00:00 2001
From: Liana Harris <46411498+LianaHarris360@users.noreply.github.com>
Date: Mon, 24 Jun 2024 11:13:39 -0500
Subject: [PATCH 6/9] Manage redirection with state machine

---
 .../assets/src/machines/wizardMachine.js       |  4 ++++
 .../assets/src/views/LodJoinFacility.vue       | 15 ++++++++++++++-
 .../onboarding-forms/UserCredentialsForm.vue   | 18 ++++++------------
 3 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/kolibri/plugins/setup_wizard/assets/src/machines/wizardMachine.js b/kolibri/plugins/setup_wizard/assets/src/machines/wizardMachine.js
index e065e320ce..549517da65 100644
--- a/kolibri/plugins/setup_wizard/assets/src/machines/wizardMachine.js
+++ b/kolibri/plugins/setup_wizard/assets/src/machines/wizardMachine.js
@@ -398,6 +398,10 @@ export const wizardMachine = createMachine(
             on: {
               BACK: 'selectLodSetupType',
               CONTINUE: 'lodJoinLoading',
+              SIGN_IN_INSTEAD: {
+                target: 'lodProceedJoinOrNew',
+                actions: ['setLodType', 'setSelectedImportDeviceFacility'],
+              },
             },
           },
         },
diff --git a/kolibri/plugins/setup_wizard/assets/src/views/LodJoinFacility.vue b/kolibri/plugins/setup_wizard/assets/src/views/LodJoinFacility.vue
index 155c1f5fe4..6f0cd01f02 100644
--- a/kolibri/plugins/setup_wizard/assets/src/views/LodJoinFacility.vue
+++ b/kolibri/plugins/setup_wizard/assets/src/views/LodJoinFacility.vue
@@ -12,6 +12,7 @@
     :noBackAction="false"
     :errors.sync="caughtErrors"
     @submit="handleClickNext"
+    @signInInstead="goToSignIn"
   />
 
 </template>
@@ -24,7 +25,7 @@
   import { ERROR_CONSTANTS } from 'kolibri.coreVue.vuex.constants';
   import commonSyncElements from 'kolibri.coreVue.mixins.commonSyncElements';
   import { SetupWizardResource } from '../api';
-  import { FooterMessageTypes } from '../constants';
+  import { FooterMessageTypes, LodTypePresets as Options } from '../constants';
   import UserCredentialsForm from './onboarding-forms/UserCredentialsForm';
 
   export default {
@@ -90,6 +91,18 @@
           }
         });
       },
+      goToSignIn() {
+        this.wizardService.send({
+          type: 'SIGN_IN_INSTEAD',
+          value: {
+            importDeviceId: this.wizardService.state.context.importDeviceId,
+            importOrJoin: Options.IMPORT,
+            selectedFacility: this.facility,
+            importDevice: this.wizardService.state.context.importDevice,
+            facilitiesCount: this.wizardService.state.context.facilitiesOnDeviceCount,
+          },
+        });
+      },
     },
     $trs: {
       header: {
diff --git a/kolibri/plugins/setup_wizard/assets/src/views/onboarding-forms/UserCredentialsForm.vue b/kolibri/plugins/setup_wizard/assets/src/views/onboarding-forms/UserCredentialsForm.vue
index 48b813a295..b3e72c410f 100644
--- a/kolibri/plugins/setup_wizard/assets/src/views/onboarding-forms/UserCredentialsForm.vue
+++ b/kolibri/plugins/setup_wizard/assets/src/views/onboarding-forms/UserCredentialsForm.vue
@@ -41,12 +41,12 @@
         :isUniqueValidator="!selectedUser ? uniqueUsernameValidator : () => true"
       />
 
-      <KRouterLink
+      <KButton
         v-if="usernameNotUnique"
         :text="$tr('SignInInstead')"
-        :to="SignInRoute"
-        appearance="basic-link"
         class="link"
+        appearance="basic-link"
+        @click="handleSignIn"
       />
 
       <PasswordTextbox
@@ -200,15 +200,6 @@
       usernameNotUnique() {
         return this.caughtErrors.includes(ERROR_CONSTANTS.USERNAME_ALREADY_EXISTS);
       },
-      SignInRoute() {
-        return { name: 'LOD_IMPORT_USER_AUTH' };
-      },
-      usernameNotUnique() {
-        return this.caughtErrors.includes(ERROR_CONSTANTS.USERNAME_ALREADY_EXISTS);
-      },
-      SignInRoute() {
-        return { name: 'LOD_IMPORT_USER_AUTH' };
-      },
     },
     watch: {
       selectedUser(user) {
@@ -288,6 +279,9 @@
           }
         });
       },
+      handleSignIn() {
+        this.$emit('signInInstead');
+      },
     },
     $trs: {
       adminAccountCreationHeader: {

From d2c19c46366bd186b7140b7d1309bbc98ea9dff8 Mon Sep 17 00:00:00 2001
From: Liana Harris <46411498+LianaHarris360@users.noreply.github.com>
Date: Mon, 24 Jun 2024 11:26:59 -0500
Subject: [PATCH 7/9] Remove duplicate import

---
 .../src/views/onboarding-forms/UserCredentialsForm.vue   | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/kolibri/plugins/setup_wizard/assets/src/views/onboarding-forms/UserCredentialsForm.vue b/kolibri/plugins/setup_wizard/assets/src/views/onboarding-forms/UserCredentialsForm.vue
index b3e72c410f..d2c6c85185 100644
--- a/kolibri/plugins/setup_wizard/assets/src/views/onboarding-forms/UserCredentialsForm.vue
+++ b/kolibri/plugins/setup_wizard/assets/src/views/onboarding-forms/UserCredentialsForm.vue
@@ -1,4 +1,5 @@
 <template>
+
   <OnboardingStepBase
     dir="auto"
     :title="header"
@@ -76,9 +77,12 @@
       </div>
     </slot>
   </OnboardingStepBase>
+
 </template>
 
+
 <script>
+
   import every from 'lodash/every';
   import get from 'lodash/get';
   import commonCoreStrings from 'kolibri.coreVue.mixins.commonCoreStrings';
@@ -88,7 +92,6 @@
   import PrivacyLinkAndModal from 'kolibri.coreVue.components.PrivacyLinkAndModal';
   import commonSyncElements from 'kolibri.coreVue.mixins.commonSyncElements';
   import { ERROR_CONSTANTS } from 'kolibri.coreVue.vuex.constants';
-  import { ERROR_CONSTANTS } from 'kolibri.coreVue.vuex.constants';
   import OnboardingStepBase from '../OnboardingStepBase';
 
   export default {
@@ -304,9 +307,12 @@
       },
     },
   };
+
 </script>
 
+
 <style lang="scss" scoped>
+
   .reminder {
     display: table;
     max-width: 480px;
@@ -332,4 +338,5 @@
   .link {
     padding-bottom: 15px;
   }
+
 </style>

From 15bd377471b89c83f9bcc8a38390ef853cf557f5 Mon Sep 17 00:00:00 2001
From: Liana Harris <46411498+LianaHarris360@users.noreply.github.com>
Date: Wed, 26 Jun 2024 08:44:01 -0500
Subject: [PATCH 8/9] Update and remove unused sign in string

---
 .../src/views/onboarding-forms/UserCredentialsForm.vue       | 4 ++--
 kolibri/plugins/user_auth/assets/src/views/SignUpPage.vue    | 5 -----
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/kolibri/plugins/setup_wizard/assets/src/views/onboarding-forms/UserCredentialsForm.vue b/kolibri/plugins/setup_wizard/assets/src/views/onboarding-forms/UserCredentialsForm.vue
index d2c6c85185..85af75d837 100644
--- a/kolibri/plugins/setup_wizard/assets/src/views/onboarding-forms/UserCredentialsForm.vue
+++ b/kolibri/plugins/setup_wizard/assets/src/views/onboarding-forms/UserCredentialsForm.vue
@@ -44,7 +44,7 @@
 
       <KButton
         v-if="usernameNotUnique"
-        :text="$tr('SignInInstead')"
+        :text="$tr('signInInstead')"
         class="link"
         appearance="basic-link"
         @click="handleSignIn"
@@ -301,7 +301,7 @@
         context:
           'The learner is creating their account for an existing facility and is told what that is',
       },
-      SignInInstead: {
+      signInInstead: {
         message: 'Sign in instead?',
         context: 'Text prompting user to sign in with existing username.',
       },
diff --git a/kolibri/plugins/user_auth/assets/src/views/SignUpPage.vue b/kolibri/plugins/user_auth/assets/src/views/SignUpPage.vue
index 3c9dedfbad..2329530624 100644
--- a/kolibri/plugins/user_auth/assets/src/views/SignUpPage.vue
+++ b/kolibri/plugins/user_auth/assets/src/views/SignUpPage.vue
@@ -333,11 +333,6 @@
         context:
           'Link to open the Kolibri usage and privacy modal. It will be displayed alongside the text describing collection of demographic user information.',
       },
-      /* eslint-disable kolibri/vue-no-unused-translations */
-      SignInOrCreateAccount: {
-        message: 'Sign in as {username} or start over and create a new account.',
-        context: 'Message prompting user to sign in with existing username or create new account.',
-      },
     },
   };
 

From b6d0d2d178fa0dfdddaef059af0faac4e06d6f69 Mon Sep 17 00:00:00 2001
From: Liana Harris <46411498+LianaHarris360@users.noreply.github.com>
Date: Mon, 1 Jul 2024 11:03:52 -0500
Subject: [PATCH 9/9] Modify sign up viewsets to ensure exclusion of CSRF
 protection for public signups

---
 kolibri/core/auth/api.py | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/kolibri/core/auth/api.py b/kolibri/core/auth/api.py
index 4bef4681f3..f26f944d46 100644
--- a/kolibri/core/auth/api.py
+++ b/kolibri/core/auth/api.py
@@ -779,12 +779,13 @@ def annotate_queryset(self, queryset):
         return annotate_array_aggregate(queryset, user_ids="membership__user__id")
 
 
-@method_decorator(csrf_protect, name="dispatch")
-class SignUpViewSet(viewsets.GenericViewSet, CreateModelMixin):
-
+class BaseSignUpViewSet(viewsets.GenericViewSet, CreateModelMixin):
     serializer_class = FacilityUserSerializer
 
     def check_can_signup(self, serializer):
+        """
+        Check if the user can sign up to the specified facility.
+        """
         facility = serializer.validated_data["facility"]
         if (
             not facility.dataset.learner_can_sign_up
@@ -793,6 +794,9 @@ def check_can_signup(self, serializer):
             raise PermissionDenied("Cannot sign up to this facility")
 
     def perform_create(self, serializer):
+        """
+        Handle the creation of a new user, including validation and logging in.
+        """
         self.check_can_signup(serializer)
         serializer.save()
         data = serializer.validated_data
@@ -804,8 +808,17 @@ def perform_create(self, serializer):
         login(self.request, authenticated_user)
 
 
+@method_decorator(csrf_protect, name="dispatch")
+class SignUpViewSet(BaseSignUpViewSet):
+    """
+    Viewset for signing up a user with CSRF protection.
+    """
+
+    pass
+
+
 @method_decorator(csrf_exempt, name="dispatch")
-class PublicSignUpViewSet(SignUpViewSet):
+class PublicSignUpViewSet(BaseSignUpViewSet):
     """
     Identical to the SignUpViewset except that it does not login the user.
     This endpoint is intended to allow a FacilityUser in a different facility