@campxdev/shared 1.7.9 → 1.7.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@campxdev/shared",
-  "version": "1.7.9",
+  "version": "1.7.10",
   "main": "./exports.ts",
   "scripts": {
     "start": "react-scripts start",

package/src/components/ChangePassword.tsx

@@ -30,8 +30,8 @@ function ChangePassword({ close }) {
       try {
         await axios.post(
           isDevelopment
-            ? 'https://auth-api.campx.dev/auth/change-password'
-            : 'https://auth-api.campx.in/auth/change-password',
+            ? 'https://api.campx.dev/auth-server/auth/change-password'
+            : 'https://api.campx.in/auth-server/auth/change-password',
           {
             oldPassword,
             newPassword,

package/src/components/LoginForm.tsx

@@ -1,14 +1,29 @@
 import { Visibility, VisibilityOff } from '@mui/icons-material'
-import { Alert, Box, IconButton, InputAdornment, Stack } from '@mui/material'
+import {
+  Alert,
+  Box,
+  Button,
+  IconButton,
+  InputAdornment,
+  Stack,
+  Typography,
+  styled,
+} from '@mui/material'
 import axiosBase from 'axios'
 import Cookies from 'js-cookie'
-import { useState } from 'react'
+import { useEffect, useState } from 'react'
 import { useForm } from 'react-hook-form'
 import ActionButton from './ActionButton'
 import { FormTextField } from './HookForm'
+import axios from '../config/axios'
+import ResetPassword from './ResetPassword'
+import { Link } from 'react-router-dom'
 
 export function LoginForm({ loginUrl }: { loginUrl?: string }) {
   const [showPassword, setShowPassword] = useState(false)
+  const [forgotMail, setForgotMail] = useState(null)
+  const [forgotPassword, setForgotPassword] = useState(true)
+  const [resetPassword, setResetPassword] = useState(false)
   const { handleSubmit, control } = useForm()
   const [error, setError] = useState('')
 
@@ -30,44 +45,115 @@ export function LoginForm({ loginUrl }: { loginUrl?: string }) {
     }
   }
 
+  const [mailSent, setMailSent] = useState(false)
+
+  async function handleSendMail() {
+    try {
+      await axios
+        .get(
+          `https://api.campx.dev/auth-server/auth/forgot-password?email=${forgotMail}`,
+        )
+        .then((res) => {
+          setForgotMail(null)
+          setMailSent(true)
+          setError(null)
+        })
+    } catch (err) {
+      setError(err.response.data.message ?? 'Server Error')
+      setMailSent(false)
+    }
+  }
+
+  useEffect(() => {
+    const restLink = window.location.pathname.split('/')[1]
+    if (restLink == 'reset-password') {
+      setResetPassword(true)
+    }
+  }, [])
+
   return (
     <>
-      <form onSubmit={handleSubmit(onSubmit)}>
-        <Stack gap={'30px'}>
-          <Box>
+      {resetPassword ? (
+        <>
+          <ResetPassword />
+        </>
+      ) : forgotPassword ? (
+        <form onSubmit={handleSubmit(onSubmit)}>
+          <Stack gap={'30px'} sx={{ display: resetPassword ? 'none' : 'flex' }}>
+            <Box>
+              <FormTextField
+                control={control}
+                name="username"
+                label="User ID"
+                required
+              />
+            </Box>
+            <Box>
+              <FormTextField
+                control={control}
+                name="password"
+                label="Password"
+                type={showPassword ? 'text' : 'password'}
+                required
+                InputProps={{
+                  endAdornment: (
+                    <InputAdornment position="end">
+                      <IconButton
+                        size="small"
+                        aria-label="toggle password visibility"
+                        onClick={() => setShowPassword((prev) => !prev)}
+                        edge="end"
+                      >
+                        {showPassword ? <VisibilityOff /> : <Visibility />}
+                      </IconButton>
+                    </InputAdornment>
+                  ),
+                }}
+              />
+            </Box>
+            <ActionButton type="submit">Login</ActionButton>
+            <Typography
+              variant="h6"
+              align="right"
+              onClick={() => setForgotPassword(false)}
+            >
+              <StyledLink to="/">Forgot Password</StyledLink>
+            </Typography>
+          </Stack>
+        </form>
+      ) : (
+        <>
+          <Stack gap={'30px'}>
             <FormTextField
               control={control}
-              name="username"
-              label="User ID"
+              name="email"
+              label="Email"
               required
+              onChange={(e) => setForgotMail(e.target.value)}
             />
-          </Box>
-          <Box>
-            <FormTextField
-              control={control}
-              name="password"
-              label="Password"
-              type={showPassword ? 'text' : 'password'}
-              required
-              InputProps={{
-                endAdornment: (
-                  <InputAdornment position="end">
-                    <IconButton
-                      size="small"
-                      aria-label="toggle password visibility"
-                      onClick={() => setShowPassword((prev) => !prev)}
-                      edge="end"
-                    >
-                      {showPassword ? <VisibilityOff /> : <Visibility />}
-                    </IconButton>
-                  </InputAdornment>
-                ),
+            <Button onClick={() => handleSendMail()}>Send Email</Button>
+
+            <Typography
+              variant="subtitle2"
+              onClick={() => {
+                setForgotPassword(true)
+                setError('')
+                setMailSent(false)
               }}
-            />
-          </Box>
-          <ActionButton type="submit">Login</ActionButton>
-        </Stack>
-      </form>
+              align="right"
+            >
+              <StyledLink to="/">Login here</StyledLink>
+            </Typography>
+
+            {mailSent && (
+              <Alert severity="success">
+                Reset password link has been sent to your email.
+              </Alert>
+            )}
+          </Stack>
+        </>
+      )}
+
       {error && (
         <Alert severity="error" sx={{ marginTop: '20px' }}>
           {error}
@@ -77,4 +163,9 @@ export function LoginForm({ loginUrl }: { loginUrl?: string }) {
   )
 }
 
+export const StyledLink = styled(Link)({
+  textDecoration: 'none',
+  color: 'black',
+})
+
 export default LoginForm

package/src/components/ResetPassword.tsx

@@ -0,0 +1,107 @@
+import { VisibilityOff, Visibility } from '@mui/icons-material'
+import { Stack, InputAdornment, IconButton, Button, Alert } from '@mui/material'
+import React, { useState } from 'react'
+import { FormTextField } from './HookForm'
+import axios from '../config/axios'
+import { useForm } from 'react-hook-form'
+import { useNavigate } from 'react-router-dom'
+import { toast } from 'react-toastify'
+
+function ResetPassword() {
+  const searchParams = new URLSearchParams(document.location.search)
+  const { handleSubmit, control } = useForm()
+  const navigate = useNavigate()
+  const [error, setError] = useState('')
+  const [showPassword, setShowPassword] = useState(false)
+  const [showConfirmPassword, setShowConfirmPassword] = useState(false)
+
+  async function handleResetPassword(values) {
+    const token = searchParams.get('token')
+    values.token = token
+
+    if (values.newPassword == values.confirmNewPassword) {
+      try {
+        await axios
+          .post(`https://api.campx.dev/auth-server/auth/reset-password`, values)
+          .then((res) => {
+            navigate('/login')
+            toast.success('Password Changed Successfully')
+          })
+      } catch (err) {
+        if (
+          values.newPassword.length == 0 &&
+          values.confirmNewPassword.length == 0
+        ) {
+          setError('Please enter valid password')
+        } else if (token == null) {
+          setError('Invalid token')
+        } else {
+          setError(err.response.data.message ?? 'Server Error')
+        }
+      }
+    } else {
+      setError("New Password and Confirm New password doesn't match")
+    }
+  }
+
+  return (
+    <>
+      <form onSubmit={handleSubmit(handleResetPassword)}>
+        <Stack gap={'30px'}>
+          <FormTextField
+            control={control}
+            name="newPassword"
+            label="New Password"
+            type={showPassword ? 'text' : 'password'}
+            required
+            InputProps={{
+              endAdornment: (
+                <InputAdornment position="end">
+                  <IconButton
+                    size="small"
+                    aria-label="toggle password visibility"
+                    onClick={() => setShowPassword((prev) => !prev)}
+                    edge="end"
+                  >
+                    {showPassword ? <VisibilityOff /> : <Visibility />}
+                  </IconButton>
+                </InputAdornment>
+              ),
+            }}
+          />
+
+          <FormTextField
+            control={control}
+            name="confirmNewPassword"
+            label="Confirm Password"
+            type={showConfirmPassword ? 'text' : 'password'}
+            required
+            InputProps={{
+              endAdornment: (
+                <InputAdornment position="end">
+                  <IconButton
+                    size="small"
+                    aria-label="toggle password visibility"
+                    onClick={() => setShowConfirmPassword((prev) => !prev)}
+                    edge="end"
+                  >
+                    {showPassword ? <VisibilityOff /> : <Visibility />}
+                  </IconButton>
+                </InputAdornment>
+              ),
+            }}
+          />
+
+          <Button type="submit">Reset Password</Button>
+        </Stack>
+      </form>
+      {error && (
+        <Alert severity="error" sx={{ marginTop: '20px' }}>
+          {error}
+        </Alert>
+      )}
+    </>
+  )
+}
+
+export default ResetPassword

package/src/components/index.ts

@@ -14,6 +14,7 @@ import { Table as StyledTable } from './Table'
 import ErrorBoundary from './ErrorBoundary'
 import FullScreenLoader from './FullScreenLoader'
 import LoginForm from './LoginForm'
+import ResetPassword from './ResetPassword'
 import { SideMenuHeader } from './Layout/SideMenuHeader'
 import SideNav from './Layout/SideNav'
 import { ListItemButton } from './ListItemButton'
@@ -74,6 +75,7 @@ export {
   ErrorBoundary,
   FullScreenLoader,
   LoginForm,
+  ResetPassword,
   SideMenuHeader,
   ListItemButton,
   LayoutWrapper,