From 45740d510e7356b3e2798379969daee6b0995593 Mon Sep 17 00:00:00 2001
From: wvffle <funkwhale@wvffle.net>
Date: Sat, 30 Jul 2022 18:44:49 +0000
Subject: [PATCH] Migrate signup

---
 front/src/components/admin/SettingsGroup.vue  |   2 +-
 front/src/components/audio/PlayButton.vue     |  14 +-
 front/src/components/audio/podcast/Row.vue    |   2 +-
 front/src/components/auth/ApplicationForm.vue |   2 +-
 front/src/components/auth/SignupForm.vue      | 198 ++++++++----------
 front/src/init/instance.ts                    |   3 +-
 front/src/store/instance.ts                   |   4 +-
 7 files changed, 106 insertions(+), 119 deletions(-)

diff --git a/front/src/components/admin/SettingsGroup.vue b/front/src/components/admin/SettingsGroup.vue
index fc7df1802..b603afc4d 100644
--- a/front/src/components/admin/SettingsGroup.vue
+++ b/front/src/components/admin/SettingsGroup.vue
@@ -85,7 +85,7 @@ const save = async () => {
       values[setting.identifier] = setting.value
     }
 
-    store.dispatch('instance/fetchSettings')
+    await store.dispatch('instance/fetchSettings')
   } catch (error) {
     errors.value = (error as BackendError).backendErrors
   }
