refactor(nestjs): hook up auth endpoints

packages/webapp/src/containers/Authentication/Login.tsx

@@ -29,22 +29,19 @@ export default function Login() {
 
   const handleSubmit = (values, { setSubmitting }) => {
     loginMutate({
-      crediential: values.crediential,
+      email: values.crediential,
       password: values.password,
-    }).catch(
-      ({
-        response: {
-          data: { errors },
-        },
-      }) => {
-        const toastBuilders = transformLoginErrorsToToasts(errors);
+    }).catch(({ response }) => {
+      const {
+        data: { errors },
+      } = response;
+      const toastBuilders = transformLoginErrorsToToasts(errors);
 
-        toastBuilders.forEach((builder) => {
-          Toaster.show(builder);
-        });
-        setSubmitting(false);
-      },
-    );
+      toastBuilders.forEach((builder) => {
+        Toaster.show(builder);
+      });
+      setSubmitting(false);
+    });
   };
 
   return (
@@ -70,7 +67,10 @@ function LoginFooterLinks() {
     <AuthFooterLinks>
       {!signupDisabled && (
         <AuthFooterLink>
-          <T id={'dont_have_an_account'} /> <Link to={'/auth/register'}><T id={'sign_up'} /></Link>
+          <T id={'dont_have_an_account'} />{' '}
+          <Link to={'/auth/register'}>
+            <T id={'sign_up'} />
+          </Link>
         </AuthFooterLink>
       )}
       <AuthFooterLink>

packages/webapp/src/containers/Authentication/Register.tsx

@@ -53,22 +53,20 @@ export default function RegisterUserForm() {
           },
         );
       })
