@fy-/fws-vue 0.5.2 → 0.5.4

package/components/fws/UserFlow.vue

@@ -120,9 +120,6 @@ const userFlow = async (params: paramsType = { initial: false }) => {
     },
   )) as UserFlow;
   if (response.value?.result == "success") {
-    if (props.onSuccess) {
-      await props.onSuccess();
-    }
     if (response.value.data.complete == true && response.value.data.user) {
       store.setUser(response.value.data.user);
       const actualReturnTo = response.value.data.redirect
@@ -130,11 +127,19 @@ const userFlow = async (params: paramsType = { initial: false }) => {
         : returnTo.value;
       session.value = null;
       if (isExternalUrl(actualReturnTo)) {
-        window.location.href = actualReturnTo;
+        if (props.onSuccess) {
+          await props.onSuccess();
+        } else {
+          window.location.href = actualReturnTo;
+        }
       } else {
-        const routeExists = router.resolve(actualReturnTo);
-        if (routeExists.matched.length != 0) router.push(actualReturnTo);
-        else window.location.href = actualReturnTo;
+        if (props.onSuccess) {
+          await props.onSuccess();
+        } else {
+          const routeExists = router.resolve(actualReturnTo);
+          if (routeExists.matched.length != 0) router.push(actualReturnTo);
+          else window.location.href = actualReturnTo;
+        }
       }
       return;
     }

package/components/fws/UserProfileStrict.vue

@@ -5,17 +5,30 @@ import { useUserStore } from "../../stores/user";
 import { useRest } from "../../composables/rest";
 import { useEventBus } from "../../composables/event-bus";
 import { computed, reactive, watchEffect, ref } from "vue";
-import { required } from "@vuelidate/validators";
+import { required, helpers } from "@vuelidate/validators";
+import { useTranslation } from "../../composables/translations";
 
 const rest = useRest();
 const props = withDefaults(
   defineProps<{
     onCompleted?: (data: any) => void;
+    termsText?: string;
+    force18?: boolean;
   }>(),
   {
     onCompleted: () => {},
+    termsText: "",
+    force18: false,
   },
 );
+const ageValidator = (value: any) => {
+  const today = new Date();
+  const birthDate = new Date(value);
+  let age = today.getFullYear() - birthDate.getFullYear();
+  const m = today.getMonth() - birthDate.getMonth();
+  if (m < 0 || (m === 0 && today.getDate() < birthDate.getDate())) age--;
+  return age >= 18 && age <= 2020;
+};
 const userStore = useUserStore();
 const userData = computed(() => userStore.user);
 const eventBus = useEventBus();
@@ -39,6 +52,7 @@ watchEffect(() => {
     AcceptedTerms: userData.value?.AcceptedTerms || true,
   };
 });
+const translate = useTranslation();
 const rules = {
   userData: {
     Username: {
@@ -48,7 +62,13 @@ const rules = {
       required: required,
     },
     Birthdate: {
-      required: required,
+      required,
+      ageValidator: props.force18
+        ? helpers.withMessage(
+            translate("fws_under_18_error_message"),
+            ageValidator,
+          )
+        : undefined,
     },
     AcceptedTerms: {
       required: required,
@@ -120,6 +140,7 @@ const patchUser = async () => {
       :help="$t('fws_accepted_terms_help')"
       :error-vuelidate="v$.userData.AcceptedTerms.$errors"
     />
+    <p class="terms-box" v-if="props.termsText">{{ props.termsText }}</p>
 
     <div class="flex">
       <button type="submit" class="btn defaults primary">

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fy-/fws-vue",
-  "version": "0.5.2",
+  "version": "0.5.4",
   "author": "Florian 'Fy' Gasquez <m@fy.to>",
   "license": "MIT",
   "repository": {