itube-specs 0.0.234 → 0.0.236

package/composables/use-user.ts

@@ -6,141 +6,7 @@ import type {
   IPasswordForm,
   IRegistrateForm,
   IChangeEmail
-} from '../types';
-import { ApiHelper } from '../runtime';
-
-async function recoveryPasswordApi(data: IRecoveryPasswordForm): Promise<any> {
-  return await ApiHelper.fetch('/authorization/recovery-password', {
-    method: 'POST',
-    headers: {
-      'X-Cache-Time': 259200,
-      'Content-Type': 'application/json',
-    },
-    body: data,
-  });
-}
-
-async function changePasswordApi(data: IChangePasswordForm): Promise<any> {
-  return await ApiHelper.fetch('/authorization/change-password', {
-    method: 'POST',
-    headers: {
-      'X-Cache-Time': 259200,
-      'Content-Type': 'application/json',
-    },
-    body: data,
-  });
-}
-
-async function changeEmailApi(data: IChangeEmail): Promise<any> {
-  console.log(data);
-  return await ApiHelper.fetch('/authorization/change-email', {
-    method: 'POST',
-    headers: {
-      'X-Cache-Time': 259200,
-      'Content-Type': 'application/json',
-    },
-    body: data,
-  });
-}
-
-async function postProfileApi(data: FormData): Promise<any> {
-  return await ApiHelper.fetch('/authorization/post-profile', {
-    method: 'POST',
-    headers: {
-      'X-Cache-Time': 259200,
-    },
-    body: data,
-  });
-}
-
-async function getProfileApi(): Promise<IProfileData | null> {
-  return await ApiHelper.fetch('/authorization/get-profile', {
-    method: 'GET',
-    headers: {
-      'X-Cache-Time': 259200,
-      'Content-Type': 'application/json',
-    },
-  });
-}
-
-async function passwordApi(data: IPasswordForm): Promise<any> {
-  return await ApiHelper.fetch('/authorization/password', {
-    method: 'POST',
-    headers: {
-      'X-Cache-Time': 259200,
-      'Content-Type': 'application/json',
-    },
-    body: data,
-  });
-}
-
-async function deleteAvatarApi(): Promise<any> {
-  return await ApiHelper.fetch('/authorization/profile-avatar', {
-    method: 'DELETE',
-    headers: {
-      'X-Cache-Time': 259200,
-      'Content-Type': 'application/json',
-    },
-  });
-}
-
-async function loginApi(data: ILoginForm): Promise<any> {
-  return await ApiHelper.fetch('/authorization/login', {
-    method: 'POST',
-    headers: {
-      'X-Cache-Time': 259200,
-      'Content-Type': 'application/json',
-    },
-    body: data,
-  });
-}
-
-async function registerApi(data: IRegistrateForm): Promise<any> {
-  return await ApiHelper.fetch('/authorization/register', {
-    method: 'POST',
-    headers: {
-      'X-Cache-Time': 259200,
-      'Content-Type': 'application/json',
-    },
-    body: data,
-  });
-}
-
-async function confirmRegistrationApi(token: string): Promise<any> {
-  return await ApiHelper.fetch('/authorization/confirm', {
-    method: 'GET',
-    headers: {
-      'X-Cache-Time': 259200,
-      'X-Domain': useRuntimeConfig()?.public?.xDomain || useAppConfig().xDomain,
-      'Content-Type': 'application/json',
-    },
-    params: {
-      token,
-    }
-  });
-}
-
-const { snackbarText, showErrorSnack } = useSnackbar();
-
-const register = async (form: IRegistrateForm) => {
-  const response = await registerApi(form);
-  if (response) {
-    useCookie('jwtoken', { path: '/', secure: true, httpOnly: false }).value = response.token;
-    await getProfile();
-  }
-};
-
-const getProfile = async (update = false) => {
-  const profileData = useState<IProfileData | null>('profileData', () => null);
-
-  if (!profileData.value || update) {
-    try {
-      profileData.value = await getProfileApi();
-    } catch (error) {
-      console.error('Error get profile:', error);
-    }
-  }
-};
+} from 'itube-specs/types';
 
 function omit<T extends object, K extends keyof T>(obj: T, keys: K[]): Omit<T, K> {
   const result = {} as Omit<T, K>;
@@ -152,93 +18,116 @@ function omit<T extends object, K extends keyof T>(obj: T, keys: K[]): Omit<T, K
   return result;
 }
 
