mirror of
https://github.com/HamzaSha1/zod-backend.git
synced 2025-08-25 05:42:27 +00:00
Merge pull request #28 from HamzaSha1/feat/neoleap-integration
Feat/neoleap integration
This commit is contained in:
abdalhamid99
24
client/.gitignore
vendored
24
client/.gitignore
vendored
@ -1,24 +0,0 @@
|
||||
# Logs
|
||||
logs
|
||||
*.log
|
||||
npm-debug.log*
|
||||
yarn-debug.log*
|
||||
yarn-error.log*
|
||||
pnpm-debug.log*
|
||||
lerna-debug.log*
|
||||
|
||||
node_modules
|
||||
dist
|
||||
dist-ssr
|
||||
*.local
|
||||
|
||||
# Editor directories and files
|
||||
.vscode/*
|
||||
!.vscode/extensions.json
|
||||
.idea
|
||||
.DS_Store
|
||||
*.suo
|
||||
*.ntvs*
|
||||
*.njsproj
|
||||
*.sln
|
||||
*.sw?
|
||||
@ -1,50 +0,0 @@
|
||||
# React + TypeScript + Vite
|
||||
|
||||
This template provides a minimal setup to get React working in Vite with HMR and some ESLint rules.
|
||||
|
||||
Currently, two official plugins are available:
|
||||
|
||||
- [@vitejs/plugin-react](https://github.com/vitejs/vite-plugin-react/blob/main/packages/plugin-react/README.md) uses [Babel](https://babeljs.io/) for Fast Refresh
|
||||
- [@vitejs/plugin-react-swc](https://github.com/vitejs/vite-plugin-react-swc) uses [SWC](https://swc.rs/) for Fast Refresh
|
||||
|
||||
## Expanding the ESLint configuration
|
||||
|
||||
If you are developing a production application, we recommend updating the configuration to enable type aware lint rules:
|
||||
|
||||
- Configure the top-level `parserOptions` property like this:
|
||||
|
||||
```js
|
||||
export default tseslint.config({
|
||||
languageOptions: {
|
||||
// other options...
|
||||
parserOptions: {
|
||||
project: ['./tsconfig.node.json', './tsconfig.app.json'],
|
||||
tsconfigRootDir: import.meta.dirname,
|
||||
},
|
||||
},
|
||||
})
|
||||
```
|
||||
|
||||
- Replace `tseslint.configs.recommended` to `tseslint.configs.recommendedTypeChecked` or `tseslint.configs.strictTypeChecked`
|
||||
- Optionally add `...tseslint.configs.stylisticTypeChecked`
|
||||
- Install [eslint-plugin-react](https://github.com/jsx-eslint/eslint-plugin-react) and update the config:
|
||||
|
||||
```js
|
||||
// eslint.config.js
|
||||
import react from 'eslint-plugin-react'
|
||||
|
||||
export default tseslint.config({
|
||||
// Set the react version
|
||||
settings: { react: { version: '18.3' } },
|
||||
plugins: {
|
||||
// Add the react plugin
|
||||
react,
|
||||
},
|
||||
rules: {
|
||||
// other rules...
|
||||
// Enable its recommended rules
|
||||
...react.configs.recommended.rules,
|
||||
...react.configs['jsx-runtime'].rules,
|
||||
},
|
||||
})
|
||||
```
|
||||
@ -1,28 +0,0 @@
|
||||
import js from '@eslint/js'
|
||||
import globals from 'globals'
|
||||
import reactHooks from 'eslint-plugin-react-hooks'
|
||||
import reactRefresh from 'eslint-plugin-react-refresh'
|
||||
import tseslint from 'typescript-eslint'
|
||||
|
||||
export default tseslint.config(
|
||||
{ ignores: ['dist'] },
|
||||
{
|
||||
extends: [js.configs.recommended, ...tseslint.configs.recommended],
|
||||
files: ['**/*.{ts,tsx}'],
|
||||
languageOptions: {
|
||||
ecmaVersion: 2020,
|
||||
globals: globals.browser,
|
||||
},
|
||||
plugins: {
|
||||
'react-hooks': reactHooks,
|
||||
'react-refresh': reactRefresh,
|
||||
},
|
||||
rules: {
|
||||
...reactHooks.configs.recommended.rules,
|
||||
'react-refresh/only-export-components': [
|
||||
'warn',
|
||||
{ allowConstantExport: true },
|
||||
],
|
||||
},
|
||||
},
|
||||
)
|
||||
@ -1,13 +0,0 @@
|
||||
<!doctype html>
|
||||
<html lang="en">
|
||||
<head>
|
||||
<meta charset="UTF-8" />
|
||||
<link rel="icon" type="image/svg+xml" href="/vite.svg" />
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
||||
<title>Vite + React + TS</title>
|
||||
</head>
|
||||
<body>
|
||||
<div id="root"></div>
|
||||
<script type="module" src="/src/main.tsx"></script>
|
||||
</body>
|
||||
</html>
|
||||
4115
client/package-lock.json
generated
4115
client/package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@ -1,38 +0,0 @@
|
||||
{
|
||||
"name": "client",
|
||||
"private": true,
|
||||
"version": "0.0.0",
|
||||
"type": "module",
|
||||
"scripts": {
|
||||
"dev": "vite",
|
||||
"build": "tsc -b && vite build",
|
||||
"lint": "eslint .",
|
||||
"preview": "vite preview"
|
||||
},
|
||||
"dependencies": {
|
||||
"@emotion/react": "^11.14.0",
|
||||
"@emotion/styled": "^11.14.0",
|
||||
"@fontsource/roboto": "^5.1.1",
|
||||
"@mui/icons-material": "^6.3.1",
|
||||
"@mui/material": "^6.3.1",
|
||||
"@react-oauth/google": "^0.12.1",
|
||||
"axios": "^1.7.9",
|
||||
"react": "^18.3.1",
|
||||
"react-apple-signin-auth": "^1.1.0",
|
||||
"react-dom": "^18.3.1",
|
||||
"react-router-dom": "^7.1.1"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@eslint/js": "^9.17.0",
|
||||
"@types/react": "^18.3.18",
|
||||
"@types/react-dom": "^18.3.5",
|
||||
"@vitejs/plugin-react": "^4.3.4",
|
||||
"eslint": "^9.17.0",
|
||||
"eslint-plugin-react-hooks": "^5.0.0",
|
||||
"eslint-plugin-react-refresh": "^0.4.16",
|
||||
"globals": "^15.14.0",
|
||||
"typescript": "~5.6.2",
|
||||
"typescript-eslint": "^8.18.2",
|
||||
"vite": "^6.0.5"
|
||||
}
|
||||
}
|
||||
@ -1 +0,0 @@
|
||||
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="iconify iconify--logos" width="31.88" height="32" preserveAspectRatio="xMidYMid meet" viewBox="0 0 256 257"><defs><linearGradient id="IconifyId1813088fe1fbc01fb466" x1="-.828%" x2="57.636%" y1="7.652%" y2="78.411%"><stop offset="0%" stop-color="#41D1FF"></stop><stop offset="100%" stop-color="#BD34FE"></stop></linearGradient><linearGradient id="IconifyId1813088fe1fbc01fb467" x1="43.376%" x2="50.316%" y1="2.242%" y2="89.03%"><stop offset="0%" stop-color="#FFEA83"></stop><stop offset="8.333%" stop-color="#FFDD35"></stop><stop offset="100%" stop-color="#FFA800"></stop></linearGradient></defs><path fill="url(#IconifyId1813088fe1fbc01fb466)" d="M255.153 37.938L134.897 252.976c-2.483 4.44-8.862 4.466-11.382.048L.875 37.958c-2.746-4.814 1.371-10.646 6.827-9.67l120.385 21.517a6.537 6.537 0 0 0 2.322-.004l117.867-21.483c5.438-.991 9.574 4.796 6.877 9.62Z"></path><path fill="url(#IconifyId1813088fe1fbc01fb467)" d="M185.432.063L96.44 17.501a3.268 3.268 0 0 0-2.634 3.014l-5.474 92.456a3.268 3.268 0 0 0 3.997 3.378l24.777-5.718c2.318-.535 4.413 1.507 3.936 3.838l-7.361 36.047c-.495 2.426 1.782 4.5 4.151 3.78l15.304-4.649c2.372-.72 4.652 1.36 4.15 3.788l-11.698 56.621c-.732 3.542 3.979 5.473 5.943 2.437l1.313-2.028l72.516-144.72c1.215-2.423-.88-5.186-3.54-4.672l-25.505 4.922c-2.396.462-4.435-1.77-3.759-4.114l16.646-57.705c.677-2.35-1.37-4.583-3.769-4.113Z"></path></svg>
|
||||
|
Before Width: | Height: | Size: 1.5 KiB |
@ -1,42 +0,0 @@
|
||||
#root {
|
||||
max-width: 1280px;
|
||||
margin: 0 auto;
|
||||
padding: 2rem;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
.logo {
|
||||
height: 6em;
|
||||
padding: 1.5em;
|
||||
will-change: filter;
|
||||
transition: filter 300ms;
|
||||
}
|
||||
.logo:hover {
|
||||
filter: drop-shadow(0 0 2em #646cffaa);
|
||||
}
|
||||
.logo.react:hover {
|
||||
filter: drop-shadow(0 0 2em #61dafbaa);
|
||||
}
|
||||
|
||||
@keyframes logo-spin {
|
||||
from {
|
||||
transform: rotate(0deg);
|
||||
}
|
||||
to {
|
||||
transform: rotate(360deg);
|
||||
}
|
||||
}
|
||||
|
||||
@media (prefers-reduced-motion: no-preference) {
|
||||
a:nth-of-type(2) .logo {
|
||||
animation: logo-spin infinite 20s linear;
|
||||
}
|
||||
}
|
||||
|
||||
.card {
|
||||
padding: 2em;
|
||||
}
|
||||
|
||||
.read-the-docs {
|
||||
color: #888;
|
||||
}
|
||||
@ -1,127 +0,0 @@
|
||||
import { CssBaseline, ThemeProvider, createTheme } from '@mui/material';
|
||||
import { BrowserRouter, Navigate, Route, Routes } from 'react-router-dom';
|
||||
import { LoginForm } from './components/auth/LoginForm';
|
||||
import { RegisterForm } from './components/auth/RegisterForm';
|
||||
import { Dashboard } from './components/dashboard/Dashboard';
|
||||
import { AddJuniorForm } from './components/juniors/AddJuniorForm';
|
||||
import { JuniorsList } from './components/juniors/JuniorsList';
|
||||
import { AuthLayout } from './components/layout/AuthLayout';
|
||||
import { AddTaskForm } from './components/tasks/AddTask';
|
||||
import { TaskDetails } from './components/tasks/TaskDetails';
|
||||
import { TasksList } from './components/tasks/TasksList';
|
||||
import { AuthProvider } from './contexts/AuthContext';
|
||||
|
||||
// Create theme
|
||||
const theme = createTheme({
|
||||
palette: {
|
||||
primary: {
|
||||
main: '#00A7E1', // Bright blue like Zod Wallet
|
||||
light: '#33B7E7',
|
||||
dark: '#0074B2',
|
||||
},
|
||||
secondary: {
|
||||
main: '#FF6B6B', // Coral red for accents
|
||||
light: '#FF8E8E',
|
||||
dark: '#FF4848',
|
||||
},
|
||||
background: {
|
||||
default: '#F8F9FA',
|
||||
paper: '#FFFFFF',
|
||||
},
|
||||
text: {
|
||||
primary: '#2D3748', // Dark gray for main text
|
||||
secondary: '#718096', // Medium gray for secondary text
|
||||
},
|
||||
},
|
||||
typography: {
|
||||
fontFamily: '"Inter", "Helvetica", "Arial", sans-serif',
|
||||
h1: {
|
||||
fontWeight: 700,
|
||||
fontSize: '2.5rem',
|
||||
},
|
||||
h2: {
|
||||
fontWeight: 600,
|
||||
fontSize: '2rem',
|
||||
},
|
||||
h3: {
|
||||
fontWeight: 600,
|
||||
fontSize: '1.75rem',
|
||||
},
|
||||
h4: {
|
||||
fontWeight: 600,
|
||||
fontSize: '1.5rem',
|
||||
},
|
||||
h5: {
|
||||
fontWeight: 600,
|
||||
fontSize: '1.25rem',
|
||||
},
|
||||
h6: {
|
||||
fontWeight: 600,
|
||||
fontSize: '1rem',
|
||||
},
|
||||
button: {
|
||||
textTransform: 'none',
|
||||
fontWeight: 500,
|
||||
},
|
||||
},
|
||||
shape: {
|
||||
borderRadius: 12,
|
||||
},
|
||||
components: {
|
||||
MuiButton: {
|
||||
styleOverrides: {
|
||||
root: {
|
||||
borderRadius: '8px',
|
||||
padding: '8px 16px',
|
||||
fontWeight: 500,
|
||||
},
|
||||
contained: {
|
||||
boxShadow: 'none',
|
||||
'&:hover': {
|
||||
boxShadow: 'none',
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
MuiCard: {
|
||||
styleOverrides: {
|
||||
root: {
|
||||
borderRadius: '16px',
|
||||
boxShadow: '0 4px 6px -1px rgba(0, 0, 0, 0.1), 0 2px 4px -1px rgba(0, 0, 0, 0.06)',
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
});
|
||||
|
||||
function App() {
|
||||
return (
|
||||
<ThemeProvider theme={theme}>
|
||||
<CssBaseline />
|
||||
<AuthProvider>
|
||||
<BrowserRouter>
|
||||
<Routes>
|
||||
{/* Public routes */}
|
||||
<Route path="/login" element={<LoginForm />} />
|
||||
<Route path="/register" element={<RegisterForm />} />
|
||||
|
||||
{/* Protected routes */}
|
||||
<Route element={<AuthLayout />}>
|
||||
<Route path="/dashboard" element={<Dashboard />} />
|
||||
<Route path="/juniors" element={<JuniorsList />} />
|
||||
<Route path="/juniors/new" element={<AddJuniorForm />} />
|
||||
<Route path="/tasks" element={<TasksList />} />
|
||||
<Route path="/tasks/new" element={<AddTaskForm />} />
|
||||
<Route path="/tasks/:taskId" element={<TaskDetails />} />
|
||||
</Route>
|
||||
|
||||
{/* Redirect root to dashboard or login */}
|
||||
<Route path="/" element={<Navigate to="/dashboard" replace />} />
|
||||
</Routes>
|
||||
</BrowserRouter>
|
||||
</AuthProvider>
|
||||
</ThemeProvider>
|
||||
);
|
||||
}
|
||||
|
||||
export default App;
|
||||
@ -1,140 +0,0 @@
|
||||
import axios from 'axios';
|
||||
import { LoginRequest } from '../types/auth';
|
||||
import { CreateJuniorRequest, JuniorTheme } from '../types/junior';
|
||||
import { CreateTaskRequest, TaskStatus, TaskSubmission } from '../types/task';
|
||||
|
||||
const API_BASE_URL = 'https://zod.life';
|
||||
const AUTH_TOKEN = btoa('zod-digital:Zod2025'); // Base64 encode credentials
|
||||
|
||||
// Helper function to get auth header
|
||||
const getAuthHeader = () => {
|
||||
const token = localStorage.getItem('accessToken');
|
||||
return token ? `Bearer ${token}` : `Basic ${AUTH_TOKEN}`;
|
||||
};
|
||||
|
||||
export const apiClient = axios.create({
|
||||
baseURL: API_BASE_URL,
|
||||
headers: {
|
||||
'Content-Type': 'application/json',
|
||||
'x-client-id': 'web-client',
|
||||
},
|
||||
});
|
||||
|
||||
// Add request interceptor to include current auth header
|
||||
apiClient.interceptors.request.use((config) => {
|
||||
config.headers.Authorization = getAuthHeader();
|
||||
return config;
|
||||
});
|
||||
|
||||
// Add response interceptor to handle errors
|
||||
apiClient.interceptors.response.use(
|
||||
(response) => response,
|
||||
(error) => {
|
||||
const errorMessage =
|
||||
error.response?.data?.message || error.response?.data?.error || error.message || 'An unexpected error occurred';
|
||||
|
||||
console.error('API Error:', {
|
||||
status: error.response?.status,
|
||||
message: errorMessage,
|
||||
data: error.response?.data,
|
||||
});
|
||||
|
||||
// Throw error with meaningful message
|
||||
throw new Error(errorMessage);
|
||||
},
|
||||
);
|
||||
|
||||
// Auth API
|
||||
export const authApi = {
|
||||
register: (countryCode: string, phoneNumber: string) => {
|
||||
// Ensure phone number is in the correct format (remove any non-digit characters)
|
||||
const cleanPhoneNumber = phoneNumber.replace(/\D/g, '');
|
||||
return apiClient.post('/api/auth/register/otp', {
|
||||
countryCode: countryCode.startsWith('+') ? countryCode : `+${countryCode}`,
|
||||
phoneNumber: cleanPhoneNumber,
|
||||
});
|
||||
},
|
||||
|
||||
verifyOtp: (countryCode: string, phoneNumber: string, otp: string) =>
|
||||
apiClient.post('/api/auth/register/verify', { countryCode, phoneNumber, otp }),
|
||||
|
||||
setEmail: (email: string) => {
|
||||
// Use the stored token from localStorage
|
||||
const storedToken = localStorage.getItem('accessToken');
|
||||
if (!storedToken) {
|
||||
throw new Error('No access token found');
|
||||
}
|
||||
return apiClient.post('/api/auth/register/set-email', { email });
|
||||
},
|
||||
|
||||
setPasscode: (passcode: string) => {
|
||||
// Use the stored token from localStorage
|
||||
const storedToken = localStorage.getItem('accessToken');
|
||||
if (!storedToken) {
|
||||
throw new Error('No access token found');
|
||||
}
|
||||
return apiClient.post('/api/auth/register/set-passcode', { passcode });
|
||||
},
|
||||
|
||||
login: ({ grantType, email, password, appleToken, googleToken }: LoginRequest) =>
|
||||
apiClient.post('/api/auth/login', {
|
||||
grantType,
|
||||
email,
|
||||
password,
|
||||
appleToken,
|
||||
googleToken,
|
||||
fcmToken: 'web-client-token', // Required by API
|
||||
signature: 'web-login', // Required by API
|
||||
}),
|
||||
};
|
||||
|
||||
// Juniors API
|
||||
export const juniorsApi = {
|
||||
createJunior: (data: CreateJuniorRequest) => apiClient.post('/api/juniors', data),
|
||||
|
||||
getJuniors: (page = 1, size = 10) => apiClient.get(`/api/juniors?page=${page}&size=${size}`),
|
||||
|
||||
getJunior: (juniorId: string) => apiClient.get(`/api/juniors/${juniorId}`),
|
||||
|
||||
setTheme: (data: JuniorTheme) => apiClient.post('/api/juniors/set-theme', data),
|
||||
|
||||
getQrCode: (juniorId: string) => apiClient.get(`/api/juniors/${juniorId}/qr-code`),
|
||||
|
||||
validateQrCode: (token: string) => apiClient.get(`/api/juniors/qr-code/${token}/validate`),
|
||||
};
|
||||
|
||||
// Document API
|
||||
export const documentApi = {
|
||||
upload: (file: File, documentType: string) => {
|
||||
const formData = new FormData();
|
||||
formData.append('document', file);
|
||||
formData.append('documentType', documentType);
|
||||
return apiClient.post('/api/document', formData, {
|
||||
headers: {
|
||||
'Content-Type': 'multipart/form-data',
|
||||
},
|
||||
});
|
||||
},
|
||||
};
|
||||
|
||||
// Tasks API
|
||||
export const tasksApi = {
|
||||
createTask: (data: CreateTaskRequest) => apiClient.post('/api/tasks', data),
|
||||
|
||||
getTasks: (status: TaskStatus, page = 1, size = 10, juniorId?: string) => {
|
||||
const url = new URL('/api/tasks', API_BASE_URL);
|
||||
url.searchParams.append('status', status);
|
||||
url.searchParams.append('page', page.toString());
|
||||
url.searchParams.append('size', size.toString());
|
||||
if (juniorId) url.searchParams.append('juniorId', juniorId);
|
||||
return apiClient.get(url.pathname + url.search);
|
||||
},
|
||||
|
||||
getTaskById: (taskId: string) => apiClient.get(`/api/tasks/${taskId}`),
|
||||
|
||||
submitTask: (taskId: string, data: TaskSubmission) => apiClient.patch(`/api/tasks/${taskId}/submit`, data),
|
||||
|
||||
approveTask: (taskId: string) => apiClient.patch(`/api/tasks/${taskId}/approve`),
|
||||
|
||||
rejectTask: (taskId: string) => apiClient.patch(`/api/tasks/${taskId}/reject`),
|
||||
};
|
||||
@ -1 +0,0 @@
|
||||
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="iconify iconify--logos" width="35.93" height="32" preserveAspectRatio="xMidYMid meet" viewBox="0 0 256 228"><path fill="#00D8FF" d="M210.483 73.824a171.49 171.49 0 0 0-8.24-2.597c.465-1.9.893-3.777 1.273-5.621c6.238-30.281 2.16-54.676-11.769-62.708c-13.355-7.7-35.196.329-57.254 19.526a171.23 171.23 0 0 0-6.375 5.848a155.866 155.866 0 0 0-4.241-3.917C100.759 3.829 77.587-4.822 63.673 3.233C50.33 10.957 46.379 33.89 51.995 62.588a170.974 170.974 0 0 0 1.892 8.48c-3.28.932-6.445 1.924-9.474 2.98C17.309 83.498 0 98.307 0 113.668c0 15.865 18.582 31.778 46.812 41.427a145.52 145.52 0 0 0 6.921 2.165a167.467 167.467 0 0 0-2.01 9.138c-5.354 28.2-1.173 50.591 12.134 58.266c13.744 7.926 36.812-.22 59.273-19.855a145.567 145.567 0 0 0 5.342-4.923a168.064 168.064 0 0 0 6.92 6.314c21.758 18.722 43.246 26.282 56.54 18.586c13.731-7.949 18.194-32.003 12.4-61.268a145.016 145.016 0 0 0-1.535-6.842c1.62-.48 3.21-.974 4.76-1.488c29.348-9.723 48.443-25.443 48.443-41.52c0-15.417-17.868-30.326-45.517-39.844Zm-6.365 70.984c-1.4.463-2.836.91-4.3 1.345c-3.24-10.257-7.612-21.163-12.963-32.432c5.106-11 9.31-21.767 12.459-31.957c2.619.758 5.16 1.557 7.61 2.4c23.69 8.156 38.14 20.213 38.14 29.504c0 9.896-15.606 22.743-40.946 31.14Zm-10.514 20.834c2.562 12.94 2.927 24.64 1.23 33.787c-1.524 8.219-4.59 13.698-8.382 15.893c-8.067 4.67-25.32-1.4-43.927-17.412a156.726 156.726 0 0 1-6.437-5.87c7.214-7.889 14.423-17.06 21.459-27.246c12.376-1.098 24.068-2.894 34.671-5.345a134.17 134.17 0 0 1 1.386 6.193ZM87.276 214.515c-7.882 2.783-14.16 2.863-17.955.675c-8.075-4.657-11.432-22.636-6.853-46.752a156.923 156.923 0 0 1 1.869-8.499c10.486 2.32 22.093 3.988 34.498 4.994c7.084 9.967 14.501 19.128 21.976 27.15a134.668 134.668 0 0 1-4.877 4.492c-9.933 8.682-19.886 14.842-28.658 17.94ZM50.35 144.747c-12.483-4.267-22.792-9.812-29.858-15.863c-6.35-5.437-9.555-10.836-9.555-15.216c0-9.322 13.897-21.212 37.076-29.293c2.813-.98 5.757-1.905 8.812-2.773c3.204 10.42 7.406 21.315 12.477 32.332c-5.137 11.18-9.399 22.249-12.634 32.792a134.718 134.718 0 0 1-6.318-1.979Zm12.378-84.26c-4.811-24.587-1.616-43.134 6.425-47.789c8.564-4.958 27.502 2.111 47.463 19.835a144.318 144.318 0 0 1 3.841 3.545c-7.438 7.987-14.787 17.08-21.808 26.988c-12.04 1.116-23.565 2.908-34.161 5.309a160.342 160.342 0 0 1-1.76-7.887Zm110.427 27.268a347.8 347.8 0 0 0-7.785-12.803c8.168 1.033 15.994 2.404 23.343 4.08c-2.206 7.072-4.956 14.465-8.193 22.045a381.151 381.151 0 0 0-7.365-13.322Zm-45.032-43.861c5.044 5.465 10.096 11.566 15.065 18.186a322.04 322.04 0 0 0-30.257-.006c4.974-6.559 10.069-12.652 15.192-18.18ZM82.802 87.83a323.167 323.167 0 0 0-7.227 13.238c-3.184-7.553-5.909-14.98-8.134-22.152c7.304-1.634 15.093-2.97 23.209-3.984a321.524 321.524 0 0 0-7.848 12.897Zm8.081 65.352c-8.385-.936-16.291-2.203-23.593-3.793c2.26-7.3 5.045-14.885 8.298-22.6a321.187 321.187 0 0 0 7.257 13.246c2.594 4.48 5.28 8.868 8.038 13.147Zm37.542 31.03c-5.184-5.592-10.354-11.779-15.403-18.433c4.902.192 9.899.29 14.978.29c5.218 0 10.376-.117 15.453-.343c-4.985 6.774-10.018 12.97-15.028 18.486Zm52.198-57.817c3.422 7.8 6.306 15.345 8.596 22.52c-7.422 1.694-15.436 3.058-23.88 4.071a382.417 382.417 0 0 0 7.859-13.026a347.403 347.403 0 0 0 7.425-13.565Zm-16.898 8.101a358.557 358.557 0 0 1-12.281 19.815a329.4 329.4 0 0 1-23.444.823c-7.967 0-15.716-.248-23.178-.732a310.202 310.202 0 0 1-12.513-19.846h.001a307.41 307.41 0 0 1-10.923-20.627a310.278 310.278 0 0 1 10.89-20.637l-.001.001a307.318 307.318 0 0 1 12.413-19.761c7.613-.576 15.42-.876 23.31-.876H128c7.926 0 15.743.303 23.354.883a329.357 329.357 0 0 1 12.335 19.695a358.489 358.489 0 0 1 11.036 20.54a329.472 329.472 0 0 1-11 20.722Zm22.56-122.124c8.572 4.944 11.906 24.881 6.52 51.026c-.344 1.668-.73 3.367-1.15 5.09c-10.622-2.452-22.155-4.275-34.23-5.408c-7.034-10.017-14.323-19.124-21.64-27.008a160.789 160.789 0 0 1 5.888-5.4c18.9-16.447 36.564-22.941 44.612-18.3ZM128 90.808c12.625 0 22.86 10.235 22.86 22.86s-10.235 22.86-22.86 22.86s-22.86-10.235-22.86-22.86s10.235-22.86 22.86-22.86Z"></path></svg>
|
||||
|
Before Width: | Height: | Size: 4.0 KiB |
@ -1,69 +0,0 @@
|
||||
import AppleSignInButton from 'react-apple-signin-auth';
|
||||
import { useNavigate } from 'react-router-dom';
|
||||
import { useAuth } from '../../contexts/AuthContext';
|
||||
import { GrantType } from '../../enums';
|
||||
|
||||
interface LoginProps {
|
||||
setError: (error: string) => void;
|
||||
setLoading: (loading: boolean) => void;
|
||||
}
|
||||
export const AppleLogin = ({ setError, setLoading }: LoginProps) => {
|
||||
const { login } = useAuth();
|
||||
const navigate = useNavigate();
|
||||
|
||||
const onError = (err: any) => {
|
||||
setError(err instanceof Error ? err.message : 'Login failed. Please check your credentials.');
|
||||
};
|
||||
|
||||
const onSuccess = async (response: any) => {
|
||||
try {
|
||||
setLoading(true);
|
||||
await login({ grantType: GrantType.APPLE, appleToken: response.authorization.id_token });
|
||||
navigate('/dashboard');
|
||||
} catch (error) {
|
||||
setError(error instanceof Error ? error.message : 'Login failed. Please check your credentials.');
|
||||
} finally {
|
||||
setLoading(false);
|
||||
}
|
||||
};
|
||||
|
||||
return (
|
||||
<AppleSignInButton
|
||||
/** Auth options passed to AppleID.auth.init() */
|
||||
authOptions={{
|
||||
/** Client ID - eg: 'com.example.com' */
|
||||
clientId: process?.env.REACT_APP_APPLE_CLIENT_ID!,
|
||||
|
||||
scope: 'email name',
|
||||
/** Requested scopes, seperated by spaces - eg: 'email name' */
|
||||
/** Apple's redirectURI - must be one of the URIs you added to the serviceID - the undocumented trick in apple docs is that you should call auth from a page that is listed as a redirectURI, localhost fails */
|
||||
redirectURI: process?.env.REACT_APP_APPLE_REDIRECT_URI!,
|
||||
|
||||
state: 'default',
|
||||
|
||||
/** Uses popup auth instead of redirection */
|
||||
usePopup: true,
|
||||
}} // REQUIRED
|
||||
/** General props */
|
||||
uiType="dark"
|
||||
/** className */
|
||||
className="apple-auth-btn"
|
||||
/** Removes default style tag */
|
||||
noDefaultStyle={false}
|
||||
/** Allows to change the button's children, eg: for changing the button text */
|
||||
buttonExtraChildren="Continue with Apple"
|
||||
/** Extra controlling props */
|
||||
/** Called upon signin success in case authOptions.usePopup = true -- which means auth is handled client side */
|
||||
onSuccess={(response: any) => {
|
||||
onSuccess(response);
|
||||
}} // default = undefined
|
||||
/** Called upon signin error */
|
||||
onError={(error: any) => onError(error)} // default = undefined
|
||||
/** Skips loading the apple script if true */
|
||||
skipScript={false} // default = undefined
|
||||
/** Apple image props */
|
||||
|
||||
/** render function - called with all props - can be used to fully customize the UI by rendering your own component */
|
||||
/>
|
||||
);
|
||||
};
|
||||
@ -1,40 +0,0 @@
|
||||
import { GoogleLogin as GoogleApiLogin, GoogleOAuthProvider } from '@react-oauth/google';
|
||||
import { useNavigate } from 'react-router-dom';
|
||||
import { useAuth } from '../../contexts/AuthContext';
|
||||
import { GrantType } from '../../enums';
|
||||
interface LoginProps {
|
||||
setError: (error: string) => void;
|
||||
setLoading: (loading: boolean) => void;
|
||||
}
|
||||
export const GoogleLogin = ({ setError, setLoading }: LoginProps) => {
|
||||
const { login } = useAuth();
|
||||
const navigate = useNavigate();
|
||||
|
||||
const onError = (err: any) => {
|
||||
setError(err instanceof Error ? err.message : 'Login failed. Please check your credentials.');
|
||||
};
|
||||
|
||||
const onSuccess = async (response: any) => {
|
||||
try {
|
||||
setLoading(true);
|
||||
await login({ grantType: GrantType.GOOGLE, googleToken: response.credential });
|
||||
navigate('/dashboard');
|
||||
} catch (error) {
|
||||
setError(error instanceof Error ? error.message : 'Login failed. Please check your credentials.');
|
||||
} finally {
|
||||
setLoading(false);
|
||||
}
|
||||
};
|
||||
return (
|
||||
<GoogleOAuthProvider clientId={process.env.GOOGLE_WEB_CLIENT_ID!}>
|
||||
<GoogleApiLogin
|
||||
onSuccess={(credentialResponse) => {
|
||||
onSuccess(credentialResponse);
|
||||
}}
|
||||
onError={() => {
|
||||
onError('Login failed. Please check your credentials.');
|
||||
}}
|
||||
/>
|
||||
</GoogleOAuthProvider>
|
||||
);
|
||||
};
|
||||
@ -1,149 +0,0 @@
|
||||
import { Alert, Box, Button, Container, Paper, TextField, Typography } from '@mui/material';
|
||||
import React, { useState } from 'react';
|
||||
import { useNavigate } from 'react-router-dom';
|
||||
import { useAuth } from '../../contexts/AuthContext';
|
||||
import { GrantType } from '../../enums';
|
||||
import { AppleLogin } from './AppleLogin';
|
||||
import { GoogleLogin } from './GoogleLogin';
|
||||
export const LoginForm = () => {
|
||||
const { login } = useAuth();
|
||||
const navigate = useNavigate();
|
||||
const [formData, setFormData] = useState({
|
||||
email: '',
|
||||
password: '',
|
||||
});
|
||||
const [error, setError] = useState('');
|
||||
const [loading, setLoading] = useState(false);
|
||||
|
||||
const handleSubmit = async (e: React.FormEvent) => {
|
||||
e.preventDefault();
|
||||
setError('');
|
||||
setLoading(true);
|
||||
|
||||
try {
|
||||
await login({ email: formData.email, password: formData.password, grantType: GrantType.PASSWORD });
|
||||
navigate('/dashboard');
|
||||
} catch (err) {
|
||||
setError(err instanceof Error ? err.message : 'Login failed. Please check your credentials.');
|
||||
} finally {
|
||||
setLoading(false);
|
||||
}
|
||||
};
|
||||
|
||||
const handleInputChange = (e: React.ChangeEvent<HTMLInputElement>) => {
|
||||
const { name, value } = e.target;
|
||||
setFormData((prev) => ({
|
||||
...prev,
|
||||
[name]: value,
|
||||
}));
|
||||
};
|
||||
return (
|
||||
<Box
|
||||
sx={{
|
||||
minHeight: '100vh',
|
||||
display: 'flex',
|
||||
flexDirection: 'column',
|
||||
backgroundColor: 'background.default',
|
||||
}}
|
||||
>
|
||||
<Container maxWidth="sm" sx={{ flex: 1, display: 'flex', flexDirection: 'column', justifyContent: 'center' }}>
|
||||
<Box sx={{ mb: 4, textAlign: 'center' }}>
|
||||
<Typography variant="h3" component="h1" gutterBottom sx={{ fontWeight: 700, color: 'primary.main' }}>
|
||||
Zod Alkhair | API TEST
|
||||
</Typography>
|
||||
<Typography variant="h6" sx={{ color: 'text.secondary', mb: 4 }}>
|
||||
login to your account.
|
||||
</Typography>
|
||||
</Box>
|
||||
|
||||
<Paper
|
||||
elevation={0}
|
||||
sx={{
|
||||
p: 4,
|
||||
borderRadius: 3,
|
||||
border: '1px solid',
|
||||
borderColor: 'divider',
|
||||
backgroundColor: 'background.paper',
|
||||
}}
|
||||
>
|
||||
{error && (
|
||||
<Alert severity="error" sx={{ mb: 3 }}>
|
||||
{error}
|
||||
</Alert>
|
||||
)}
|
||||
|
||||
<Box component="form" onSubmit={handleSubmit}>
|
||||
<TextField
|
||||
fullWidth
|
||||
margin="normal"
|
||||
label="Email"
|
||||
name="email"
|
||||
type="email"
|
||||
value={formData.email}
|
||||
onChange={handleInputChange}
|
||||
required
|
||||
autoFocus
|
||||
sx={{
|
||||
'& .MuiOutlinedInput-root': {
|
||||
borderRadius: 2,
|
||||
},
|
||||
}}
|
||||
/>
|
||||
|
||||
<TextField
|
||||
fullWidth
|
||||
margin="normal"
|
||||
label="Password"
|
||||
name="password"
|
||||
type="password"
|
||||
value={formData.password}
|
||||
onChange={handleInputChange}
|
||||
required
|
||||
sx={{
|
||||
'& .MuiOutlinedInput-root': {
|
||||
borderRadius: 2,
|
||||
},
|
||||
}}
|
||||
/>
|
||||
|
||||
<Button
|
||||
type="submit"
|
||||
fullWidth
|
||||
variant="contained"
|
||||
size="large"
|
||||
sx={{
|
||||
mt: 3,
|
||||
mb: 2,
|
||||
height: 48,
|
||||
borderRadius: 2,
|
||||
textTransform: 'none',
|
||||
fontSize: '1rem',
|
||||
}}
|
||||
disabled={loading}
|
||||
>
|
||||
{loading ? 'Signing in...' : 'Sign in'}
|
||||
</Button>
|
||||
|
||||
<Button
|
||||
fullWidth
|
||||
variant="text"
|
||||
sx={{
|
||||
textTransform: 'none',
|
||||
fontSize: '1rem',
|
||||
color: 'text.secondary',
|
||||
'&:hover': {
|
||||
color: 'primary.main',
|
||||
},
|
||||
}}
|
||||
onClick={() => navigate('/register')}
|
||||
>
|
||||
signup
|
||||
</Button>
|
||||
<AppleLogin setError={setError} setLoading={setLoading} />
|
||||
<GoogleLogin setError={setError} setLoading={setLoading} />
|
||||
</Box>
|
||||
</Paper>
|
||||
</Container>
|
||||
</Box>
|
||||
);
|
||||
};
|
||||
@ -1,254 +0,0 @@
|
||||
import { Alert, Box, Button, Container, Paper, Step, StepLabel, Stepper, TextField, Typography } from '@mui/material';
|
||||
import React, { useState } from 'react';
|
||||
import { useNavigate } from 'react-router-dom';
|
||||
import { useAuth } from '../../contexts/AuthContext';
|
||||
|
||||
const steps = ['Phone Verification', 'Email', 'Set Passcode'];
|
||||
|
||||
export const RegisterForm = () => {
|
||||
const { register, verifyOtp, setEmail, setPasscode } = useAuth();
|
||||
const navigate = useNavigate();
|
||||
const [activeStep, setActiveStep] = useState(0);
|
||||
const [loading, setLoading] = useState(false);
|
||||
const [error, setError] = useState('');
|
||||
const [formData, setFormData] = useState({
|
||||
countryCode: '+962',
|
||||
phoneNumber: '',
|
||||
otp: '',
|
||||
email: '',
|
||||
passcode: '',
|
||||
confirmPasscode: '',
|
||||
otpRequested: false
|
||||
});
|
||||
|
||||
const handleSubmit = async (e: React.FormEvent) => {
|
||||
e.preventDefault();
|
||||
setError('');
|
||||
setLoading(true);
|
||||
|
||||
try {
|
||||
switch (activeStep) {
|
||||
case 0:
|
||||
if (!formData.otpRequested) {
|
||||
// Request OTP
|
||||
await register(formData.countryCode, formData.phoneNumber);
|
||||
setFormData(prev => ({ ...prev, otpRequested: true }));
|
||||
} else {
|
||||
// Verify OTP
|
||||
await verifyOtp(formData.countryCode, formData.phoneNumber, formData.otp);
|
||||
setActiveStep(1);
|
||||
}
|
||||
break;
|
||||
case 1:
|
||||
await setEmail(formData.email);
|
||||
setActiveStep(2);
|
||||
break;
|
||||
case 2:
|
||||
if (formData.passcode !== formData.confirmPasscode) {
|
||||
throw new Error('Passcodes do not match');
|
||||
}
|
||||
await setPasscode(formData.passcode);
|
||||
navigate('/dashboard');
|
||||
break;
|
||||
}
|
||||
} catch (err) {
|
||||
setError(err instanceof Error ? err.message : 'Registration failed');
|
||||
} finally {
|
||||
setLoading(false);
|
||||
}
|
||||
};
|
||||
|
||||
const handleInputChange = (e: React.ChangeEvent<HTMLInputElement>) => {
|
||||
const { name, value } = e.target;
|
||||
setFormData((prev) => ({
|
||||
...prev,
|
||||
[name]: value,
|
||||
}));
|
||||
};
|
||||
|
||||
const renderStepContent = () => {
|
||||
switch (activeStep) {
|
||||
case 0:
|
||||
return (
|
||||
<>
|
||||
<TextField
|
||||
fullWidth
|
||||
margin="normal"
|
||||
label="Phone Number"
|
||||
name="phoneNumber"
|
||||
value={formData.phoneNumber}
|
||||
onChange={handleInputChange}
|
||||
placeholder="7XXXXXXXX"
|
||||
required
|
||||
disabled={formData.otpRequested}
|
||||
sx={{
|
||||
'& .MuiOutlinedInput-root': {
|
||||
borderRadius: 2,
|
||||
}
|
||||
}}
|
||||
/>
|
||||
{formData.otpRequested && (
|
||||
<TextField
|
||||
fullWidth
|
||||
margin="normal"
|
||||
label="OTP"
|
||||
name="otp"
|
||||
value={formData.otp}
|
||||
onChange={handleInputChange}
|
||||
placeholder="Enter OTP"
|
||||
required
|
||||
autoFocus
|
||||
sx={{
|
||||
'& .MuiOutlinedInput-root': {
|
||||
borderRadius: 2,
|
||||
}
|
||||
}}
|
||||
/>
|
||||
)}
|
||||
</>
|
||||
);
|
||||
case 1:
|
||||
return (
|
||||
<TextField
|
||||
fullWidth
|
||||
margin="normal"
|
||||
label="Email"
|
||||
name="email"
|
||||
type="email"
|
||||
value={formData.email}
|
||||
onChange={handleInputChange}
|
||||
required
|
||||
autoFocus
|
||||
sx={{
|
||||
'& .MuiOutlinedInput-root': {
|
||||
borderRadius: 2,
|
||||
}
|
||||
}}
|
||||
/>
|
||||
);
|
||||
case 2:
|
||||
return (
|
||||
<>
|
||||
<TextField
|
||||
fullWidth
|
||||
margin="normal"
|
||||
label="Passcode"
|
||||
name="passcode"
|
||||
type="password"
|
||||
value={formData.passcode}
|
||||
onChange={handleInputChange}
|
||||
required
|
||||
autoFocus
|
||||
sx={{
|
||||
'& .MuiOutlinedInput-root': {
|
||||
borderRadius: 2,
|
||||
}
|
||||
}}
|
||||
/>
|
||||
<TextField
|
||||
fullWidth
|
||||
margin="normal"
|
||||
label="Confirm Passcode"
|
||||
name="confirmPasscode"
|
||||
type="password"
|
||||
value={formData.confirmPasscode}
|
||||
onChange={handleInputChange}
|
||||
required
|
||||
sx={{
|
||||
'& .MuiOutlinedInput-root': {
|
||||
borderRadius: 2,
|
||||
}
|
||||
}}
|
||||
/>
|
||||
</>
|
||||
);
|
||||
default:
|
||||
return null;
|
||||
}
|
||||
};
|
||||
|
||||
return (
|
||||
<Box
|
||||
sx={{
|
||||
minHeight: '100vh',
|
||||
display: 'flex',
|
||||
flexDirection: 'column',
|
||||
backgroundColor: 'background.default',
|
||||
}}
|
||||
>
|
||||
<Container maxWidth="sm" sx={{ flex: 1, display: 'flex', flexDirection: 'column', justifyContent: 'center' }}>
|
||||
<Box sx={{ mb: 4, textAlign: 'center' }}>
|
||||
<Typography variant="h3" component="h1" gutterBottom sx={{ fontWeight: 700, color: 'primary.main' }}>
|
||||
Zod Alkhair | API TEST
|
||||
</Typography>
|
||||
<Typography variant="h6" sx={{ color: 'text.secondary', mb: 4 }}>
|
||||
signup
|
||||
</Typography>
|
||||
</Box>
|
||||
|
||||
<Paper
|
||||
elevation={0}
|
||||
sx={{
|
||||
p: 4,
|
||||
borderRadius: 3,
|
||||
border: '1px solid',
|
||||
borderColor: 'divider',
|
||||
backgroundColor: 'background.paper'
|
||||
}}
|
||||
>
|
||||
<Stepper activeStep={activeStep} sx={{ mb: 4 }}>
|
||||
{steps.map((label) => (
|
||||
<Step key={label}>
|
||||
<StepLabel>{label}</StepLabel>
|
||||
</Step>
|
||||
))}
|
||||
</Stepper>
|
||||
|
||||
{error && (
|
||||
<Alert severity="error" sx={{ mb: 3 }}>
|
||||
{error}
|
||||
</Alert>
|
||||
)}
|
||||
|
||||
<Box component="form" onSubmit={handleSubmit}>
|
||||
{renderStepContent()}
|
||||
|
||||
<Button
|
||||
type="submit"
|
||||
fullWidth
|
||||
variant="contained"
|
||||
size="large"
|
||||
sx={{
|
||||
mt: 3,
|
||||
mb: 2,
|
||||
height: 48,
|
||||
borderRadius: 2,
|
||||
textTransform: 'none',
|
||||
fontSize: '1rem'
|
||||
}}
|
||||
disabled={loading}
|
||||
>
|
||||
{loading ? 'Processing...' : activeStep === 0 && !formData.otpRequested ? 'Send OTP' : 'Continue'}
|
||||
</Button>
|
||||
|
||||
<Button
|
||||
fullWidth
|
||||
variant="text"
|
||||
sx={{
|
||||
textTransform: 'none',
|
||||
fontSize: '1rem',
|
||||
color: 'text.secondary',
|
||||
'&:hover': {
|
||||
color: 'primary.main'
|
||||
}
|
||||
}}
|
||||
onClick={() => navigate('/login')}
|
||||
>
|
||||
sign in
|
||||
</Button>
|
||||
</Box>
|
||||
</Paper>
|
||||
</Container>
|
||||
</Box>
|
||||
);
|
||||
};
|
||||
@ -1,151 +0,0 @@
|
||||
import {
|
||||
People as PeopleIcon,
|
||||
Assignment as TaskIcon,
|
||||
TrendingUp as TrendingUpIcon,
|
||||
AccountBalance as WalletIcon
|
||||
} from '@mui/icons-material';
|
||||
import {
|
||||
Box,
|
||||
Button,
|
||||
Card,
|
||||
CardContent,
|
||||
Grid,
|
||||
Paper,
|
||||
Typography,
|
||||
useTheme
|
||||
} from '@mui/material';
|
||||
import { useNavigate } from 'react-router-dom';
|
||||
|
||||
export const Dashboard = () => {
|
||||
const theme = useTheme();
|
||||
const navigate = useNavigate();
|
||||
|
||||
const stats = [
|
||||
{
|
||||
title: 'Total Juniors',
|
||||
value: '3',
|
||||
icon: <PeopleIcon sx={{ fontSize: 40, color: 'primary.main' }} />,
|
||||
action: () => navigate('/juniors')
|
||||
},
|
||||
{
|
||||
title: 'Active Tasks',
|
||||
value: '5',
|
||||
icon: <TaskIcon sx={{ fontSize: 40, color: 'secondary.main' }} />,
|
||||
action: () => navigate('/tasks')
|
||||
},
|
||||
{
|
||||
title: 'Total Balance',
|
||||
value: 'SAR 500',
|
||||
icon: <WalletIcon sx={{ fontSize: 40, color: 'success.main' }} />,
|
||||
action: () => { }
|
||||
},
|
||||
{
|
||||
title: 'Monthly Growth',
|
||||
value: '+15%',
|
||||
icon: <TrendingUpIcon sx={{ fontSize: 40, color: 'info.main' }} />,
|
||||
action: () => { }
|
||||
}
|
||||
];
|
||||
|
||||
return (
|
||||
<Box>
|
||||
<Box sx={{ mb: 4 }}>
|
||||
<Typography variant="h4" sx={{ fontWeight: 600, color: 'text.primary', mb: 1 }}>
|
||||
Welcome to Zod Alkhair,
|
||||
</Typography>
|
||||
<Typography variant="body1" sx={{ color: 'text.secondary' }}>
|
||||
This is the API Testing client
|
||||
</Typography>
|
||||
</Box>
|
||||
|
||||
<Grid container spacing={3} sx={{ mb: 4 }}>
|
||||
{stats.map((stat, index) => (
|
||||
<Grid item xs={12} sm={6} md={3} key={index}>
|
||||
<Card
|
||||
sx={{
|
||||
height: '100%',
|
||||
cursor: 'pointer',
|
||||
transition: 'transform 0.2s',
|
||||
'&:hover': {
|
||||
transform: 'translateY(-4px)'
|
||||
}
|
||||
}}
|
||||
onClick={stat.action}
|
||||
>
|
||||
<CardContent>
|
||||
<Box sx={{ display: 'flex', alignItems: 'center', mb: 2 }}>
|
||||
{stat.icon}
|
||||
</Box>
|
||||
<Typography variant="h5" sx={{ fontWeight: 600, mb: 1 }}>
|
||||
{stat.value}
|
||||
</Typography>
|
||||
<Typography variant="body2" sx={{ color: 'text.secondary' }}>
|
||||
{stat.title}
|
||||
</Typography>
|
||||
</CardContent>
|
||||
</Card>
|
||||
</Grid>
|
||||
))}
|
||||
</Grid>
|
||||
|
||||
<Grid container spacing={3}>
|
||||
<Grid item xs={12} md={8}>
|
||||
<Paper
|
||||
sx={{
|
||||
p: 3,
|
||||
height: '100%',
|
||||
backgroundColor: theme.palette.primary.main,
|
||||
color: 'white'
|
||||
}}
|
||||
>
|
||||
<Typography variant="h6" sx={{ mb: 2, fontWeight: 600 }}>
|
||||
Quick Actions
|
||||
</Typography>
|
||||
<Grid container spacing={2}>
|
||||
<Grid item xs={12} sm={6}>
|
||||
<Button
|
||||
fullWidth
|
||||
variant="contained"
|
||||
sx={{
|
||||
backgroundColor: 'rgba(255, 255, 255, 0.1)',
|
||||
'&:hover': {
|
||||
backgroundColor: 'rgba(255, 255, 255, 0.2)'
|
||||
}
|
||||
}}
|
||||
onClick={() => navigate('/juniors/new')}
|
||||
>
|
||||
Add New Junior
|
||||
</Button>
|
||||
</Grid>
|
||||
<Grid item xs={12} sm={6}>
|
||||
<Button
|
||||
fullWidth
|
||||
variant="contained"
|
||||
sx={{
|
||||
backgroundColor: 'rgba(255, 255, 255, 0.1)',
|
||||
'&:hover': {
|
||||
backgroundColor: 'rgba(255, 255, 255, 0.2)'
|
||||
}
|
||||
}}
|
||||
onClick={() => navigate('/tasks/new')}
|
||||
>
|
||||
Create New Task
|
||||
</Button>
|
||||
</Grid>
|
||||
</Grid>
|
||||
</Paper>
|
||||
</Grid>
|
||||
<Grid item xs={12} md={4}>
|
||||
<Paper sx={{ p: 3, height: '100%' }}>
|
||||
<Typography variant="h6" sx={{ mb: 2, fontWeight: 600 }}>
|
||||
Recent Activity
|
||||
</Typography>
|
||||
<Typography variant="body2" color="text.secondary" sx={{ textAlign: 'center', mt: 4 }}>
|
||||
No recent activity
|
||||
</Typography>
|
||||
</Paper>
|
||||
</Grid>
|
||||
</Grid>
|
||||
</Box>
|
||||
);
|
||||
};
|
||||
@ -1,86 +0,0 @@
|
||||
import { CloudUpload as CloudUploadIcon } from '@mui/icons-material';
|
||||
import { Alert, Box, Button, CircularProgress } from '@mui/material';
|
||||
import { AxiosError } from 'axios';
|
||||
import React, { useState } from 'react';
|
||||
import { documentApi } from '../../api/client';
|
||||
import { ApiError } from '../../types/api';
|
||||
import { DocumentType } from '../../types/document';
|
||||
|
||||
interface DocumentUploadProps {
|
||||
onUploadSuccess: (documentId: string) => void;
|
||||
documentType: DocumentType;
|
||||
label: string;
|
||||
}
|
||||
|
||||
export const DocumentUpload = ({ onUploadSuccess, documentType, label }: DocumentUploadProps) => {
|
||||
const [loading, setLoading] = useState(false);
|
||||
const [error, setError] = useState('');
|
||||
const [success, setSuccess] = useState(false);
|
||||
|
||||
const handleFileChange = async (event: React.ChangeEvent<HTMLInputElement>) => {
|
||||
const file = event.target.files?.[0];
|
||||
if (!file) return;
|
||||
|
||||
setLoading(true);
|
||||
setError('');
|
||||
setSuccess(false);
|
||||
|
||||
try {
|
||||
const response = await documentApi.upload(file, documentType);
|
||||
console.log('Document upload response:', response.data);
|
||||
const documentId = response.data.data.id;
|
||||
console.log('Extracted document ID:', documentId);
|
||||
onUploadSuccess(documentId);
|
||||
setSuccess(true);
|
||||
} catch (err) {
|
||||
if (err instanceof AxiosError && err.response?.data) {
|
||||
const apiError = err.response.data as ApiError;
|
||||
const messages = Array.isArray(apiError.message)
|
||||
? apiError.message.map((m) => `${m.field}: ${m.message}`).join('\n')
|
||||
: apiError.message;
|
||||
setError(messages);
|
||||
} else {
|
||||
setError(err instanceof Error ? err.message : 'Failed to upload document');
|
||||
}
|
||||
} finally {
|
||||
setLoading(false);
|
||||
}
|
||||
};
|
||||
|
||||
const now = new Date();
|
||||
return (
|
||||
<Box>
|
||||
<input
|
||||
accept="image/*,.pdf"
|
||||
style={{ display: 'none' }}
|
||||
id={`upload-${documentType}-${now.getTime()}`}
|
||||
type="file"
|
||||
onChange={handleFileChange}
|
||||
disabled={loading}
|
||||
/>
|
||||
<label htmlFor={`upload-${documentType}-${now.getTime()}`}>
|
||||
<Button
|
||||
variant="outlined"
|
||||
component="span"
|
||||
startIcon={loading ? <CircularProgress size={20} /> : <CloudUploadIcon />}
|
||||
disabled={loading}
|
||||
fullWidth
|
||||
>
|
||||
{loading ? 'Uploading...' : label}
|
||||
</Button>
|
||||
</label>
|
||||
|
||||
{error && (
|
||||
<Alert severity="error" sx={{ mt: 1, whiteSpace: 'pre-line' }}>
|
||||
{error}
|
||||
</Alert>
|
||||
)}
|
||||
|
||||
{success && (
|
||||
<Alert severity="success" sx={{ mt: 1 }}>
|
||||
Document uploaded successfully
|
||||
</Alert>
|
||||
)}
|
||||
</Box>
|
||||
);
|
||||
};
|
||||
@ -1,266 +0,0 @@
|
||||
import React, { useState, useEffect } from 'react';
|
||||
import {
|
||||
Box,
|
||||
TextField,
|
||||
Button,
|
||||
Typography,
|
||||
Paper,
|
||||
FormControl,
|
||||
InputLabel,
|
||||
Select,
|
||||
MenuItem,
|
||||
Grid,
|
||||
Alert,
|
||||
SelectChangeEvent,
|
||||
Divider
|
||||
} from '@mui/material';
|
||||
import { useNavigate } from 'react-router-dom';
|
||||
import { juniorsApi } from '../../api/client';
|
||||
import { CreateJuniorRequest } from '../../types/junior';
|
||||
import { DocumentUpload } from '../document/DocumentUpload';
|
||||
import { DocumentType } from '../../types/document';
|
||||
import { ApiError } from '../../types/api';
|
||||
import { AxiosError } from 'axios';
|
||||
|
||||
export const AddJuniorForm = () => {
|
||||
const navigate = useNavigate();
|
||||
const [loading, setLoading] = useState(false);
|
||||
const [error, setError] = useState('');
|
||||
const [formData, setFormData] = useState<CreateJuniorRequest>({
|
||||
countryCode: '+962',
|
||||
phoneNumber: '',
|
||||
firstName: '',
|
||||
lastName: '',
|
||||
dateOfBirth: '',
|
||||
email: '',
|
||||
relationship: 'PARENT',
|
||||
civilIdFrontId: '',
|
||||
civilIdBackId: ''
|
||||
});
|
||||
|
||||
const handleSubmit = async (e: React.FormEvent) => {
|
||||
e.preventDefault();
|
||||
console.log('Form data:', formData);
|
||||
|
||||
setError('');
|
||||
setLoading(true);
|
||||
|
||||
try {
|
||||
if (!formData.civilIdFrontId || !formData.civilIdBackId) {
|
||||
console.log('Missing documents - Front:', formData.civilIdFrontId, 'Back:', formData.civilIdBackId);
|
||||
throw new Error('Please upload both front and back civil ID documents');
|
||||
}
|
||||
|
||||
console.log('Submitting data:', formData);
|
||||
const dataToSubmit = {
|
||||
...formData,
|
||||
civilIdFrontId: formData.civilIdFrontId.trim(),
|
||||
civilIdBackId: formData.civilIdBackId.trim()
|
||||
};
|
||||
await juniorsApi.createJunior(dataToSubmit);
|
||||
navigate('/juniors');
|
||||
} catch (err) {
|
||||
console.error('Create junior error:', err);
|
||||
if (err instanceof AxiosError && err.response?.data) {
|
||||
const apiError = err.response.data as ApiError;
|
||||
const messages = Array.isArray(apiError.message)
|
||||
? apiError.message.map(m => `${m.field}: ${m.message}`).join('\n')
|
||||
: apiError.message;
|
||||
setError(messages);
|
||||
} else {
|
||||
setError(err instanceof Error ? err.message : 'Failed to create junior');
|
||||
}
|
||||
} finally {
|
||||
setLoading(false);
|
||||
}
|
||||
};
|
||||
|
||||
const handleInputChange = (e: React.ChangeEvent<HTMLInputElement>) => {
|
||||
const { name, value } = e.target;
|
||||
setFormData(prev => ({
|
||||
...prev,
|
||||
[name]: value
|
||||
}));
|
||||
};
|
||||
|
||||
const handleSelectChange = (e: SelectChangeEvent) => {
|
||||
const { name, value } = e.target;
|
||||
setFormData(prev => ({
|
||||
...prev,
|
||||
[name as string]: value
|
||||
}));
|
||||
};
|
||||
|
||||
useEffect(() => {
|
||||
console.log('Form data updated:', formData);
|
||||
}, [formData]);
|
||||
|
||||
const handleCivilIdFrontUpload = (documentId: string) => {
|
||||
console.log('Front ID uploaded:', documentId);
|
||||
setFormData(prev => ({
|
||||
...prev,
|
||||
civilIdFrontId: documentId
|
||||
}));
|
||||
};
|
||||
|
||||
const handleCivilIdBackUpload = (documentId: string) => {
|
||||
console.log('Back ID uploaded:', documentId);
|
||||
setFormData(prev => ({
|
||||
...prev,
|
||||
civilIdBackId: documentId
|
||||
}));
|
||||
};
|
||||
|
||||
return (
|
||||
<Box p={3}>
|
||||
<Typography variant="h4" gutterBottom>
|
||||
Add New Junior
|
||||
</Typography>
|
||||
|
||||
<Paper sx={{ p: 3, maxWidth: 600, mx: 'auto' }}>
|
||||
{error && (
|
||||
<Alert severity="error" sx={{ mb: 3, whiteSpace: 'pre-line' }}>
|
||||
{error}
|
||||
</Alert>
|
||||
)}
|
||||
|
||||
<Box component="form" onSubmit={handleSubmit}>
|
||||
<Grid container spacing={3}>
|
||||
<Grid item xs={12} sm={6}>
|
||||
<FormControl fullWidth>
|
||||
<InputLabel>Country Code</InputLabel>
|
||||
<Select
|
||||
name="countryCode"
|
||||
value={formData.countryCode}
|
||||
label="Country Code"
|
||||
onChange={handleSelectChange}
|
||||
>
|
||||
<MenuItem value="+962">Jordan (+962)</MenuItem>
|
||||
</Select>
|
||||
</FormControl>
|
||||
</Grid>
|
||||
<Grid item xs={12} sm={6}>
|
||||
<TextField
|
||||
fullWidth
|
||||
label="Phone Number"
|
||||
name="phoneNumber"
|
||||
value={formData.phoneNumber}
|
||||
onChange={handleInputChange}
|
||||
placeholder="7XXXXXXXX"
|
||||
required
|
||||
/>
|
||||
</Grid>
|
||||
<Grid item xs={12} sm={6}>
|
||||
<TextField
|
||||
fullWidth
|
||||
label="First Name"
|
||||
name="firstName"
|
||||
value={formData.firstName}
|
||||
onChange={handleInputChange}
|
||||
required
|
||||
/>
|
||||
</Grid>
|
||||
<Grid item xs={12} sm={6}>
|
||||
<TextField
|
||||
fullWidth
|
||||
label="Last Name"
|
||||
name="lastName"
|
||||
value={formData.lastName}
|
||||
onChange={handleInputChange}
|
||||
required
|
||||
/>
|
||||
</Grid>
|
||||
<Grid item xs={12} sm={6}>
|
||||
<TextField
|
||||
fullWidth
|
||||
label="Email"
|
||||
name="email"
|
||||
type="email"
|
||||
value={formData.email}
|
||||
onChange={handleInputChange}
|
||||
required
|
||||
/>
|
||||
</Grid>
|
||||
<Grid item xs={12} sm={6}>
|
||||
<TextField
|
||||
fullWidth
|
||||
label="Date of Birth"
|
||||
name="dateOfBirth"
|
||||
type="date"
|
||||
value={formData.dateOfBirth}
|
||||
onChange={handleInputChange}
|
||||
required
|
||||
InputLabelProps={{
|
||||
shrink: true,
|
||||
}}
|
||||
/>
|
||||
</Grid>
|
||||
<Grid item xs={12}>
|
||||
<FormControl fullWidth>
|
||||
<InputLabel>Relationship</InputLabel>
|
||||
<Select
|
||||
name="relationship"
|
||||
value={formData.relationship}
|
||||
label="Relationship"
|
||||
onChange={handleSelectChange}
|
||||
>
|
||||
<MenuItem value="PARENT">Parent</MenuItem>
|
||||
<MenuItem value="GUARDIAN">Guardian</MenuItem>
|
||||
</Select>
|
||||
</FormControl>
|
||||
</Grid>
|
||||
|
||||
<Grid item xs={12}>
|
||||
<Divider sx={{ my: 2 }}>
|
||||
<Typography variant="body2" color="textSecondary">
|
||||
Civil ID Documents
|
||||
</Typography>
|
||||
</Divider>
|
||||
</Grid>
|
||||
|
||||
<Grid item xs={12} sm={6}>
|
||||
<DocumentUpload
|
||||
documentType={DocumentType.PASSPORT}
|
||||
label="Upload Civil ID Front"
|
||||
onUploadSuccess={handleCivilIdFrontUpload}
|
||||
/>
|
||||
{formData.civilIdFrontId && (
|
||||
<Typography variant="caption" color="success.main" sx={{ mt: 1, display: 'block' }}>
|
||||
Civil ID Front uploaded (ID: {formData.civilIdFrontId})
|
||||
</Typography>
|
||||
)}
|
||||
</Grid>
|
||||
<Grid item xs={12} sm={6}>
|
||||
<DocumentUpload
|
||||
documentType={DocumentType.PASSPORT}
|
||||
label="Upload Civil ID Back"
|
||||
onUploadSuccess={handleCivilIdBackUpload}
|
||||
/>
|
||||
{formData.civilIdBackId && (
|
||||
<Typography variant="caption" color="success.main" sx={{ mt: 1, display: 'block' }}>
|
||||
Civil ID Back uploaded (ID: {formData.civilIdBackId})
|
||||
</Typography>
|
||||
)}
|
||||
</Grid>
|
||||
</Grid>
|
||||
|
||||
<Box sx={{ mt: 3, display: 'flex', gap: 2, justifyContent: 'flex-end' }}>
|
||||
<Button
|
||||
variant="outlined"
|
||||
onClick={() => navigate('/juniors')}
|
||||
>
|
||||
Cancel
|
||||
</Button>
|
||||
<Button
|
||||
type="submit"
|
||||
variant="contained"
|
||||
disabled={loading}
|
||||
>
|
||||
{loading ? 'Adding...' : 'Add Junior'}
|
||||
</Button>
|
||||
</Box>
|
||||
</Box>
|
||||
</Paper>
|
||||
</Box>
|
||||
);
|
||||
};
|
||||
@ -1,121 +0,0 @@
|
||||
import React, { useEffect, useState } from 'react';
|
||||
import {
|
||||
Box,
|
||||
Typography,
|
||||
Grid,
|
||||
Card,
|
||||
CardContent,
|
||||
CardMedia,
|
||||
Button,
|
||||
CircularProgress,
|
||||
Pagination
|
||||
} from '@mui/material';
|
||||
import { juniorsApi } from '../../api/client';
|
||||
import { Junior, PaginatedResponse } from '../../types/junior';
|
||||
import { useNavigate } from 'react-router-dom';
|
||||
|
||||
export const JuniorsList = () => {
|
||||
const [loading, setLoading] = useState(true);
|
||||
const [error, setError] = useState('');
|
||||
const [juniors, setJuniors] = useState<Junior[]>([]);
|
||||
const [page, setPage] = useState(1);
|
||||
const [totalPages, setTotalPages] = useState(1);
|
||||
const navigate = useNavigate();
|
||||
|
||||
const fetchJuniors = async (pageNum: number) => {
|
||||
try {
|
||||
setLoading(true);
|
||||
const response = await juniorsApi.getJuniors(pageNum);
|
||||
const data = response.data as PaginatedResponse<Junior>;
|
||||
setJuniors(data.data);
|
||||
setTotalPages(data.meta.pageCount);
|
||||
} catch (err) {
|
||||
setError(err instanceof Error ? err.message : 'Failed to load juniors');
|
||||
} finally {
|
||||
setLoading(false);
|
||||
}
|
||||
};
|
||||
|
||||
useEffect(() => {
|
||||
fetchJuniors(page);
|
||||
}, [page]);
|
||||
|
||||
const handlePageChange = (event: React.ChangeEvent<unknown>, value: number) => {
|
||||
setPage(value);
|
||||
};
|
||||
|
||||
if (loading) {
|
||||
return (
|
||||
<Box display="flex" justifyContent="center" alignItems="center" minHeight="200px">
|
||||
<CircularProgress />
|
||||
</Box>
|
||||
);
|
||||
}
|
||||
|
||||
if (error) {
|
||||
return (
|
||||
<Box p={3}>
|
||||
<Typography color="error">{error}</Typography>
|
||||
</Box>
|
||||
);
|
||||
}
|
||||
|
||||
return (
|
||||
<Box p={3}>
|
||||
<Box display="flex" justifyContent="space-between" alignItems="center" mb={3}>
|
||||
<Typography variant="h4">Juniors</Typography>
|
||||
<Button
|
||||
variant="contained"
|
||||
color="primary"
|
||||
onClick={() => navigate('/juniors/new')}
|
||||
>
|
||||
Add Junior
|
||||
</Button>
|
||||
</Box>
|
||||
|
||||
<Grid container spacing={3}>
|
||||
{juniors.map((junior) => (
|
||||
<Grid item xs={12} sm={6} md={4} key={junior.id}>
|
||||
<Card>
|
||||
<CardMedia
|
||||
component="img"
|
||||
height="140"
|
||||
image={junior.profilePicture?.url || '/default-avatar.png'}
|
||||
alt={junior.fullName}
|
||||
sx={{ objectFit: 'contain', bgcolor: 'grey.100' }}
|
||||
/>
|
||||
<CardContent>
|
||||
<Typography variant="h6" gutterBottom>
|
||||
{junior.fullName}
|
||||
</Typography>
|
||||
<Typography color="textSecondary">
|
||||
{junior.relationship}
|
||||
</Typography>
|
||||
<Box mt={2}>
|
||||
<Button
|
||||
variant="outlined"
|
||||
fullWidth
|
||||
onClick={() => navigate(`/juniors/${junior.id}`)}
|
||||
>
|
||||
View Details
|
||||
</Button>
|
||||
</Box>
|
||||
</CardContent>
|
||||
</Card>
|
||||
</Grid>
|
||||
))}
|
||||
</Grid>
|
||||
|
||||
{totalPages > 1 && (
|
||||
<Box display="flex" justifyContent="center" mt={4}>
|
||||
<Pagination
|
||||
count={totalPages}
|
||||
page={page}
|
||||
onChange={handlePageChange}
|
||||
color="primary"
|
||||
/>
|
||||
</Box>
|
||||
)}
|
||||
</Box>
|
||||
);
|
||||
};
|
||||
@ -1,175 +0,0 @@
|
||||
import React from 'react';
|
||||
import { Navigate, Outlet, useNavigate } from 'react-router-dom';
|
||||
import {
|
||||
AppBar,
|
||||
Toolbar,
|
||||
Typography,
|
||||
Button,
|
||||
Box,
|
||||
Container,
|
||||
List,
|
||||
ListItem,
|
||||
Drawer,
|
||||
Divider
|
||||
} from '@mui/material';
|
||||
import {
|
||||
Dashboard as DashboardIcon,
|
||||
People as PeopleIcon,
|
||||
Assignment as TasksIcon,
|
||||
Person as ProfileIcon
|
||||
} from '@mui/icons-material';
|
||||
import { useAuth } from '../../contexts/AuthContext';
|
||||
|
||||
export const AuthLayout = () => {
|
||||
const { isAuthenticated, user, logout } = useAuth();
|
||||
const navigate = useNavigate();
|
||||
|
||||
if (!isAuthenticated) {
|
||||
return <Navigate to="/login" />;
|
||||
}
|
||||
|
||||
return (
|
||||
<Box sx={{ display: 'flex', flexDirection: 'column', minHeight: '100vh' }}>
|
||||
<AppBar
|
||||
position="fixed"
|
||||
sx={{
|
||||
zIndex: (theme) => theme.zIndex.drawer + 1,
|
||||
backgroundColor: 'background.paper',
|
||||
boxShadow: 'none',
|
||||
borderBottom: '1px solid',
|
||||
borderColor: 'divider'
|
||||
}}
|
||||
>
|
||||
<Toolbar>
|
||||
<Typography variant="h5" component="div" sx={{ flexGrow: 1, color: 'text.primary', fontWeight: 600 }}>
|
||||
Zod Alkhair | API Testting client
|
||||
</Typography>
|
||||
<Box sx={{ display: 'flex', alignItems: 'center', gap: 2 }}>
|
||||
{user && (
|
||||
<Typography variant="body1" sx={{ color: 'text.primary' }}>
|
||||
{user.firstName} {user.lastName}
|
||||
</Typography>
|
||||
)}
|
||||
<Button
|
||||
variant="outlined"
|
||||
color="primary"
|
||||
onClick={logout}
|
||||
size="small"
|
||||
>
|
||||
Logout
|
||||
</Button>
|
||||
</Box>
|
||||
</Toolbar>
|
||||
</AppBar>
|
||||
|
||||
<Drawer
|
||||
variant="permanent"
|
||||
sx={{
|
||||
width: 280,
|
||||
flexShrink: 0,
|
||||
'& .MuiDrawer-paper': {
|
||||
width: 280,
|
||||
boxSizing: 'border-box',
|
||||
marginTop: '64px',
|
||||
backgroundColor: 'background.paper',
|
||||
borderRight: '1px solid',
|
||||
borderColor: 'divider',
|
||||
padding: 2
|
||||
},
|
||||
}}
|
||||
>
|
||||
<Box sx={{ overflow: 'auto' }}>
|
||||
<List>
|
||||
<ListItem component="div">
|
||||
<Button
|
||||
fullWidth
|
||||
sx={{
|
||||
justifyContent: 'flex-start',
|
||||
pl: 2,
|
||||
py: 1.5,
|
||||
borderRadius: 2,
|
||||
color: 'text.primary',
|
||||
'&:hover': {
|
||||
backgroundColor: 'primary.light',
|
||||
color: 'primary.contrastText'
|
||||
}
|
||||
}}
|
||||
onClick={() => navigate('/dashboard')}
|
||||
startIcon={<DashboardIcon />}
|
||||
>
|
||||
Dashboard
|
||||
</Button>
|
||||
</ListItem>
|
||||
<ListItem component="div">
|
||||
<Button
|
||||
fullWidth
|
||||
sx={{
|
||||
justifyContent: 'flex-start',
|
||||
pl: 2,
|
||||
py: 1.5,
|
||||
borderRadius: 2,
|
||||
color: 'text.primary',
|
||||
'&:hover': {
|
||||
backgroundColor: 'primary.light',
|
||||
color: 'primary.contrastText'
|
||||
}
|
||||
}}
|
||||
onClick={() => navigate('/juniors')}
|
||||
startIcon={<PeopleIcon />}
|
||||
>
|
||||
Juniors
|
||||
</Button>
|
||||
</ListItem>
|
||||
<ListItem component="div">
|
||||
<Button
|
||||
fullWidth
|
||||
sx={{
|
||||
justifyContent: 'flex-start',
|
||||
pl: 2,
|
||||
py: 1.5,
|
||||
borderRadius: 2,
|
||||
color: 'text.primary',
|
||||
'&:hover': {
|
||||
backgroundColor: 'primary.light',
|
||||
color: 'primary.contrastText'
|
||||
}
|
||||
}}
|
||||
onClick={() => navigate('/tasks')}
|
||||
startIcon={<TasksIcon />}
|
||||
>
|
||||
Tasks
|
||||
</Button>
|
||||
</ListItem>
|
||||
</List>
|
||||
<Divider />
|
||||
<List>
|
||||
<ListItem component="div">
|
||||
<Button
|
||||
fullWidth
|
||||
sx={{
|
||||
justifyContent: 'flex-start',
|
||||
pl: 2,
|
||||
py: 1.5,
|
||||
borderRadius: 2,
|
||||
color: 'text.primary',
|
||||
'&:hover': {
|
||||
backgroundColor: 'primary.light',
|
||||
color: 'primary.contrastText'
|
||||
}
|
||||
}}
|
||||
onClick={() => navigate('/profile')}
|
||||
startIcon={<ProfileIcon />}
|
||||
>
|
||||
Profile
|
||||
</Button>
|
||||
</ListItem>
|
||||
</List>
|
||||
</Box>
|
||||
</Drawer>
|
||||
|
||||
<Container component="main" sx={{ flexGrow: 1, p: 4, marginLeft: '280px', marginTop: '64px' }}>
|
||||
<Outlet />
|
||||
</Container>
|
||||
</Box>
|
||||
);
|
||||
};
|
||||
@ -1,245 +0,0 @@
|
||||
import {
|
||||
Alert,
|
||||
Box,
|
||||
Button,
|
||||
Checkbox,
|
||||
FormControl,
|
||||
FormControlLabel,
|
||||
Grid,
|
||||
InputLabel,
|
||||
MenuItem,
|
||||
Paper,
|
||||
Select,
|
||||
SelectChangeEvent,
|
||||
TextField,
|
||||
Typography,
|
||||
} from '@mui/material';
|
||||
import { AxiosError } from 'axios';
|
||||
import React, { useEffect, useState } from 'react';
|
||||
import { useNavigate } from 'react-router-dom';
|
||||
import { juniorsApi, tasksApi } from '../../api/client';
|
||||
import { ApiError } from '../../types/api';
|
||||
import { DocumentType } from '../../types/document';
|
||||
import { Junior, PaginatedResponse } from '../../types/junior';
|
||||
import { CreateTaskRequest } from '../../types/task';
|
||||
import { DocumentUpload } from '../document/DocumentUpload';
|
||||
|
||||
export const AddTaskForm = () => {
|
||||
const navigate = useNavigate();
|
||||
const [loading, setLoading] = useState(false);
|
||||
const [error, setError] = useState('');
|
||||
const [formData, setFormData] = useState<CreateTaskRequest>({
|
||||
title: '',
|
||||
description: '',
|
||||
dueDate: '',
|
||||
rewardAmount: 0,
|
||||
isProofRequired: false,
|
||||
juniorId: '',
|
||||
imageId: '',
|
||||
});
|
||||
|
||||
const [juniors, setJuniors] = useState<Junior[]>([]);
|
||||
|
||||
const handleSubmit = async (e: React.FormEvent) => {
|
||||
e.preventDefault();
|
||||
console.log('Form data:', formData);
|
||||
|
||||
setError('');
|
||||
setLoading(true);
|
||||
|
||||
try {
|
||||
if (!formData.imageId) {
|
||||
console.log('Proof is required but no image uploaded');
|
||||
}
|
||||
|
||||
console.log('Submitting data:', formData);
|
||||
const dataToSubmit = {
|
||||
...formData,
|
||||
rewardAmount: Number(formData.rewardAmount),
|
||||
imageId: formData.imageId,
|
||||
};
|
||||
await tasksApi.createTask(dataToSubmit);
|
||||
navigate('/tasks');
|
||||
} catch (err) {
|
||||
console.error('Create junior error:', err);
|
||||
if (err instanceof AxiosError && err.response?.data) {
|
||||
const apiError = err.response.data as ApiError;
|
||||
const messages = Array.isArray(apiError.message)
|
||||
? apiError.message.map((m) => `${m.field}: ${m.message}`).join('\n')
|
||||
: apiError.message;
|
||||
setError(messages);
|
||||
} else {
|
||||
setError(err instanceof Error ? err.message : 'Failed to create Task');
|
||||
}
|
||||
} finally {
|
||||
setLoading(false);
|
||||
}
|
||||
};
|
||||
|
||||
const handleInputChange = (e: React.ChangeEvent<HTMLInputElement>) => {
|
||||
const { name, value } = e.target;
|
||||
console.log(name, value);
|
||||
setFormData((prev) => ({
|
||||
...prev,
|
||||
[name]: value,
|
||||
}));
|
||||
};
|
||||
|
||||
const fetchJuniors = async () => {
|
||||
try {
|
||||
const response = await juniorsApi.getJuniors(1, 50);
|
||||
const data = response.data as PaginatedResponse<Junior>;
|
||||
setJuniors(data.data);
|
||||
} catch (err) {
|
||||
console.error('Failed to load juniors:', err);
|
||||
}
|
||||
};
|
||||
|
||||
const handleSelectChange = (e: SelectChangeEvent) => {
|
||||
const { name, value } = e.target;
|
||||
setFormData((prev) => ({
|
||||
...prev,
|
||||
[name as string]: value,
|
||||
}));
|
||||
};
|
||||
|
||||
useEffect(() => {
|
||||
console.log('Form data updated:', formData);
|
||||
}, [formData]);
|
||||
|
||||
useEffect(() => {
|
||||
fetchJuniors();
|
||||
}, []);
|
||||
|
||||
const handleTaskImageUpload = (documentId: string) => {
|
||||
console.log('task image ID uploaded:', documentId);
|
||||
setFormData((prev) => ({
|
||||
...prev,
|
||||
imageId: documentId,
|
||||
}));
|
||||
};
|
||||
|
||||
const handleCheckedInputChange = (e: React.ChangeEvent<HTMLInputElement>) => {
|
||||
setFormData((prev) => ({
|
||||
...prev,
|
||||
isProofRequired: e.target.checked,
|
||||
}));
|
||||
};
|
||||
|
||||
return (
|
||||
<Box p={3}>
|
||||
<Typography variant="h4" gutterBottom>
|
||||
Add New Task
|
||||
</Typography>
|
||||
|
||||
<Paper sx={{ p: 3, maxWidth: 600, mx: 'auto' }}>
|
||||
{error && (
|
||||
<Alert severity="error" sx={{ mb: 3, whiteSpace: 'pre-line' }}>
|
||||
{error}
|
||||
</Alert>
|
||||
)}
|
||||
|
||||
<Box component="form" onSubmit={handleSubmit}>
|
||||
<Grid container spacing={3}>
|
||||
<Grid item xs={12} sm={12}>
|
||||
<TextField
|
||||
fullWidth
|
||||
label="Title"
|
||||
name="title"
|
||||
value={formData.title}
|
||||
onChange={handleInputChange}
|
||||
placeholder="Task Title"
|
||||
required
|
||||
/>
|
||||
</Grid>
|
||||
<Grid item xs={12} sm={12}>
|
||||
<TextField
|
||||
fullWidth
|
||||
label="Description"
|
||||
name="description"
|
||||
value={formData.description}
|
||||
onChange={handleInputChange}
|
||||
placeholder="Task Description"
|
||||
required
|
||||
/>
|
||||
</Grid>
|
||||
|
||||
<Grid item xs={12} sm={12}>
|
||||
<TextField
|
||||
fullWidth
|
||||
label="Due Date"
|
||||
name="dueDate"
|
||||
type="date"
|
||||
value={formData.dueDate}
|
||||
onChange={handleInputChange}
|
||||
required
|
||||
InputLabelProps={{
|
||||
shrink: true,
|
||||
}}
|
||||
/>
|
||||
</Grid>
|
||||
|
||||
<Grid item xs={12} sm={12}>
|
||||
<TextField
|
||||
fullWidth
|
||||
label="Reward Amount"
|
||||
name="rewardAmount"
|
||||
type="number"
|
||||
value={formData.rewardAmount}
|
||||
onChange={handleInputChange}
|
||||
required
|
||||
/>
|
||||
</Grid>
|
||||
|
||||
<Grid item xs={12}>
|
||||
<FormControl fullWidth>
|
||||
<InputLabel>Junior</InputLabel>
|
||||
<Select name="juniorId" value={formData.juniorId} label="Junior" onChange={handleSelectChange}>
|
||||
<MenuItem value="">Select Junior</MenuItem>
|
||||
{juniors.map((junior) => (
|
||||
<MenuItem key={junior.id} value={junior.id}>
|
||||
{junior.fullName}
|
||||
</MenuItem>
|
||||
))}
|
||||
</Select>
|
||||
</FormControl>
|
||||
</Grid>
|
||||
|
||||
<Grid item xs={12} sm={12}>
|
||||
<DocumentUpload
|
||||
documentType={DocumentType.PASSPORT}
|
||||
label="Upload Task Image"
|
||||
onUploadSuccess={handleTaskImageUpload}
|
||||
/>
|
||||
{formData.imageId && (
|
||||
<Typography variant="caption" color="success.main" sx={{ mt: 1, display: 'block' }}>
|
||||
Task Image uploaded (ID: {formData.imageId})
|
||||
</Typography>
|
||||
)}
|
||||
</Grid>
|
||||
|
||||
<Grid item xs={12}>
|
||||
<FormControl fullWidth>
|
||||
<FormControlLabel
|
||||
control={
|
||||
<Checkbox checked={formData.isProofRequired} onChange={handleCheckedInputChange} color="primary" />
|
||||
}
|
||||
label="Proof Required"
|
||||
/>
|
||||
</FormControl>
|
||||
</Grid>
|
||||
</Grid>
|
||||
|
||||
<Box sx={{ mt: 3, display: 'flex', gap: 2, justifyContent: 'flex-end' }}>
|
||||
<Button variant="outlined" onClick={() => navigate('/juniors')}>
|
||||
Cancel
|
||||
</Button>
|
||||
<Button type="submit" variant="contained" disabled={loading}>
|
||||
{loading ? 'Adding...' : 'Add Task'}
|
||||
</Button>
|
||||
</Box>
|
||||
</Box>
|
||||
</Paper>
|
||||
</Box>
|
||||
);
|
||||
};
|
||||
@ -1,87 +0,0 @@
|
||||
import { Box, Card, CardContent, Chip, CircularProgress, Typography } from '@mui/material';
|
||||
import { useEffect, useState } from 'react';
|
||||
import { useNavigate, useParams } from 'react-router-dom';
|
||||
import { tasksApi } from '../../api/client';
|
||||
import { Task } from '../../types/task';
|
||||
|
||||
export const TaskDetails = () => {
|
||||
useNavigate();
|
||||
const [loading, setLoading] = useState(false);
|
||||
const [error, setError] = useState('');
|
||||
const statusColors = {
|
||||
PENDING: 'warning',
|
||||
IN_PROGRESS: 'info',
|
||||
COMPLETED: 'success',
|
||||
} as const;
|
||||
|
||||
const { taskId } = useParams();
|
||||
if (!taskId) {
|
||||
throw new Error('Task ID is required');
|
||||
}
|
||||
const [task, setTask] = useState<Task>();
|
||||
const fetchTask = async () => {
|
||||
try {
|
||||
setLoading(true);
|
||||
const response = await tasksApi.getTaskById(taskId);
|
||||
setTask(response.data.data);
|
||||
} catch (err) {
|
||||
setError(err instanceof Error ? err.message : 'Failed to load task');
|
||||
} finally {
|
||||
setLoading(false);
|
||||
}
|
||||
};
|
||||
|
||||
useEffect(() => {
|
||||
fetchTask();
|
||||
}, []);
|
||||
|
||||
if (loading) {
|
||||
return (
|
||||
<Box display="flex" justifyContent="center" alignItems="center" minHeight="200px">
|
||||
<CircularProgress />
|
||||
</Box>
|
||||
);
|
||||
}
|
||||
|
||||
if (error) {
|
||||
return (
|
||||
<Box p={3}>
|
||||
<Typography color="error">{error}</Typography>
|
||||
</Box>
|
||||
);
|
||||
}
|
||||
|
||||
if (!task) {
|
||||
return (
|
||||
<Box p={3}>
|
||||
<Typography color="error">Task not found</Typography>
|
||||
</Box>
|
||||
);
|
||||
}
|
||||
console.log(task);
|
||||
|
||||
return (
|
||||
<Card>
|
||||
<CardContent>
|
||||
<Box display="flex" justifyContent="space-between" alignItems="flex-start">
|
||||
<Typography variant="h6" gutterBottom>
|
||||
{task.title}
|
||||
</Typography>
|
||||
<Chip label={task.status} color={statusColors[task.status]} size="small" />
|
||||
</Box>
|
||||
<Typography color="textSecondary" gutterBottom>
|
||||
Due: {new Date(task.dueDate).toLocaleDateString()}
|
||||
</Typography>
|
||||
<Typography variant="body2" gutterBottom>
|
||||
{task.description}
|
||||
</Typography>
|
||||
<Typography color="primary" gutterBottom>
|
||||
Reward: ${task.rewardAmount}
|
||||
</Typography>
|
||||
<Typography variant="body2" color="textSecondary">
|
||||
Assigned to: {task.junior.fullName}
|
||||
</Typography>
|
||||
</CardContent>
|
||||
</Card>
|
||||
);
|
||||
};
|
||||
@ -1,200 +0,0 @@
|
||||
import {
|
||||
Box,
|
||||
Button,
|
||||
Card,
|
||||
CardContent,
|
||||
Chip,
|
||||
CircularProgress,
|
||||
FormControl,
|
||||
Grid,
|
||||
InputLabel,
|
||||
MenuItem,
|
||||
Pagination,
|
||||
Select,
|
||||
SelectChangeEvent,
|
||||
Typography
|
||||
} from '@mui/material';
|
||||
import React, { useEffect, useState } from 'react';
|
||||
import { useNavigate } from 'react-router-dom';
|
||||
import { juniorsApi, tasksApi } from '../../api/client';
|
||||
import { Junior, PaginatedResponse } from '../../types/junior';
|
||||
import { Task, TaskStatus } from '../../types/task';
|
||||
|
||||
const statusColors = {
|
||||
PENDING: 'warning',
|
||||
IN_PROGRESS: 'info',
|
||||
COMPLETED: 'success'
|
||||
} as const;
|
||||
|
||||
export const TasksList = () => {
|
||||
const [loading, setLoading] = useState(true);
|
||||
const [error, setError] = useState('');
|
||||
const [tasks, setTasks] = useState<Task[]>([]);
|
||||
const [juniors, setJuniors] = useState<Junior[]>([]);
|
||||
const [page, setPage] = useState(1);
|
||||
const [totalPages, setTotalPages] = useState(1);
|
||||
const [status, setStatus] = useState<TaskStatus>('PENDING');
|
||||
const [selectedJuniorId, setSelectedJuniorId] = useState<string>('');
|
||||
const navigate = useNavigate();
|
||||
|
||||
const fetchJuniors = async () => {
|
||||
try {
|
||||
const response = await juniorsApi.getJuniors(1, 50);
|
||||
const data = response.data as PaginatedResponse<Junior>;
|
||||
setJuniors(data.data);
|
||||
} catch (err) {
|
||||
console.error('Failed to load juniors:', err);
|
||||
}
|
||||
};
|
||||
|
||||
const fetchTasks = async (pageNum: number) => {
|
||||
try {
|
||||
setLoading(true);
|
||||
const response = await tasksApi.getTasks(status, pageNum, 10, selectedJuniorId || undefined);
|
||||
const data = response.data as PaginatedResponse<Task>;
|
||||
setTasks(data.data);
|
||||
setTotalPages(data.meta.pageCount);
|
||||
} catch (err) {
|
||||
setError(err instanceof Error ? err.message : 'Failed to load tasks');
|
||||
} finally {
|
||||
setLoading(false);
|
||||
}
|
||||
};
|
||||
|
||||
useEffect(() => {
|
||||
fetchJuniors();
|
||||
}, []);
|
||||
|
||||
useEffect(() => {
|
||||
fetchTasks(page);
|
||||
}, [page, status, selectedJuniorId]);
|
||||
|
||||
const handlePageChange = (event: React.ChangeEvent<unknown>, value: number) => {
|
||||
setPage(value);
|
||||
};
|
||||
|
||||
const handleStatusChange = (event: SelectChangeEvent) => {
|
||||
setStatus(event.target.value as TaskStatus);
|
||||
setPage(1);
|
||||
};
|
||||
|
||||
const handleJuniorChange = (event: SelectChangeEvent) => {
|
||||
setSelectedJuniorId(event.target.value);
|
||||
setPage(1);
|
||||
};
|
||||
|
||||
if (loading && page === 1) {
|
||||
return (
|
||||
<Box display="flex" justifyContent="center" alignItems="center" minHeight="200px">
|
||||
<CircularProgress />
|
||||
</Box>
|
||||
);
|
||||
}
|
||||
|
||||
if (error) {
|
||||
return (
|
||||
<Box p={3}>
|
||||
<Typography color="error">{error}</Typography>
|
||||
</Box>
|
||||
);
|
||||
}
|
||||
|
||||
return (
|
||||
<Box p={3}>
|
||||
<Box display="flex" justifyContent="space-between" alignItems="center" mb={3}>
|
||||
<Typography variant="h4">Tasks</Typography>
|
||||
<Button
|
||||
variant="contained"
|
||||
color="primary"
|
||||
onClick={() => navigate('/tasks/new')}
|
||||
>
|
||||
Create Task
|
||||
</Button>
|
||||
</Box>
|
||||
|
||||
<Box display="flex" gap={2} mb={3}>
|
||||
<FormControl sx={{ minWidth: 200 }}>
|
||||
<InputLabel>Status</InputLabel>
|
||||
<Select
|
||||
value={status}
|
||||
label="Status"
|
||||
onChange={handleStatusChange}
|
||||
>
|
||||
<MenuItem value="PENDING">Pending</MenuItem>
|
||||
<MenuItem value="IN_PROGRESS">In Progress</MenuItem>
|
||||
<MenuItem value="COMPLETED">Completed</MenuItem>
|
||||
</Select>
|
||||
</FormControl>
|
||||
|
||||
<FormControl sx={{ minWidth: 200 }}>
|
||||
<InputLabel>Junior</InputLabel>
|
||||
<Select
|
||||
value={selectedJuniorId}
|
||||
label="Junior"
|
||||
onChange={handleJuniorChange}
|
||||
>
|
||||
<MenuItem value="">All Juniors</MenuItem>
|
||||
{juniors.map(junior => (
|
||||
<MenuItem key={junior.id} value={junior.id}>
|
||||
{junior.fullName}
|
||||
</MenuItem>
|
||||
))}
|
||||
</Select>
|
||||
</FormControl>
|
||||
</Box>
|
||||
|
||||
<Grid container spacing={3}>
|
||||
{tasks.map((task) => (
|
||||
<Grid item xs={12} sm={6} md={4} key={task.id}>
|
||||
<Card>
|
||||
<CardContent>
|
||||
<Box display="flex" justifyContent="space-between" alignItems="flex-start">
|
||||
<Typography variant="h6" gutterBottom>
|
||||
{task.title}
|
||||
</Typography>
|
||||
<Chip
|
||||
label={task.status}
|
||||
color={statusColors[task.status]}
|
||||
size="small"
|
||||
/>
|
||||
</Box>
|
||||
<Typography color="textSecondary" gutterBottom>
|
||||
Due: {new Date(task.dueDate).toLocaleDateString()}
|
||||
</Typography>
|
||||
<Typography variant="body2" gutterBottom>
|
||||
{task.description}
|
||||
</Typography>
|
||||
<Typography color="primary" gutterBottom>
|
||||
Reward: ${task.rewardAmount}
|
||||
</Typography>
|
||||
<Typography variant="body2" color="textSecondary">
|
||||
Assigned to: {task.junior.fullName}
|
||||
</Typography>
|
||||
<Box mt={2}>
|
||||
<Button
|
||||
variant="outlined"
|
||||
fullWidth
|
||||
onClick={() => navigate(`/tasks/${task.id}`)}
|
||||
>
|
||||
View Details
|
||||
</Button>
|
||||
</Box>
|
||||
</CardContent>
|
||||
</Card>
|
||||
</Grid>
|
||||
))}
|
||||
</Grid>
|
||||
|
||||
{totalPages > 1 && (
|
||||
<Box display="flex" justifyContent="center" mt={4}>
|
||||
<Pagination
|
||||
count={totalPages}
|
||||
page={page}
|
||||
onChange={handlePageChange}
|
||||
color="primary"
|
||||
/>
|
||||
</Box>
|
||||
)}
|
||||
</Box>
|
||||
);
|
||||
};
|
||||
@ -1,119 +0,0 @@
|
||||
import React, { createContext, useCallback, useContext, useState } from 'react';
|
||||
import { authApi } from '../api/client';
|
||||
import { LoginRequest, LoginResponse, User } from '../types/auth';
|
||||
|
||||
interface AuthContextType {
|
||||
isAuthenticated: boolean;
|
||||
user: User | null;
|
||||
login: (loginRequest: LoginRequest) => Promise<void>;
|
||||
logout: () => void;
|
||||
register: (countryCode: string, phoneNumber: string) => Promise<void>;
|
||||
verifyOtp: (countryCode: string, phoneNumber: string, otp: string) => Promise<string>;
|
||||
setEmail: (email: string) => Promise<void>;
|
||||
setPasscode: (passcode: string) => Promise<void>;
|
||||
}
|
||||
|
||||
const AuthContext = createContext<AuthContextType | null>(null);
|
||||
|
||||
export const useAuth = () => {
|
||||
const context = useContext(AuthContext);
|
||||
if (!context) {
|
||||
throw new Error('useAuth must be used within an AuthProvider');
|
||||
}
|
||||
return context;
|
||||
};
|
||||
|
||||
export const AuthProvider: React.FC<{ children: React.ReactNode }> = ({ children }) => {
|
||||
const [isAuthenticated, setIsAuthenticated] = useState(false);
|
||||
const [user, setUser] = useState<User | null>(null);
|
||||
|
||||
const login = useCallback(async (loginRequest: LoginRequest) => {
|
||||
try {
|
||||
const response = await authApi.login(loginRequest);
|
||||
const loginData = response.data.data as LoginResponse;
|
||||
setUser(loginData.user);
|
||||
// Store tokens
|
||||
localStorage.setItem('accessToken', loginData.accessToken);
|
||||
localStorage.setItem('refreshToken', loginData.refreshToken);
|
||||
setIsAuthenticated(true);
|
||||
// Store tokens or other auth data in localStorage if needed
|
||||
} catch (error) {
|
||||
console.error('Login failed:', error);
|
||||
throw error;
|
||||
}
|
||||
}, []);
|
||||
|
||||
const logout = useCallback(() => {
|
||||
setUser(null);
|
||||
setIsAuthenticated(false);
|
||||
// Clear any stored auth data
|
||||
localStorage.clear();
|
||||
}, []);
|
||||
|
||||
// Registration state
|
||||
const [registrationData, setRegistrationData] = useState<{
|
||||
countryCode?: string;
|
||||
phoneNumber?: string;
|
||||
email?: string;
|
||||
token?: string;
|
||||
}>({});
|
||||
|
||||
const register = useCallback(async (countryCode: string, phoneNumber: string) => {
|
||||
try {
|
||||
await authApi.register(countryCode, phoneNumber);
|
||||
setRegistrationData({ countryCode, phoneNumber });
|
||||
} catch (error) {
|
||||
console.error('Registration failed:', error);
|
||||
throw error;
|
||||
}
|
||||
}, []);
|
||||
|
||||
const verifyOtp = useCallback(async (countryCode: string, phoneNumber: string, otp: string) => {
|
||||
try {
|
||||
const response = await authApi.verifyOtp(countryCode, phoneNumber, otp);
|
||||
console.log('OTP verification response:', response.data);
|
||||
const { accessToken } = response.data.data;
|
||||
console.log('Access token:', accessToken);
|
||||
// Store token in localStorage immediately
|
||||
localStorage.setItem('accessToken', accessToken);
|
||||
setRegistrationData((prev) => ({ ...prev, token: accessToken }));
|
||||
return accessToken;
|
||||
} catch (error) {
|
||||
console.error('OTP verification failed:', error);
|
||||
throw error;
|
||||
}
|
||||
}, []);
|
||||
|
||||
const setEmail = useCallback(async (email: string) => {
|
||||
try {
|
||||
await authApi.setEmail(email);
|
||||
setRegistrationData((prev) => ({ ...prev, email }));
|
||||
} catch (error) {
|
||||
console.error('Setting email failed:', error);
|
||||
throw error;
|
||||
}
|
||||
}, []);
|
||||
|
||||
const setPasscode = useCallback(async (passcode: string) => {
|
||||
try {
|
||||
await authApi.setPasscode(passcode);
|
||||
setIsAuthenticated(true);
|
||||
} catch (error) {
|
||||
console.error('Setting passcode failed:', error);
|
||||
throw error;
|
||||
}
|
||||
}, []);
|
||||
|
||||
const value = {
|
||||
isAuthenticated,
|
||||
user,
|
||||
login,
|
||||
logout,
|
||||
register,
|
||||
verifyOtp,
|
||||
setEmail,
|
||||
setPasscode,
|
||||
};
|
||||
|
||||
return <AuthContext.Provider value={value}>{children}</AuthContext.Provider>;
|
||||
};
|
||||
@ -1,6 +0,0 @@
|
||||
export enum GrantType {
|
||||
PASSWORD = 'PASSWORD',
|
||||
APPLE = 'APPLE',
|
||||
GOOGLE = 'GOOGLE',
|
||||
BIOMETRIC = 'BIOMETRIC',
|
||||
}
|
||||
@ -1 +0,0 @@
|
||||
export * from './grantType.enum';
|
||||
@ -1,52 +0,0 @@
|
||||
@import url('https://fonts.googleapis.com/css2?family=Inter:wght@400;500;600;700&display=swap');
|
||||
|
||||
* {
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
box-sizing: border-box;
|
||||
}
|
||||
|
||||
body {
|
||||
font-family: 'Inter', -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen',
|
||||
'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue',
|
||||
sans-serif;
|
||||
-webkit-font-smoothing: antialiased;
|
||||
-moz-osx-font-smoothing: grayscale;
|
||||
background-color: #F8F9FA;
|
||||
color: #2D3748;
|
||||
}
|
||||
|
||||
/* Custom scrollbar */
|
||||
::-webkit-scrollbar {
|
||||
width: 8px;
|
||||
height: 8px;
|
||||
}
|
||||
|
||||
::-webkit-scrollbar-track {
|
||||
background: #F8F9FA;
|
||||
}
|
||||
|
||||
::-webkit-scrollbar-thumb {
|
||||
background: #CBD5E0;
|
||||
border-radius: 4px;
|
||||
}
|
||||
|
||||
::-webkit-scrollbar-thumb:hover {
|
||||
background: #A0AEC0;
|
||||
}
|
||||
|
||||
/* Smooth transitions */
|
||||
a, button {
|
||||
transition: all 0.2s ease-in-out;
|
||||
}
|
||||
|
||||
/* Remove focus outline for mouse users, keep for keyboard users */
|
||||
:focus:not(:focus-visible) {
|
||||
outline: none;
|
||||
}
|
||||
|
||||
/* Keep focus outline for keyboard users */
|
||||
:focus-visible {
|
||||
outline: 2px solid #00A7E1;
|
||||
outline-offset: 2px;
|
||||
}
|
||||
@ -1,13 +0,0 @@
|
||||
import React from 'react';
|
||||
import ReactDOM from 'react-dom/client';
|
||||
import App from './App';
|
||||
import '@fontsource/roboto/300.css';
|
||||
import '@fontsource/roboto/400.css';
|
||||
import '@fontsource/roboto/500.css';
|
||||
import '@fontsource/roboto/700.css';
|
||||
|
||||
ReactDOM.createRoot(document.getElementById('root')!).render(
|
||||
<React.StrictMode>
|
||||
<App />
|
||||
</React.StrictMode>
|
||||
);
|
||||
@ -1,14 +0,0 @@
|
||||
interface ApiErrorField {
|
||||
field: string;
|
||||
message: string;
|
||||
}
|
||||
|
||||
export interface ApiError {
|
||||
statusCode: number;
|
||||
message: string | ApiErrorField[];
|
||||
error: string;
|
||||
}
|
||||
|
||||
export interface ApiResponse<T> {
|
||||
data: T;
|
||||
}
|
||||
@ -1,27 +0,0 @@
|
||||
import { GrantType } from '../enums';
|
||||
|
||||
export interface User {
|
||||
id: string;
|
||||
email: string;
|
||||
customerStatus?: string;
|
||||
firstName?: string;
|
||||
lastName?: string;
|
||||
dateOfBirth?: string;
|
||||
countryOfResidence?: string;
|
||||
isJunior?: boolean;
|
||||
isGuardian?: boolean;
|
||||
}
|
||||
|
||||
export interface LoginResponse {
|
||||
accessToken: string;
|
||||
refreshToken: string;
|
||||
user: User;
|
||||
}
|
||||
|
||||
export interface LoginRequest {
|
||||
email?: string;
|
||||
password?: string;
|
||||
grantType: GrantType;
|
||||
googleToken?: string;
|
||||
appleToken?: string;
|
||||
}
|
||||
@ -1,9 +0,0 @@
|
||||
export enum DocumentType {
|
||||
PROFILE_PICTURE = 'PROFILE_PICTURE',
|
||||
PASSPORT = 'PASSPORT',
|
||||
DEFAULT_AVATAR = 'DEFAULT_AVATAR',
|
||||
DEFAULT_TASKS_LOGO = 'DEFAULT_TASKS_LOGO',
|
||||
CUSTOM_AVATAR = 'CUSTOM_AVATAR',
|
||||
CUSTOM_TASKS_LOGO = 'CUSTOM_TASKS_LOGO',
|
||||
GOALS = 'GOALS'
|
||||
}
|
||||
@ -1,41 +0,0 @@
|
||||
export interface Junior {
|
||||
id: string;
|
||||
fullName: string;
|
||||
relationship: string;
|
||||
profilePicture?: {
|
||||
id: string;
|
||||
name: string;
|
||||
extension: string;
|
||||
documentType: string;
|
||||
url: string;
|
||||
};
|
||||
}
|
||||
|
||||
export interface CreateJuniorRequest {
|
||||
countryCode: string;
|
||||
phoneNumber: string;
|
||||
firstName: string;
|
||||
lastName: string;
|
||||
dateOfBirth: string;
|
||||
email: string;
|
||||
relationship: string;
|
||||
civilIdFrontId: string;
|
||||
civilIdBackId: string;
|
||||
}
|
||||
|
||||
export interface JuniorTheme {
|
||||
color: string;
|
||||
avatarId: string;
|
||||
}
|
||||
|
||||
export interface PaginatedResponse<T> {
|
||||
data: T[];
|
||||
meta: {
|
||||
page: number;
|
||||
size: number;
|
||||
itemCount: number;
|
||||
pageCount: number;
|
||||
hasPreviousPage: boolean;
|
||||
hasNextPage: boolean;
|
||||
};
|
||||
}
|
||||
@ -1,42 +0,0 @@
|
||||
import { Junior } from './junior';
|
||||
|
||||
export interface Task {
|
||||
id: string;
|
||||
title: string;
|
||||
description: string;
|
||||
status: 'PENDING' | 'IN_PROGRESS' | 'COMPLETED';
|
||||
dueDate: string;
|
||||
rewardAmount: number;
|
||||
isProofRequired: boolean;
|
||||
submission?: {
|
||||
imageId?: string;
|
||||
submittedAt?: string;
|
||||
status?: 'PENDING' | 'APPROVED' | 'REJECTED';
|
||||
};
|
||||
junior: Junior;
|
||||
image?: {
|
||||
id: string;
|
||||
name: string;
|
||||
extension: string;
|
||||
documentType: string;
|
||||
url: string;
|
||||
};
|
||||
createdAt: string;
|
||||
updatedAt: string;
|
||||
}
|
||||
|
||||
export interface CreateTaskRequest {
|
||||
title: string;
|
||||
description: string;
|
||||
dueDate: string;
|
||||
rewardAmount: number;
|
||||
isProofRequired: boolean;
|
||||
imageId?: string;
|
||||
juniorId: string;
|
||||
}
|
||||
|
||||
export interface TaskSubmission {
|
||||
imageId: string;
|
||||
}
|
||||
|
||||
export type TaskStatus = 'PENDING' | 'IN_PROGRESS' | 'COMPLETED';
|
||||
1
client/src/vite-env.d.ts
vendored
1
client/src/vite-env.d.ts
vendored
@ -1 +0,0 @@
|
||||
/// <reference types="vite/client" />
|
||||
@ -1,26 +0,0 @@
|
||||
{
|
||||
"compilerOptions": {
|
||||
"tsBuildInfoFile": "./node_modules/.tmp/tsconfig.app.tsbuildinfo",
|
||||
"target": "ES2020",
|
||||
"useDefineForClassFields": true,
|
||||
"lib": ["ES2020", "DOM", "DOM.Iterable"],
|
||||
"module": "ESNext",
|
||||
"skipLibCheck": true,
|
||||
|
||||
/* Bundler mode */
|
||||
"moduleResolution": "bundler",
|
||||
"allowImportingTsExtensions": true,
|
||||
"isolatedModules": true,
|
||||
"moduleDetection": "force",
|
||||
"noEmit": true,
|
||||
"jsx": "react-jsx",
|
||||
|
||||
/* Linting */
|
||||
"strict": true,
|
||||
"noUnusedLocals": false,
|
||||
"noUnusedParameters": false,
|
||||
"noFallthroughCasesInSwitch": true,
|
||||
"noUncheckedSideEffectImports": true
|
||||
},
|
||||
"include": ["src"]
|
||||
}
|
||||
@ -1,7 +0,0 @@
|
||||
{
|
||||
"files": [],
|
||||
"references": [
|
||||
{ "path": "./tsconfig.app.json" },
|
||||
{ "path": "./tsconfig.node.json" }
|
||||
]
|
||||
}
|
||||
@ -1,24 +0,0 @@
|
||||
{
|
||||
"compilerOptions": {
|
||||
"tsBuildInfoFile": "./node_modules/.tmp/tsconfig.node.tsbuildinfo",
|
||||
"target": "ES2022",
|
||||
"lib": ["ES2023"],
|
||||
"module": "ESNext",
|
||||
"skipLibCheck": true,
|
||||
|
||||
/* Bundler mode */
|
||||
"moduleResolution": "bundler",
|
||||
"allowImportingTsExtensions": true,
|
||||
"isolatedModules": true,
|
||||
"moduleDetection": "force",
|
||||
"noEmit": true,
|
||||
|
||||
/* Linting */
|
||||
"strict": true,
|
||||
"noUnusedLocals": true,
|
||||
"noUnusedParameters": true,
|
||||
"noFallthroughCasesInSwitch": true,
|
||||
"noUncheckedSideEffectImports": true
|
||||
},
|
||||
"include": ["vite.config.ts"]
|
||||
}
|
||||
@ -1,16 +0,0 @@
|
||||
import react from '@vitejs/plugin-react';
|
||||
import path from 'path';
|
||||
import { defineConfig, loadEnv } from 'vite';
|
||||
|
||||
// https://vitejs.dev/config/
|
||||
export default defineConfig(({ mode }) => {
|
||||
const env = loadEnv(mode, path.join(process.cwd(), '..'), '');
|
||||
return {
|
||||
define: {
|
||||
'process.env.REACT_APP_APPLE_CLIENT_ID': JSON.stringify(env.REACT_APP_APPLE_CLIENT_ID),
|
||||
'process.env.REACT_APP_APPLE_REDIRECT_URI': JSON.stringify(env.REACT_APP_APPLE_REDIRECT_URI),
|
||||
'process.env.GOOGLE_WEB_CLIENT_ID': JSON.stringify(env.GOOGLE_WEB_CLIENT_ID),
|
||||
},
|
||||
plugins: [react()],
|
||||
};
|
||||
});
|
||||
@ -25,7 +25,13 @@ export class AllowanceChangeRequestsRepository {
|
||||
|
||||
findAllowanceChangeRequestBy(where: FindOptionsWhere<AllowanceChangeRequest>, withRelations = false) {
|
||||
const relations = withRelations
|
||||
? ['allowance', 'allowance.junior', 'allowance.junior.customer', 'allowance.junior.customer.profilePicture']
|
||||
? [
|
||||
'allowance',
|
||||
'allowance.junior',
|
||||
'allowance.junior.customer',
|
||||
'allowance.junior.customer.user',
|
||||
'allowance.junior.customer.user.profilePicture',
|
||||
]
|
||||
: [];
|
||||
return this.allowanceChangeRequestsRepository.findOne({ where, relations });
|
||||
}
|
||||
@ -43,7 +49,8 @@ export class AllowanceChangeRequestsRepository {
|
||||
'allowance',
|
||||
'allowance.junior',
|
||||
'allowance.junior.customer',
|
||||
'allowance.junior.customer.profilePicture',
|
||||
'allowance.junior.customer.user',
|
||||
'allowance.junior.customer.user.profilePicture',
|
||||
],
|
||||
});
|
||||
}
|
||||
|
||||
@ -28,14 +28,14 @@ export class AllowancesRepository {
|
||||
findAllowanceById(allowanceId: string, guardianId?: string) {
|
||||
return this.allowancesRepository.findOne({
|
||||
where: { id: allowanceId, guardianId },
|
||||
relations: ['junior', 'junior.customer', 'junior.customer.profilePicture'],
|
||||
relations: ['junior', 'junior.customer', 'junior.customer.user', 'junior.customer.user.profilePicture'],
|
||||
});
|
||||
}
|
||||
|
||||
findAllowances(guardianId: string, query: PageOptionsRequestDto) {
|
||||
return this.allowancesRepository.findAndCount({
|
||||
where: { guardianId },
|
||||
relations: ['junior', 'junior.customer', 'junior.customer.profilePicture'],
|
||||
relations: ['junior', 'junior.customer', 'junior.customer.user', 'junior.customer.user.profilePicture'],
|
||||
take: query.size,
|
||||
skip: query.size * (query.page - ONE),
|
||||
});
|
||||
|
||||
@ -122,7 +122,7 @@ export class AllowanceChangeRequestsService {
|
||||
this.logger.log(`Preparing allowance change requests images`);
|
||||
return Promise.all(
|
||||
requests.map(async (request) => {
|
||||
const profilePicture = request.allowance.junior.customer.profilePicture;
|
||||
const profilePicture = request.allowance.junior.customer.user.profilePicture;
|
||||
if (profilePicture) {
|
||||
profilePicture.url = await this.ociService.generatePreSignedUrl(profilePicture);
|
||||
}
|
||||
|
||||
@ -100,7 +100,7 @@ export class AllowancesService {
|
||||
this.logger.log(`Preparing document for allowances`);
|
||||
await Promise.all(
|
||||
allowance.map(async (allowance) => {
|
||||
const profilePicture = allowance.junior.customer.profilePicture;
|
||||
const profilePicture = allowance.junior.customer.user.profilePicture;
|
||||
if (profilePicture) {
|
||||
profilePicture.url = await this.ociService.generatePreSignedUrl(profilePicture);
|
||||
}
|
||||
|
||||
@ -1,11 +1,12 @@
|
||||
import { Body, Controller, HttpCode, HttpStatus, Post, Req, UseGuards } from '@nestjs/common';
|
||||
import { ApiBearerAuth, ApiTags } from '@nestjs/swagger';
|
||||
import { Request } from 'express';
|
||||
import { Public } from '~/common/decorators';
|
||||
import { AuthenticatedUser, Public } from '~/common/decorators';
|
||||
import { AccessTokenGuard } from '~/common/guards';
|
||||
import { ApiDataResponse, ApiLangRequestHeader } from '~/core/decorators';
|
||||
import { ResponseFactory } from '~/core/utils';
|
||||
import {
|
||||
ChangePasswordRequestDto,
|
||||
CreateUnverifiedUserRequestDto,
|
||||
ForgetPasswordRequestDto,
|
||||
LoginRequestDto,
|
||||
@ -17,6 +18,7 @@ import {
|
||||
import { SendForgetPasswordOtpResponseDto, SendRegisterOtpResponseDto } from '../dtos/response';
|
||||
import { LoginResponseDto } from '../dtos/response/login.response.dto';
|
||||
import { VerifyForgetPasswordOtpResponseDto } from '../dtos/response/verify-forget-password-otp.response.dto';
|
||||
import { IJwtPayload } from '../interfaces';
|
||||
import { AuthService } from '../services';
|
||||
|
||||
@Controller('auth')
|
||||
@ -64,6 +66,13 @@ export class AuthController {
|
||||
return this.authService.resetPassword(forgetPasswordDto);
|
||||
}
|
||||
|
||||
@Post('change-password')
|
||||
@HttpCode(HttpStatus.NO_CONTENT)
|
||||
@UseGuards(AccessTokenGuard)
|
||||
async changePassword(@AuthenticatedUser() { sub }: IJwtPayload, @Body() forgetPasswordDto: ChangePasswordRequestDto) {
|
||||
return this.authService.changePassword(sub, forgetPasswordDto);
|
||||
}
|
||||
|
||||
@Post('refresh-token')
|
||||
@Public()
|
||||
async refreshToken(@Body() { refreshToken }: RefreshTokenRequestDto) {
|
||||
|
||||
23
src/auth/dtos/request/change-password.request.dto.ts
Normal file
23
src/auth/dtos/request/change-password.request.dto.ts
Normal file
@ -0,0 +1,23 @@
|
||||
import { ApiProperty } from '@nestjs/swagger';
|
||||
import { IsNotEmpty, IsString, Matches } from 'class-validator';
|
||||
import { i18nValidationMessage as i18n } from 'nestjs-i18n';
|
||||
import { PASSWORD_REGEX } from '~/auth/constants';
|
||||
|
||||
export class ChangePasswordRequestDto {
|
||||
@ApiProperty({ example: 'currentPassword@123' })
|
||||
@IsString({ message: i18n('validation.IsString', { path: 'general', property: 'auth.currentPassword' }) })
|
||||
@IsNotEmpty({ message: i18n('validation.IsNotEmpty', { path: 'general', property: 'auth.currentPassword' }) })
|
||||
currentPassword!: string;
|
||||
|
||||
@ApiProperty({ example: 'Abcd1234@' })
|
||||
@Matches(PASSWORD_REGEX, {
|
||||
message: i18n('validation.Matches', { path: 'general', property: 'auth.newPassword' }),
|
||||
})
|
||||
newPassword!: string;
|
||||
|
||||
@ApiProperty({ example: 'Abcd1234@' })
|
||||
@Matches(PASSWORD_REGEX, {
|
||||
message: i18n('validation.Matches', { path: 'general', property: 'auth.confirmNewPassword' }),
|
||||
})
|
||||
confirmNewPassword!: string;
|
||||
}
|
||||
@ -1,4 +1,5 @@
|
||||
export * from './apple-login.request.dto';
|
||||
export * from './change-password.request.dto';
|
||||
export * from './create-unverified-user.request.dto';
|
||||
export * from './disable-biometric.request.dto';
|
||||
export * from './enable-biometric.request.dto';
|
||||
|
||||
@ -39,7 +39,7 @@ export class VerifyUserRequestDto {
|
||||
@IsNotEmpty({ message: i18n('validation.IsNotEmpty', { path: 'general', property: 'customer.lastName' }) })
|
||||
lastName!: string;
|
||||
|
||||
@ApiProperty({ example: '2021-01-01' })
|
||||
@ApiProperty({ example: '2001-01-01' })
|
||||
@IsDateString({}, { message: i18n('validation.IsDateString', { path: 'general', property: 'customer.dateOfBirth' }) })
|
||||
@IsAbove18({ message: i18n('validation.IsAbove18', { path: 'general', property: 'customer.dateOfBirth' }) })
|
||||
dateOfBirth!: Date;
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
import { ApiProperty } from '@nestjs/swagger';
|
||||
import { Roles } from '~/auth/enums';
|
||||
import { ApiProperty, ApiPropertyOptional } from '@nestjs/swagger';
|
||||
import { DocumentMetaResponseDto } from '~/document/dtos/response';
|
||||
import { User } from '~/user/entities';
|
||||
|
||||
export class UserResponseDto {
|
||||
@ -7,42 +7,42 @@ export class UserResponseDto {
|
||||
id!: string;
|
||||
|
||||
@ApiProperty()
|
||||
email!: string;
|
||||
countryCode!: string;
|
||||
|
||||
@ApiProperty()
|
||||
phoneNumber!: string;
|
||||
|
||||
@ApiProperty()
|
||||
countryCode!: string;
|
||||
email!: string;
|
||||
|
||||
@ApiProperty()
|
||||
isPasswordSet!: boolean;
|
||||
firstName!: string;
|
||||
|
||||
@ApiProperty()
|
||||
isProfileCompleted!: boolean;
|
||||
lastName!: string;
|
||||
|
||||
@ApiProperty()
|
||||
isSmsEnabled!: boolean;
|
||||
dateOfBirth!: Date;
|
||||
|
||||
@ApiPropertyOptional({ type: DocumentMetaResponseDto, nullable: true })
|
||||
profilePicture!: DocumentMetaResponseDto | null;
|
||||
|
||||
@ApiProperty()
|
||||
isEmailEnabled!: boolean;
|
||||
isPhoneVerified!: boolean;
|
||||
|
||||
@ApiProperty()
|
||||
isPushEnabled!: boolean;
|
||||
|
||||
@ApiProperty()
|
||||
roles!: Roles[];
|
||||
isEmailVerified!: boolean;
|
||||
|
||||
constructor(user: User) {
|
||||
this.id = user.id;
|
||||
this.email = user.email;
|
||||
this.phoneNumber = user.phoneNumber;
|
||||
this.countryCode = user.countryCode;
|
||||
this.isPasswordSet = user.isPasswordSet;
|
||||
this.isProfileCompleted = user.isProfileCompleted;
|
||||
this.isSmsEnabled = user.isSmsEnabled;
|
||||
this.isEmailEnabled = user.isEmailEnabled;
|
||||
this.isPushEnabled = user.isPushEnabled;
|
||||
this.roles = user.roles;
|
||||
this.phoneNumber = user.phoneNumber;
|
||||
this.dateOfBirth = user.customer?.dateOfBirth;
|
||||
this.email = user.email;
|
||||
this.firstName = user.firstName;
|
||||
this.lastName = user.lastName;
|
||||
this.profilePicture = user.profilePicture ? new DocumentMetaResponseDto(user.profilePicture) : null;
|
||||
this.isEmailVerified = user.isEmailVerified;
|
||||
this.isPhoneVerified = user.isPhoneVerified;
|
||||
}
|
||||
}
|
||||
|
||||
@ -11,6 +11,7 @@ import { UserType } from '~/user/enums';
|
||||
import { DeviceService, UserService, UserTokenService } from '~/user/services';
|
||||
import { User } from '../../user/entities';
|
||||
import {
|
||||
ChangePasswordRequestDto,
|
||||
CreateUnverifiedUserRequestDto,
|
||||
DisableBiometricRequestDto,
|
||||
EnableBiometricRequestDto,
|
||||
@ -172,6 +173,7 @@ export class AuthService {
|
||||
|
||||
return { token, user };
|
||||
}
|
||||
|
||||
async resetPassword({
|
||||
countryCode,
|
||||
phoneNumber,
|
||||
@ -191,6 +193,15 @@ export class AuthService {
|
||||
throw new BadRequestException('AUTH.PASSWORD_MISMATCH');
|
||||
}
|
||||
|
||||
const isOldPassword = bcrypt.compareSync(password, user.password);
|
||||
|
||||
if (isOldPassword) {
|
||||
this.logger.error(
|
||||
`New password cannot be the same as the current password for user with phone number ${user.fullPhoneNumber}`,
|
||||
);
|
||||
throw new BadRequestException('AUTH.PASSWORD_SAME_AS_CURRENT');
|
||||
}
|
||||
|
||||
const hashedPassword = bcrypt.hashSync(password, user.salt);
|
||||
|
||||
await this.userService.setPassword(user.id, hashedPassword, user.salt);
|
||||
@ -198,6 +209,38 @@ export class AuthService {
|
||||
this.logger.log(`Passcode updated successfully for user with phone number ${user.fullPhoneNumber}`);
|
||||
}
|
||||
|
||||
async changePassword(userId: string, { currentPassword, newPassword, confirmNewPassword }: ChangePasswordRequestDto) {
|
||||
const user = await this.userService.findUserOrThrow({ id: userId });
|
||||
|
||||
if (!user.isPasswordSet) {
|
||||
this.logger.error(`Password not set for user with id ${userId}`);
|
||||
throw new BadRequestException('AUTH.PASSWORD_NOT_SET');
|
||||
}
|
||||
|
||||
if (currentPassword === newPassword) {
|
||||
this.logger.error('New password cannot be the same as current password');
|
||||
throw new BadRequestException('AUTH.PASSWORD_SAME_AS_CURRENT');
|
||||
}
|
||||
|
||||
if (newPassword !== confirmNewPassword) {
|
||||
this.logger.error('New password and confirm new password do not match');
|
||||
throw new BadRequestException('AUTH.PASSWORD_MISMATCH');
|
||||
}
|
||||
|
||||
this.logger.log(`Validating current password for user with id ${userId}`);
|
||||
const isCurrentPasswordValid = bcrypt.compareSync(currentPassword, user.password);
|
||||
|
||||
if (!isCurrentPasswordValid) {
|
||||
this.logger.error(`Invalid current password for user with id ${userId}`);
|
||||
throw new UnauthorizedException('AUTH.INVALID_CURRENT_PASSWORD');
|
||||
}
|
||||
|
||||
const salt = bcrypt.genSaltSync(SALT_ROUNDS);
|
||||
const hashedNewPassword = bcrypt.hashSync(newPassword, salt);
|
||||
await this.userService.setPassword(user.id, hashedNewPassword, salt);
|
||||
this.logger.log(`Password changed successfully for user with id ${userId}`);
|
||||
}
|
||||
|
||||
async setJuniorPasscode(body: setJuniorPasswordRequestDto) {
|
||||
this.logger.log(`Setting passcode for junior with qrToken ${body.qrToken}`);
|
||||
const juniorId = await this.userTokenService.validateToken(body.qrToken, UserType.JUNIOR);
|
||||
|
||||
1
src/common/mappers/index.ts
Normal file
1
src/common/mappers/index.ts
Normal file
@ -0,0 +1 @@
|
||||
export * from './numeric-to-iso.mapper';
|
||||
11
src/common/mappers/numeric-to-iso.mapper.ts
Normal file
11
src/common/mappers/numeric-to-iso.mapper.ts
Normal file
@ -0,0 +1,11 @@
|
||||
import { CountriesNumericISO } from '../constants';
|
||||
import { CountryIso } from '../enums';
|
||||
|
||||
// At module top-level
|
||||
export const NumericToCountryIso: Record<string, CountryIso> = Object.entries(CountriesNumericISO).reduce(
|
||||
(acc, [isoKey, numeric]) => {
|
||||
acc[numeric] = isoKey as CountryIso;
|
||||
return acc;
|
||||
},
|
||||
{} as Record<string, CountryIso>,
|
||||
);
|
||||
@ -1,2 +1,3 @@
|
||||
export * from './create-application.mock';
|
||||
export * from './initiate-kyc.mock';
|
||||
export * from './inquire-application.mock';
|
||||
|
||||
21
src/common/modules/neoleap/__mocks__/initiate-kyc.mock.ts
Normal file
21
src/common/modules/neoleap/__mocks__/initiate-kyc.mock.ts
Normal file
@ -0,0 +1,21 @@
|
||||
export const INITIATE_KYC_MOCK = {
|
||||
ResponseHeader: {
|
||||
Version: '1.0.0',
|
||||
MsgUid: 'f3a9d4b2-5c7a-4e2f-8121-9c4e5a6b7d8f',
|
||||
Source: 'ZOD',
|
||||
ServiceId: 'InitiateKyc',
|
||||
ReqDateTime: '2025-08-07T14:20:00.000Z',
|
||||
RspDateTime: '2025-08-07T14:20:00.123Z',
|
||||
ResponseCode: '000',
|
||||
ResponseType: 'Success',
|
||||
ProcessingTime: 123,
|
||||
ResponseDescription: 'KYC initiation successful',
|
||||
},
|
||||
InitiateKycResponseDetails: {
|
||||
InstitutionCode: '1100',
|
||||
TransId: '3136fd60-3f89-4d24-a92f-b9c63a53807f',
|
||||
RandomNumber: '38',
|
||||
Status: 'WAITING',
|
||||
ExpiryDateTime: '2025-08-07T14:30:00.000Z',
|
||||
},
|
||||
};
|
||||
23
src/common/modules/neoleap/__mocks__/kyc-callback.mock.ts
Normal file
23
src/common/modules/neoleap/__mocks__/kyc-callback.mock.ts
Normal file
@ -0,0 +1,23 @@
|
||||
export const getKycCallbackMock = (nationalId: string) => {
|
||||
return {
|
||||
InstId: '1100',
|
||||
transId: '3136fd60-3f89-4d24-a92f-b9c63a53807f',
|
||||
date: '20250807',
|
||||
time: '150000',
|
||||
status: 'SUCCESS',
|
||||
firstName: 'John',
|
||||
lastName: 'Doe',
|
||||
dob: '19990107',
|
||||
nationality: '682',
|
||||
gender: 'M',
|
||||
nationalIdExpiry: '20310917',
|
||||
nationalId,
|
||||
mobile: '+962798765432',
|
||||
salaryMin: '500',
|
||||
salaryMax: '1000',
|
||||
incomeSource: 'Salary',
|
||||
professionTitle: 'Software Engineer',
|
||||
professionType: 'Full-Time',
|
||||
isPep: 'N',
|
||||
};
|
||||
};
|
||||
@ -5,6 +5,7 @@ import {
|
||||
AccountCardStatusChangedWebhookRequest,
|
||||
AccountTransactionWebhookRequest,
|
||||
CardTransactionWebhookRequest,
|
||||
KycWebhookRequest,
|
||||
} from '../dtos/requests';
|
||||
import { NeoLeapWebhookService } from '../services';
|
||||
|
||||
@ -30,4 +31,10 @@ export class NeoLeapWebhooksController {
|
||||
await this.neoleapWebhookService.handleAccountCardStatusChangedWebhook(body);
|
||||
return ResponseFactory.data({ message: 'Card status updated successfully', status: 'success' });
|
||||
}
|
||||
|
||||
@Post('kyc')
|
||||
async handleKycWebhook(@Body() body: KycWebhookRequest) {
|
||||
await this.neoleapWebhookService.handleKycWebhook(body);
|
||||
return ResponseFactory.data({ message: 'KYC processed successfully', status: 'success' });
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
export * from './account-card-status-changed-webhook.request.dto';
|
||||
export * from './account-transaction-webhook.request.dto';
|
||||
export * from './card-transaction-webhook.request.dto';
|
||||
export * from './kyc-webhook.request.dto';
|
||||
export * from './update-card-controls.request.dto';
|
||||
|
||||
@ -0,0 +1,99 @@
|
||||
import { ApiProperty } from '@nestjs/swagger';
|
||||
import { Expose } from 'class-transformer';
|
||||
import { IsString } from 'class-validator';
|
||||
export class KycWebhookRequest {
|
||||
@Expose({ name: 'InstId' })
|
||||
@IsString()
|
||||
@ApiProperty({ name: 'InstId', example: '1100' })
|
||||
instId!: string;
|
||||
|
||||
@Expose()
|
||||
@IsString()
|
||||
@ApiProperty({ example: '3136fd60-3f89-4d24-a92f-b9c63a53807f' })
|
||||
transId!: string;
|
||||
|
||||
@Expose()
|
||||
@IsString()
|
||||
@ApiProperty({ example: '20250807' })
|
||||
date!: string;
|
||||
|
||||
@Expose()
|
||||
@IsString()
|
||||
@ApiProperty({ example: '150000' })
|
||||
time!: string;
|
||||
|
||||
@Expose()
|
||||
@IsString()
|
||||
@ApiProperty({ example: 'SUCCESS' })
|
||||
status!: string;
|
||||
|
||||
@Expose()
|
||||
@IsString()
|
||||
@ApiProperty({ example: 'John' })
|
||||
firstName!: string;
|
||||
|
||||
@Expose()
|
||||
@IsString()
|
||||
@ApiProperty({ example: 'Doe' })
|
||||
lastName!: string;
|
||||
|
||||
@Expose()
|
||||
@IsString()
|
||||
@ApiProperty({ example: '19990107' })
|
||||
dob!: string;
|
||||
|
||||
@Expose()
|
||||
@IsString()
|
||||
@ApiProperty({ example: '682' })
|
||||
nationality!: string;
|
||||
|
||||
@Expose()
|
||||
@IsString()
|
||||
@ApiProperty({ example: 'M' })
|
||||
gender!: string;
|
||||
|
||||
@Expose()
|
||||
@IsString()
|
||||
@ApiProperty({ example: '20310917' })
|
||||
nationalIdExpiry!: string;
|
||||
|
||||
@Expose()
|
||||
@IsString()
|
||||
@ApiProperty({ example: '1250820840' })
|
||||
nationalId!: string;
|
||||
|
||||
@Expose()
|
||||
@IsString()
|
||||
@ApiProperty({ example: '+962798765432' })
|
||||
mobile!: string;
|
||||
|
||||
@Expose()
|
||||
@IsString()
|
||||
@ApiProperty({ example: '500' })
|
||||
salaryMin!: string;
|
||||
|
||||
@Expose()
|
||||
@IsString()
|
||||
@ApiProperty({ example: '1000' })
|
||||
salaryMax!: string;
|
||||
|
||||
@Expose()
|
||||
@IsString()
|
||||
@ApiProperty({ example: 'Salary' })
|
||||
incomeSource!: string;
|
||||
|
||||
@Expose()
|
||||
@IsString()
|
||||
@ApiProperty({ example: 'Software Engineer' })
|
||||
professionTitle!: string;
|
||||
|
||||
@Expose()
|
||||
@IsString()
|
||||
@ApiProperty({ example: 'Full-Time' })
|
||||
professionType!: string;
|
||||
|
||||
@Expose()
|
||||
@IsString()
|
||||
@ApiProperty({ example: 'N' })
|
||||
isPep!: string;
|
||||
}
|
||||
@ -1,3 +1,4 @@
|
||||
export * from './create-application.response.dto';
|
||||
export * from './initiate-kyc.response.dto';
|
||||
export * from './inquire-application.response';
|
||||
export * from './update-card-controls.response.dto';
|
||||
|
||||
@ -0,0 +1,28 @@
|
||||
import { ApiProperty } from '@nestjs/swagger';
|
||||
import { Expose, Transform } from 'class-transformer';
|
||||
export class InitiateKycResponseDto {
|
||||
@Transform(({ obj }) => obj?.InstitutionCode)
|
||||
@Expose()
|
||||
@ApiProperty()
|
||||
institutionCode!: string;
|
||||
|
||||
@Transform(({ obj }) => obj?.TransId)
|
||||
@Expose()
|
||||
@ApiProperty()
|
||||
transId!: string;
|
||||
|
||||
@Transform(({ obj }) => obj?.RandomNumber)
|
||||
@Expose()
|
||||
@ApiProperty()
|
||||
randomNumber!: string;
|
||||
|
||||
@Transform(({ obj }) => obj?.Status)
|
||||
@Expose()
|
||||
@ApiProperty()
|
||||
status!: string;
|
||||
|
||||
@Transform(({ obj }) => obj?.ExpiryDateTime)
|
||||
@Expose()
|
||||
@ApiProperty()
|
||||
expiryDateTime!: string;
|
||||
}
|
||||
@ -1,5 +1,5 @@
|
||||
import { HttpModule } from '@nestjs/axios';
|
||||
import { Module } from '@nestjs/common';
|
||||
import { forwardRef, Module } from '@nestjs/common';
|
||||
import { CardModule } from '~/card/card.module';
|
||||
import { CustomerModule } from '~/customer/customer.module';
|
||||
import { NeoLeapWebhooksController } from './controllers/neoleap-webhooks.controller';
|
||||
@ -8,8 +8,9 @@ import { NeoLeapWebhookService } from './services';
|
||||
import { NeoLeapService } from './services/neoleap.service';
|
||||
|
||||
@Module({
|
||||
imports: [HttpModule, CustomerModule, CardModule],
|
||||
imports: [HttpModule, CardModule, forwardRef(() => CustomerModule)],
|
||||
controllers: [NeoTestController, NeoLeapWebhooksController],
|
||||
providers: [NeoLeapService, NeoLeapWebhookService],
|
||||
exports: [NeoLeapService],
|
||||
})
|
||||
export class NeoLeapModule {}
|
||||
|
||||
@ -1,15 +1,21 @@
|
||||
import { Injectable } from '@nestjs/common';
|
||||
import { CardService } from '~/card/services';
|
||||
import { TransactionService } from '~/card/services/transaction.service';
|
||||
import { CustomerService } from '~/customer/services';
|
||||
import {
|
||||
AccountCardStatusChangedWebhookRequest,
|
||||
AccountTransactionWebhookRequest,
|
||||
CardTransactionWebhookRequest,
|
||||
KycWebhookRequest,
|
||||
} from '../dtos/requests';
|
||||
|
||||
@Injectable()
|
||||
export class NeoLeapWebhookService {
|
||||
constructor(private readonly transactionService: TransactionService, private readonly cardService: CardService) {}
|
||||
constructor(
|
||||
private readonly transactionService: TransactionService,
|
||||
private readonly cardService: CardService,
|
||||
private customerService: CustomerService,
|
||||
) {}
|
||||
|
||||
handleCardTransactionWebhook(body: CardTransactionWebhookRequest) {
|
||||
return this.transactionService.createCardTransaction(body);
|
||||
@ -22,4 +28,8 @@ export class NeoLeapWebhookService {
|
||||
handleAccountCardStatusChangedWebhook(body: AccountCardStatusChangedWebhookRequest) {
|
||||
return this.cardService.updateCardStatus(body);
|
||||
}
|
||||
|
||||
handleKycWebhook(body: KycWebhookRequest) {
|
||||
return this.customerService.updateCustomerKyc(body);
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,14 +1,21 @@
|
||||
import { HttpService } from '@nestjs/axios';
|
||||
import { BadRequestException, Injectable, InternalServerErrorException } from '@nestjs/common';
|
||||
import { BadRequestException, Injectable, InternalServerErrorException, Logger } from '@nestjs/common';
|
||||
import { ConfigService } from '@nestjs/config';
|
||||
import { ClassConstructor, plainToInstance } from 'class-transformer';
|
||||
import moment from 'moment';
|
||||
import { v4 as uuid } from 'uuid';
|
||||
import { CountriesNumericISO } from '~/common/constants';
|
||||
import { InitiateKycRequestDto } from '~/customer/dtos/request';
|
||||
import { Customer } from '~/customer/entities';
|
||||
import { Gender, KycStatus } from '~/customer/enums';
|
||||
import { CREATE_APPLICATION_MOCK, INQUIRE_APPLICATION_MOCK } from '../__mocks__/';
|
||||
import { CreateApplicationResponse, InquireApplicationResponse, UpdateCardControlsResponseDto } from '../dtos/response';
|
||||
import { CREATE_APPLICATION_MOCK, INITIATE_KYC_MOCK, INQUIRE_APPLICATION_MOCK } from '../__mocks__/';
|
||||
import { getKycCallbackMock } from '../__mocks__/kyc-callback.mock';
|
||||
import {
|
||||
CreateApplicationResponse,
|
||||
InitiateKycResponseDto,
|
||||
InquireApplicationResponse,
|
||||
UpdateCardControlsResponseDto,
|
||||
} from '../dtos/response';
|
||||
import {
|
||||
ICreateApplicationRequest,
|
||||
IInquireApplicationRequest,
|
||||
@ -17,16 +24,62 @@ import {
|
||||
} from '../interfaces';
|
||||
@Injectable()
|
||||
export class NeoLeapService {
|
||||
private readonly baseUrl: string;
|
||||
private readonly logger = new Logger(NeoLeapService.name);
|
||||
private readonly gatewayBaseUrl: string;
|
||||
private readonly zodApiUrl: string;
|
||||
private readonly apiKey: string;
|
||||
private readonly useGateway: boolean;
|
||||
private readonly institutionCode = '1100';
|
||||
useLocalCert: boolean;
|
||||
constructor(private readonly httpService: HttpService, private readonly configService: ConfigService) {
|
||||
this.baseUrl = this.configService.getOrThrow<string>('GATEWAY_URL');
|
||||
this.gatewayBaseUrl = this.configService.getOrThrow<string>('GATEWAY_URL');
|
||||
this.apiKey = this.configService.getOrThrow<string>('GATEWAY_API_KEY');
|
||||
this.useGateway = [true, 'true'].includes(this.configService.get<boolean>('USE_GATEWAY', false));
|
||||
this.useLocalCert = this.configService.get<boolean>('USE_LOCAL_CERT', false);
|
||||
this.zodApiUrl = this.configService.getOrThrow<string>('ZOD_API_URL');
|
||||
}
|
||||
|
||||
async initiateKyc(customerId: string, body: InitiateKycRequestDto) {
|
||||
const responseKey = 'InitiateKycResponseDetails';
|
||||
|
||||
if (!this.useGateway) {
|
||||
const responseDto = plainToInstance(InitiateKycResponseDto, INITIATE_KYC_MOCK[responseKey], {
|
||||
excludeExtraneousValues: true,
|
||||
});
|
||||
|
||||
setTimeout(() => {
|
||||
this.httpService
|
||||
.post(`${this.zodApiUrl}/neoleap-webhooks/kyc`, getKycCallbackMock(body.nationalId), {
|
||||
headers: {
|
||||
'Content-Type': 'application/json',
|
||||
},
|
||||
})
|
||||
.subscribe({
|
||||
next: () => this.logger.log('Mock KYC webhook sent'),
|
||||
error: (err) => console.error(err),
|
||||
});
|
||||
}, 7000);
|
||||
|
||||
return responseDto;
|
||||
}
|
||||
|
||||
const payload = {
|
||||
InitiateKycRequestDetails: {
|
||||
CustomerIdentifier: {
|
||||
InstitutionCode: this.institutionCode,
|
||||
Id: customerId,
|
||||
NationalId: body.nationalId,
|
||||
},
|
||||
},
|
||||
RequestHeader: this.prepareHeaders('InitiateKyc'),
|
||||
};
|
||||
|
||||
return this.sendRequestToNeoLeap<typeof payload, InitiateKycResponseDto>(
|
||||
'kyc/InitiateKyc',
|
||||
payload,
|
||||
responseKey,
|
||||
InitiateKycResponseDto,
|
||||
);
|
||||
}
|
||||
|
||||
async createApplication(customer: Customer) {
|
||||
@ -189,7 +242,7 @@ export class NeoLeapService {
|
||||
responseClass: ClassConstructor<R>,
|
||||
): Promise<R> {
|
||||
try {
|
||||
const { data } = await this.httpService.axiosRef.post(`${this.baseUrl}/${endpoint}`, payload, {
|
||||
const { data } = await this.httpService.axiosRef.post(`${this.gatewayBaseUrl}/${endpoint}`, payload, {
|
||||
headers: {
|
||||
'Content-Type': 'application/json',
|
||||
Authorization: `${this.apiKey}`,
|
||||
|
||||
@ -1,3 +1,4 @@
|
||||
// placeholder
|
||||
export * from './is-above-18';
|
||||
export * from './is-valid-phone-number';
|
||||
export * from './is-valid-saudi-id';
|
||||
|
||||
35
src/core/decorators/validations/is-valid-saudi-id.ts
Normal file
35
src/core/decorators/validations/is-valid-saudi-id.ts
Normal file
@ -0,0 +1,35 @@
|
||||
import { registerDecorator, ValidationArguments, ValidationOptions } from 'class-validator';
|
||||
|
||||
export function isValidSaudiId(validationOptions?: ValidationOptions) {
|
||||
return function (object: any, propertyName: string) {
|
||||
registerDecorator({
|
||||
name: 'isValidSaudiId',
|
||||
target: object.constructor,
|
||||
propertyName,
|
||||
options: {
|
||||
message: `${propertyName} must be a valid Saudi ID`,
|
||||
...validationOptions,
|
||||
},
|
||||
constraints: [],
|
||||
validator: {
|
||||
validate(value: any, args: ValidationArguments) {
|
||||
if (typeof value !== 'string') return false;
|
||||
if (!/^[12]\d{9}$/.test(value)) return false;
|
||||
|
||||
// Luhn algorithm
|
||||
let sum = 0;
|
||||
for (let i = 0; i < 10; i++) {
|
||||
let digit = parseInt(value[i]);
|
||||
if (i % 2 === 0) {
|
||||
digit *= 2;
|
||||
if (digit > 9) digit -= 9;
|
||||
}
|
||||
sum += digit;
|
||||
}
|
||||
|
||||
return sum % 10 === 0;
|
||||
},
|
||||
},
|
||||
});
|
||||
};
|
||||
}
|
||||
@ -1,12 +1,12 @@
|
||||
import { Body, Controller, Get, Patch, Post, UseGuards } from '@nestjs/common';
|
||||
import { Body, Controller, Get, Post, UseGuards } from '@nestjs/common';
|
||||
import { ApiBearerAuth, ApiTags } from '@nestjs/swagger';
|
||||
import { IJwtPayload } from '~/auth/interfaces';
|
||||
import { AuthenticatedUser } from '~/common/decorators';
|
||||
import { AccessTokenGuard } from '~/common/guards';
|
||||
import { ApiDataResponse, ApiLangRequestHeader } from '~/core/decorators';
|
||||
import { ResponseFactory } from '~/core/utils';
|
||||
import { CreateCustomerRequestDto, UpdateCustomerRequestDto } from '../dtos/request';
|
||||
import { CustomerResponseDto } from '../dtos/response';
|
||||
import { InitiateKycRequestDto } from '../dtos/request';
|
||||
import { CustomerResponseDto, InitiateKycResponseDto } from '../dtos/response';
|
||||
import { CustomerService } from '../services';
|
||||
|
||||
@Controller('customers')
|
||||
@ -15,8 +15,7 @@ import { CustomerService } from '../services';
|
||||
@ApiLangRequestHeader()
|
||||
export class CustomerController {
|
||||
constructor(private readonly customerService: CustomerService) {}
|
||||
|
||||
@Get('/profile')
|
||||
@Get('/kyc')
|
||||
@UseGuards(AccessTokenGuard)
|
||||
@ApiDataResponse(CustomerResponseDto)
|
||||
async getCustomerProfile(@AuthenticatedUser() { sub }: IJwtPayload) {
|
||||
@ -25,21 +24,12 @@ export class CustomerController {
|
||||
return ResponseFactory.data(new CustomerResponseDto(customer));
|
||||
}
|
||||
|
||||
@Patch()
|
||||
@Post('/kyc/initiate')
|
||||
@UseGuards(AccessTokenGuard)
|
||||
@ApiDataResponse(CustomerResponseDto)
|
||||
async updateCustomer(@AuthenticatedUser() { sub }: IJwtPayload, @Body() body: UpdateCustomerRequestDto) {
|
||||
const customer = await this.customerService.updateCustomer(sub, body);
|
||||
@ApiDataResponse(InitiateKycResponseDto)
|
||||
async initiateKyc(@AuthenticatedUser() { sub }: IJwtPayload, @Body() body: InitiateKycRequestDto) {
|
||||
const res = await this.customerService.initiateKycRequest(sub, body);
|
||||
|
||||
return ResponseFactory.data(new CustomerResponseDto(customer));
|
||||
}
|
||||
|
||||
@Post('')
|
||||
@UseGuards(AccessTokenGuard)
|
||||
@ApiDataResponse(CustomerResponseDto)
|
||||
async createCustomer(@AuthenticatedUser() { sub }: IJwtPayload, @Body() body: CreateCustomerRequestDto) {
|
||||
const customer = await this.customerService.createGuardianCustomer(sub, body);
|
||||
|
||||
return ResponseFactory.data(new CustomerResponseDto(customer));
|
||||
return ResponseFactory.data(new InitiateKycResponseDto(res.randomNumber));
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,2 +1 @@
|
||||
export * from './customer.controller';
|
||||
export * from './internal.customer.controller';
|
||||
|
||||
@ -1,49 +0,0 @@
|
||||
import { Body, Controller, Get, HttpCode, HttpStatus, Param, Patch, Query } from '@nestjs/common';
|
||||
import { ApiTags } from '@nestjs/swagger';
|
||||
import { CustomParseUUIDPipe } from '~/core/pipes';
|
||||
import { ResponseFactory } from '~/core/utils';
|
||||
import { CustomerFiltersRequestDto, RejectCustomerKycRequestDto } from '../dtos/request';
|
||||
import { InternalCustomerDetailsResponseDto } from '../dtos/response';
|
||||
import { InternalCustomerListResponse } from '../dtos/response/internal.customer-list.response.dto';
|
||||
import { CustomerService } from '../services';
|
||||
|
||||
@ApiTags('Customers')
|
||||
@Controller('internal/customers')
|
||||
export class InternalCustomerController {
|
||||
constructor(private readonly customerService: CustomerService) {}
|
||||
@Get()
|
||||
async findCustomers(@Query() filters: CustomerFiltersRequestDto) {
|
||||
const [customers, count] = await this.customerService.findCustomers(filters);
|
||||
|
||||
return ResponseFactory.dataPage(
|
||||
customers.map((customer) => new InternalCustomerListResponse(customer)),
|
||||
{
|
||||
page: filters.page,
|
||||
size: filters.size,
|
||||
itemCount: count,
|
||||
},
|
||||
);
|
||||
}
|
||||
|
||||
@Get(':customerId')
|
||||
async findCustomerById(@Param('customerId', CustomParseUUIDPipe) customerId: string) {
|
||||
const customer = await this.customerService.findInternalCustomerById(customerId);
|
||||
|
||||
return ResponseFactory.data(new InternalCustomerDetailsResponseDto(customer));
|
||||
}
|
||||
|
||||
@Patch(':customerId/approve')
|
||||
@HttpCode(HttpStatus.NO_CONTENT)
|
||||
async approveKycForCustomer(@Param('customerId', CustomParseUUIDPipe) customerId: string) {
|
||||
await this.customerService.approveKycForCustomer(customerId);
|
||||
}
|
||||
|
||||
@Patch(':customerId/reject')
|
||||
@HttpCode(HttpStatus.NO_CONTENT)
|
||||
async rejectKycForCustomer(
|
||||
@Param('customerId', CustomParseUUIDPipe) customerId: string,
|
||||
@Body() body: RejectCustomerKycRequestDto,
|
||||
) {
|
||||
await this.customerService.rejectKycForCustomer(customerId, body);
|
||||
}
|
||||
}
|
||||
@ -1,15 +1,21 @@
|
||||
import { forwardRef, Module } from '@nestjs/common';
|
||||
import { TypeOrmModule } from '@nestjs/typeorm';
|
||||
import { NeoLeapModule } from '~/common/modules/neoleap/neoleap.module';
|
||||
import { GuardianModule } from '~/guardian/guardian.module';
|
||||
import { UserModule } from '~/user/user.module';
|
||||
import { CustomerController, InternalCustomerController } from './controllers';
|
||||
import { CustomerController } from './controllers';
|
||||
import { Customer } from './entities';
|
||||
import { CustomerRepository } from './repositories/customer.repository';
|
||||
import { CustomerService } from './services';
|
||||
|
||||
@Module({
|
||||
imports: [TypeOrmModule.forFeature([Customer]), forwardRef(() => UserModule), GuardianModule],
|
||||
controllers: [CustomerController, InternalCustomerController],
|
||||
imports: [
|
||||
TypeOrmModule.forFeature([Customer]),
|
||||
forwardRef(() => UserModule),
|
||||
GuardianModule,
|
||||
forwardRef(() => NeoLeapModule),
|
||||
],
|
||||
controllers: [CustomerController],
|
||||
providers: [CustomerService, CustomerRepository],
|
||||
exports: [CustomerService],
|
||||
})
|
||||
|
||||
@ -1,80 +0,0 @@
|
||||
import { ApiProperty } from '@nestjs/swagger';
|
||||
import { IsBoolean, IsDateString, IsEnum, IsNotEmpty, IsOptional, IsString, IsUUID } from 'class-validator';
|
||||
import { i18nValidationMessage as i18n } from 'nestjs-i18n';
|
||||
import { CountryIso } from '~/common/enums';
|
||||
import { IsAbove18 } from '~/core/decorators/validations';
|
||||
import { Gender } from '~/customer/enums';
|
||||
export class CreateCustomerRequestDto {
|
||||
@ApiProperty({ example: 'John' })
|
||||
@IsString({ message: i18n('validation.IsString', { path: 'general', property: 'customer.firstName' }) })
|
||||
@IsNotEmpty({ message: i18n('validation.IsNotEmpty', { path: 'general', property: 'customer.firstName' }) })
|
||||
firstName!: string;
|
||||
|
||||
@ApiProperty({ example: 'Doe' })
|
||||
@IsString({ message: i18n('validation.IsString', { path: 'general', property: 'customer.lastName' }) })
|
||||
@IsNotEmpty({ message: i18n('validation.IsNotEmpty', { path: 'general', property: 'customer.lastName' }) })
|
||||
lastName!: string;
|
||||
|
||||
@ApiProperty({ example: 'MALE' })
|
||||
@IsEnum(Gender, { message: i18n('validation.IsEnum', { path: 'general', property: 'customer.gender' }) })
|
||||
@IsOptional()
|
||||
gender?: Gender;
|
||||
|
||||
@ApiProperty({ example: 'JO' })
|
||||
@IsEnum(CountryIso, {
|
||||
message: i18n('validation.IsEnum', { path: 'general', property: 'customer.countryOfResidence' }),
|
||||
})
|
||||
countryOfResidence!: CountryIso;
|
||||
|
||||
@ApiProperty({ example: '2021-01-01' })
|
||||
@IsDateString({}, { message: i18n('validation.IsDateString', { path: 'general', property: 'customer.dateOfBirth' }) })
|
||||
@IsAbove18({ message: i18n('validation.IsAbove18', { path: 'general', property: 'customer.dateOfBirth' }) })
|
||||
dateOfBirth!: Date;
|
||||
|
||||
@ApiProperty({ example: '999300024' })
|
||||
@IsString({ message: i18n('validation.IsString', { path: 'general', property: 'customer.nationalId' }) })
|
||||
@IsNotEmpty({ message: i18n('validation.IsNotEmpty', { path: 'general', property: 'customer.nationalId' }) })
|
||||
@IsOptional()
|
||||
nationalId?: string;
|
||||
|
||||
@ApiProperty({ example: '2021-01-01' })
|
||||
@IsDateString(
|
||||
{},
|
||||
{ message: i18n('validation.IsDateString', { path: 'general', property: 'junior.nationalIdExpiry' }) },
|
||||
)
|
||||
@IsOptional()
|
||||
nationalIdExpiry?: Date;
|
||||
|
||||
@ApiProperty({ example: 'Employee' })
|
||||
@IsString({ message: i18n('validation.IsString', { path: 'general', property: 'customer.sourceOfIncome' }) })
|
||||
@IsNotEmpty({ message: i18n('validation.IsNotEmpty', { path: 'general', property: 'customer.sourceOfIncome' }) })
|
||||
@IsOptional()
|
||||
sourceOfIncome?: string;
|
||||
|
||||
@ApiProperty({ example: 'Accountant' })
|
||||
@IsString({ message: i18n('validation.IsString', { path: 'general', property: 'customer.profession' }) })
|
||||
@IsNotEmpty({ message: i18n('validation.IsNotEmpty', { path: 'general', property: 'customer.profession' }) })
|
||||
@IsOptional()
|
||||
profession?: string;
|
||||
|
||||
@ApiProperty({ example: 'Finance' })
|
||||
@IsString({ message: i18n('validation.IsString', { path: 'general', property: 'customer.professionType' }) })
|
||||
@IsNotEmpty({ message: i18n('validation.IsNotEmpty', { path: 'general', property: 'customer.professionType' }) })
|
||||
@IsOptional()
|
||||
professionType?: string;
|
||||
|
||||
@ApiProperty({ example: false })
|
||||
@IsBoolean({ message: i18n('validation.IsBoolean', { path: 'general', property: 'junior.isPep' }) })
|
||||
@IsOptional()
|
||||
isPep?: boolean;
|
||||
|
||||
@ApiProperty({ example: 'bf342-3f3f-3f3f-3f3f' })
|
||||
@IsUUID('4', { message: i18n('validation.IsUUID', { path: 'general', property: 'junior.civilIdFrontId' }) })
|
||||
@IsOptional()
|
||||
civilIdFrontId?: string;
|
||||
|
||||
@ApiProperty({ example: 'bf342-3f3f-3f3f-3f3f' })
|
||||
@IsUUID('4', { message: i18n('validation.IsUUID', { path: 'general', property: 'junior.civilIdBackId' }) })
|
||||
@IsOptional()
|
||||
civilIdBackId?: string;
|
||||
}
|
||||
@ -1,23 +0,0 @@
|
||||
import { ApiPropertyOptional } from '@nestjs/swagger';
|
||||
import { IsEnum, IsNotEmpty, IsOptional, IsString } from 'class-validator';
|
||||
import { i18nValidationMessage as i18n } from 'nestjs-i18n';
|
||||
import { PageOptionsRequestDto } from '~/core/dtos';
|
||||
import { KycStatus } from '~/customer/enums';
|
||||
|
||||
export class CustomerFiltersRequestDto extends PageOptionsRequestDto {
|
||||
@IsString({ message: i18n('validation.IsString', { path: 'general', property: 'customer.name' }) })
|
||||
@IsNotEmpty({ message: i18n('validation.IsNotEmpty', { path: 'general', property: 'customer.name' }) })
|
||||
@IsOptional()
|
||||
@ApiPropertyOptional({ description: 'search by name' })
|
||||
name?: string;
|
||||
|
||||
@IsEnum(KycStatus, { message: i18n('validation.IsEnum', { path: 'general', property: 'customer.kycStatus' }) })
|
||||
@IsOptional()
|
||||
@ApiPropertyOptional({
|
||||
enum: KycStatus,
|
||||
enumName: 'KycStatus',
|
||||
example: KycStatus.PENDING,
|
||||
description: 'kyc status of the customer',
|
||||
})
|
||||
kycStatus?: string;
|
||||
}
|
||||
@ -1,4 +1 @@
|
||||
export * from './create-customer.request.dto';
|
||||
export * from './customer-filters.request.dto';
|
||||
export * from './reject-customer-kyc.request.dto';
|
||||
export * from './update-customer.request.dto';
|
||||
export * from './initiate-kyc.request.dto';
|
||||
|
||||
8
src/customer/dtos/request/initiate-kyc.request.dto.ts
Normal file
8
src/customer/dtos/request/initiate-kyc.request.dto.ts
Normal file
@ -0,0 +1,8 @@
|
||||
import { ApiProperty } from '@nestjs/swagger';
|
||||
import { i18nValidationMessage as i18n } from 'nestjs-i18n';
|
||||
import { isValidSaudiId } from '~/core/decorators/validations';
|
||||
export class InitiateKycRequestDto {
|
||||
@ApiProperty({ example: '999300024' })
|
||||
@isValidSaudiId({ message: i18n('validation.isValidSaudiId', { path: 'general', property: 'customer.nationalId' }) })
|
||||
nationalId!: string;
|
||||
}
|
||||
@ -1,11 +0,0 @@
|
||||
import { ApiPropertyOptional } from '@nestjs/swagger';
|
||||
import { IsNotEmpty, IsOptional, IsString } from 'class-validator';
|
||||
import { i18nValidationMessage as i18n } from 'nestjs-i18n';
|
||||
|
||||
export class RejectCustomerKycRequestDto {
|
||||
@ApiPropertyOptional({ description: 'reason for rejecting the customer kyc' })
|
||||
@IsString({ message: i18n('validation.IsString', { path: 'general', property: 'customer.rejectionReason' }) })
|
||||
@IsNotEmpty({ message: i18n('validation.IsNotEmpty', { path: 'general', property: 'customer.rejectionReason' }) })
|
||||
@IsOptional({ message: i18n('validation.IsOptional', { path: 'general', property: 'customer.rejectionReason' }) })
|
||||
reason?: string;
|
||||
}
|
||||
@ -1,10 +0,0 @@
|
||||
import { ApiProperty, PartialType } from '@nestjs/swagger';
|
||||
import { IsOptional, IsUUID } from 'class-validator';
|
||||
import { i18nValidationMessage as i18n } from 'nestjs-i18n';
|
||||
import { CreateCustomerRequestDto } from './create-customer.request.dto';
|
||||
export class UpdateCustomerRequestDto extends PartialType(CreateCustomerRequestDto) {
|
||||
@ApiProperty({ example: '123e4567-e89b-12d3-a456-426614174000' })
|
||||
@IsUUID('4', { message: i18n('validation.IsUUID', { path: 'general', property: 'customer.profilePictureId' }) })
|
||||
@IsOptional()
|
||||
profilePictureId!: string;
|
||||
}
|
||||
@ -104,7 +104,5 @@ export class CustomerResponseDto {
|
||||
this.neighborhood = customer.neighborhood;
|
||||
this.street = customer.street;
|
||||
this.building = customer.building;
|
||||
|
||||
this.profilePicture = customer.profilePicture ? new DocumentMetaResponseDto(customer.profilePicture) : null;
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,3 +1,2 @@
|
||||
export * from './customer.response.dto';
|
||||
export * from './internal.customer-details.response.dto';
|
||||
export * from './internal.customer-list.response.dto';
|
||||
export * from './initiate-kyc.response.dto';
|
||||
|
||||
10
src/customer/dtos/response/initiate-kyc.response.dto.ts
Normal file
10
src/customer/dtos/response/initiate-kyc.response.dto.ts
Normal file
@ -0,0 +1,10 @@
|
||||
import { ApiProperty } from '@nestjs/swagger';
|
||||
|
||||
export class InitiateKycResponseDto {
|
||||
@ApiProperty()
|
||||
randomNumber!: string;
|
||||
|
||||
constructor(randomNumber: string) {
|
||||
this.randomNumber = randomNumber;
|
||||
}
|
||||
}
|
||||
@ -1,89 +0,0 @@
|
||||
import { ApiProperty, ApiPropertyOptional } from '@nestjs/swagger';
|
||||
import { Customer } from '~/customer/entities';
|
||||
import { CustomerStatus, KycStatus } from '~/customer/enums';
|
||||
import { DocumentMetaResponseDto } from '~/document/dtos/response';
|
||||
|
||||
export class InternalCustomerDetailsResponseDto {
|
||||
@ApiProperty()
|
||||
id!: string;
|
||||
|
||||
@ApiProperty()
|
||||
customerStatus!: CustomerStatus;
|
||||
|
||||
@ApiProperty()
|
||||
kycStatus!: KycStatus;
|
||||
|
||||
@ApiProperty()
|
||||
rejectionReason!: string | null;
|
||||
|
||||
@ApiProperty()
|
||||
fullName!: string;
|
||||
|
||||
@ApiProperty()
|
||||
phoneNumber!: string;
|
||||
|
||||
@ApiProperty()
|
||||
dateOfBirth!: Date;
|
||||
|
||||
@ApiProperty()
|
||||
nationalId!: string;
|
||||
|
||||
@ApiProperty()
|
||||
nationalIdExpiry!: Date;
|
||||
|
||||
@ApiProperty()
|
||||
countryOfResidence!: string;
|
||||
|
||||
@ApiProperty()
|
||||
sourceOfIncome!: string;
|
||||
|
||||
@ApiProperty()
|
||||
profession!: string;
|
||||
|
||||
@ApiProperty()
|
||||
professionType!: string;
|
||||
|
||||
@ApiProperty()
|
||||
isPep!: boolean;
|
||||
|
||||
@ApiProperty()
|
||||
gender!: string;
|
||||
|
||||
@ApiProperty()
|
||||
isJunior!: boolean;
|
||||
|
||||
@ApiProperty()
|
||||
isGuardian!: boolean;
|
||||
|
||||
@ApiProperty({ type: DocumentMetaResponseDto })
|
||||
civilIdFront!: DocumentMetaResponseDto;
|
||||
|
||||
@ApiProperty({ type: DocumentMetaResponseDto })
|
||||
civilIdBack!: DocumentMetaResponseDto;
|
||||
|
||||
@ApiPropertyOptional({ type: DocumentMetaResponseDto })
|
||||
profilePicture!: DocumentMetaResponseDto | null;
|
||||
|
||||
constructor(customer: Customer) {
|
||||
this.id = customer.id;
|
||||
this.customerStatus = customer.customerStatus;
|
||||
this.kycStatus = customer.kycStatus;
|
||||
this.rejectionReason = customer.rejectionReason;
|
||||
this.fullName = `${customer.firstName} ${customer.lastName}`;
|
||||
this.phoneNumber = customer.user.fullPhoneNumber;
|
||||
this.dateOfBirth = customer.dateOfBirth;
|
||||
this.nationalId = customer.nationalId;
|
||||
this.nationalIdExpiry = customer.nationalIdExpiry;
|
||||
this.countryOfResidence = customer.countryOfResidence;
|
||||
this.sourceOfIncome = customer.sourceOfIncome;
|
||||
this.profession = customer.profession;
|
||||
this.professionType = customer.professionType;
|
||||
this.isPep = customer.isPep;
|
||||
this.gender = customer.gender;
|
||||
this.isJunior = customer.isJunior;
|
||||
this.isGuardian = customer.isGuardian;
|
||||
this.civilIdFront = new DocumentMetaResponseDto(customer.civilIdFront);
|
||||
this.civilIdBack = new DocumentMetaResponseDto(customer.civilIdBack);
|
||||
this.profilePicture = customer.profilePicture ? new DocumentMetaResponseDto(customer.profilePicture) : null;
|
||||
}
|
||||
}
|
||||
@ -1,44 +0,0 @@
|
||||
import { ApiProperty } from '@nestjs/swagger';
|
||||
import { Customer } from '~/customer/entities';
|
||||
import { CustomerStatus, KycStatus } from '~/customer/enums';
|
||||
|
||||
export class InternalCustomerListResponse {
|
||||
@ApiProperty()
|
||||
id!: string;
|
||||
|
||||
@ApiProperty()
|
||||
fullName!: string;
|
||||
|
||||
@ApiProperty()
|
||||
phoneNumber!: string;
|
||||
|
||||
@ApiProperty()
|
||||
customerStatus!: CustomerStatus;
|
||||
|
||||
@ApiProperty()
|
||||
kycStatus!: KycStatus;
|
||||
|
||||
@ApiProperty()
|
||||
dateOfBirth!: Date;
|
||||
|
||||
@ApiProperty()
|
||||
gender!: string;
|
||||
|
||||
@ApiProperty()
|
||||
isJunior!: boolean;
|
||||
|
||||
@ApiProperty()
|
||||
isGuardian!: boolean;
|
||||
|
||||
constructor(customer: Customer) {
|
||||
this.id = customer.id;
|
||||
this.fullName = `${customer.firstName} ${customer.lastName}`;
|
||||
this.phoneNumber = customer.user?.fullPhoneNumber;
|
||||
this.customerStatus = customer.customerStatus;
|
||||
this.kycStatus = customer.kycStatus;
|
||||
this.dateOfBirth = customer.dateOfBirth;
|
||||
this.gender = customer.gender;
|
||||
this.isGuardian = customer.isGuardian;
|
||||
this.isJunior = customer.isJunior;
|
||||
}
|
||||
}
|
||||
@ -96,13 +96,6 @@ export class Customer extends BaseEntity {
|
||||
@Column('varchar', { name: 'building', length: 255, nullable: true })
|
||||
building!: string;
|
||||
|
||||
@Column('varchar', { name: 'profile_picture_id', nullable: true })
|
||||
profilePictureId!: string;
|
||||
|
||||
@OneToOne(() => Document, (document) => document.customerPicture, { cascade: true, nullable: true })
|
||||
@JoinColumn({ name: 'profile_picture_id' })
|
||||
profilePicture!: Document;
|
||||
|
||||
@OneToOne(() => User, (user) => user.customer, { onDelete: 'CASCADE' })
|
||||
@JoinColumn({ name: 'user_id' })
|
||||
user!: User;
|
||||
|
||||
@ -1,7 +1,6 @@
|
||||
import { Injectable } from '@nestjs/common';
|
||||
import { InjectRepository } from '@nestjs/typeorm';
|
||||
import { FindOptionsWhere, Repository } from 'typeorm';
|
||||
import { CustomerFiltersRequestDto } from '../dtos/request';
|
||||
import { Customer } from '../entities';
|
||||
|
||||
@Injectable()
|
||||
@ -15,7 +14,7 @@ export class CustomerRepository {
|
||||
findOne(where: FindOptionsWhere<Customer>) {
|
||||
return this.customerRepository.findOne({
|
||||
where,
|
||||
relations: ['profilePicture', 'user', 'civilIdFront', 'civilIdBack', 'cards'],
|
||||
relations: ['user', 'civilIdFront', 'civilIdBack', 'cards'],
|
||||
});
|
||||
}
|
||||
|
||||
@ -34,34 +33,6 @@ export class CustomerRepository {
|
||||
);
|
||||
}
|
||||
|
||||
findCustomers(filters: CustomerFiltersRequestDto) {
|
||||
const query = this.customerRepository.createQueryBuilder('customer');
|
||||
query.leftJoinAndSelect('customer.profilePicture', 'profilePicture');
|
||||
query.leftJoinAndSelect('customer.user', 'user');
|
||||
|
||||
if (filters.name) {
|
||||
const nameParts = filters.name.trim().split(/\s+/);
|
||||
nameParts.length > 1
|
||||
? query.andWhere('customer.firstName LIKE :firstName AND customer.lastName LIKE :lastName', {
|
||||
firstName: `%${nameParts[0]}%`,
|
||||
lastName: `%${nameParts[1]}%`,
|
||||
})
|
||||
: query.andWhere('customer.firstName LIKE :name OR customer.lastName LIKE :name', {
|
||||
name: `%${filters.name.trim()}%`,
|
||||
});
|
||||
}
|
||||
|
||||
if (filters.kycStatus) {
|
||||
query.andWhere('customer.kycStatus = :kycStatus', { kycStatus: filters.kycStatus });
|
||||
}
|
||||
|
||||
query.orderBy('customer.createdAt', 'DESC');
|
||||
query.take(filters.size);
|
||||
query.skip((filters.page - 1) * filters.size);
|
||||
|
||||
return query.getManyAndCount();
|
||||
}
|
||||
|
||||
findCustomerByCivilId(civilIdFrontId: string, civilIdBackId: string) {
|
||||
return this.customerRepository.findOne({
|
||||
where: [{ civilIdFrontId, civilIdBackId }, { civilIdFrontId }, { civilIdBackId }],
|
||||
|
||||
@ -1,17 +1,14 @@
|
||||
import { BadRequestException, Injectable, Logger } from '@nestjs/common';
|
||||
import { BadRequestException, forwardRef, Inject, Injectable, Logger } from '@nestjs/common';
|
||||
import moment from 'moment';
|
||||
import { Transactional } from 'typeorm-transactional';
|
||||
import { CountryIso } from '~/common/enums';
|
||||
import { DocumentService, OciService } from '~/document/services';
|
||||
import { NumericToCountryIso } from '~/common/mappers';
|
||||
import { KycWebhookRequest } from '~/common/modules/neoleap/dtos/requests';
|
||||
import { NeoLeapService } from '~/common/modules/neoleap/services';
|
||||
import { GuardianService } from '~/guardian/services';
|
||||
import { CreateJuniorRequestDto } from '~/junior/dtos/request';
|
||||
import { User } from '~/user/entities';
|
||||
import {
|
||||
CreateCustomerRequestDto,
|
||||
CustomerFiltersRequestDto,
|
||||
RejectCustomerKycRequestDto,
|
||||
UpdateCustomerRequestDto,
|
||||
} from '../dtos/request';
|
||||
import { InitiateKycRequestDto } from '../dtos/request';
|
||||
import { Customer } from '../entities';
|
||||
import { Gender, KycStatus } from '../enums';
|
||||
import { CustomerRepository } from '../repositories/customer.repository';
|
||||
@ -21,15 +18,13 @@ export class CustomerService {
|
||||
private readonly logger = new Logger(CustomerService.name);
|
||||
constructor(
|
||||
private readonly customerRepository: CustomerRepository,
|
||||
private readonly ociService: OciService,
|
||||
private readonly documentService: DocumentService,
|
||||
private readonly guardianService: GuardianService,
|
||||
@Inject(forwardRef(() => NeoLeapService)) private readonly neoleapService: NeoLeapService,
|
||||
) {}
|
||||
|
||||
async updateCustomer(userId: string, data: UpdateCustomerRequestDto): Promise<Customer> {
|
||||
async updateCustomer(userId: string, data: Partial<Customer>): Promise<Customer> {
|
||||
this.logger.log(`Updating customer ${userId}`);
|
||||
|
||||
await this.validateProfilePictureForCustomer(userId, data.profilePictureId);
|
||||
await this.customerRepository.updateCustomer(userId, data);
|
||||
this.logger.log(`Customer ${userId} updated successfully`);
|
||||
return this.findCustomerById(userId);
|
||||
@ -38,8 +33,6 @@ export class CustomerService {
|
||||
async createJuniorCustomer(guardianId: string, juniorId: string, body: CreateJuniorRequestDto) {
|
||||
this.logger.log(`Creating junior customer for user ${juniorId}`);
|
||||
|
||||
await this.validateCivilIdForCustomer(guardianId, body.civilIdFrontId, body.civilIdBackId);
|
||||
|
||||
return this.customerRepository.createCustomer(juniorId, body, false);
|
||||
}
|
||||
|
||||
@ -52,47 +45,32 @@ export class CustomerService {
|
||||
throw new BadRequestException('CUSTOMER.NOT_FOUND');
|
||||
}
|
||||
|
||||
if (customer.profilePicture) {
|
||||
customer.profilePicture.url = await this.ociService.generatePreSignedUrl(customer.profilePicture);
|
||||
}
|
||||
this.logger.log(`Customer ${id} found successfully`);
|
||||
return customer;
|
||||
}
|
||||
|
||||
async findInternalCustomerById(id: string) {
|
||||
this.logger.log(`Finding internal customer ${id}`);
|
||||
const customer = await this.customerRepository.findOne({ id });
|
||||
async initiateKycRequest(customerId: string, body: InitiateKycRequestDto) {
|
||||
this.logger.log(`Initiating KYC request for user ${customerId}`);
|
||||
|
||||
if (!customer) {
|
||||
this.logger.error(`Internal customer ${id} not found`);
|
||||
throw new BadRequestException('CUSTOMER.NOT_FOUND');
|
||||
}
|
||||
|
||||
await this.prepareCustomerDocuments(customer);
|
||||
this.logger.log(`Internal customer ${id} found successfully`);
|
||||
return customer;
|
||||
}
|
||||
|
||||
async approveKycForCustomer(customerId: string) {
|
||||
const customer = await this.findCustomerById(customerId);
|
||||
|
||||
if (customer.kycStatus === KycStatus.APPROVED) {
|
||||
this.logger.error(`Customer ${customerId} is already approved`);
|
||||
throw new BadRequestException('CUSTOMER.ALREADY_APPROVED');
|
||||
this.logger.error(`KYC for customer ${customerId} is already approved`);
|
||||
throw new BadRequestException('CUSTOMER.KYC_ALREADY_APPROVED');
|
||||
}
|
||||
|
||||
this.logger.debug(`Approving KYC for customer ${customerId}`);
|
||||
await this.customerRepository.updateCustomer(customerId, { kycStatus: KycStatus.APPROVED, rejectionReason: null });
|
||||
this.logger.log(`KYC approved for customer ${customerId}`);
|
||||
}
|
||||
// I will assume the api for initiating KYC is not allowing me to send customerId as correlationId so I will store the nationalId in the customer entity
|
||||
|
||||
findCustomers(filters: CustomerFiltersRequestDto) {
|
||||
this.logger.log(`Finding customers with filters ${JSON.stringify(filters)}`);
|
||||
return this.customerRepository.findCustomers(filters);
|
||||
await this.customerRepository.updateCustomer(customerId, {
|
||||
nationalId: body.nationalId,
|
||||
kycStatus: KycStatus.PENDING,
|
||||
});
|
||||
|
||||
return this.neoleapService.initiateKyc(customerId, body);
|
||||
}
|
||||
|
||||
@Transactional()
|
||||
async createGuardianCustomer(userId: string, body: Partial<CreateCustomerRequestDto>) {
|
||||
async createGuardianCustomer(userId: string, body: Partial<Customer>) {
|
||||
this.logger.log(`Creating guardian customer for user ${userId}`);
|
||||
const existingCustomer = await this.customerRepository.findOne({ id: userId });
|
||||
|
||||
@ -101,8 +79,6 @@ export class CustomerService {
|
||||
throw new BadRequestException('CUSTOMER.ALREADY_EXISTS');
|
||||
}
|
||||
|
||||
// await this.validateCivilIdForCustomer(userId, body.civilIdFrontId, body.civilIdBackId);
|
||||
|
||||
const customer = await this.customerRepository.createCustomer(userId, body, true);
|
||||
this.logger.log(`customer created for user ${userId}`);
|
||||
|
||||
@ -112,23 +88,33 @@ export class CustomerService {
|
||||
return customer;
|
||||
}
|
||||
|
||||
async rejectKycForCustomer(customerId: string, { reason }: RejectCustomerKycRequestDto) {
|
||||
const customer = await this.findCustomerById(customerId);
|
||||
async updateCustomerKyc(body: KycWebhookRequest) {
|
||||
this.logger.log(`Updating KYC for customer with national ID ${body.nationalId}`);
|
||||
|
||||
if (customer.kycStatus === KycStatus.REJECTED) {
|
||||
this.logger.error(`Customer ${customerId} is already rejected`);
|
||||
throw new BadRequestException('CUSTOMER.ALREADY_REJECTED');
|
||||
const customer = await this.customerRepository.findOne({ nationalId: body.nationalId });
|
||||
|
||||
if (!customer) {
|
||||
throw new BadRequestException('CUSTOMER.NOT_FOUND');
|
||||
}
|
||||
|
||||
this.logger.debug(`Rejecting KYC for customer ${customerId}`);
|
||||
await this.customerRepository.updateCustomer(customerId, {
|
||||
kycStatus: KycStatus.REJECTED,
|
||||
rejectionReason: reason,
|
||||
await this.customerRepository.updateCustomer(customer.id, {
|
||||
kycStatus: body.status === 'SUCCESS' ? KycStatus.APPROVED : KycStatus.REJECTED,
|
||||
firstName: body.firstName,
|
||||
lastName: body.lastName,
|
||||
dateOfBirth: moment(body.dob, 'YYYYMMDD').toDate(),
|
||||
nationalId: body.nationalId,
|
||||
nationalIdExpiry: moment(body.nationalIdExpiry, 'YYYYMMDD').toDate(),
|
||||
countryOfResidence: NumericToCountryIso[body.nationality],
|
||||
country: NumericToCountryIso[body.nationality],
|
||||
gender: body.gender === 'M' ? Gender.MALE : Gender.FEMALE,
|
||||
sourceOfIncome: body.incomeSource,
|
||||
profession: body.professionTitle,
|
||||
professionType: body.professionType,
|
||||
isPep: body.isPep === 'Y',
|
||||
});
|
||||
this.logger.log(`KYC rejected for customer ${customerId}`);
|
||||
}
|
||||
|
||||
// this function is for testing only and will be removed
|
||||
// TO BE REMOVED: This function is for testing only and will be removed
|
||||
@Transactional()
|
||||
async updateKyc(userId: string) {
|
||||
this.logger.log(`Updating KYC for customer ${userId}`);
|
||||
@ -155,84 +141,6 @@ export class CustomerService {
|
||||
return this.findCustomerById(userId);
|
||||
}
|
||||
|
||||
private async validateProfilePictureForCustomer(userId: string, profilePictureId?: string) {
|
||||
if (!profilePictureId) return;
|
||||
|
||||
this.logger.log(`Validating profile picture ${profilePictureId}`);
|
||||
|
||||
const profilePicture = await this.documentService.findDocumentById(profilePictureId);
|
||||
|
||||
if (!profilePicture) {
|
||||
this.logger.error(`Profile picture ${profilePictureId} not found`);
|
||||
throw new BadRequestException('DOCUMENT.NOT_FOUND');
|
||||
}
|
||||
|
||||
if (profilePicture.createdById && profilePicture.createdById !== userId) {
|
||||
this.logger.error(`Profile picture ${profilePictureId} does not belong to user ${userId}`);
|
||||
throw new BadRequestException('DOCUMENT.NOT_CREATED_BY_USER');
|
||||
}
|
||||
}
|
||||
|
||||
private async validateCivilIdForCustomer(userId: string, civilIdFrontId: string, civilIdBackId: string) {
|
||||
this.logger.log(`Validating customer documents`);
|
||||
|
||||
if (!civilIdFrontId || !civilIdBackId) {
|
||||
this.logger.error('Civil id front and back are required');
|
||||
throw new BadRequestException('CUSTOMER.CIVIL_ID_REQUIRED');
|
||||
}
|
||||
|
||||
const [civilIdFront, civilIdBack] = await Promise.all([
|
||||
this.documentService.findDocumentById(civilIdFrontId),
|
||||
this.documentService.findDocumentById(civilIdBackId),
|
||||
]);
|
||||
|
||||
if (!civilIdFront || !civilIdBack) {
|
||||
this.logger.error('Civil id front or back not found');
|
||||
throw new BadRequestException('CUSTOMER.CIVIL_ID_REQUIRED');
|
||||
}
|
||||
|
||||
if (civilIdFront.createdById !== userId || civilIdBack.createdById !== userId) {
|
||||
this.logger.error(`Civil id front or back not created by user with id ${userId}`);
|
||||
throw new BadRequestException('CUSTOMER.CIVIL_ID_NOT_CREATED_BY_USER');
|
||||
}
|
||||
|
||||
const customerWithTheSameCivilId = await this.customerRepository.findCustomerByCivilId(
|
||||
civilIdFrontId,
|
||||
civilIdBackId,
|
||||
);
|
||||
|
||||
if (customerWithTheSameCivilId) {
|
||||
this.logger.error(
|
||||
`Customer with civil id front ${civilIdFrontId} and civil id back ${civilIdBackId} already exists`,
|
||||
);
|
||||
throw new BadRequestException('CUSTOMER.CIVIL_ID_ALREADY_EXISTS');
|
||||
}
|
||||
}
|
||||
|
||||
private async prepareCustomerDocuments(customer: Customer) {
|
||||
const promises = [];
|
||||
|
||||
promises.push(this.ociService.generatePreSignedUrl(customer.civilIdFront));
|
||||
promises.push(this.ociService.generatePreSignedUrl(customer.civilIdBack));
|
||||
|
||||
if (customer.profilePicture) {
|
||||
promises.push(this.ociService.generatePreSignedUrl(customer.profilePicture));
|
||||
}
|
||||
|
||||
const [civilIdFrontUrl, civilIdBackUrl, profilePictureUrl] = await Promise.all(promises);
|
||||
if (customer.profilePicture) {
|
||||
customer.profilePicture.url = profilePictureUrl;
|
||||
}
|
||||
|
||||
customer.civilIdFront.url = civilIdFrontUrl;
|
||||
customer.civilIdBack.url = civilIdBackUrl;
|
||||
return customer;
|
||||
}
|
||||
|
||||
async findAnyCustomer() {
|
||||
return this.customerRepository.findOne({ isGuardian: true });
|
||||
}
|
||||
|
||||
// TO BE REMOVED: This function is for testing only and will be removed
|
||||
private generateSaudiPhoneNumber(): string {
|
||||
// Saudi mobile numbers are 9 digits, always starting with '5'
|
||||
|
||||
37
src/db/migrations/1754399872619-add-display-name-to-user.ts
Normal file
37
src/db/migrations/1754399872619-add-display-name-to-user.ts
Normal file
@ -0,0 +1,37 @@
|
||||
import { MigrationInterface, QueryRunner } from 'typeorm';
|
||||
|
||||
export class AddDisplayNameToUser1754399872619 implements MigrationInterface {
|
||||
name = 'AddDisplayNameToUser1754399872619';
|
||||
|
||||
public async up(queryRunner: QueryRunner): Promise<void> {
|
||||
// Step 1: Add columns as nullable
|
||||
await queryRunner.query(`ALTER TABLE "users" ADD "first_name" character varying(255)`);
|
||||
await queryRunner.query(`ALTER TABLE "users" ADD "last_name" character varying(255)`);
|
||||
|
||||
// Step 2: Populate the new columns with fallback to test values
|
||||
await queryRunner.query(`
|
||||
UPDATE "users"
|
||||
SET "first_name" = COALESCE(c."first_name", 'TEST_FIRST_NAME'),
|
||||
"last_name" = COALESCE(c."last_name", 'TEST_LAST_NAME')
|
||||
FROM "customers" c
|
||||
WHERE c.user_id = "users"."id"
|
||||
`);
|
||||
|
||||
// Step 2b: Handle users without a matching customer row
|
||||
await queryRunner.query(`
|
||||
UPDATE "users"
|
||||
SET "first_name" = COALESCE("first_name", 'TEST_FIRST_NAME'),
|
||||
"last_name" = COALESCE("last_name", 'TEST_LAST_NAME')
|
||||
WHERE "first_name" IS NULL OR "last_name" IS NULL
|
||||
`);
|
||||
|
||||
// Step 3: Make the columns NOT NULL
|
||||
await queryRunner.query(`ALTER TABLE "users" ALTER COLUMN "first_name" SET NOT NULL`);
|
||||
await queryRunner.query(`ALTER TABLE "users" ALTER COLUMN "last_name" SET NOT NULL`);
|
||||
}
|
||||
|
||||
public async down(queryRunner: QueryRunner): Promise<void> {
|
||||
await queryRunner.query(`ALTER TABLE "users" DROP COLUMN "last_name"`);
|
||||
await queryRunner.query(`ALTER TABLE "users" DROP COLUMN "first_name"`);
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,31 @@
|
||||
import { MigrationInterface, QueryRunner } from 'typeorm';
|
||||
|
||||
export class AddProfilePictureToUserInsteadOfCustomer1754401348483 implements MigrationInterface {
|
||||
name = 'AddProfilePictureToUserInsteadOfCustomer1754401348483';
|
||||
|
||||
public async up(queryRunner: QueryRunner): Promise<void> {
|
||||
await queryRunner.query(`ALTER TABLE "customers" DROP CONSTRAINT "FK_e7574892da11dd01de5cfc46499"`);
|
||||
await queryRunner.query(`ALTER TABLE "customers" DROP CONSTRAINT "REL_e7574892da11dd01de5cfc4649"`);
|
||||
await queryRunner.query(`ALTER TABLE "customers" DROP COLUMN "profile_picture_id"`);
|
||||
await queryRunner.query(`ALTER TABLE "users" ADD "profile_picture_id" uuid`);
|
||||
await queryRunner.query(
|
||||
`ALTER TABLE "users" ADD CONSTRAINT "UQ_02ec15de199e79a0c46869895f4" UNIQUE ("profile_picture_id")`,
|
||||
);
|
||||
await queryRunner.query(
|
||||
`ALTER TABLE "users" ADD CONSTRAINT "FK_02ec15de199e79a0c46869895f4" FOREIGN KEY ("profile_picture_id") REFERENCES "documents"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`,
|
||||
);
|
||||
}
|
||||
|
||||
public async down(queryRunner: QueryRunner): Promise<void> {
|
||||
await queryRunner.query(`ALTER TABLE "users" DROP CONSTRAINT "FK_02ec15de199e79a0c46869895f4"`);
|
||||
await queryRunner.query(`ALTER TABLE "users" DROP CONSTRAINT "UQ_02ec15de199e79a0c46869895f4"`);
|
||||
await queryRunner.query(`ALTER TABLE "users" DROP COLUMN "profile_picture_id"`);
|
||||
await queryRunner.query(`ALTER TABLE "customers" ADD "profile_picture_id" uuid`);
|
||||
await queryRunner.query(
|
||||
`ALTER TABLE "customers" ADD CONSTRAINT "REL_e7574892da11dd01de5cfc4649" UNIQUE ("profile_picture_id")`,
|
||||
);
|
||||
await queryRunner.query(
|
||||
`ALTER TABLE "customers" ADD CONSTRAINT "FK_e7574892da11dd01de5cfc46499" FOREIGN KEY ("profile_picture_id") REFERENCES "documents"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`,
|
||||
);
|
||||
}
|
||||
}
|
||||
@ -6,3 +6,5 @@ export * from './1753874205042-add-neoleap-related-entities';
|
||||
export * from './1753948642040-add-account-number-and-iban-to-account-entity';
|
||||
export * from './1754210729273-add-vpan-to-card';
|
||||
export * from './1754226754947-add-upload-status-to-document-entity';
|
||||
export * from './1754399872619-add-display-name-to-user';
|
||||
export * from './1754401348483-add-profile-picture-to-user-instead-of-customer';
|
||||
|
||||
@ -37,8 +37,8 @@ export class Document {
|
||||
@Column({ type: 'uuid', nullable: true, name: 'created_by_id' })
|
||||
createdById!: string;
|
||||
|
||||
@OneToOne(() => Customer, (customer) => customer.profilePicture, { onDelete: 'SET NULL' })
|
||||
customerPicture?: Customer;
|
||||
@OneToOne(() => User, (user) => user.profilePicture, { onDelete: 'SET NULL' })
|
||||
userPicture?: Customer;
|
||||
|
||||
@OneToOne(() => Customer, (customer) => customer.civilIdFront, { onDelete: 'SET NULL' })
|
||||
customerCivilIdFront?: User;
|
||||
|
||||
@ -51,7 +51,7 @@ export class OciService {
|
||||
}
|
||||
|
||||
const bucketName = BUCKETS[document.documentType];
|
||||
const objectName = document.name;
|
||||
const objectName = document.name + document.extension;
|
||||
const expiration = moment().add(TWO, 'hours').toDate();
|
||||
|
||||
try {
|
||||
|
||||
@ -9,6 +9,9 @@
|
||||
"BIOMETRIC_NOT_ENABLED": "المصادقة البيومترية لم يتم تفعيلها على حسابك. يرجى تفعيلها للمتابعة.",
|
||||
"INVALID_BIOMETRIC": "البيانات البيومترية المقدمة غير صالحة. يرجى المحاولة مرة أخرى أو إعادة إعداد المصادقة البيومترية.",
|
||||
"PASSWORD_MISMATCH": "كلمات المرور التي أدخلتها غير متطابقة. يرجى إدخال كلمات المرور مرة أخرى.",
|
||||
"INVALID_CURRENT_PASSWORD": "كلمة المرور الحالية التي أدخلتها غير صحيحة. يرجى المحاولة مرة أخرى.",
|
||||
"PASSWORD_NOT_SET": "لم يتم تعيين كلمة مرور لهذا الحساب. يرجى تعيين كلمة مرور للمتابعة.",
|
||||
"PASSWORD_SAME_AS_CURRENT": "كلمة المرور الجديدة لا يمكن أن تكون نفس كلمة المرور الحالية.",
|
||||
"INVALID_PASSCODE": "رمز المرور الذي أدخلته غير صحيح. يرجى المحاولة مرة أخرى.",
|
||||
"PASSCODE_ALREADY_SET": "تم تعيين رمز المرور بالفعل.",
|
||||
"APPLE_RE-CONSENT_REQUIRED": "إعادة الموافقة على آبل مطلوبة. يرجى إلغاء تطبيقك من إعدادات معرف آبل الخاصة بك والمحاولة مرة أخرى.",
|
||||
|
||||
@ -24,5 +24,6 @@
|
||||
"IsValidExpiryDate": "$t({path}.PROPERTY_MAPPINGS.{property}) يجب ان يكون تاريخ انتهاء بطاقه صحيح",
|
||||
"IsEnglishOnly": "$t({path}.PROPERTY_MAPPINGS.{property}) يجب أن يكون باللغة الانجليزية",
|
||||
"IsAbove18": "$t({path}.PROPERTY_MAPPINGS.{property}) يجب ان يكون فوق 18 سنة",
|
||||
"IsValidPhoneNumber": "$t({path}.PROPERTY_MAPPINGS.{property}) يجب ان يكون رقم هاتف صحيح"
|
||||
"IsValidPhoneNumber": "$t({path}.PROPERTY_MAPPINGS.{property}) يجب ان يكون رقم هاتف صحيح",
|
||||
"isValidSaudiId": "$t({path}.PROPERTY_MAPPINGS.{property}) يجب أن يكون رقم هوية سعودية صحيح"
|
||||
}
|
||||
|
||||
@ -9,6 +9,9 @@
|
||||
"BIOMETRIC_NOT_ENABLED": "Biometric authentication has not been activated for your account. Please enable it to proceed.",
|
||||
"INVALID_BIOMETRIC": "The biometric data provided is invalid. Please try again or reconfigure your biometric settings.",
|
||||
"PASSWORD_MISMATCH": "The passwords you entered do not match. Please re-enter the passwords.",
|
||||
"INVALID_CURRENT_PASSWORD": "The current password you entered is incorrect. Please try again.",
|
||||
"PASSWORD_NOT_SET": "A password has not been set for this account. Please set a password to proceed.",
|
||||
"PASSWORD_SAME_AS_CURRENT": "The new password cannot be the same as the current password.",
|
||||
"INVALID_PASSCODE": "The passcode you entered is incorrect. Please try again.",
|
||||
"PASSCODE_ALREADY_SET": "The pass code has already been set.",
|
||||
"APPLE_RE-CONSENT_REQUIRED": "Apple re-consent is required. Please revoke the app from your Apple ID settings and try again.",
|
||||
|
||||
@ -25,5 +25,6 @@
|
||||
"IsEnglishOnly": "$t({path}.PROPERTY_MAPPINGS.{property}) must be in English",
|
||||
"IsAbove18": "$t({path}.PROPERTY_MAPPINGS.{property}) must be above 18 years",
|
||||
"IsValidPhoneNumber": "$t({path}.PROPERTY_MAPPINGS.{property}) must be a valid phone number",
|
||||
"IsPositive": "$t({path}.PROPERTY_MAPPINGS.{property}) must be a positive number"
|
||||
"IsPositive": "$t({path}.PROPERTY_MAPPINGS.{property}) must be a positive number",
|
||||
"isValidSaudiId": "$t({path}.PROPERTY_MAPPINGS.{property}) must be a valid Saudi ID"
|
||||
}
|
||||
|
||||
@ -20,8 +20,8 @@ export class JuniorResponseDto {
|
||||
this.id = junior.id;
|
||||
this.fullName = `${junior.customer.firstName} ${junior.customer.lastName}`;
|
||||
this.relationship = junior.relationship;
|
||||
this.profilePicture = junior.customer.profilePicture
|
||||
? new DocumentMetaResponseDto(junior.customer.profilePicture)
|
||||
this.profilePicture = junior.customer.user.profilePicture
|
||||
? new DocumentMetaResponseDto(junior.customer.user.profilePicture)
|
||||
: null;
|
||||
}
|
||||
}
|
||||
|
||||
@ -13,7 +13,7 @@ export class JuniorRepository {
|
||||
findJuniorsByGuardianId(guardianId: string, pageOptions: PageOptionsRequestDto) {
|
||||
return this.juniorRepository.findAndCount({
|
||||
where: { guardianId },
|
||||
relations: ['customer', 'customer.user', 'customer.profilePicture'],
|
||||
relations: ['customer', 'customer.user', 'customer.user.profilePicture'],
|
||||
skip: (pageOptions.page - FIRST_PAGE) * pageOptions.size,
|
||||
take: pageOptions.size,
|
||||
});
|
||||
|
||||
@ -132,7 +132,7 @@ export class JuniorService {
|
||||
this.logger.log(`Preparing junior images`);
|
||||
await Promise.all(
|
||||
juniors.map(async (junior) => {
|
||||
const profilePicture = junior.customer.profilePicture;
|
||||
const profilePicture = junior.customer.user.profilePicture;
|
||||
|
||||
if (profilePicture) {
|
||||
profilePicture.url = await this.ociService.generatePreSignedUrl(profilePicture);
|
||||
|
||||
@ -34,7 +34,8 @@ export class MoneyRequestsRepository {
|
||||
const query = this.moneyRequestRepository.createQueryBuilder('moneyRequest');
|
||||
query.leftJoinAndSelect('moneyRequest.requester', 'requester');
|
||||
query.leftJoinAndSelect('requester.customer', 'customer');
|
||||
query.leftJoinAndSelect('customer.profilePicture', 'profilePicture');
|
||||
query.leftJoinAndSelect('customer.user', 'user');
|
||||
query.leftJoinAndSelect('user.profilePicture', 'profilePicture');
|
||||
query.orderBy('moneyRequest.createdAt', 'DESC');
|
||||
query.where('moneyRequest.reviewerId = :reviewerId', { reviewerId });
|
||||
query.andWhere('moneyRequest.status = :status', { status: filters.status });
|
||||
|
||||
@ -106,7 +106,7 @@ export class MoneyRequestsService {
|
||||
this.logger.log(`Preparing document for money requests`);
|
||||
await Promise.all(
|
||||
moneyRequests.map(async (moneyRequest) => {
|
||||
const profilePicture = moneyRequest.requester.customer.profilePicture;
|
||||
const profilePicture = moneyRequest.requester.customer.user.profilePicture;
|
||||
|
||||
if (profilePicture) {
|
||||
profilePicture.url = await this.ociService.generatePreSignedUrl(profilePicture);
|
||||
|
||||
@ -36,7 +36,8 @@ export class TaskRepository {
|
||||
'image',
|
||||
'assignedTo',
|
||||
'assignedTo.customer',
|
||||
'assignedTo.customer.profilePicture',
|
||||
'assignedTo.customer.user',
|
||||
'assignedTo.customer.user.profilePicture',
|
||||
'submission',
|
||||
'submission.proofOfCompletion',
|
||||
],
|
||||
@ -50,7 +51,8 @@ export class TaskRepository {
|
||||
.leftJoinAndSelect('task.image', 'image')
|
||||
.leftJoinAndSelect('task.assignedTo', 'assignedTo')
|
||||
.leftJoinAndSelect('assignedTo.customer', 'customer')
|
||||
.leftJoinAndSelect('customer.profilePicture', 'profilePicture')
|
||||
.leftJoinAndSelect('customer.user', 'user')
|
||||
.leftJoinAndSelect('user.profilePicture', 'profilePicture')
|
||||
.leftJoinAndSelect('task.submission', 'submission')
|
||||
.leftJoinAndSelect('submission.proofOfCompletion', 'proofOfCompletion');
|
||||
|
||||
|
||||
@ -132,7 +132,7 @@ export class TaskService {
|
||||
const [imageUrl, submissionUrl, profilePictureUrl] = await Promise.all([
|
||||
this.ociService.generatePreSignedUrl(task.image),
|
||||
this.ociService.generatePreSignedUrl(task.submission?.proofOfCompletion),
|
||||
this.ociService.generatePreSignedUrl(task.assignedTo.customer.profilePicture),
|
||||
this.ociService.generatePreSignedUrl(task.assignedTo.customer.user.profilePicture),
|
||||
]);
|
||||
|
||||
task.image.url = imageUrl;
|
||||
@ -141,8 +141,8 @@ export class TaskService {
|
||||
task.submission.proofOfCompletion.url = submissionUrl;
|
||||
}
|
||||
|
||||
if (task.assignedTo.customer.profilePicture) {
|
||||
task.assignedTo.customer.profilePicture.url = profilePictureUrl;
|
||||
if (task.assignedTo.customer.user.profilePicture) {
|
||||
task.assignedTo.customer.user.profilePicture.url = profilePictureUrl;
|
||||
}
|
||||
}),
|
||||
);
|
||||
|
||||
@ -1,50 +0,0 @@
|
||||
import { Body, Controller, Get, Param, Post, Query, UseGuards } from '@nestjs/common';
|
||||
import { ApiBearerAuth, ApiTags } from '@nestjs/swagger';
|
||||
import { UserResponseDto } from '~/auth/dtos/response';
|
||||
import { Roles } from '~/auth/enums';
|
||||
import { AllowedRoles } from '~/common/decorators';
|
||||
import { RolesGuard } from '~/common/guards';
|
||||
import { ApiDataPageResponse, ApiDataResponse } from '~/core/decorators';
|
||||
import { CustomParseUUIDPipe } from '~/core/pipes';
|
||||
import { ResponseFactory } from '~/core/utils';
|
||||
import { CreateCheckerRequestDto, UserFiltersRequestDto } from '../dtos/request';
|
||||
import { UserService } from '../services';
|
||||
|
||||
@Controller('admin/users')
|
||||
@ApiTags('Users')
|
||||
@UseGuards(RolesGuard)
|
||||
@AllowedRoles(Roles.SUPER_ADMIN)
|
||||
@ApiBearerAuth()
|
||||
export class AdminUserController {
|
||||
constructor(private readonly userService: UserService) {}
|
||||
@Post()
|
||||
@ApiDataResponse(UserResponseDto)
|
||||
async createCheckers(@Body() data: CreateCheckerRequestDto) {
|
||||
const user = await this.userService.createChecker(data);
|
||||
|
||||
return ResponseFactory.data(new UserResponseDto(user));
|
||||
}
|
||||
|
||||
@Get()
|
||||
@ApiDataPageResponse(UserResponseDto)
|
||||
async findUsers(@Query() filters: UserFiltersRequestDto) {
|
||||
const [users, count] = await this.userService.findUsers(filters);
|
||||
|
||||
return ResponseFactory.dataPage(
|
||||
users.map((user) => new UserResponseDto(user)),
|
||||
{
|
||||
page: filters.page,
|
||||
size: filters.size,
|
||||
itemCount: count,
|
||||
},
|
||||
);
|
||||
}
|
||||
|
||||
@Get(':userId')
|
||||
@ApiDataResponse(UserResponseDto)
|
||||
async findUserById(@Param('userId', CustomParseUUIDPipe) userId: string) {
|
||||
const user = await this.userService.findUserOrThrow({ id: userId });
|
||||
|
||||
return ResponseFactory.data(new UserResponseDto(user));
|
||||
}
|
||||
}
|
||||
@ -1,2 +1 @@
|
||||
export * from './admin.user.controller';
|
||||
export * from './user.controller';
|
||||
|
||||
@ -1,20 +1,52 @@
|
||||
import { Body, Controller, Headers, HttpCode, HttpStatus, Patch, Post, UseGuards } from '@nestjs/common';
|
||||
import { Body, Controller, Get, Headers, HttpCode, HttpStatus, Patch, UseGuards } from '@nestjs/common';
|
||||
import { ApiBearerAuth, ApiTags } from '@nestjs/swagger';
|
||||
import { VerifyOtpRequestDto } from '~/auth/dtos/request';
|
||||
import { UserResponseDto } from '~/auth/dtos/response';
|
||||
import { IJwtPayload } from '~/auth/interfaces';
|
||||
import { DEVICE_ID_HEADER } from '~/common/constants';
|
||||
import { AuthenticatedUser, Public } from '~/common/decorators';
|
||||
import { AuthenticatedUser } from '~/common/decorators';
|
||||
import { AccessTokenGuard } from '~/common/guards';
|
||||
import { SetInternalPasswordRequestDto, UpdateNotificationsSettingsRequestDto } from '../dtos/request';
|
||||
import { ApiDataResponse } from '~/core/decorators';
|
||||
import { ResponseFactory } from '~/core/utils';
|
||||
import { UpdateNotificationsSettingsRequestDto, UpdateUserRequestDto } from '../dtos/request';
|
||||
import { UpdateEmailRequestDto } from '../dtos/request/update-email.request.dto';
|
||||
import { UserService } from '../services';
|
||||
|
||||
@Controller('users')
|
||||
@ApiTags('Users')
|
||||
@Controller('profile')
|
||||
@ApiTags('User - Profile')
|
||||
@UseGuards(AccessTokenGuard)
|
||||
@ApiBearerAuth()
|
||||
export class UserController {
|
||||
constructor(private userService: UserService) {}
|
||||
|
||||
@Get()
|
||||
@HttpCode(HttpStatus.OK)
|
||||
@ApiDataResponse(UserResponseDto)
|
||||
async getProfile(@AuthenticatedUser() { sub }: IJwtPayload) {
|
||||
const user = await this.userService.findUserOrThrow({ id: sub }, true);
|
||||
|
||||
return ResponseFactory.data(new UserResponseDto(user));
|
||||
}
|
||||
@Patch('')
|
||||
@HttpCode(HttpStatus.NO_CONTENT)
|
||||
async updateProfile(@AuthenticatedUser() user: IJwtPayload, @Body() data: UpdateUserRequestDto) {
|
||||
return this.userService.updateUser(user.sub, data);
|
||||
}
|
||||
|
||||
@Patch('email')
|
||||
@HttpCode(HttpStatus.NO_CONTENT)
|
||||
async updateEmail(@AuthenticatedUser() user: IJwtPayload, @Body() data: UpdateEmailRequestDto) {
|
||||
return this.userService.updateUserEmail(user.sub, data.email);
|
||||
}
|
||||
|
||||
@Patch('verify-email')
|
||||
@HttpCode(HttpStatus.NO_CONTENT)
|
||||
async verifyEmail(@AuthenticatedUser() user: IJwtPayload, @Body() { otp }: VerifyOtpRequestDto) {
|
||||
return this.userService.verifyEmail(user.sub, otp);
|
||||
}
|
||||
|
||||
@Patch('notifications-settings')
|
||||
@HttpCode(HttpStatus.NO_CONTENT)
|
||||
async updateNotificationSettings(
|
||||
@AuthenticatedUser() user: IJwtPayload,
|
||||
@Body() data: UpdateNotificationsSettingsRequestDto,
|
||||
@ -22,11 +54,4 @@ export class UserController {
|
||||
) {
|
||||
return this.userService.updateNotificationSettings(user.sub, data, deviceId);
|
||||
}
|
||||
|
||||
@Post('internal/set-password')
|
||||
@Public()
|
||||
@HttpCode(HttpStatus.NO_CONTENT)
|
||||
async setPassword(@Body() data: SetInternalPasswordRequestDto) {
|
||||
return this.userService.setCheckerPassword(data);
|
||||
}
|
||||
}
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user