-      .catch(
-        ({
-          response: {
-            data: { errors },
-          },
-        }) => {
-          const formErrors = transformRegisterErrorsToForm(errors);
-          const toastMessages = transformRegisterToastMessages(errors);
+      .catch(({ response }) => {
+        const {
+          data: { errors },
+        } = response;
+        
+        const formErrors = transformRegisterErrorsToForm(errors);
+        const toastMessages = transformRegisterToastMessages(errors);
 
-          toastMessages.forEach((toastMessage) => {
-            AppToaster.show(toastMessage);
-          });
-          setErrors(formErrors);
-          setSubmitting(false);
-        },
-      );
+        toastMessages.forEach((toastMessage) => {
+          AppToaster.show(toastMessage);
+        });
+        setErrors(formErrors);
+        setSubmitting(false);
+      });
   };
 
   return (

packages/webapp/src/hooks/query/authentication.tsx

@@ -13,17 +13,27 @@ import {
   useSetTenantId,
 } from '../state';
 
+const AuthRoute = {
+  Signin: 'auth/signin',
+  Signup: 'auth/signup',
+  SignupVerify: 'auth/signup/verify',
+  SignupVerifyResend: 'auth/signup/verify/resend',
+  SendResetPassword: 'auth/send_reset_password',
+  ForgetPassword: 'auth/reset_password/:token',
+  AuthMeta: 'auth/meta',
+};
+
 /**
  * Saves the response data to cookies.
  */
 export function setAuthLoginCookies(data) {
-  setCookie('token', data.token);
-  setCookie('authenticated_user_id', data.user.id);
-  setCookie('organization_id', data.tenant.organization_id);
-  setCookie('tenant_id', data.tenant.id);
+  setCookie('token', data.access_token);
+  setCookie('authenticated_user_id', data.user_id);
+  setCookie('organization_id', data.organization_id);
+  setCookie('tenant_id', data.tenant_id);
 
-  if (data?.tenant?.metadata?.language)
-    setCookie('locale', data.tenant.metadata.language);
+  // if (data?.tenant?.metadata?.language)
+  //   setCookie('locale', data.tenant.metadata.language);
 }
 
 /**
@@ -38,7 +48,7 @@ export const useAuthLogin = (props) => {
   const setTenantId = useSetTenantId();
   const setLocale = useSetLocale();
 
-  return useMutation((values) => apiRequest.post('auth/login', values), {
+  return useMutation((values) => apiRequest.post(AuthRoute.Signin, values), {
     select: (res) => res.data,
     onSuccess: (res) => {
       // Set authentication cookies.
@@ -46,14 +56,14 @@ export const useAuthLogin = (props) => {
 
       batch(() => {
         // Sets the auth metadata to global state.
-        setAuthToken(res.data.token);
-        setOrganizationId(res.data.tenant.organization_id);
-        setUserId(res.data.user.id);
-        setTenantId(res.data.tenant.id);
+        setAuthToken(res.data.access_token);
+        setOrganizationId(res.data.organization_id);
+        setTenantId(res.data.tenant_id);
+        setUserId(res.data.user_id);
 
-        if (res.data?.tenant?.metadata?.language) {
-          setLocale(res.data?.tenant?.metadata?.language);
-        }
+        // if (res.data?.tenant?.metadata?.language) {
+        //   setLocale(res.data?.tenant?.metadata?.language);
+        // }
       });
       props?.onSuccess && props?.onSuccess(...args);
     },
@@ -68,7 +78,7 @@ export const useAuthRegister = (props) => {
   const apiRequest = useApiRequest();
 
   return useMutation(
-    (values) => apiRequest.post('auth/register', values),
+    (values) => apiRequest.post(AuthRoute.Signup, values),
     props,
   );
 };
@@ -80,7 +90,7 @@ export const useAuthSendResetPassword = (props) => {
   const apiRequest = useApiRequest();
 
   return useMutation(
-    (email) => apiRequest.post('auth/send_reset_password', email),
+    (values) => apiRequest.post(AuthRoute.SendResetPassword, values),
     props,
   );
 };
@@ -105,7 +115,7 @@ export const useAuthMetadata = (props = {}) => {
     [t.AUTH_METADATA_PAGE],
     {
       method: 'get',
-      url: `auth/meta`,
+      url: AuthRoute.AuthMeta,
     },
     {
       select: (res) => res.data,
@@ -116,13 +126,13 @@ export const useAuthMetadata = (props = {}) => {
 };
 
 /**
- *
+ * Resend the mail of signup verification.
  */
 export const useAuthSignUpVerifyResendMail = (props) => {
   const apiRequest = useApiRequest();
 
   return useMutation(
-    () => apiRequest.post('auth/register/verify/resend'),
+    () => apiRequest.post(AuthRoute.SignupVerifyResend),
     props,
   );
 };
@@ -133,14 +143,14 @@ interface AuthSignUpVerifyValues {
 }
 
 /**
- *
+ * Signup verification.
  */
 export const useAuthSignUpVerify = (props) => {
   const apiRequest = useApiRequest();
 
   return useMutation(
     (values: AuthSignUpVerifyValues) =>
-      apiRequest.post('auth/register/verify', values),
+      apiRequest.post(AuthRoute.SignupVerify, values),
     props,
   );
 };

packages/webapp/src/hooks/query/organization.tsx

@@ -7,6 +7,11 @@ import useApiRequest from '../useRequest';
 import { useRequestQuery } from '../useQueryRequest';
 import { useSetOrganizations, useSetSubscriptions } from '../state';
 
+const OrganizationRoute = {
+  Current: '/organization/current',
+  Build: '/organization/build',
+};
+
 /**
  * Retrieve organizations of the authenticated user.
  */
@@ -36,7 +41,7 @@ export function useCurrentOrganization(props) {
 
   return useRequestQuery(
     [t.ORGANIZATION_CURRENT],
-    { method: 'get', url: `organization` },
+    { method: 'get', url: OrganizationRoute.Current },
     {
       select: (res) => res.data.organization,
       defaultData: {},
@@ -64,7 +69,7 @@ export function useOrganizationSetup() {
   const queryClient = useQueryClient();
 
   return useMutation(
-    (values) => apiRequest.post(`organization/build`, values),
+    (values) => apiRequest.post(OrganizationRoute.Build, values),
     {
       onSuccess: (res) => {
         queryClient.invalidateQueries(t.ORGANIZATION_CURRENT);

packages/webapp/src/hooks/query/users.tsx

@@ -137,13 +137,14 @@ export function useAuthenticatedAccount(props) {
     ['AuthenticatedAccount'],
     {
       method: 'get',
-      url: `account`,
+      url: `auth/account`,
     },
     {
       select: (response) => response.data.data,
       defaultData: {},
       onSuccess: (data) => {
-        setEmailConfirmed(data.is_verified, data.email);
+        debugger;
+        setEmailConfirmed(data.verified, data.email);
       },
       ...props,
     },
@@ -160,7 +161,7 @@ export const useDashboardMeta = (props) => {
     [t.DASHBOARD_META],
     { method: 'get', url: 'dashboard/boot' },
     {
-      select: (res) => res.data.meta,
+      select: (res) => res.data,
       defaultData: {},
       ...props,
     },

packages/webapp/src/hooks/useRequest.tsx

@@ -30,7 +30,7 @@ export default function useApiRequest() {
         const locale = currentLocale;
 
         if (token) {
-          request.headers['X-Access-Token'] = token;
+          request.headers['Authorization'] = `Bearer ${token}`;
         }
         if (organizationId) {
           request.headers['organization-id'] = organizationId;