-const updateProfile = async (form: IProfileData) => {
-  try {
-    const formData = new FormData();
-    const config = JSON.stringify(omit(form, ['avatar']));
-
-    formData.append('config', config);
+const { snackbarText, showErrorSnack } = useSnackbar();
 
-    if (form.avatar) {
-      formData.append('avatar', form.avatar);
+export const useUser = (apiService) => {
+  const register = async (form: IRegistrateForm) => {
+    const response = await apiService.register(form);
+    if (response) {
+      useCookie('jwtoken', { path: '/', secure: true, httpOnly: false }).value = response.token;
+      await getProfile();
     }
+  };
 
-    await postProfileApi(formData);
-  } catch (error) {
-    console.error('Error edit profile:', error);
-  }
-};
+  const getProfile = async (update = false) => {
+    const profileData = useState<IProfileData | null>('profileData', () => null);
 
-const login = async (form: ILoginForm) => {
-  const response = await loginApi(form);
-  if (response) {
-    useCookie('jwtoken', { path: '/', secure: true, httpOnly: false }).value = response.token;
-    await getProfile();
-  }
-};
+    if (!profileData.value || update) {
+      try {
+        profileData.value = await apiService.getProfile();
+      } catch (error) {
+        console.error('Error get profile:', error);
+      }
+    }
+  };
 
-const changePassword = async (form: IChangePasswordForm) => {
-  try {
-    await changePasswordApi(form);
-    snackbarText.value = 'Password changed';
-  } catch (err) {
-    showErrorSnack('Error while changing password');
-    console.log(err, 'error change password');
-  }
-};
+  const updateProfile = async (form: IProfileData) => {
+    try {
+      const formData = new FormData();
+      const config = JSON.stringify(omit(form, ['avatar']));
 
-const changeEmail = async (form: IChangeEmail) => {
-  try {
-    await changeEmailApi(form);
-    snackbarText.value = 'email_changed';
-  } catch (err) {
-    showErrorSnack('Error while changing email');
-    console.log(err, 'error change email');
-  }
-};
+      formData.append('config', config);
 
-const recoveryPassword = async (form: IRecoveryPasswordForm) => {
-  try {
-    await recoveryPasswordApi(form);
-    snackbarText.value = 'Password recovered';
-    await useRouter().push('/profile');
-  } catch (err) {
-    showErrorSnack('Error while recovery password');
-    console.log(err, 'error change password');
-  }
-};
+      if (form.avatar) {
+        formData.append('avatar', form.avatar);
+      }
 
-const password = async (form: IPasswordForm) => {
-  await passwordApi(form);
-};
+      await apiService.postProfile(formData);
+    } catch (error) {
+      console.error('Error edit profile:', error);
+    }
+  };
 
-const deleteAvatar = async () => {
-  await deleteAvatarApi();
-};
+  const login = async (form: ILoginForm) => {
+    const response = await apiService.login(form);
+    if (response) {
+      useCookie('jwtoken', { path: '/', secure: true, httpOnly: false }).value = response.token;
+      await getProfile();
+    }
+  };
 
-const signOut = () => {
-  const cookie = useCookie('jwtoken', { path: '/', secure: true, httpOnly: false });
-  cookie.value = undefined; // или null
-  document.cookie = "jwtoken=; path=/; domain=gay.cool; expires=Thu, 01 Jan 1970 00:00:00 GMT; Secure";;
+  const changePassword = async (form: IChangePasswordForm) => {
+    try {
+      await apiService.changePassword(form);
+      snackbarText.value = 'Password changed';
+    } catch (err) {
+      showErrorSnack('Error while changing password');
+      console.log(err, 'error change password');
+    }
+  };
 
-  const profile = useState<IProfileData | null>('profileData');
-  profile.value = null;
+  const changeEmail = async (form: IChangeEmail) => {
+    try {
+      await apiService.changeEmail(form);
+      snackbarText.value = 'email_changed';
+    } catch (err) {
+      showErrorSnack('Error while changing email');
+      console.log(err, 'error change email');
+    }
+  };
 
-  const router = useRouter();
-  router.push('/');
+  const recoveryPassword = async (form: IRecoveryPasswordForm) => {
+    try {
+      await apiService.recoveryPassword(form);
+      snackbarText.value = 'Password recovered';
+      await useRouter().push('/profile');
+    } catch (err) {
+      showErrorSnack('Error while recovery password');
+      console.log(err, 'error change password');
+    }
+  };
+
+  const password = async (form: IPasswordForm) => {
+    await apiService.password(form);
+  };
+
+  const deleteAvatar = async () => {
+    await apiService.deleteAvatar();
+  };
+
+  const signOut = () => {
+    const cookie = useCookie('jwtoken', { path: '/', secure: true, httpOnly: false });
+    cookie.value = undefined; // или null
+    document.cookie = "jwtoken=; path=/; domain=gay.cool; expires=Thu, 01 Jan 1970 00:00:00 GMT; Secure";;
+
+    const profile = useState<IProfileData | null>('profileData');
+    profile.value = null;
+
+    const router = useRouter();
+    router.push('/');
+  };
+
+  return {
+    isAuthorized: computed(() => process.client && !!useCookie('jwtoken').value),
+    register,
+    login,
+    password,
+    signOut,
+    getProfile,
+    updateProfile,
+    changePassword,
+    recoveryPassword,
+    deleteAvatar,
+    changeEmail,
+  };
 };
-
-export const useUser = () => ({
-  isAuthorized: computed(() => process.client && !!useCookie('jwtoken').value),
-  register,
-  login,
-  password,
-  signOut,
-  getProfile,
-  updateProfile,
-  changePassword,
-  recoveryPassword,
-  deleteAvatar,
-  changeEmail,
-  confirmRegistrationApi,
-});

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "itube-specs",
   "type": "module",
-  "version": "0.0.234",
+  "version": "0.0.236",
   "main": "./nuxt.config.ts",
   "types": "./types/index.d.ts",
   "scripts": {

package/composables/use-test-composable.ts

@@ -1,3 +0,0 @@
-export function useTestComposable() {
-  console.log('useTestComposable')
-}