fix: user status

src/features/admin/users/components/verifications/VerificationItem.vue

@@ -21,11 +21,11 @@
       <div class="verification-item__date">
         <span class="verification-item__date-label">تاریخ ثبت نام:</span>
         <span class="verification-item__date-value">
-          {{ user.faSubmittedAt || formatJalaaliDate(user.submittedAt) || '—' }}
+          {{ formatJalaaliDate(user.createdAt) || '—' }}
         </span>
       </div>
       <div
-        v-if="user.status === 'pending'"
+        v-if="user.status === 'verified'"
         class="verification-item__badge verification-item__badge--pending"
       >
         <span class="verification-item__dot" />
@@ -92,9 +92,7 @@ const props = defineProps({
 
 const emit = defineEmits(['show-details', 'show-reject-reason', 'verify-user'])
 
-const fullName = computed(
-  () => `${props.user.firstName || ''} ${props.user.lastName || ''}`.trim() || '—'
-)
+const fullName = computed(() => `${props.user.name || ''}`.trim() || '—')
 </script>
 
 <style lang="scss" scoped>

src/features/admin/users/components/verifications/modals/RejectReasonModal.vue

@@ -77,15 +77,12 @@ import TextField from '@/components/form/TextField.vue'
 import { rejectionReasonSchema } from '../../../schema'
 import SelectField from '@/components/form/SelectField.vue'
 import TextareaField from '@/components/form/TextareaField.vue'
-import {
-  adminPendingStudentsKeys,
-  useChangePendingStudentStatusMutation,
-} from '@/services/query/admin-pending-students'
+import { adminUsersKeys, useChangeAdminUserStatusMutation } from '@/services/query/admin-users'
 
 defineOptions({ name: 'RejectReasonModal' })
 
 const queryClient = useQueryClient()
-const changeStatusMutation = useChangePendingStudentStatusMutation()
+const changeStatusMutation = useChangeAdminUserStatusMutation()
 
 const DEFAULT_FORM = { rejectionReason: '', adminNote: '' }
 
@@ -105,16 +102,14 @@ const handleChange = (key, value) => {
 
 const onSubmit = async (data, close) => {
   const { isValid, payload } = await validate(form.value)
-  console.log(errors)
-
   if (!isValid) return
   const id = data?.id
   if (!id) return
   await changeStatusMutation.mutateAsync({
     id,
-    payload: { status: 'rejected', ...payload },
+    payload: { status: 'blocked', ...payload },
   })
-  await queryClient.invalidateQueries({ queryKey: adminPendingStudentsKeys.all })
+  await queryClient.invalidateQueries({ queryKey: adminUsersKeys.all })
   form.value = structuredClone({ ...DEFAULT_FORM })
   resetErrors()
   close()

src/features/admin/users/components/verifications/modals/UserVerificationDetailsModal.vue

@@ -7,7 +7,7 @@
     min-width="auto"
     :show-close-button="true"
   >
-    <template #default="{ data, close }">
+    <template #default>
       <div v-if="!user" class="user-verification-details">
         <p class="user-verification-details__loading">در حال بارگذاری…</p>
       </div>
@@ -203,39 +203,19 @@
             class="user-verification-details__video"
           />
         </section>
-
-        <div class="user-verification-details__divider" />
-
-        <div class="user-verification-details__actions">
-          <BaseButton
-            text="ذخیره به صورت PDF"
-            :loading="pdfLoading"
-            custom-class="user-verification-details__pdf-btn"
-            @click="onSaveAsPdf(data, close)"
-          >
-            <template #appendIcon>
-              <SvgIcon name="arrow-left" :size="18" color="#fff" />
-            </template>
-          </BaseButton>
-        </div>
       </div>
     </template>
   </BasicModal>
 </template>
 
 <script setup>
-import { computed, ref } from 'vue'
+import { computed } from 'vue'
 import useModal from '@/composables/useModal'
 import BasicModal from '@/components/BasicModal.vue'
-import BaseButton from '@/components/BaseButton.vue'
-import SvgIcon from '@/components/icons/SvgIcon.vue'
 import { formatJalaaliDate } from '@/utils/date-utils'
 import LineTitleBlock from '@/components/LineTitleBlock.vue'
+import { useAdminUserQuery } from '@/services/query/admin-users'
 import LineInfoBlock from '@/components/blocks/LineInfoBlock.vue'
-import {
-  usePendingStudentQuery,
-  useDownloadPendingStudentPdfMutation,
-} from '@/services/query/admin-pending-students'
 import {
   AUDIENCE_CONFLICT_RESPONSE,
   COMPETING_PROPAGATOR_RESPONSE,
@@ -258,7 +238,7 @@ const modalData = computed(() => getModal('UserVerificationDetailsModal')?.data
 const userId = computed(() => modalData.value.id ?? null)
 const userIdRef = computed(() => userId.value)
 
-const { data: fetched } = usePendingStudentQuery(userIdRef, {
+const { data: fetched } = useAdminUserQuery(userIdRef, {
   enabled: () => !!userIdRef.value,
 })
 
@@ -293,31 +273,6 @@ const faithProduction = computed(() =>
 const leaderMessage = computed(() =>
   verificationMedia.value.find((m) => m.type === VERIFICATION_MEDIA_TYPE.LEADER_MESSAGE)
 )
-
-const pdfLoading = ref(false)
-const pdfMutation = useDownloadPendingStudentPdfMutation()
-
-const onSaveAsPdf = async (data, close) => {
-  if (!user.value?.id) return
-  pdfLoading.value = true
-  try {
-    const response = await pdfMutation.mutateAsync(user.value.id)
-    const url = response?.data?.downloadUrl || response?.downloadUrl
-    if (url) {
-      const link = document.createElement('a')
-      link.href = url
-      link.target = '_blank'
-      link.download = 'profile.pdf'
-      document.body.append(link)
-      link.click()
-      link.remove()
-    }
-    close()
-  } finally {
-    pdfLoading.value = false
-  }
-  data
-}
 </script>
 
 <style lang="scss" scoped>

src/features/admin/users/pages/UserVerificationPage.vue

@@ -54,12 +54,12 @@ import VerificationItem from '@/features/admin/users/components/verifications/Ve
 import VerificationsFilters from '@/features/admin/users/components/verifications/VerificationsFilters.vue'
 import RejectReasonModal from '@/features/admin/users/components/verifications/modals/RejectReasonModal.vue'
 import RejectReasonDetailsModal from '@/features/admin/users/components/verifications/modals/RejectReasonDetailsModal.vue'
-import UserVerificationDetailsModal from '@/features/admin/users/components/verifications/modals/UserVerificationDetailsModal.vue'
 import {
-  adminPendingStudentsKeys,
-  useChangePendingStudentStatusMutation,
-  usePendingStudentsListQuery,
-} from '@/services/query/admin-pending-students'
+  adminUsersKeys,
+  useAdminUsersListQuery,
+  useChangeAdminUserStatusMutation,
+} from '@/services/query/admin-users'
+import UserVerificationDetailsModal from '@/features/admin/users/components/verifications/modals/UserVerificationDetailsModal.vue'
 
 const queryClient = useQueryClient()
 const { openModal, isModal } = useModal()
@@ -67,7 +67,9 @@ const { openModal, isModal } = useModal()
 const filters = ref({ name: '', nationalCode: '', fromDate: '', toDate: '' })
 const { pagination, setPage, reset: resetPagination } = usePagination({ page: 1, perPage: 10 })
 
-const { data, isLoading } = usePendingStudentsListQuery(filters, pagination, {
+const listFilters = computed(() => ({ ...filters.value, status: 'verified' }))
+
+const { data, isLoading } = useAdminUsersListQuery(listFilters, pagination, {
   keepPreviousData: true,
 })
 
@@ -81,7 +83,7 @@ const paginationMeta = computed(() => ({
 const onFilterApply = () => resetPagination()
 const onFilterReset = () => resetPagination()
 
-const changeStatusMutation = useChangePendingStudentStatusMutation()
+const changeStatusMutation = useChangeAdminUserStatusMutation()
 
 const onVerifyUser = ({ id, status }) => {
   if (status === 'rejected') {
@@ -91,7 +93,7 @@ const onVerifyUser = ({ id, status }) => {
   changeStatusMutation.mutate(
     { id, payload: { status } },
     {
-      onSuccess: () => queryClient.invalidateQueries({ queryKey: adminPendingStudentsKeys.all }),
+      onSuccess: () => queryClient.invalidateQueries({ queryKey: adminUsersKeys.all }),
     }
   )
 }

src/features/auth/components/LoginWithVerifyCodeForm.vue

@@ -56,7 +56,7 @@ import TextField from '@/components/form/TextField.vue'
 import { loginWithCodeSchema } from '@/features/auth/schema'
 import AuthHeading from '@/features/auth/components/AuthHeading.vue'
 import AuthCopyright from '@/features/auth/components/AuthCopyright.vue'
-import { useForgotPasswordMutation, useLoginWithCodeMutation } from '@/services/query/auth'
+import { useForgotPasswordMutation, useRequestLoginOtpMutation } from '@/services/query/auth'
 
 const props = defineProps({
   mode: { type: String, default: 'loginWithCode' },
@@ -71,20 +71,20 @@ const form = ref({ phone: '' })
 const { validate, validateAt, errors } = useYup(schema)
 
 const { savePhoneNumber } = useAuth()
-const loginCodeMutation = useLoginWithCodeMutation()
+const requestLoginOtpMutation = useRequestLoginOtpMutation()
 const forgotPasswordMutation = useForgotPasswordMutation()
 
 const loading = computed(
-  () => loginCodeMutation.isPending.value || forgotPasswordMutation.isPending.value
+  () => requestLoginOtpMutation.isPending.value || forgotPasswordMutation.isPending.value
 )
 
 const onSubmit = async () => {
   const { isValid, payload } = await validate(form.value)
   if (!isValid) return
   if (isForgotPassword.value) {
-    await forgotPasswordMutation.mutateAsync(payload)
+    await forgotPasswordMutation.mutateAsync({ phone: payload.phone })
   } else {
-    await loginCodeMutation.mutateAsync(payload)
+    await requestLoginOtpMutation.mutateAsync({ phone: payload.phone })
   }
   savePhoneNumber(payload.phone)
   emit('next', { phone: payload.phone, mode: props.mode })

src/features/auth/components/VerifyCodeForm.vue

@@ -55,10 +55,12 @@ import TextField from '@/components/form/TextField.vue'
 import { verifyCodeSchema } from '@/features/auth/schema'
 import AuthHeading from '@/features/auth/components/AuthHeading.vue'
 import AuthCopyright from '@/features/auth/components/AuthCopyright.vue'
+import { usePasswordReset } from '@/features/auth/composables/usePasswordReset'
 import { useRedirectAfterLogin } from '@/features/auth/composables/useRedirectAfterLogin'
 import {
   useForgotPasswordMutation,
-  useLoginWithCodeMutation,
+  useRequestLoginOtpMutation,
+  useVerifyLoginOtpMutation,
   useResendVerificationCodeMutation,
   useVerifyCodeMutation,
   useVerifyForgotPasswordCodeMutation,
@@ -76,15 +78,16 @@ const form = ref({ verifyCode: '' })
 const { validate, validateAt, errors } = useYup(schema)
 
 const { applySession } = useAuth()
+const { setResetTicket } = usePasswordReset()
 const router = useRouter()
 const redirectAfterLogin = useRedirectAfterLogin()
 
-const verifyLoginMutation = useLoginWithCodeMutation()
+const verifyLoginMutation = useVerifyLoginOtpMutation()
 const verifySignupMutation = useVerifyCodeMutation()
 const verifyForgotMutation = useVerifyForgotPasswordCodeMutation()
 const resendCodeMutation = useResendVerificationCodeMutation()
 const forgotMutation = useForgotPasswordMutation()
-const loginCodeMutation = useLoginWithCodeMutation()
+const requestLoginOtpMutation = useRequestLoginOtpMutation()
 
 const submitting = computed(
   () =>
@@ -97,37 +100,43 @@ const resending = computed(
   () =>
     resendCodeMutation.isPending.value ||
     forgotMutation.isPending.value ||
-    loginCodeMutation.isPending.value
+    requestLoginOtpMutation.isPending.value
 )
 
 const onSubmit = async () => {
   const { isValid, payload } = await validate(form.value)
   if (!isValid) return
-  const body = { phone: props.phoneNumber, verifyCode: payload.verifyCode }
+  const code = payload.verifyCode
 
   if (props.mode === 'loginWithCode') {
-    const response = await verifyLoginMutation.mutateAsync(body)
+    const response = await verifyLoginMutation.mutateAsync({
+      phone: props.phoneNumber,
+      code,
+      deviceName: 'web',
+    })
     applySession(response?.data ?? response)
     redirectAfterLogin()
     return
   }
 
   if (props.mode === 'forgotPassword') {
-    await verifyForgotMutation.mutateAsync(body)
+    const response = await verifyForgotMutation.mutateAsync({ phone: props.phoneNumber, code })
+    const data = response?.data ?? response
+    setResetTicket({ phone: props.phoneNumber, token: data?.resetToken })
     router.push({ name: 'reset-password' })
     return
   }
 
-  await verifySignupMutation.mutateAsync(body)
-  emit('verified', body)
+  await verifySignupMutation.mutateAsync({ phone: props.phoneNumber, verifyCode: code })
+  emit('verified', { phone: props.phoneNumber, verifyCode: code })
 }
 
 const onResend = async () => {
   if (!props.phoneNumber) return
-  const body = { phoneNumber: props.phoneNumber }
+  const body = { phone: props.phoneNumber }
   if (props.mode === 'forgotPassword') await forgotMutation.mutateAsync(body)
-  else if (props.mode === 'loginWithCode') await loginCodeMutation.mutateAsync(body)
-  else await resendCodeMutation.mutateAsync(body)
+  else if (props.mode === 'loginWithCode') await requestLoginOtpMutation.mutateAsync(body)
+  else await resendCodeMutation.mutateAsync({ phoneNumber: props.phoneNumber })
 }
 </script>
 

src/features/auth/composables/usePasswordReset.js

@@ -0,0 +1,20 @@
+import { ref } from 'vue'
+
+const phone = ref('')
+const token = ref('')
+
+export const usePasswordReset = () => {
+  const setResetTicket = ({ phone: phoneNumber, token: resetToken }) => {
+    if (phoneNumber) phone.value = phoneNumber
+    if (resetToken) token.value = resetToken
+  }
+
+  const clearResetTicket = () => {
+    phone.value = ''
+    token.value = ''
+  }
+
+  return { phone, token, setResetTicket, clearResetTicket }
+}
+
+export default usePasswordReset

src/features/auth/pages/ResetPasswordPage.vue

@@ -52,6 +52,7 @@
 
 <script setup>
 import { ref } from 'vue'
+import { useRouter } from 'vue-router'
 import useYup from '@/composables/useYup'
 import useAuth from '@/composables/useAuth'
 import BaseButton from '@/components/BaseButton.vue'
@@ -63,15 +64,16 @@ import AuthShell from '@/features/auth/components/AuthShell.vue'
 import { useResetPasswordMutation } from '@/services/query/auth'
 import AuthHeading from '@/features/auth/components/AuthHeading.vue'
 import AuthCopyright from '@/features/auth/components/AuthCopyright.vue'
-import { useRedirectAfterLogin } from '@/features/auth/composables/useRedirectAfterLogin'
+import { usePasswordReset } from '@/features/auth/composables/usePasswordReset'
 
-const { user, applySession } = useAuth()
-const redirectAfterLogin = useRedirectAfterLogin()
+const { user } = useAuth()
+const { phone: resetPhone, token: resetToken, clearResetTicket } = usePasswordReset()
+const router = useRouter()
 
 const schema = resetPasswordSchema
 
 const form = ref({
-  phone: user.value?.phone || '',
+  phone: resetPhone.value || user.value?.phone || '',
   password: '',
   passwordConfirmation: '',
 })
@@ -82,9 +84,14 @@ const resetMutation = useResetPasswordMutation()
 const onSubmit = async () => {
   const { isValid, payload } = await validate(form.value)
   if (!isValid) return
-  const response = await resetMutation.mutateAsync(payload)
-  applySession(response?.data ?? response)
-  redirectAfterLogin()
+  await resetMutation.mutateAsync({
+    phone: form.value.phone,
+    token: resetToken.value,
+    password: payload.password,
+    passwordConfirmation: payload.passwordConfirmation,
+  })
+  clearResetTicket()
+  router.push({ name: 'login' })
 }
 </script>
 

src/features/student/profile/pages/EditProfilePage.vue

@@ -226,7 +226,6 @@ import { studentProfileSchema, studentResetPasswordSchema } from '@/features/stu
 import {
   authKeys,
   useGetMeQuery,
-  useResetPasswordMutation,
   useUpdateProfileMutation,
   useUploadMediaMutation,
 } from '@/services/query/auth'
@@ -339,7 +338,7 @@ const onAvatarCropped = async (file) => {
 const onAvatarError = (msg) => toast.error(msg)
 
 const updateMutation = useUpdateProfileMutation()
-const resetPasswordMutation = useResetPasswordMutation()
+const resetPasswordMutation = useUpdateProfileMutation()
 
 const onSubmit = async () => {
   const { isValid, payload } = await validate(form.value)
@@ -369,7 +368,10 @@ const onResetPassword = async () => {
   })
   if (!isValid) return
   try {
-    await resetPasswordMutation.mutateAsync(payload)
+    await resetPasswordMutation.mutateAsync({
+      password: payload.password,
+      passwordConfirmation: payload.passwordConfirmation,
+    })
     passwordForm.value.password = ''
     passwordForm.value.passwordConfirmation = ''
     resetPasswordErrors()