diff --git a/front/src/components/audio/PlayButton.vue b/front/src/components/audio/PlayButton.vue
index d2575cf6c..c6c6ae18e 100644
--- a/front/src/components/audio/PlayButton.vue
+++ b/front/src/components/audio/PlayButton.vue
@@ -33,13 +33,13 @@ interface Props extends PlayOptionsProps {
 
 const props = withDefaults(defineProps<Props>(), {
   tracks: () => [],
-  track: () => null,
-  artist: () => null,
-  playlist: () => null,
-  album: () => null,
-  library: () => null,
-  channel: () => null,
-  account: () => null,
+  track: null,
+  artist: null,
+  playlist: null,
+  album: null,
+  library: null,
+  channel: null,
+  account: null,
   dropdownIconClasses: () => ['dropdown'],
   playIconClass: () => 'play icon',
   buttonClasses: () => ['button'],
diff --git a/front/src/components/audio/podcast/Row.vue b/front/src/components/audio/podcast/Row.vue
index 9c46e2320..5bee67dc9 100644
--- a/front/src/components/audio/podcast/Row.vue
+++ b/front/src/components/audio/podcast/Row.vue
@@ -30,7 +30,7 @@ interface Props extends PlayOptionsProps {
 const props = withDefaults(defineProps<Props>(), {
   showArt: true,
   displayActions: true,
-  defaultCover: () => null
+  defaultCover: null
 })
 
 const description = ref('')
diff --git a/front/src/components/auth/ApplicationForm.vue b/front/src/components/auth/ApplicationForm.vue
index 8cd8d48dd..fba4ea1d5 100644
--- a/front/src/components/auth/ApplicationForm.vue
+++ b/front/src/components/auth/ApplicationForm.vue
@@ -21,7 +21,7 @@ interface Props {
 
 const emit = defineEmits<Emits>()
 const props = withDefaults(defineProps<Props>(), {
-  app: () => null,
+  app: null,
   defaults: () => ({})
 })
 
diff --git a/front/src/components/auth/SignupForm.vue b/front/src/components/auth/SignupForm.vue
index 6d69d6290..0886ea409 100644
--- a/front/src/components/auth/SignupForm.vue
+++ b/front/src/components/auth/SignupForm.vue
@@ -1,3 +1,88 @@
+<script setup lang="ts">
+import type { RouteLocationRaw } from 'vue-router'
+import type { BackendError, Form } from '~/types'
+
+import { computed, reactive, ref } from 'vue'
+import { useGettext } from 'vue3-gettext'
+import { useStore } from '~/store'
+
+import axios from 'axios'
+
+import LoginForm from '~/components/auth/LoginForm.vue'
+import PasswordInput from '~/components/forms/PasswordInput.vue'
+import useLogger from '~/composables/useLogger'
+
+interface Props {
+  defaultInvitation?: string | null
+  next?: RouteLocationRaw
+  buttonClasses?: string
+  customization?: Form | null
+  fetchDescriptionHtml?: boolean
+  signupApprovalEnabled?: boolean
+}
+
+const props = withDefaults(defineProps<Props>(), {
+  defaultInvitation: null,
+  next: '/',
+  buttonClasses: 'success',
+  customization: null,
+  fetchDescriptionHtml: false,
+  signupApprovalEnabled: false
+})
+
+const { $pgettext } = useGettext()
+const logger = useLogger()
+const store = useStore()
+
+const labels = computed(() => ({
+  placeholder: $pgettext('Content/Signup/Form/Placeholder', 'Enter your invitation code (case insensitive)'),
+  usernamePlaceholder: $pgettext('Content/Signup/Form/Placeholder', 'Enter your username'),
+  emailPlaceholder: $pgettext('Content/Signup/Form/Placeholder', 'Enter your e-mail address')
+}))
+
+const signupRequiresApproval = computed(() => props.signupApprovalEnabled ?? store.state.instance.settings.moderation.signup_approval_enabled.value)
+const formCustomization = computed(() => props.customization ?? store.state.instance.settings.moderation.signup_form_customization.value)
+
+const payload = reactive({
+  username: '',
+  password1: '',
+  email: '',
+  invitation: props.defaultInvitation,
+  request_fields: {}
+})
+
+const submitted = ref(false)
+const isLoading = ref(false)
+const errors = ref([] as string[])
+const submit = async () => {
+  isLoading.value = true
+  errors.value = []
+
+  try {
+    await axios.post('auth/registration/', {
+      ...payload,
+      password2: payload.password1
+    })
+
+    logger.info('Successfully created account')
+    submitted.value = true
+  } catch (error) {
+    errors.value = (error as BackendError).backendErrors
+  }
+
+  isLoading.value = false
+}
+
+const isLoadingInstanceSetting = ref(false)
+const fetchInstanceSettings = async () => {
+  isLoadingInstanceSetting.value = true
+  await store.dispatch('instance/fetchSettings')
+  isLoadingInstanceSetting.value = false
+}
+
+fetchInstanceSettings()
+</script>
+
 <template>
   <div v-if="submitted">
     <div class="ui success message">
@@ -75,7 +160,7 @@
       <input
         id="username-field"
         ref="username"
-        v-model="username"
+        v-model="payload.username"
         name="username"
         required
         type="text"
@@ -88,7 +173,7 @@
       <input
         id="email-field"
         ref="email"
-        v-model="email"
+        v-model="payload.email"
         name="email"
         required
         type="email"
@@ -98,7 +183,7 @@
     <div class="required field">
       <label for="password-field"><translate translate-context="*/*/*">Password</translate></label>
       <password-input
-        v-model="password"
+        v-model="payload.password1"
         field-id="password-field"
       />
     </div>
@@ -109,7 +194,7 @@
       <label for="invitation-code"><translate translate-context="Content/*/Input.Label">Invitation code</translate></label>
       <input
         id="invitation-code"
-        v-model="invitation"
+        v-model="payload.invitation"
         required
         type="text"
         name="invitation"
@@ -126,16 +211,16 @@
         <textarea
           v-if="field.input_type === 'long_text'"
           :id="`custom-field-${idx}`"
-          v-model="customFields[field.label]"
-          :required="field.required || null"
+          v-model="payload.request_fields[field.label]"
+          :required="field.required"
           rows="5"
         />
         <input
           v-else
           :id="`custom-field-${idx}`"
-          v-model="customFields[field.label]"
+          v-model="payload.request_fields[field.label]"
           type="text"
-          :required="field.required || null"
+          :required="field.required"
         >
       </div>
     </template>
@@ -149,100 +234,3 @@
     </button>
   </form>
 </template>
-
-<script>
-import axios from 'axios'
-
-import LoginForm from '~/components/auth/LoginForm.vue'
-import PasswordInput from '~/components/forms/PasswordInput.vue'
-import useLogger from '~/composables/useLogger'
-
-const logger = useLogger()
-
-export default {
-  components: {
-    LoginForm,
-    PasswordInput
-  },
-  props: {
-    defaultInvitation: { type: String, required: false, default: null },
-    next: { type: String, default: '/' },
-    buttonClasses: { type: String, default: 'success' },
-    customization: { type: Object, default: null }, // ts type: Form
-    fetchDescriptionHtml: { type: Boolean, default: false },
-    signupApprovalEnabled: { type: Boolean, default: null, required: false }
-  },
-  data () {
-    return {
-      username: '',
-      email: '',
-      password: '',
-      isLoadingInstanceSetting: true,
-      errors: [],
-      isLoading: false,
-      invitation: this.defaultInvitation,
-      customFields: {},
-      submitted: false
-    }
-  },
-  computed: {
-    labels () {
-      const placeholder = this.$pgettext(
-        'Content/Signup/Form/Placeholder',
-        'Enter your invitation code (case insensitive)'
-      )
-      const usernamePlaceholder = this.$pgettext('Content/Signup/Form/Placeholder', 'Enter your username')
-      const emailPlaceholder = this.$pgettext('Content/Signup/Form/Placeholder', 'Enter your e-mail address')
-      return {
-        usernamePlaceholder,
-        emailPlaceholder,
-        placeholder
-      }
-    },
-    formCustomization () {
-      return this.customization || this.$store.state.instance.settings.moderation.signup_form_customization.value
-    },
-    signupRequiresApproval () {
-      if (this.signupApprovalEnabled === null) {
-        return this.$store.state.instance.settings.moderation.signup_approval_enabled.value
-      }
-      return this.signupApprovalEnabled
-    }
-  },
-  created () {
-    const self = this
-    // TODO (wvffle): Await action result and remove callback from the instance store
-    this.$store.dispatch('instance/fetchSettings', {
-      callback: function () {
-        self.isLoadingInstanceSetting = false
-      }
-    })
-  },
-  methods: {
-    submit () {
-      const self = this
-      self.isLoading = true
-      this.errors = []
-      const payload = {
-        username: this.username,
-        password1: this.password,
-        password2: this.password,
-        email: this.email,
-        invitation: this.invitation,
-        request_fields: this.customFields
-      }
-      return axios.post('auth/registration/', payload).then(
-        response => {
-          logger.info('Successfully created account')
-          self.submitted = true
-          self.isLoading = false
-        },
-        error => {
-          self.errors = error.backendErrors
-          self.isLoading = false
-        }
-      )
-    }
-  }
-}
-</script>
diff --git a/front/src/init/instance.ts b/front/src/init/instance.ts
index 2282ec60b..2214bc2ca 100644
--- a/front/src/init/instance.ts
+++ b/front/src/init/instance.ts
@@ -22,7 +22,8 @@ export const install: InitModule = async ({ store, router }) => {
 
   const url = urlParams.get('_url')
   if (url) {
-    return router.replace(url)
+    router.replace(url)
+    return
   }
 
   if (!store.state.instance.instanceUrl) {
diff --git a/front/src/store/instance.ts b/front/src/store/instance.ts
index 1c163d7b0..c4fdb66c2 100644
--- a/front/src/store/instance.ts
+++ b/front/src/store/instance.ts
@@ -163,8 +163,7 @@ const store: Module<State, RootState> = {
         commit(`${m}/reset`, null, { root: true })
       })
     },
-    // Send a request to the login URL and save the returned JWT
-    async fetchSettings ({ commit }, payload) {
+    async fetchSettings ({ commit }) {
       const response = await axios.get('instance/settings/')
         .catch(err => logger.error('Error while fetching settings', err.response.data))
 
@@ -180,7 +179,6 @@ const store: Module<State, RootState> = {
       }, {})
 
       commit('settings', sections)
-      payload?.callback?.()
     },
     async fetchFrontSettings ({ state }) {
       const response = await axios.get(`${import.meta.env.BASE_URL}settings.json`)