mirror of
https://github.com/HamzaSha1/zod-backend.git
synced 2025-08-25 13:49:40 +00:00
Compare commits
44 Commits
mvp-1
...
bf43e62b17
| Author | SHA1 | Date | |
|---|---|---|---|
| bf43e62b17 | |||
| 5a780eeb17 | |||
| 038b8ef6e3 | |||
| 3b3f8c0104 | |||
| 2770cf8774 | |||
| bea3ccfbbc | |||
| 492e538eb8 | |||
| d3057beb54 | |||
| 19fa53c981 | |||
| d2cc02fb60 | |||
| 4cbbfd8136 | |||
| 6c859a25d2 | |||
| d1a6d3e715 | |||
| 1ea1f42169 | |||
| d4fe3b3fc3 | |||
| b44bc5d5cc | |||
| 9aa6c487ed | |||
| 42e4d75d70 | |||
| a358cd2e7a | |||
| 641a665beb | |||
| 49326e983f | |||
| 881d88c8d8 | |||
| 35ab3df7c1 | |||
| cbade0a87d | |||
| 4c6ef17525 | |||
| ffca6996fd | |||
| a3f88c774c | |||
| ec38b82a7b | |||
| 9b5f863577 | |||
| 54ce5b022d | |||
| dae9cb6323 | |||
| 270753cfd7 | |||
| 6b1cb3a84e | |||
| ebd4b293e9 | |||
| 87bb1a2709 | |||
| 663e8972c4 | |||
| 8ff9f921e8 | |||
| 6d2d2b558a | |||
| 5aa3d3774d | |||
| 221f3bae4f | |||
| 62621c1a15 | |||
| 756e947c8a | |||
| db02a28b4d | |||
| afc087ff08 |
2
.gitignore
vendored
2
.gitignore
vendored
@ -53,3 +53,5 @@ pids
|
||||
# Diagnostic reports (https://nodejs.org/api/report.html)
|
||||
report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json
|
||||
|
||||
|
||||
zod-certs
|
||||
|
||||
24
client/.gitignore
vendored
Normal file
24
client/.gitignore
vendored
Normal file
@ -0,0 +1,24 @@
|
||||
# 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?
|
||||
50
client/README.md
Normal file
50
client/README.md
Normal file
@ -0,0 +1,50 @@
|
||||
# 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,
|
||||
},
|
||||
})
|
||||
```
|
||||
28
client/eslint.config.js
Normal file
28
client/eslint.config.js
Normal file
@ -0,0 +1,28 @@
|
||||
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 },
|
||||
],
|
||||
},
|
||||
},
|
||||
)
|
||||
13
client/index.html
Normal file
13
client/index.html
Normal file
@ -0,0 +1,13 @@
|
||||
<!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
Normal file
4115
client/package-lock.json
generated
Normal file
File diff suppressed because it is too large
Load Diff
38
client/package.json
Normal file
38
client/package.json
Normal file
@ -0,0 +1,38 @@
|
||||
{
|
||||
"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
client/public/vite.svg
Normal file
1
client/public/vite.svg
Normal file
@ -0,0 +1 @@
|
||||
<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>
|
||||
|
After Width: | Height: | Size: 1.5 KiB |
42
client/src/App.css
Normal file
42
client/src/App.css
Normal file
@ -0,0 +1,42 @@
|
||||
#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;
|
||||
}
|
||||
127
client/src/App.tsx
Normal file
127
client/src/App.tsx
Normal file
@ -0,0 +1,127 @@
|
||||
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;
|
||||
140
client/src/api/client.ts
Normal file
140
client/src/api/client.ts
Normal file
@ -0,0 +1,140 @@
|
||||
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
client/src/assets/react.svg
Normal file
1
client/src/assets/react.svg
Normal file
@ -0,0 +1 @@
|
||||
<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>
|
||||
|
After Width: | Height: | Size: 4.0 KiB |
69
client/src/components/auth/AppleLogin.tsx
Normal file
69
client/src/components/auth/AppleLogin.tsx
Normal file
@ -0,0 +1,69 @@
|
||||
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 */
|
||||
/>
|
||||
);
|
||||
};
|
||||
40
client/src/components/auth/GoogleLogin.tsx
Normal file
40
client/src/components/auth/GoogleLogin.tsx
Normal file
@ -0,0 +1,40 @@
|
||||
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>
|
||||
);
|
||||
};
|
||||
149
client/src/components/auth/LoginForm.tsx
Normal file
149
client/src/components/auth/LoginForm.tsx
Normal file
@ -0,0 +1,149 @@
|
||||
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>
|
||||
);
|
||||
};
|
||||
254
client/src/components/auth/RegisterForm.tsx
Normal file
254
client/src/components/auth/RegisterForm.tsx
Normal file
@ -0,0 +1,254 @@
|
||||
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>
|
||||
);
|
||||
};
|
||||
151
client/src/components/dashboard/Dashboard.tsx
Normal file
151
client/src/components/dashboard/Dashboard.tsx
Normal file
@ -0,0 +1,151 @@
|
||||
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>
|
||||
);
|
||||
};
|
||||
86
client/src/components/document/DocumentUpload.tsx
Normal file
86
client/src/components/document/DocumentUpload.tsx
Normal file
@ -0,0 +1,86 @@
|
||||
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>
|
||||
);
|
||||
};
|
||||
266
client/src/components/juniors/AddJuniorForm.tsx
Normal file
266
client/src/components/juniors/AddJuniorForm.tsx
Normal file
@ -0,0 +1,266 @@
|
||||
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>
|
||||
);
|
||||
};
|
||||
121
client/src/components/juniors/JuniorsList.tsx
Normal file
121
client/src/components/juniors/JuniorsList.tsx
Normal file
@ -0,0 +1,121 @@
|
||||
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>
|
||||
);
|
||||
};
|
||||
175
client/src/components/layout/AuthLayout.tsx
Normal file
175
client/src/components/layout/AuthLayout.tsx
Normal file
@ -0,0 +1,175 @@
|
||||
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>
|
||||
);
|
||||
};
|
||||
245
client/src/components/tasks/AddTask.tsx
Normal file
245
client/src/components/tasks/AddTask.tsx
Normal file
@ -0,0 +1,245 @@
|
||||
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>
|
||||
);
|
||||
};
|
||||
87
client/src/components/tasks/TaskDetails.tsx
Normal file
87
client/src/components/tasks/TaskDetails.tsx
Normal file
@ -0,0 +1,87 @@
|
||||
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>
|
||||
);
|
||||
};
|
||||
200
client/src/components/tasks/TasksList.tsx
Normal file
200
client/src/components/tasks/TasksList.tsx
Normal file
@ -0,0 +1,200 @@
|
||||
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>
|
||||
);
|
||||
};
|
||||
119
client/src/contexts/AuthContext.tsx
Normal file
119
client/src/contexts/AuthContext.tsx
Normal file
@ -0,0 +1,119 @@
|
||||
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>;
|
||||
};
|
||||
6
client/src/enums/grantType.enum.ts
Normal file
6
client/src/enums/grantType.enum.ts
Normal file
@ -0,0 +1,6 @@
|
||||
export enum GrantType {
|
||||
PASSWORD = 'PASSWORD',
|
||||
APPLE = 'APPLE',
|
||||
GOOGLE = 'GOOGLE',
|
||||
BIOMETRIC = 'BIOMETRIC',
|
||||
}
|
||||
1
client/src/enums/index.ts
Normal file
1
client/src/enums/index.ts
Normal file
@ -0,0 +1 @@
|
||||
export * from './grantType.enum';
|
||||
52
client/src/index.css
Normal file
52
client/src/index.css
Normal file
@ -0,0 +1,52 @@
|
||||
@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;
|
||||
}
|
||||
13
client/src/main.tsx
Normal file
13
client/src/main.tsx
Normal file
@ -0,0 +1,13 @@
|
||||
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>
|
||||
);
|
||||
14
client/src/types/api.ts
Normal file
14
client/src/types/api.ts
Normal file
@ -0,0 +1,14 @@
|
||||
interface ApiErrorField {
|
||||
field: string;
|
||||
message: string;
|
||||
}
|
||||
|
||||
export interface ApiError {
|
||||
statusCode: number;
|
||||
message: string | ApiErrorField[];
|
||||
error: string;
|
||||
}
|
||||
|
||||
export interface ApiResponse<T> {
|
||||
data: T;
|
||||
}
|
||||
27
client/src/types/auth.ts
Normal file
27
client/src/types/auth.ts
Normal file
@ -0,0 +1,27 @@
|
||||
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;
|
||||
}
|
||||
9
client/src/types/document.ts
Normal file
9
client/src/types/document.ts
Normal file
@ -0,0 +1,9 @@
|
||||
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'
|
||||
}
|
||||
41
client/src/types/junior.ts
Normal file
41
client/src/types/junior.ts
Normal file
@ -0,0 +1,41 @@
|
||||
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;
|
||||
};
|
||||
}
|
||||
42
client/src/types/task.ts
Normal file
42
client/src/types/task.ts
Normal file
@ -0,0 +1,42 @@
|
||||
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
Normal file
1
client/src/vite-env.d.ts
vendored
Normal file
@ -0,0 +1 @@
|
||||
/// <reference types="vite/client" />
|
||||
26
client/tsconfig.app.json
Normal file
26
client/tsconfig.app.json
Normal file
@ -0,0 +1,26 @@
|
||||
{
|
||||
"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"]
|
||||
}
|
||||
7
client/tsconfig.json
Normal file
7
client/tsconfig.json
Normal file
@ -0,0 +1,7 @@
|
||||
{
|
||||
"files": [],
|
||||
"references": [
|
||||
{ "path": "./tsconfig.app.json" },
|
||||
{ "path": "./tsconfig.node.json" }
|
||||
]
|
||||
}
|
||||
24
client/tsconfig.node.json
Normal file
24
client/tsconfig.node.json
Normal file
@ -0,0 +1,24 @@
|
||||
{
|
||||
"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"]
|
||||
}
|
||||
16
client/vite.config.ts
Normal file
16
client/vite.config.ts
Normal file
@ -0,0 +1,16 @@
|
||||
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()],
|
||||
};
|
||||
});
|
||||
@ -10,8 +10,8 @@
|
||||
"include": "config",
|
||||
"exclude": "**/*.md"
|
||||
},
|
||||
{ "include": "common/modules/**/templates/*", "watchAssets": true }
|
||||
,
|
||||
{ "include": "common/modules/**/templates/**/*", "watchAssets": true },
|
||||
{ "include": "common/modules/neoleap/zod-certs" },
|
||||
"i18n",
|
||||
"files"
|
||||
]
|
||||
|
||||
134
package-lock.json
generated
134
package-lock.json
generated
@ -33,10 +33,12 @@
|
||||
"cacheable": "^1.8.5",
|
||||
"class-transformer": "^0.5.1",
|
||||
"class-validator": "^0.14.1",
|
||||
"decimal.js": "^10.6.0",
|
||||
"firebase-admin": "^13.0.2",
|
||||
"google-libphonenumber": "^3.2.39",
|
||||
"handlebars": "^4.7.8",
|
||||
"ioredis": "^5.4.1",
|
||||
"handlebars-layouts": "^3.1.4",
|
||||
"jwk-to-pem": "^2.0.7",
|
||||
"lodash": "^4.17.21",
|
||||
"moment": "^2.30.1",
|
||||
"nestjs-i18n": "^10.4.9",
|
||||
@ -65,6 +67,7 @@
|
||||
"@types/express": "^5.0.0",
|
||||
"@types/google-libphonenumber": "^7.4.30",
|
||||
"@types/jest": "^29.5.2",
|
||||
"@types/jwk-to-pem": "^2.0.3",
|
||||
"@types/lodash": "^4.17.13",
|
||||
"@types/multer": "^1.4.12",
|
||||
"@types/node": "^20.3.1",
|
||||
@ -1185,7 +1188,9 @@
|
||||
},
|
||||
"node_modules/@ioredis/commands": {
|
||||
"version": "1.2.0",
|
||||
"license": "MIT"
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"peer": true
|
||||
},
|
||||
"node_modules/@isaacs/cliui": {
|
||||
"version": "8.0.2",
|
||||
@ -2858,6 +2863,13 @@
|
||||
"version": "2.0.0",
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/@types/jwk-to-pem": {
|
||||
"version": "2.0.3",
|
||||
"resolved": "https://registry.npmjs.org/@types/jwk-to-pem/-/jwk-to-pem-2.0.3.tgz",
|
||||
"integrity": "sha512-I/WFyFgk5GrNbkpmt14auGO3yFK1Wt4jXzkLuI+fDBNtO5ZI2rbymyGd6bKzfSBEuyRdM64ZUwxU1+eDcPSOEQ==",
|
||||
"dev": true,
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/@types/lodash": {
|
||||
"version": "4.17.13",
|
||||
"dev": true,
|
||||
@ -3788,6 +3800,18 @@
|
||||
"safer-buffer": "~2.1.0"
|
||||
}
|
||||
},
|
||||
"node_modules/asn1.js": {
|
||||
"version": "5.4.1",
|
||||
"resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-5.4.1.tgz",
|
||||
"integrity": "sha512-+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA==",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"bn.js": "^4.0.0",
|
||||
"inherits": "^2.0.1",
|
||||
"minimalistic-assert": "^1.0.0",
|
||||
"safer-buffer": "^2.1.0"
|
||||
}
|
||||
},
|
||||
"node_modules/assert-never": {
|
||||
"version": "1.3.0",
|
||||
"license": "MIT",
|
||||
@ -4055,6 +4079,12 @@
|
||||
"node": ">= 6"
|
||||
}
|
||||
},
|
||||
"node_modules/bn.js": {
|
||||
"version": "4.12.1",
|
||||
"resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.1.tgz",
|
||||
"integrity": "sha512-k8TVBiPkPJT9uHLdOKfFpqcfprwBFOAAXXozRubr7R7PfIuKvQlzcI4M0pALeqXN09vdaMbUdUj+pass+uULAg==",
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/body-parser": {
|
||||
"version": "1.20.3",
|
||||
"license": "MIT",
|
||||
@ -4155,6 +4185,12 @@
|
||||
"node": ">=8"
|
||||
}
|
||||
},
|
||||
"node_modules/brorand": {
|
||||
"version": "1.1.0",
|
||||
"resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz",
|
||||
"integrity": "sha512-cKV8tMCEpQs4hK/ik71d6LrPOnpkpGBR0wzxqr68g2m/LB2GxVYQroAjMJZRVM1Y4BCjCKc3vAamxSzOY2RP+w==",
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/browserslist": {
|
||||
"version": "4.24.2",
|
||||
"dev": true,
|
||||
@ -5132,6 +5168,12 @@
|
||||
"node": ">=0.10.0"
|
||||
}
|
||||
},
|
||||
"node_modules/decimal.js": {
|
||||
"version": "10.6.0",
|
||||
"resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.6.0.tgz",
|
||||
"integrity": "sha512-YpgQiITW3JXGntzdUmyUR1V812Hn8T1YVXhCu+wO3OpS4eU9l4YdD3qjyiKdV6mvV29zapkMeD390UVEf2lkUg==",
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/dedent": {
|
||||
"version": "1.5.3",
|
||||
"dev": true,
|
||||
@ -5206,6 +5248,8 @@
|
||||
"node_modules/denque": {
|
||||
"version": "2.1.0",
|
||||
"license": "Apache-2.0",
|
||||
"optional": true,
|
||||
"peer": true,
|
||||
"engines": {
|
||||
"node": ">=0.10"
|
||||
}
|
||||
@ -5514,6 +5558,21 @@
|
||||
"dev": true,
|
||||
"license": "ISC"
|
||||
},
|
||||
"node_modules/elliptic": {
|
||||
"version": "6.6.1",
|
||||
"resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.6.1.tgz",
|
||||
"integrity": "sha512-RaddvvMatK2LJHqFJ+YA4WysVN5Ita9E35botqIYspQ4TkRAlCicdzKOjlyv/1Za5RyTNn7di//eEV0uTAfe3g==",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"bn.js": "^4.11.9",
|
||||
"brorand": "^1.1.0",
|
||||
"hash.js": "^1.0.0",
|
||||
"hmac-drbg": "^1.0.1",
|
||||
"inherits": "^2.0.4",
|
||||
"minimalistic-assert": "^1.0.1",
|
||||
"minimalistic-crypto-utils": "^1.0.1"
|
||||
}
|
||||
},
|
||||
"node_modules/emitter-listener": {
|
||||
"version": "1.1.2",
|
||||
"license": "BSD-2-Clause",
|
||||
@ -6932,6 +6991,15 @@
|
||||
"uglify-js": "^3.1.4"
|
||||
}
|
||||
},
|
||||
"node_modules/handlebars-layouts": {
|
||||
"version": "3.1.4",
|
||||
"resolved": "https://registry.npmjs.org/handlebars-layouts/-/handlebars-layouts-3.1.4.tgz",
|
||||
"integrity": "sha512-2llBmvnj8ueOfxNHdRzJOcgalzZjYVd9+WAl93kPYmlX4WGx7FTHTzNxhK+i9YKY2OSjzfehgpLiIwP/OJr6tw==",
|
||||
"license": "MIT",
|
||||
"engines": {
|
||||
"node": ">= 0.10"
|
||||
}
|
||||
},
|
||||
"node_modules/handlebars/node_modules/source-map": {
|
||||
"version": "0.6.1",
|
||||
"license": "BSD-3-Clause",
|
||||
@ -6994,6 +7062,16 @@
|
||||
"version": "2.0.1",
|
||||
"license": "ISC"
|
||||
},
|
||||
"node_modules/hash.js": {
|
||||
"version": "1.1.7",
|
||||
"resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz",
|
||||
"integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"inherits": "^2.0.3",
|
||||
"minimalistic-assert": "^1.0.1"
|
||||
}
|
||||
},
|
||||
"node_modules/hasown": {
|
||||
"version": "2.0.2",
|
||||
"license": "MIT",
|
||||
@ -7031,6 +7109,17 @@
|
||||
"node": "*"
|
||||
}
|
||||
},
|
||||
"node_modules/hmac-drbg": {
|
||||
"version": "1.0.1",
|
||||
"resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz",
|
||||
"integrity": "sha512-Tti3gMqLdZfhOQY1Mzf/AanLiqh1WTiJgEj26ZuYQ9fbkLomzGchCws4FyrSd4VkpBfiNhaE1On+lOz894jvXg==",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"hash.js": "^1.0.3",
|
||||
"minimalistic-assert": "^1.0.0",
|
||||
"minimalistic-crypto-utils": "^1.0.1"
|
||||
}
|
||||
},
|
||||
"node_modules/hookified": {
|
||||
"version": "1.5.1",
|
||||
"license": "MIT"
|
||||
@ -7312,6 +7401,8 @@
|
||||
"node_modules/ioredis": {
|
||||
"version": "5.4.1",
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"peer": true,
|
||||
"dependencies": {
|
||||
"@ioredis/commands": "^1.1.1",
|
||||
"cluster-key-slot": "^1.1.0",
|
||||
@ -8503,6 +8594,17 @@
|
||||
"safe-buffer": "^5.0.1"
|
||||
}
|
||||
},
|
||||
"node_modules/jwk-to-pem": {
|
||||
"version": "2.0.7",
|
||||
"resolved": "https://registry.npmjs.org/jwk-to-pem/-/jwk-to-pem-2.0.7.tgz",
|
||||
"integrity": "sha512-cSVphrmWr6reVchuKQZdfSs4U9c5Y4hwZggPoz6cbVnTpAVgGRpEuQng86IyqLeGZlhTh+c4MAreB6KbdQDKHQ==",
|
||||
"license": "Apache-2.0",
|
||||
"dependencies": {
|
||||
"asn1.js": "^5.3.0",
|
||||
"elliptic": "^6.6.1",
|
||||
"safe-buffer": "^5.0.1"
|
||||
}
|
||||
},
|
||||
"node_modules/jwks-rsa": {
|
||||
"version": "3.1.0",
|
||||
"resolved": "https://registry.npmjs.org/jwks-rsa/-/jwks-rsa-3.1.0.tgz",
|
||||
@ -9025,7 +9127,9 @@
|
||||
},
|
||||
"node_modules/lodash.defaults": {
|
||||
"version": "4.2.0",
|
||||
"license": "MIT"
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"peer": true
|
||||
},
|
||||
"node_modules/lodash.includes": {
|
||||
"version": "4.3.0",
|
||||
@ -9033,7 +9137,9 @@
|
||||
},
|
||||
"node_modules/lodash.isarguments": {
|
||||
"version": "3.1.0",
|
||||
"license": "MIT"
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"peer": true
|
||||
},
|
||||
"node_modules/lodash.isboolean": {
|
||||
"version": "3.0.3",
|
||||
@ -9532,6 +9638,18 @@
|
||||
"node": ">=6"
|
||||
}
|
||||
},
|
||||
"node_modules/minimalistic-assert": {
|
||||
"version": "1.0.1",
|
||||
"resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
|
||||
"integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==",
|
||||
"license": "ISC"
|
||||
},
|
||||
"node_modules/minimalistic-crypto-utils": {
|
||||
"version": "1.0.1",
|
||||
"resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz",
|
||||
"integrity": "sha512-JIYlbt6g8i5jKfJ3xz7rF0LXmv2TkDxBLUkiBeZ7bAx4GnnNMr8xFpGnOxn6GhTEHx3SjRrZEoU+j04prX1ktg==",
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/minimatch": {
|
||||
"version": "9.0.5",
|
||||
"license": "ISC",
|
||||
@ -15616,6 +15734,8 @@
|
||||
"node_modules/redis-errors": {
|
||||
"version": "1.2.0",
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"peer": true,
|
||||
"engines": {
|
||||
"node": ">=4"
|
||||
}
|
||||
@ -15623,6 +15743,8 @@
|
||||
"node_modules/redis-parser": {
|
||||
"version": "3.0.0",
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"peer": true,
|
||||
"dependencies": {
|
||||
"redis-errors": "^1.0.0"
|
||||
},
|
||||
@ -16407,7 +16529,9 @@
|
||||
},
|
||||
"node_modules/standard-as-callback": {
|
||||
"version": "2.1.0",
|
||||
"license": "MIT"
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"peer": true
|
||||
},
|
||||
"node_modules/statuses": {
|
||||
"version": "2.0.1",
|
||||
|
||||
@ -23,7 +23,8 @@
|
||||
"migration:generate": "npm run typeorm:cli-d migration:generate",
|
||||
"migration:create": "npm run typeorm:cli migration:create",
|
||||
"migration:up": "npm run typeorm:cli-d migration:run",
|
||||
"migration:down": "npm run typeorm:cli-d migration:revert"
|
||||
"migration:down": "npm run typeorm:cli-d migration:revert",
|
||||
"seed": "TS_NODE_PROJECT=tsconfig.json ts-node -r tsconfig-paths/register src/scripts/seed.ts"
|
||||
},
|
||||
"dependencies": {
|
||||
"@abdalhamid/hello": "^2.0.0",
|
||||
@ -50,10 +51,12 @@
|
||||
"cacheable": "^1.8.5",
|
||||
"class-transformer": "^0.5.1",
|
||||
"class-validator": "^0.14.1",
|
||||
"decimal.js": "^10.6.0",
|
||||
"firebase-admin": "^13.0.2",
|
||||
"google-libphonenumber": "^3.2.39",
|
||||
"handlebars": "^4.7.8",
|
||||
"ioredis": "^5.4.1",
|
||||
"handlebars-layouts": "^3.1.4",
|
||||
"jwk-to-pem": "^2.0.7",
|
||||
"lodash": "^4.17.21",
|
||||
"moment": "^2.30.1",
|
||||
"nestjs-i18n": "^10.4.9",
|
||||
@ -82,6 +85,7 @@
|
||||
"@types/express": "^5.0.0",
|
||||
"@types/google-libphonenumber": "^7.4.30",
|
||||
"@types/jest": "^29.5.2",
|
||||
"@types/jwk-to-pem": "^2.0.3",
|
||||
"@types/lodash": "^4.17.13",
|
||||
"@types/multer": "^1.4.12",
|
||||
"@types/node": "^20.3.1",
|
||||
|
||||
@ -4,7 +4,7 @@ import { Roles } from '~/auth/enums';
|
||||
import { IJwtPayload } from '~/auth/interfaces';
|
||||
import { AllowedRoles, AuthenticatedUser } from '~/common/decorators';
|
||||
import { RolesGuard } from '~/common/guards';
|
||||
import { ApiDataPageResponse, ApiDataResponse } from '~/core/decorators';
|
||||
import { ApiDataPageResponse, ApiDataResponse, ApiLangRequestHeader } from '~/core/decorators';
|
||||
import { PageOptionsRequestDto } from '~/core/dtos';
|
||||
import { CustomParseUUIDPipe } from '~/core/pipes';
|
||||
import { ResponseFactory } from '~/core/utils';
|
||||
@ -15,6 +15,7 @@ import { AllowanceChangeRequestsService } from '../services';
|
||||
@Controller('allowance-change-requests')
|
||||
@ApiTags('Allowance Change Requests')
|
||||
@ApiBearerAuth()
|
||||
@ApiLangRequestHeader()
|
||||
export class AllowanceChangeRequestController {
|
||||
constructor(private readonly allowanceChangeRequestsService: AllowanceChangeRequestsService) {}
|
||||
|
||||
|
||||
@ -4,7 +4,7 @@ import { Roles } from '~/auth/enums';
|
||||
import { IJwtPayload } from '~/auth/interfaces';
|
||||
import { AllowedRoles, AuthenticatedUser } from '~/common/decorators';
|
||||
import { RolesGuard } from '~/common/guards';
|
||||
import { ApiDataPageResponse, ApiDataResponse } from '~/core/decorators';
|
||||
import { ApiDataPageResponse, ApiDataResponse, ApiLangRequestHeader } from '~/core/decorators';
|
||||
import { PageOptionsRequestDto } from '~/core/dtos';
|
||||
import { CustomParseUUIDPipe } from '~/core/pipes';
|
||||
import { ResponseFactory } from '~/core/utils';
|
||||
@ -15,6 +15,7 @@ import { AllowancesService } from '../services';
|
||||
@Controller('allowances')
|
||||
@ApiTags('Allowances')
|
||||
@ApiBearerAuth()
|
||||
@ApiLangRequestHeader()
|
||||
export class AllowancesController {
|
||||
constructor(private readonly allowancesService: AllowancesService) {}
|
||||
|
||||
|
||||
@ -12,6 +12,7 @@ import { AllowanceModule } from './allowance/allowance.module';
|
||||
import { AuthModule } from './auth/auth.module';
|
||||
import { CacheModule } from './common/modules/cache/cache.module';
|
||||
import { LookupModule } from './common/modules/lookup/lookup.module';
|
||||
import { NeoLeapModule } from './common/modules/neoleap/neoleap.module';
|
||||
import { NotificationModule } from './common/modules/notification/notification.module';
|
||||
import { OtpModule } from './common/modules/otp/otp.module';
|
||||
import { AllExceptionsFilter, buildI18nValidationExceptionFilter } from './core/filters';
|
||||
@ -30,6 +31,7 @@ import { MoneyRequestModule } from './money-request/money-request.module';
|
||||
import { SavingGoalsModule } from './saving-goals/saving-goals.module';
|
||||
import { TaskModule } from './task/task.module';
|
||||
import { UserModule } from './user/user.module';
|
||||
import { CardModule } from './card/card.module';
|
||||
|
||||
@Module({
|
||||
controllers: [],
|
||||
@ -80,6 +82,8 @@ import { UserModule } from './user/user.module';
|
||||
UserModule,
|
||||
|
||||
CronModule,
|
||||
NeoLeapModule,
|
||||
CardModule,
|
||||
],
|
||||
providers: [
|
||||
// Global Pipes
|
||||
|
||||
@ -1,14 +1,15 @@
|
||||
import { HttpModule } from '@nestjs/axios';
|
||||
import { Module } from '@nestjs/common';
|
||||
import { JwtModule } from '@nestjs/jwt';
|
||||
import { JuniorModule } from '~/junior/junior.module';
|
||||
import { UserModule } from '~/user/user.module';
|
||||
import { AuthController } from './controllers';
|
||||
import { AuthService } from './services';
|
||||
import { AuthService, Oauth2Service } from './services';
|
||||
import { AccessTokenStrategy } from './strategies';
|
||||
|
||||
@Module({
|
||||
imports: [JwtModule.register({}), JuniorModule, UserModule],
|
||||
providers: [AuthService, AccessTokenStrategy],
|
||||
imports: [JwtModule.register({}), UserModule, JuniorModule, HttpModule],
|
||||
providers: [AuthService, AccessTokenStrategy, Oauth2Service],
|
||||
controllers: [AuthController],
|
||||
exports: [],
|
||||
})
|
||||
|
||||
@ -1,21 +1,24 @@
|
||||
import { Body, Controller, Headers, HttpCode, HttpStatus, Post, Req, UseGuards } from '@nestjs/common';
|
||||
import { Body, Controller, HttpCode, HttpStatus, Post, Req, UseGuards } from '@nestjs/common';
|
||||
import { ApiBearerAuth, ApiTags } from '@nestjs/swagger';
|
||||
import { Request } from 'express';
|
||||
import { DEVICE_ID_HEADER } from '~/common/constants';
|
||||
import { AuthenticatedUser, Public } from '~/common/decorators';
|
||||
import { AccessTokenGuard } from '~/common/guards';
|
||||
import { ApiDataResponse, ApiLangRequestHeader } from '~/core/decorators';
|
||||
import { ResponseFactory } from '~/core/utils';
|
||||
import {
|
||||
AppleLoginRequestDto,
|
||||
CreateUnverifiedUserRequestDto,
|
||||
DisableBiometricRequestDto,
|
||||
EnableBiometricRequestDto,
|
||||
ForgetPasswordRequestDto,
|
||||
LoginRequestDto,
|
||||
GoogleLoginRequestDto,
|
||||
RefreshTokenRequestDto,
|
||||
SendForgetPasswordOtpRequestDto,
|
||||
SendLoginOtpRequestDto,
|
||||
SetEmailRequestDto,
|
||||
setJuniorPasswordRequestDto,
|
||||
SetPasscodeRequestDto,
|
||||
VerifyLoginOtpRequestDto,
|
||||
VerifyUserRequestDto,
|
||||
} from '../dtos/request';
|
||||
import { SendForgetPasswordOtpResponseDto, SendRegisterOtpResponseDto } from '../dtos/response';
|
||||
@ -26,6 +29,7 @@ import { AuthService } from '../services';
|
||||
@Controller('auth')
|
||||
@ApiTags('Auth')
|
||||
@ApiBearerAuth()
|
||||
@ApiLangRequestHeader()
|
||||
export class AuthController {
|
||||
constructor(private readonly authService: AuthService) {}
|
||||
@Post('register/otp')
|
||||
@ -40,6 +44,36 @@ export class AuthController {
|
||||
return ResponseFactory.data(new LoginResponseDto(res, user));
|
||||
}
|
||||
|
||||
@Post('login/otp')
|
||||
@HttpCode(HttpStatus.NO_CONTENT)
|
||||
async sendLoginOtp(@Body() data: SendLoginOtpRequestDto) {
|
||||
return this.authService.sendLoginOtp(data);
|
||||
}
|
||||
|
||||
@Post('login/verify')
|
||||
@HttpCode(HttpStatus.OK)
|
||||
@ApiDataResponse(LoginResponseDto)
|
||||
async verifyLoginOtp(@Body() data: VerifyLoginOtpRequestDto) {
|
||||
const [token, user] = await this.authService.verifyLoginOtp(data);
|
||||
return ResponseFactory.data(new LoginResponseDto(token, user));
|
||||
}
|
||||
|
||||
@Post('login/google')
|
||||
@HttpCode(HttpStatus.OK)
|
||||
@ApiDataResponse(LoginResponseDto)
|
||||
async loginWithGoogle(@Body() data: GoogleLoginRequestDto) {
|
||||
const [token, user] = await this.authService.loginWithGoogle(data);
|
||||
return ResponseFactory.data(new LoginResponseDto(token, user));
|
||||
}
|
||||
|
||||
@Post('login/apple')
|
||||
@HttpCode(HttpStatus.OK)
|
||||
@ApiDataResponse(LoginResponseDto)
|
||||
async loginWithApple(@Body() data: AppleLoginRequestDto) {
|
||||
const [token, user] = await this.authService.loginWithApple(data);
|
||||
return ResponseFactory.data(new LoginResponseDto(token, user));
|
||||
}
|
||||
|
||||
@Post('register/set-email')
|
||||
@HttpCode(HttpStatus.NO_CONTENT)
|
||||
@UseGuards(AccessTokenGuard)
|
||||
@ -54,6 +88,23 @@ export class AuthController {
|
||||
await this.authService.setPasscode(sub, passcode);
|
||||
}
|
||||
|
||||
// @Post('register/set-phone/otp')
|
||||
// @UseGuards(AccessTokenGuard)
|
||||
// async setPhoneNumber(
|
||||
// @AuthenticatedUser() { sub }: IJwtPayload,
|
||||
// @Body() setPhoneNumberDto: CreateUnverifiedUserRequestDto,
|
||||
// ) {
|
||||
// const phoneNumber = await this.authService.setPhoneNumber(sub, setPhoneNumberDto);
|
||||
// return ResponseFactory.data(new SendRegisterOtpResponseDto(phoneNumber));
|
||||
// }
|
||||
|
||||
// @Post('register/set-phone/verify')
|
||||
// @HttpCode(HttpStatus.NO_CONTENT)
|
||||
// @UseGuards(AccessTokenGuard)
|
||||
// async verifyPhoneNumber(@AuthenticatedUser() { sub }: IJwtPayload, @Body() { otp }: VerifyOtpRequestDto) {
|
||||
// await this.authService.verifyPhoneNumber(sub, otp);
|
||||
// }
|
||||
|
||||
@Post('biometric/enable')
|
||||
@HttpCode(HttpStatus.NO_CONTENT)
|
||||
@UseGuards(AccessTokenGuard)
|
||||
@ -94,12 +145,6 @@ export class AuthController {
|
||||
return ResponseFactory.data(new LoginResponseDto(res, user));
|
||||
}
|
||||
|
||||
@Post('login')
|
||||
async login(@Body() loginDto: LoginRequestDto, @Headers(DEVICE_ID_HEADER) deviceId: string) {
|
||||
const [res, user] = await this.authService.login(loginDto, deviceId);
|
||||
return ResponseFactory.data(new LoginResponseDto(res, user));
|
||||
}
|
||||
|
||||
@Post('logout')
|
||||
@HttpCode(HttpStatus.NO_CONTENT)
|
||||
@UseGuards(AccessTokenGuard)
|
||||
|
||||
14
src/auth/dtos/request/apple-additional-data.request.dto.ts
Normal file
14
src/auth/dtos/request/apple-additional-data.request.dto.ts
Normal file
@ -0,0 +1,14 @@
|
||||
import { ApiProperty } from '@nestjs/swagger';
|
||||
import { IsNotEmpty, IsString } from 'class-validator';
|
||||
import { i18nValidationMessage as i18n } from 'nestjs-i18n';
|
||||
export class AppleAdditionalData {
|
||||
@ApiProperty({ example: 'Ahmad' })
|
||||
@IsString({ message: i18n('validation.IsString', { path: 'general', property: 'customer.firstName' }) })
|
||||
@IsNotEmpty({ message: i18n('validation.IsNotEmpty', { path: 'general', property: 'customer.firstName' }) })
|
||||
firstName!: string;
|
||||
|
||||
@ApiProperty({ example: 'Khan' })
|
||||
@IsString({ message: i18n('validation.IsString', { path: 'general', property: 'customer.lastName' }) })
|
||||
@IsNotEmpty({ message: i18n('validation.IsNotEmpty', { path: 'general', property: 'customer.lastName' }) })
|
||||
lastName!: string;
|
||||
}
|
||||
21
src/auth/dtos/request/apple-login.request.dto.ts
Normal file
21
src/auth/dtos/request/apple-login.request.dto.ts
Normal file
@ -0,0 +1,21 @@
|
||||
import { ApiProperty } from '@nestjs/swagger';
|
||||
import { Type } from 'class-transformer';
|
||||
import { IsNotEmpty, IsOptional, IsString, ValidateNested } from 'class-validator';
|
||||
import { i18nValidationMessage as i18n } from 'nestjs-i18n';
|
||||
import { AppleAdditionalData } from './apple-additional-data.request.dto';
|
||||
|
||||
export class AppleLoginRequestDto {
|
||||
@ApiProperty({ example: 'apple_token' })
|
||||
@IsString({ message: i18n('validation.IsString', { path: 'general', property: 'auth.appleToken' }) })
|
||||
@IsNotEmpty({ message: i18n('validation.IsNotEmpty', { path: 'general', property: 'auth.appleToken' }) })
|
||||
appleToken!: string;
|
||||
|
||||
@ApiProperty({ type: AppleAdditionalData })
|
||||
@ValidateNested({
|
||||
each: true,
|
||||
message: i18n('validation.ValidateNested', { path: 'general', property: 'auth.apple.additionalData' }),
|
||||
})
|
||||
@IsOptional()
|
||||
@Type(() => AppleAdditionalData)
|
||||
additionalData?: AppleAdditionalData;
|
||||
}
|
||||
@ -1,19 +1,14 @@
|
||||
import { ApiProperty } from '@nestjs/swagger';
|
||||
import { Matches } from 'class-validator';
|
||||
import { IsEmail } from 'class-validator';
|
||||
import { i18nValidationMessage as i18n } from 'nestjs-i18n';
|
||||
import { COUNTRY_CODE_REGEX } from '~/auth/constants';
|
||||
import { IsValidPhoneNumber } from '~/core/decorators/validations';
|
||||
|
||||
export class CreateUnverifiedUserRequestDto {
|
||||
@ApiProperty({ example: '+962' })
|
||||
@Matches(COUNTRY_CODE_REGEX, {
|
||||
message: i18n('validation.Matches', { path: 'general', property: 'auth.countryCode' }),
|
||||
})
|
||||
countryCode: string = '+966';
|
||||
|
||||
@ApiProperty({ example: '787259134' })
|
||||
@IsValidPhoneNumber({
|
||||
message: i18n('validation.IsValidPhoneNumber', { path: 'general', property: 'auth.phoneNumber' }),
|
||||
})
|
||||
phoneNumber!: string;
|
||||
@ApiProperty({ example: 'test@test.com' })
|
||||
@IsEmail(
|
||||
{},
|
||||
{
|
||||
message: i18n('validation.IsEmail', { path: 'general', property: 'auth.email' }),
|
||||
},
|
||||
)
|
||||
email!: string;
|
||||
}
|
||||
|
||||
10
src/auth/dtos/request/google-login.request.dto.ts
Normal file
10
src/auth/dtos/request/google-login.request.dto.ts
Normal file
@ -0,0 +1,10 @@
|
||||
import { ApiProperty } from '@nestjs/swagger';
|
||||
import { IsNotEmpty, IsString } from 'class-validator';
|
||||
import { i18nValidationMessage as i18n } from 'nestjs-i18n';
|
||||
|
||||
export class GoogleLoginRequestDto {
|
||||
@ApiProperty({ example: 'google_token' })
|
||||
@IsString({ message: i18n('validation.IsString', { path: 'general', property: 'auth.googleToken' }) })
|
||||
@IsNotEmpty({ message: i18n('validation.IsNotEmpty', { path: 'general', property: 'auth.googleToken' }) })
|
||||
googleToken!: string;
|
||||
}
|
||||
@ -1,11 +1,16 @@
|
||||
export * from './apple-login.request.dto';
|
||||
export * from './create-unverified-user.request.dto';
|
||||
export * from './disable-biometric.request.dto';
|
||||
export * from './enable-biometric.request.dto';
|
||||
export * from './forget-password.request.dto';
|
||||
export * from './google-login.request.dto';
|
||||
export * from './login.request.dto';
|
||||
export * from './refresh-token.request.dto';
|
||||
export * from './send-forget-password-otp.request.dto';
|
||||
export * from './send-login-otp.request.dto';
|
||||
export * from './set-email.request.dto';
|
||||
export * from './set-junior-password.request.dto';
|
||||
export * from './set-passcode.request.dto';
|
||||
export * from './verify-login-otp.request.dto';
|
||||
export * from './verify-otp.request.dto';
|
||||
export * from './verify-user.request.dto';
|
||||
|
||||
@ -3,13 +3,14 @@ import { IsEmail, IsEnum, IsNotEmpty, IsOptional, IsString, ValidateIf } from 'c
|
||||
import { i18nValidationMessage as i18n } from 'nestjs-i18n';
|
||||
import { GrantType } from '~/auth/enums';
|
||||
export class LoginRequestDto {
|
||||
@ApiProperty({ example: GrantType.PASSWORD })
|
||||
@ApiProperty({ example: GrantType.APPLE })
|
||||
@IsEnum(GrantType, { message: i18n('validation.IsEnum', { path: 'general', property: 'auth.grantType' }) })
|
||||
grantType!: GrantType;
|
||||
|
||||
@ApiProperty({ example: 'test@test.com' })
|
||||
@IsString({ message: i18n('validation.IsString', { path: 'general', property: 'auth.email' }) })
|
||||
@IsEmail({}, { message: i18n('validation.IsEmail', { path: 'general', property: 'auth.email' }) })
|
||||
@ValidateIf((o) => o.grantType !== GrantType.APPLE && o.grantType !== GrantType.GOOGLE)
|
||||
email!: string;
|
||||
|
||||
@ApiProperty({ example: '123456' })
|
||||
@ -17,14 +18,26 @@ export class LoginRequestDto {
|
||||
@ValidateIf((o) => o.grantType === GrantType.PASSWORD)
|
||||
password!: string;
|
||||
|
||||
@ApiProperty({ example: 'Login signature' })
|
||||
@IsString({ message: i18n('validation.IsString', { path: 'general', property: 'auth.signature' }) })
|
||||
@ValidateIf((o) => o.grantType === GrantType.BIOMETRIC)
|
||||
signature!: string;
|
||||
|
||||
@ApiProperty({ example: 'google_token' })
|
||||
@IsString({ message: i18n('validation.IsString', { path: 'general', property: 'auth.googleToken' }) })
|
||||
@IsNotEmpty({ message: i18n('validation.IsNotEmpty', { path: 'general', property: 'auth.googleToken' }) })
|
||||
@ValidateIf((o) => o.grantType === GrantType.GOOGLE)
|
||||
googleToken!: string;
|
||||
|
||||
@ApiProperty({ example: 'apple_token' })
|
||||
@IsString({ message: i18n('validation.IsString', { path: 'general', property: 'auth.appleToken' }) })
|
||||
@IsNotEmpty({ message: i18n('validation.IsNotEmpty', { path: 'general', property: 'auth.appleToken' }) })
|
||||
@ValidateIf((o) => o.grantType === GrantType.APPLE)
|
||||
appleToken!: string;
|
||||
|
||||
@ApiProperty({ example: 'fcm-device-token' })
|
||||
@IsString({ message: i18n('validation.IsString', { path: 'general', property: 'auth.fcmToken' }) })
|
||||
@IsNotEmpty({ message: i18n('validation.IsNotEmpty', { path: 'general', property: 'auth.fcmToken' }) })
|
||||
@IsOptional()
|
||||
fcmToken?: string;
|
||||
|
||||
@ApiProperty({ example: 'Login signature' })
|
||||
@IsString({ message: i18n('validation.IsString', { path: 'general', property: 'auth.signature' }) })
|
||||
@ValidateIf((o) => o.grantType === GrantType.BIOMETRIC)
|
||||
signature!: string;
|
||||
}
|
||||
|
||||
9
src/auth/dtos/request/send-login-otp.request.dto.ts
Normal file
9
src/auth/dtos/request/send-login-otp.request.dto.ts
Normal file
@ -0,0 +1,9 @@
|
||||
import { ApiProperty } from '@nestjs/swagger';
|
||||
import { IsEmail } from 'class-validator';
|
||||
import { i18nValidationMessage as i18n } from 'nestjs-i18n';
|
||||
|
||||
export class SendLoginOtpRequestDto {
|
||||
@ApiProperty({ example: 'test@test.com' })
|
||||
@IsEmail({}, { message: i18n('validation.IsEmail', { path: 'general', property: 'auth.email' }) })
|
||||
email!: string;
|
||||
}
|
||||
20
src/auth/dtos/request/verify-login-otp.request.dto.ts
Normal file
20
src/auth/dtos/request/verify-login-otp.request.dto.ts
Normal file
@ -0,0 +1,20 @@
|
||||
import { ApiProperty } from '@nestjs/swagger';
|
||||
import { IsNumberString, MaxLength, MinLength } from 'class-validator';
|
||||
import { i18nValidationMessage as i18n } from 'nestjs-i18n';
|
||||
import { DEFAULT_OTP_LENGTH } from '~/common/modules/otp/constants';
|
||||
import { SendLoginOtpRequestDto } from './send-login-otp.request.dto';
|
||||
|
||||
export class VerifyLoginOtpRequestDto extends SendLoginOtpRequestDto {
|
||||
@ApiProperty({ example: '111111' })
|
||||
@IsNumberString(
|
||||
{ no_symbols: true },
|
||||
{ message: i18n('validation.IsNumberString', { path: 'general', property: 'auth.otp' }) },
|
||||
)
|
||||
@MaxLength(DEFAULT_OTP_LENGTH, {
|
||||
message: i18n('validation.MaxLength', { path: 'general', property: 'auth.otp', length: DEFAULT_OTP_LENGTH }),
|
||||
})
|
||||
@MinLength(DEFAULT_OTP_LENGTH, {
|
||||
message: i18n('validation.MinLength', { path: 'general', property: 'auth.otp', length: DEFAULT_OTP_LENGTH }),
|
||||
})
|
||||
otp!: string;
|
||||
}
|
||||
19
src/auth/dtos/request/verify-otp.request.dto.ts
Normal file
19
src/auth/dtos/request/verify-otp.request.dto.ts
Normal file
@ -0,0 +1,19 @@
|
||||
import { ApiProperty } from '@nestjs/swagger';
|
||||
import { IsNumberString, MaxLength, MinLength } from 'class-validator';
|
||||
import { i18nValidationMessage as i18n } from 'nestjs-i18n';
|
||||
import { DEFAULT_OTP_LENGTH } from '~/common/modules/otp/constants';
|
||||
|
||||
export class VerifyOtpRequestDto {
|
||||
@ApiProperty({ example: '111111' })
|
||||
@IsNumberString(
|
||||
{ no_symbols: true },
|
||||
{ message: i18n('validation.IsNumberString', { path: 'general', property: 'auth.otp' }) },
|
||||
)
|
||||
@MaxLength(DEFAULT_OTP_LENGTH, {
|
||||
message: i18n('validation.MaxLength', { path: 'general', property: 'auth.otp', length: DEFAULT_OTP_LENGTH }),
|
||||
})
|
||||
@MinLength(DEFAULT_OTP_LENGTH, {
|
||||
message: i18n('validation.MinLength', { path: 'general', property: 'auth.otp', length: DEFAULT_OTP_LENGTH }),
|
||||
})
|
||||
otp!: string;
|
||||
}
|
||||
@ -1,10 +1,43 @@
|
||||
import { ApiProperty } from '@nestjs/swagger';
|
||||
import { IsNumberString, MaxLength, MinLength } from 'class-validator';
|
||||
import { ApiProperty, PickType } from '@nestjs/swagger';
|
||||
import {
|
||||
IsDateString,
|
||||
IsEnum,
|
||||
IsNotEmpty,
|
||||
IsNumberString,
|
||||
IsOptional,
|
||||
IsString,
|
||||
MaxLength,
|
||||
MinLength,
|
||||
} from 'class-validator';
|
||||
import { i18nValidationMessage as i18n } from 'nestjs-i18n';
|
||||
import { CountryIso } from '~/common/enums';
|
||||
import { DEFAULT_OTP_LENGTH } from '~/common/modules/otp/constants';
|
||||
import { IsAbove18 } from '~/core/decorators/validations';
|
||||
import { CreateUnverifiedUserRequestDto } from './create-unverified-user.request.dto';
|
||||
|
||||
export class VerifyUserRequestDto extends CreateUnverifiedUserRequestDto {
|
||||
export class VerifyUserRequestDto extends PickType(CreateUnverifiedUserRequestDto, ['email']) {
|
||||
@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: '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: 'JO' })
|
||||
@IsEnum(CountryIso, {
|
||||
message: i18n('validation.IsEnum', { path: 'general', property: 'customer.countryOfResidence' }),
|
||||
})
|
||||
@IsOptional()
|
||||
countryOfResidence: CountryIso = CountryIso.SAUDI_ARABIA;
|
||||
|
||||
@ApiProperty({ example: '111111' })
|
||||
@IsNumberString(
|
||||
{ no_symbols: true },
|
||||
|
||||
@ -18,11 +18,11 @@ export class LoginResponseDto {
|
||||
user!: UserResponseDto;
|
||||
|
||||
@ApiProperty({ example: CustomerResponseDto })
|
||||
customer!: CustomerResponseDto;
|
||||
customer!: CustomerResponseDto | null;
|
||||
|
||||
constructor(IVerifyUserResponse: ILoginResponse, user: User) {
|
||||
this.user = new UserResponseDto(user);
|
||||
this.customer = new CustomerResponseDto(user.customer);
|
||||
this.customer = user.customer ? new CustomerResponseDto(user.customer) : null;
|
||||
this.accessToken = IVerifyUserResponse.accessToken;
|
||||
this.refreshToken = IVerifyUserResponse.refreshToken;
|
||||
this.expiresAt = IVerifyUserResponse.expiresAt;
|
||||
|
||||
@ -2,9 +2,9 @@ import { ApiProperty } from '@nestjs/swagger';
|
||||
|
||||
export class SendRegisterOtpResponseDto {
|
||||
@ApiProperty()
|
||||
phoneNumber!: string;
|
||||
email!: string;
|
||||
|
||||
constructor(phoneNumber: string) {
|
||||
this.phoneNumber = phoneNumber;
|
||||
constructor(email: string) {
|
||||
this.email = email;
|
||||
}
|
||||
}
|
||||
|
||||
@ -21,6 +21,15 @@ export class UserResponseDto {
|
||||
@ApiProperty()
|
||||
isProfileCompleted!: boolean;
|
||||
|
||||
@ApiProperty()
|
||||
isSmsEnabled!: boolean;
|
||||
|
||||
@ApiProperty()
|
||||
isEmailEnabled!: boolean;
|
||||
|
||||
@ApiProperty()
|
||||
isPushEnabled!: boolean;
|
||||
|
||||
@ApiProperty()
|
||||
roles!: Roles[];
|
||||
|
||||
@ -31,6 +40,9 @@ export class UserResponseDto {
|
||||
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;
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,4 +1,6 @@
|
||||
export enum GrantType {
|
||||
PASSWORD = 'PASSWORD',
|
||||
BIOMETRIC = 'BIOMETRIC',
|
||||
GOOGLE = 'GOOGLE',
|
||||
APPLE = 'APPLE',
|
||||
}
|
||||
|
||||
@ -1,4 +1,6 @@
|
||||
export enum Roles {
|
||||
JUNIOR = 'JUNIOR',
|
||||
GUARDIAN = 'GUARDIAN',
|
||||
CHECKER = 'CHECKER',
|
||||
SUPER_ADMIN = 'SUPER_ADMIN',
|
||||
}
|
||||
|
||||
11
src/auth/interfaces/apple-payload.interface.ts
Normal file
11
src/auth/interfaces/apple-payload.interface.ts
Normal file
@ -0,0 +1,11 @@
|
||||
export interface ApplePayload {
|
||||
iss: string;
|
||||
aud: string;
|
||||
exp: number;
|
||||
iat: number;
|
||||
sub: string;
|
||||
c_hash: string;
|
||||
auth_time: number;
|
||||
nonce_supported: boolean;
|
||||
email?: string;
|
||||
}
|
||||
@ -1,2 +1,3 @@
|
||||
export * from './apple-payload.interface';
|
||||
export * from './jwt-payload.interface';
|
||||
export * from './login-response.interface';
|
||||
|
||||
@ -3,86 +3,90 @@ import { ConfigService } from '@nestjs/config';
|
||||
import { JwtService } from '@nestjs/jwt';
|
||||
import * as bcrypt from 'bcrypt';
|
||||
import { Request } from 'express';
|
||||
import { ArrayContains } from 'typeorm';
|
||||
import { CacheService } from '~/common/modules/cache/services';
|
||||
import { OtpScope, OtpType } from '~/common/modules/otp/enums';
|
||||
import { OtpService } from '~/common/modules/otp/services';
|
||||
import { JuniorTokenService } from '~/junior/services';
|
||||
import { DeviceService, UserService } from '~/user/services';
|
||||
import { UserType } from '~/user/enums';
|
||||
import { DeviceService, UserService, UserTokenService } from '~/user/services';
|
||||
import { User } from '../../user/entities';
|
||||
import { PASSCODE_REGEX } from '../constants';
|
||||
import {
|
||||
AppleLoginRequestDto,
|
||||
CreateUnverifiedUserRequestDto,
|
||||
DisableBiometricRequestDto,
|
||||
EnableBiometricRequestDto,
|
||||
ForgetPasswordRequestDto,
|
||||
GoogleLoginRequestDto,
|
||||
LoginRequestDto,
|
||||
SendForgetPasswordOtpRequestDto,
|
||||
SendLoginOtpRequestDto,
|
||||
SetEmailRequestDto,
|
||||
setJuniorPasswordRequestDto,
|
||||
VerifyLoginOtpRequestDto,
|
||||
VerifyUserRequestDto,
|
||||
} from '../dtos/request';
|
||||
import { GrantType } from '../enums';
|
||||
import { Roles } from '../enums';
|
||||
import { IJwtPayload, ILoginResponse } from '../interfaces';
|
||||
import { removePadding, verifySignature } from '../utils';
|
||||
import { Oauth2Service } from './oauth2.service';
|
||||
|
||||
const ONE_THOUSAND = 1000;
|
||||
const SALT_ROUNDS = 10;
|
||||
@Injectable()
|
||||
export class AuthService {
|
||||
private readonly logger = new Logger(AuthService.name);
|
||||
|
||||
constructor(
|
||||
private readonly otpService: OtpService,
|
||||
private readonly jwtService: JwtService,
|
||||
private readonly configService: ConfigService,
|
||||
private readonly userService: UserService,
|
||||
private readonly deviceService: DeviceService,
|
||||
private readonly juniorTokenService: JuniorTokenService,
|
||||
private readonly userTokenService: UserTokenService,
|
||||
private readonly cacheService: CacheService,
|
||||
private readonly oauth2Service: Oauth2Service,
|
||||
) {}
|
||||
async sendRegisterOtp({ phoneNumber, countryCode }: CreateUnverifiedUserRequestDto) {
|
||||
this.logger.log(`Sending OTP to ${countryCode + phoneNumber}`);
|
||||
const user = await this.userService.findOrCreateUser({ phoneNumber, countryCode });
|
||||
async sendRegisterOtp(body: CreateUnverifiedUserRequestDto) {
|
||||
this.logger.log(`Sending OTP to ${body.email}`);
|
||||
const user = await this.userService.findOrCreateUser(body);
|
||||
|
||||
return this.otpService.generateAndSendOtp({
|
||||
userId: user.id,
|
||||
recipient: user.countryCode + user.phoneNumber,
|
||||
scope: OtpScope.VERIFY_PHONE,
|
||||
otpType: OtpType.SMS,
|
||||
recipient: user.email,
|
||||
scope: OtpScope.VERIFY_EMAIL,
|
||||
otpType: OtpType.EMAIL,
|
||||
});
|
||||
}
|
||||
|
||||
async verifyUser(verifyUserDto: VerifyUserRequestDto): Promise<[ILoginResponse, User]> {
|
||||
this.logger.log(`Verifying user with phone number ${verifyUserDto.countryCode + verifyUserDto.phoneNumber}`);
|
||||
const user = await this.userService.findUserOrThrow({ phoneNumber: verifyUserDto.phoneNumber });
|
||||
this.logger.log(`Verifying user with email ${verifyUserDto.email}`);
|
||||
const user = await this.userService.findUserOrThrow({ email: verifyUserDto.email });
|
||||
|
||||
if (user.isPasswordSet) {
|
||||
this.logger.error(
|
||||
`User with phone number ${verifyUserDto.countryCode + verifyUserDto.phoneNumber} already verified`,
|
||||
);
|
||||
throw new BadRequestException('USERS.PHONE_ALREADY_VERIFIED');
|
||||
if (user.isEmailVerified) {
|
||||
this.logger.error(`User with email ${verifyUserDto.email} already verified`);
|
||||
throw new BadRequestException('USER.EMAIL_ALREADY_VERIFIED');
|
||||
}
|
||||
|
||||
const isOtpValid = await this.otpService.verifyOtp({
|
||||
userId: user.id,
|
||||
scope: OtpScope.VERIFY_PHONE,
|
||||
otpType: OtpType.SMS,
|
||||
scope: OtpScope.VERIFY_EMAIL,
|
||||
otpType: OtpType.EMAIL,
|
||||
value: verifyUserDto.otp,
|
||||
});
|
||||
|
||||
if (!isOtpValid) {
|
||||
this.logger.error(
|
||||
`Invalid OTP for user with phone number ${verifyUserDto.countryCode + verifyUserDto.phoneNumber}`,
|
||||
);
|
||||
throw new BadRequestException('USERS.INVALID_OTP');
|
||||
this.logger.error(`Invalid OTP for user with email ${verifyUserDto.email}`);
|
||||
throw new BadRequestException('OTP.INVALID_OTP');
|
||||
}
|
||||
|
||||
const updatedUser = await this.userService.verifyUserAndCreateCustomer(user);
|
||||
await this.userService.verifyUser(user.id, verifyUserDto);
|
||||
|
||||
const tokens = await this.generateAuthToken(updatedUser);
|
||||
this.logger.log(
|
||||
`User with phone number ${verifyUserDto.countryCode + verifyUserDto.phoneNumber} verified successfully`,
|
||||
);
|
||||
return [tokens, updatedUser];
|
||||
await user.reload();
|
||||
|
||||
const tokens = await this.generateAuthToken(user);
|
||||
this.logger.log(`User with email ${verifyUserDto.email} verified successfully`);
|
||||
return [tokens, user];
|
||||
}
|
||||
|
||||
async setEmail(userId: string, { email }: SetEmailRequestDto) {
|
||||
@ -91,14 +95,14 @@ export class AuthService {
|
||||
|
||||
if (user.email) {
|
||||
this.logger.error(`Email already set for user with id ${userId}`);
|
||||
throw new BadRequestException('USERS.EMAIL_ALREADY_SET');
|
||||
throw new BadRequestException('USER.EMAIL_ALREADY_SET');
|
||||
}
|
||||
|
||||
const existingUser = await this.userService.findUser({ email });
|
||||
|
||||
if (existingUser) {
|
||||
this.logger.error(`Email ${email} already taken`);
|
||||
throw new BadRequestException('USERS.EMAIL_ALREADY_TAKEN');
|
||||
throw new BadRequestException('USER.EMAIL_ALREADY_TAKEN');
|
||||
}
|
||||
|
||||
return this.userService.setEmail(userId, email);
|
||||
@ -110,7 +114,7 @@ export class AuthService {
|
||||
|
||||
if (user.password) {
|
||||
this.logger.error(`Passcode already set for user with id ${userId}`);
|
||||
throw new BadRequestException('USERS.PASSCODE_ALREADY_SET');
|
||||
throw new BadRequestException('AUTH.PASSCODE_ALREADY_SET');
|
||||
}
|
||||
const salt = bcrypt.genSaltSync(SALT_ROUNDS);
|
||||
const hashedPasscode = bcrypt.hashSync(passcode, salt);
|
||||
@ -119,6 +123,47 @@ export class AuthService {
|
||||
this.logger.log(`Passcode set successfully for user with id ${userId}`);
|
||||
}
|
||||
|
||||
// async setPhoneNumber(userId: string, { phoneNumber, countryCode }: CreateUnverifiedUserRequestDto) {
|
||||
// const user = await this.userService.findUserOrThrow({ id: userId });
|
||||
|
||||
// if (user.phoneNumber || user.countryCode) {
|
||||
// this.logger.error(`Phone number already set for user with id ${userId}`);
|
||||
// throw new BadRequestException('USER.PHONE_NUMBER_ALREADY_SET');
|
||||
// }
|
||||
|
||||
// const existingUser = await this.userService.findUser({ phoneNumber, countryCode });
|
||||
|
||||
// if (existingUser) {
|
||||
// this.logger.error(`Phone number ${countryCode + phoneNumber} already taken`);
|
||||
// throw new BadRequestException('USER.PHONE_NUMBER_ALREADY_TAKEN');
|
||||
// }
|
||||
|
||||
// await this.userService.setPhoneNumber(userId, phoneNumber, countryCode);
|
||||
|
||||
// return this.otpService.generateAndSendOtp({
|
||||
// userId,
|
||||
// recipient: countryCode + phoneNumber,
|
||||
// scope: OtpScope.VERIFY_PHONE,
|
||||
// otpType: OtpType.SMS,
|
||||
// });
|
||||
// }
|
||||
|
||||
// async verifyPhoneNumber(userId: string, otp: string) {
|
||||
// const isOtpValid = await this.otpService.verifyOtp({
|
||||
// otpType: OtpType.SMS,
|
||||
// scope: OtpScope.VERIFY_PHONE,
|
||||
// userId,
|
||||
// value: otp,
|
||||
// });
|
||||
|
||||
// if (!isOtpValid) {
|
||||
// this.logger.error(`Invalid OTP for user with id ${userId}`);
|
||||
// throw new BadRequestException('OTP.INVALID_OTP');
|
||||
// }
|
||||
|
||||
// return this.userService.verifyPhoneNumber(userId);
|
||||
// }
|
||||
|
||||
async enableBiometric(userId: string, { deviceId, publicKey }: EnableBiometricRequestDto) {
|
||||
this.logger.log(`Enabling biometric for user with id ${userId}`);
|
||||
const device = await this.deviceService.findUserDeviceById(deviceId, userId);
|
||||
@ -162,7 +207,7 @@ export class AuthService {
|
||||
|
||||
if (!user.isProfileCompleted) {
|
||||
this.logger.error(`Profile not completed for user with email ${email}`);
|
||||
throw new BadRequestException('USERS.PROFILE_NOT_COMPLETED');
|
||||
throw new BadRequestException('USER.PROFILE_NOT_COMPLETED');
|
||||
}
|
||||
|
||||
return this.otpService.generateAndSendOtp({
|
||||
@ -178,7 +223,7 @@ export class AuthService {
|
||||
const user = await this.userService.findUserOrThrow({ email });
|
||||
if (!user.isProfileCompleted) {
|
||||
this.logger.error(`Profile not completed for user with email ${email}`);
|
||||
throw new BadRequestException('USERS.PROFILE_NOT_COMPLETED');
|
||||
throw new BadRequestException('USER.PROFILE_NOT_COMPLETED');
|
||||
}
|
||||
const isOtpValid = await this.otpService.verifyOtp({
|
||||
userId: user.id,
|
||||
@ -189,7 +234,7 @@ export class AuthService {
|
||||
|
||||
if (!isOtpValid) {
|
||||
this.logger.error(`Invalid OTP for user with email ${email}`);
|
||||
throw new BadRequestException('USERS.INVALID_OTP');
|
||||
throw new BadRequestException('OTP.INVALID_OTP');
|
||||
}
|
||||
|
||||
this.validatePassword(password, confirmPassword, user);
|
||||
@ -200,47 +245,26 @@ export class AuthService {
|
||||
this.logger.log(`Passcode updated successfully for user with email ${email}`);
|
||||
}
|
||||
|
||||
async login(loginDto: LoginRequestDto, deviceId: string): Promise<[ILoginResponse, User]> {
|
||||
this.logger.log(`Logging in user with email ${loginDto.email}`);
|
||||
const user = await this.userService.findUser({ email: loginDto.email });
|
||||
let tokens;
|
||||
|
||||
if (!user) {
|
||||
this.logger.error(`User with email ${loginDto.email} not found`);
|
||||
throw new UnauthorizedException('AUTH.INVALID_CREDENTIALS');
|
||||
}
|
||||
|
||||
if (loginDto.grantType === GrantType.PASSWORD) {
|
||||
this.logger.log(`Logging in user with email ${loginDto.email} using password`);
|
||||
tokens = await this.loginWithPassword(loginDto, user);
|
||||
} else {
|
||||
this.logger.log(`Logging in user with email ${loginDto.email} using biometric`);
|
||||
tokens = await this.loginWithBiometric(loginDto, user, deviceId);
|
||||
}
|
||||
|
||||
await this.deviceService.updateDevice(deviceId, {
|
||||
lastAccessOn: new Date(),
|
||||
fcmToken: loginDto.fcmToken,
|
||||
userId: user.id,
|
||||
});
|
||||
|
||||
this.logger.log(`User with email ${loginDto.email} logged in successfully`);
|
||||
|
||||
return [tokens, user];
|
||||
}
|
||||
|
||||
async setJuniorPasscode(body: setJuniorPasswordRequestDto) {
|
||||
this.logger.log(`Setting passcode for junior with qrToken ${body.qrToken}`);
|
||||
const juniorId = await this.juniorTokenService.validateToken(body.qrToken);
|
||||
const juniorId = await this.userTokenService.validateToken(body.qrToken, UserType.JUNIOR);
|
||||
const salt = bcrypt.genSaltSync(SALT_ROUNDS);
|
||||
const hashedPasscode = bcrypt.hashSync(body.passcode, salt);
|
||||
await this.userService.setPasscode(juniorId, hashedPasscode, salt);
|
||||
await this.juniorTokenService.invalidateToken(body.qrToken);
|
||||
await this.userService.setPasscode(juniorId!, hashedPasscode, salt);
|
||||
await this.userTokenService.invalidateToken(body.qrToken);
|
||||
this.logger.log(`Passcode set successfully for junior with id ${juniorId}`);
|
||||
}
|
||||
|
||||
async refreshToken(refreshToken: string): Promise<[ILoginResponse, User]> {
|
||||
this.logger.log('Refreshing token');
|
||||
|
||||
const isBlackListed = await this.cacheService.get(refreshToken);
|
||||
|
||||
if (isBlackListed) {
|
||||
this.logger.error('Refresh token is blacklisted');
|
||||
throw new BadRequestException('AUTH.INVALID_REFRESH_TOKEN');
|
||||
}
|
||||
|
||||
try {
|
||||
const isValid = await this.jwtService.verifyAsync<IJwtPayload>(refreshToken, {
|
||||
secret: this.configService.getOrThrow('JWT_REFRESH_TOKEN_SECRET'),
|
||||
@ -252,6 +276,12 @@ export class AuthService {
|
||||
|
||||
const tokens = await this.generateAuthToken(user);
|
||||
|
||||
this.logger.log(`Blacklisting old tokens for user with id ${isValid.sub}`);
|
||||
|
||||
const refreshTokenExpiry = this.jwtService.decode(refreshToken).exp - Date.now() / ONE_THOUSAND;
|
||||
|
||||
await this.cacheService.set(refreshToken, 'BLACKLISTED', refreshTokenExpiry);
|
||||
|
||||
this.logger.log(`Token refreshed successfully for user with id ${isValid.sub}`);
|
||||
|
||||
return [tokens, user];
|
||||
@ -261,14 +291,50 @@ export class AuthService {
|
||||
}
|
||||
}
|
||||
|
||||
async sendLoginOtp({ email }: SendLoginOtpRequestDto) {
|
||||
const user = await this.userService.findUserOrThrow({ email });
|
||||
|
||||
this.logger.log(`Sending login OTP to ${email}`);
|
||||
return this.otpService.generateAndSendOtp({
|
||||
recipient: email,
|
||||
scope: OtpScope.LOGIN,
|
||||
otpType: OtpType.EMAIL,
|
||||
userId: user.id,
|
||||
});
|
||||
}
|
||||
|
||||
async verifyLoginOtp({ email, otp }: VerifyLoginOtpRequestDto): Promise<[ILoginResponse, User]> {
|
||||
const user = await this.userService.findUserOrThrow({ email });
|
||||
|
||||
this.logger.log(`Verifying login OTP for ${email}`);
|
||||
const isOtpValid = await this.otpService.verifyOtp({
|
||||
otpType: OtpType.EMAIL,
|
||||
scope: OtpScope.LOGIN,
|
||||
userId: user.id,
|
||||
value: otp,
|
||||
});
|
||||
|
||||
if (!isOtpValid) {
|
||||
this.logger.error(`Invalid OTP for user with email ${email}`);
|
||||
throw new BadRequestException('OTP.INVALID_OTP');
|
||||
}
|
||||
|
||||
this.logger.log(`Login OTP verified successfully for ${email}`);
|
||||
|
||||
const token = await this.generateAuthToken(user);
|
||||
return [token, user];
|
||||
}
|
||||
|
||||
logout(req: Request) {
|
||||
this.logger.log('Logging out');
|
||||
const accessToken = req.headers.authorization?.split(' ')[1] as string;
|
||||
const expiryInTtl = this.jwtService.decode(accessToken).exp - Date.now() / ONE_THOUSAND;
|
||||
return this.cacheService.set(accessToken, 'LOGOUT', expiryInTtl);
|
||||
return this.cacheService.set(accessToken, 'BLACKLISTED', expiryInTtl);
|
||||
}
|
||||
|
||||
private async loginWithPassword(loginDto: LoginRequestDto, user: User): Promise<ILoginResponse> {
|
||||
private async loginWithPassword(loginDto: LoginRequestDto): Promise<[ILoginResponse, User]> {
|
||||
const user = await this.userService.findUserOrThrow({ email: loginDto.email });
|
||||
|
||||
this.logger.log(`validating password for user with email ${loginDto.email}`);
|
||||
const isPasswordValid = bcrypt.compareSync(loginDto.password, user.password);
|
||||
|
||||
@ -279,10 +345,12 @@ export class AuthService {
|
||||
|
||||
const tokens = await this.generateAuthToken(user);
|
||||
this.logger.log(`Password validated successfully for user with email ${loginDto.email}`);
|
||||
return tokens;
|
||||
return [tokens, user];
|
||||
}
|
||||
|
||||
private async loginWithBiometric(loginDto: LoginRequestDto, user: User, deviceId: string): Promise<ILoginResponse> {
|
||||
private async loginWithBiometric(loginDto: LoginRequestDto, deviceId: string): Promise<[ILoginResponse, User]> {
|
||||
const user = await this.userService.findUserOrThrow({ email: loginDto.email });
|
||||
|
||||
this.logger.log(`validating biometric for user with email ${loginDto.email}`);
|
||||
const device = await this.deviceService.findUserDeviceById(deviceId, user.id);
|
||||
|
||||
@ -311,7 +379,99 @@ export class AuthService {
|
||||
|
||||
const tokens = await this.generateAuthToken(user);
|
||||
this.logger.log(`Biometric validated successfully for user with email ${loginDto.email}`);
|
||||
return tokens;
|
||||
return [tokens, user];
|
||||
}
|
||||
|
||||
async loginWithGoogle(loginDto: GoogleLoginRequestDto): Promise<[ILoginResponse, User]> {
|
||||
const {
|
||||
email,
|
||||
sub,
|
||||
given_name: firstName,
|
||||
family_name: lastName,
|
||||
} = await this.oauth2Service.verifyGoogleToken(loginDto.googleToken);
|
||||
const [existingUser, isJunior, existingUserWithEmail] = await Promise.all([
|
||||
this.userService.findUser({ googleId: sub }),
|
||||
this.userService.findUser({ email, roles: ArrayContains([Roles.JUNIOR]) }),
|
||||
this.userService.findUser({ email }),
|
||||
]);
|
||||
|
||||
if (isJunior) {
|
||||
this.logger.error(`User with email ${email} is an already registered junior`);
|
||||
throw new BadRequestException('USER.JUNIOR_UPGRADE_NOT_SUPPORTED_YET');
|
||||
}
|
||||
|
||||
if (!existingUser && existingUserWithEmail) {
|
||||
this.logger.error(`User with email ${email} already exists adding google id to existing user`);
|
||||
await this.userService.updateUser(existingUserWithEmail.id, { googleId: sub });
|
||||
const tokens = await this.generateAuthToken(existingUserWithEmail);
|
||||
return [tokens, existingUserWithEmail];
|
||||
}
|
||||
|
||||
if (!existingUser && !existingUserWithEmail) {
|
||||
this.logger.debug(`User with google id ${sub} or email ${email} not found, creating new user`);
|
||||
const user = await this.userService.createGoogleUser(sub, email, firstName, lastName);
|
||||
|
||||
const tokens = await this.generateAuthToken(user);
|
||||
|
||||
return [tokens, user];
|
||||
}
|
||||
|
||||
const tokens = await this.generateAuthToken(existingUser!);
|
||||
|
||||
return [tokens, existingUser!];
|
||||
}
|
||||
|
||||
async loginWithApple(loginDto: AppleLoginRequestDto): Promise<[ILoginResponse, User]> {
|
||||
const { sub, email } = await this.oauth2Service.verifyAppleToken(loginDto.appleToken);
|
||||
|
||||
const [existingUserWithSub, isJunior] = await Promise.all([
|
||||
this.userService.findUser({ appleId: sub }),
|
||||
this.userService.findUser({ email, roles: ArrayContains([Roles.JUNIOR]) }),
|
||||
]);
|
||||
|
||||
if (isJunior) {
|
||||
this.logger.error(`User with apple id ${sub} is an already registered junior`);
|
||||
throw new BadRequestException('USER.JUNIOR_UPGRADE_NOT_SUPPORTED_YET');
|
||||
}
|
||||
|
||||
if (email) {
|
||||
const existingUserWithEmail = await this.userService.findUser({ email });
|
||||
|
||||
if (existingUserWithEmail && !existingUserWithSub) {
|
||||
{
|
||||
this.logger.error(`User with email ${email} already exists adding apple id to existing user`);
|
||||
await this.userService.updateUser(existingUserWithEmail.id, { appleId: sub });
|
||||
const tokens = await this.generateAuthToken(existingUserWithEmail);
|
||||
return [tokens, existingUserWithEmail];
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (!existingUserWithSub) {
|
||||
// Apple only provides email if user authorized zod for the first time
|
||||
if (!email || !loginDto.additionalData) {
|
||||
this.logger.error(`User authorized zod before but his email is not stored in the database`);
|
||||
throw new BadRequestException('AUTH.APPLE_RE-CONSENT_REQUIRED');
|
||||
}
|
||||
|
||||
this.logger.debug(`User with apple id ${sub} not found, creating new user`);
|
||||
const user = await this.userService.createAppleUser(
|
||||
sub,
|
||||
email,
|
||||
loginDto.additionalData.firstName,
|
||||
loginDto.additionalData.lastName,
|
||||
);
|
||||
|
||||
const tokens = await this.generateAuthToken(user);
|
||||
|
||||
return [tokens, user];
|
||||
}
|
||||
|
||||
const tokens = await this.generateAuthToken(existingUserWithSub);
|
||||
|
||||
this.logger.log(`User with apple id ${sub} logged in successfully`);
|
||||
|
||||
return [tokens, existingUserWithSub];
|
||||
}
|
||||
|
||||
private async generateAuthToken(user: User) {
|
||||
@ -349,4 +509,6 @@ export class AuthService {
|
||||
throw new BadRequestException('AUTH.INVALID_PASSCODE');
|
||||
}
|
||||
}
|
||||
|
||||
private validateGoogleToken(googleToken: string) {}
|
||||
}
|
||||
|
||||
@ -1 +1,2 @@
|
||||
export * from './auth.service';
|
||||
export * from './oauth2.service';
|
||||
|
||||
83
src/auth/services/oauth2.service.ts
Normal file
83
src/auth/services/oauth2.service.ts
Normal file
@ -0,0 +1,83 @@
|
||||
import { HttpService } from '@nestjs/axios';
|
||||
import { Injectable, Logger, UnauthorizedException } from '@nestjs/common';
|
||||
import { ConfigService } from '@nestjs/config';
|
||||
import { JwtService } from '@nestjs/jwt';
|
||||
import { OAuth2Client } from 'google-auth-library';
|
||||
import jwkToPem from 'jwk-to-pem';
|
||||
import { lastValueFrom } from 'rxjs';
|
||||
import { ApplePayload } from '../interfaces';
|
||||
|
||||
@Injectable()
|
||||
export class Oauth2Service {
|
||||
private readonly logger = new Logger(Oauth2Service.name);
|
||||
private appleKeysEndpoint = 'https://appleid.apple.com/auth/keys';
|
||||
private appleIssuer = 'https://appleid.apple.com';
|
||||
private readonly googleWebClientId = this.configService.getOrThrow('GOOGLE_WEB_CLIENT_ID');
|
||||
private readonly googleAndroidClientId = this.configService.getOrThrow('GOOGLE_ANDROID_CLIENT_ID');
|
||||
private readonly googleIosClientId = this.configService.getOrThrow('GOOGLE_IOS_CLIENT_ID');
|
||||
private readonly client = new OAuth2Client();
|
||||
constructor(
|
||||
private readonly httpService: HttpService,
|
||||
private readonly jwtService: JwtService,
|
||||
private readonly configService: ConfigService,
|
||||
) {}
|
||||
|
||||
async verifyAppleToken(appleToken: string): Promise<ApplePayload> {
|
||||
try {
|
||||
const response = await lastValueFrom(this.httpService.get(this.appleKeysEndpoint));
|
||||
|
||||
const keys = response.data.keys;
|
||||
|
||||
const decodedHeader = this.jwtService.decode(appleToken, { complete: true })?.header;
|
||||
|
||||
if (!decodedHeader) {
|
||||
this.logger.error(`Invalid apple token`);
|
||||
throw new UnauthorizedException();
|
||||
}
|
||||
|
||||
const keyId = decodedHeader.kid;
|
||||
|
||||
const appleKey = keys.find((key: any) => key.kid === keyId);
|
||||
|
||||
if (!appleKey) {
|
||||
this.logger.error(`Invalid apple token`);
|
||||
throw new UnauthorizedException();
|
||||
}
|
||||
|
||||
const publicKey = jwkToPem(appleKey);
|
||||
|
||||
const payload = this.jwtService.verify(appleToken, {
|
||||
publicKey,
|
||||
algorithms: ['RS256'],
|
||||
audience: this.configService.getOrThrow('APPLE_CLIENT_ID').split(','),
|
||||
issuer: this.appleIssuer,
|
||||
});
|
||||
|
||||
return payload;
|
||||
} catch (error) {
|
||||
this.logger.error(`Error verifying apple token: ${error} `);
|
||||
throw new UnauthorizedException(error);
|
||||
}
|
||||
}
|
||||
|
||||
async verifyGoogleToken(googleToken: string): Promise<any> {
|
||||
try {
|
||||
const ticket = await this.client.verifyIdToken({
|
||||
idToken: googleToken,
|
||||
audience: [this.googleWebClientId, this.googleAndroidClientId, this.googleIosClientId],
|
||||
});
|
||||
|
||||
const payload = ticket.getPayload();
|
||||
|
||||
if (!payload) {
|
||||
this.logger.error(`payload not found in google token`);
|
||||
throw new UnauthorizedException();
|
||||
}
|
||||
|
||||
return payload;
|
||||
} catch (error) {
|
||||
this.logger.error(`Invalid google token`, error);
|
||||
throw new UnauthorizedException();
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -1,12 +1,13 @@
|
||||
import { Injectable } from '@nestjs/common';
|
||||
import { Injectable, UnauthorizedException } from '@nestjs/common';
|
||||
import { ConfigService } from '@nestjs/config';
|
||||
import { PassportStrategy } from '@nestjs/passport';
|
||||
import { ExtractJwt, Strategy } from 'passport-jwt';
|
||||
import { UserService } from '~/user/services';
|
||||
import { IJwtPayload } from '../interfaces';
|
||||
|
||||
@Injectable()
|
||||
export class AccessTokenStrategy extends PassportStrategy(Strategy, 'access-token') {
|
||||
constructor(configService: ConfigService) {
|
||||
constructor(configService: ConfigService, private userService: UserService) {
|
||||
super({
|
||||
jwtFromRequest: ExtractJwt.fromAuthHeaderAsBearerToken(),
|
||||
ignoreExpiration: false,
|
||||
@ -14,7 +15,13 @@ export class AccessTokenStrategy extends PassportStrategy(Strategy, 'access-toke
|
||||
});
|
||||
}
|
||||
|
||||
validate(payload: IJwtPayload) {
|
||||
async validate(payload: IJwtPayload) {
|
||||
const user = await this.userService.findUser({ id: payload.sub });
|
||||
|
||||
if (!user) {
|
||||
throw new UnauthorizedException();
|
||||
}
|
||||
|
||||
return payload;
|
||||
}
|
||||
}
|
||||
|
||||
25
src/card/card.module.ts
Normal file
25
src/card/card.module.ts
Normal file
@ -0,0 +1,25 @@
|
||||
import { Module } from '@nestjs/common';
|
||||
import { TypeOrmModule } from '@nestjs/typeorm';
|
||||
import { Card } from './entities';
|
||||
import { Account } from './entities/account.entity';
|
||||
import { Transaction } from './entities/transaction.entity';
|
||||
import { CardRepository } from './repositories';
|
||||
import { AccountRepository } from './repositories/account.repository';
|
||||
import { TransactionRepository } from './repositories/transaction.repository';
|
||||
import { CardService } from './services';
|
||||
import { AccountService } from './services/account.service';
|
||||
import { TransactionService } from './services/transaction.service';
|
||||
|
||||
@Module({
|
||||
imports: [TypeOrmModule.forFeature([Card, Account, Transaction])],
|
||||
providers: [
|
||||
CardService,
|
||||
CardRepository,
|
||||
TransactionService,
|
||||
TransactionRepository,
|
||||
AccountService,
|
||||
AccountRepository,
|
||||
],
|
||||
exports: [CardService, TransactionService],
|
||||
})
|
||||
export class CardModule {}
|
||||
31
src/card/entities/account.entity.ts
Normal file
31
src/card/entities/account.entity.ts
Normal file
@ -0,0 +1,31 @@
|
||||
import { Column, CreateDateColumn, Entity, Index, OneToMany, PrimaryGeneratedColumn, UpdateDateColumn } from 'typeorm';
|
||||
import { Card } from './card.entity';
|
||||
import { Transaction } from './transaction.entity';
|
||||
|
||||
@Entity('accounts')
|
||||
export class Account {
|
||||
@PrimaryGeneratedColumn('uuid')
|
||||
id!: string;
|
||||
|
||||
@Column('varchar', { length: 255, nullable: false, unique: true, name: 'account_reference' })
|
||||
@Index({ unique: true })
|
||||
accountReference!: string;
|
||||
|
||||
@Column('varchar', { length: 255, nullable: false, name: 'currency' })
|
||||
currency!: string;
|
||||
|
||||
@Column('decimal', { precision: 10, scale: 2, default: 0.0, name: 'balance' })
|
||||
balance!: number;
|
||||
|
||||
@OneToMany(() => Card, (card) => card.account, { cascade: true })
|
||||
cards!: Card[];
|
||||
|
||||
@OneToMany(() => Transaction, (transaction) => transaction.account, { cascade: true })
|
||||
transactions!: Transaction[];
|
||||
|
||||
@CreateDateColumn({ name: 'created_at', type: 'timestamp with time zone' })
|
||||
createdAt!: Date;
|
||||
|
||||
@UpdateDateColumn({ name: 'updated_at', type: 'timestamp with time zone' })
|
||||
updatedAt!: Date;
|
||||
}
|
||||
85
src/card/entities/card.entity.ts
Normal file
85
src/card/entities/card.entity.ts
Normal file
@ -0,0 +1,85 @@
|
||||
import {
|
||||
Column,
|
||||
CreateDateColumn,
|
||||
Entity,
|
||||
Index,
|
||||
JoinColumn,
|
||||
ManyToOne,
|
||||
OneToMany,
|
||||
PrimaryGeneratedColumn,
|
||||
UpdateDateColumn,
|
||||
} from 'typeorm';
|
||||
import { Customer } from '~/customer/entities';
|
||||
import { CardColors, CardIssuers, CardScheme, CardStatus, CardStatusDescription, CustomerType } from '../enums';
|
||||
import { Account } from './account.entity';
|
||||
import { Transaction } from './transaction.entity';
|
||||
|
||||
@Entity('cards')
|
||||
export class Card {
|
||||
@PrimaryGeneratedColumn('uuid')
|
||||
id!: string;
|
||||
|
||||
@Index({ unique: true })
|
||||
@Column({ name: 'card_reference', nullable: false, type: 'varchar' })
|
||||
cardReference!: string;
|
||||
|
||||
@Column({ length: 6, name: 'first_six_digits', nullable: false, type: 'varchar' })
|
||||
firstSixDigits!: string;
|
||||
|
||||
@Column({ length: 4, name: 'last_four_digits', nullable: false, type: 'varchar' })
|
||||
lastFourDigits!: string;
|
||||
|
||||
@Column({ type: 'varchar', nullable: false })
|
||||
expiry!: string;
|
||||
|
||||
@Column({ type: 'varchar', nullable: false, name: 'customer_type' })
|
||||
customerType!: CustomerType;
|
||||
|
||||
@Column({ type: 'varchar', nullable: false, default: CardColors.BLUE })
|
||||
color!: CardColors;
|
||||
|
||||
@Column({ type: 'varchar', nullable: false, default: CardStatus.PENDING })
|
||||
status!: CardStatus;
|
||||
|
||||
@Column({ type: 'varchar', nullable: false, default: CardStatusDescription.PENDING_ACTIVATION })
|
||||
statusDescription!: CardStatusDescription;
|
||||
|
||||
@Column({ type: 'decimal', precision: 10, scale: 2, default: 0.0, name: 'limit' })
|
||||
limit!: number;
|
||||
|
||||
@Column({ type: 'varchar', nullable: false, default: CardScheme.VISA })
|
||||
scheme!: CardScheme;
|
||||
|
||||
@Column({ type: 'varchar', nullable: false })
|
||||
issuer!: CardIssuers;
|
||||
|
||||
@Column({ type: 'uuid', name: 'customer_id', nullable: false })
|
||||
customerId!: string;
|
||||
|
||||
@Column({ type: 'uuid', name: 'parent_id', nullable: true })
|
||||
parentId?: string;
|
||||
|
||||
@Column({ type: 'uuid', name: 'account_id', nullable: false })
|
||||
accountId!: string;
|
||||
|
||||
@ManyToOne(() => Customer, (customer) => customer.childCards)
|
||||
@JoinColumn({ name: 'parent_id' })
|
||||
parentCustomer?: Customer;
|
||||
|
||||
@ManyToOne(() => Customer, (customer) => customer.cards, { onDelete: 'CASCADE' })
|
||||
@JoinColumn({ name: 'customer_id' })
|
||||
customer!: Customer;
|
||||
|
||||
@ManyToOne(() => Account, (account) => account.cards, { onDelete: 'CASCADE' })
|
||||
@JoinColumn({ name: 'account_id' })
|
||||
account!: Account;
|
||||
|
||||
@OneToMany(() => Transaction, (transaction) => transaction.card, { cascade: true })
|
||||
transactions!: Transaction[];
|
||||
|
||||
@CreateDateColumn({ name: 'created_at', type: 'timestamp with time zone' })
|
||||
createdAt!: Date;
|
||||
|
||||
@UpdateDateColumn({ type: 'timestamp with time zone', name: 'updated_at' })
|
||||
updatedAt!: Date;
|
||||
}
|
||||
1
src/card/entities/index.ts
Normal file
1
src/card/entities/index.ts
Normal file
@ -0,0 +1 @@
|
||||
export * from './card.entity';
|
||||
69
src/card/entities/transaction.entity.ts
Normal file
69
src/card/entities/transaction.entity.ts
Normal file
@ -0,0 +1,69 @@
|
||||
import { Column, CreateDateColumn, Entity, JoinColumn, ManyToOne, PrimaryGeneratedColumn } from 'typeorm';
|
||||
import { TransactionScope, TransactionType } from '../enums';
|
||||
import { Account } from './account.entity';
|
||||
import { Card } from './card.entity';
|
||||
|
||||
@Entity('transactions')
|
||||
export class Transaction {
|
||||
@PrimaryGeneratedColumn('uuid')
|
||||
id!: string;
|
||||
|
||||
@Column({ name: 'transaction_scope', type: 'varchar', nullable: false })
|
||||
transactionScope!: TransactionScope;
|
||||
|
||||
@Column({ name: 'transaction_type', type: 'varchar', default: TransactionType.EXTERNAL })
|
||||
transactionType!: TransactionType;
|
||||
|
||||
@Column({ name: 'card_reference', nullable: true, type: 'varchar' })
|
||||
cardReference!: string;
|
||||
|
||||
@Column({ name: 'account_reference', nullable: true, type: 'varchar' })
|
||||
accountReference!: string;
|
||||
|
||||
@Column({ name: 'transaction_id', unique: true, nullable: true, type: 'varchar' })
|
||||
transactionId!: string;
|
||||
|
||||
@Column({ name: 'card_masked_number', nullable: true, type: 'varchar' })
|
||||
cardMaskedNumber!: string;
|
||||
|
||||
@Column({ type: 'timestamp with time zone', name: 'transaction_date', nullable: true })
|
||||
transactionDate!: Date;
|
||||
|
||||
@Column({ name: 'rrn', nullable: true, type: 'varchar' })
|
||||
rrn!: string;
|
||||
|
||||
@Column({ type: 'decimal', precision: 12, scale: 2, name: 'transaction_amount' })
|
||||
transactionAmount!: number;
|
||||
|
||||
@Column({ type: 'varchar', name: 'transaction_currency' })
|
||||
transactionCurrency!: string;
|
||||
|
||||
@Column({ type: 'decimal', name: 'billing_amount', precision: 12, scale: 2 })
|
||||
billingAmount!: number;
|
||||
|
||||
@Column({ type: 'decimal', name: 'settlement_amount', precision: 12, scale: 2 })
|
||||
settlementAmount!: number;
|
||||
|
||||
@Column({ type: 'decimal', name: 'fees', precision: 12, scale: 2 })
|
||||
fees!: number;
|
||||
|
||||
@Column({ type: 'decimal', name: 'vat_on_fees', precision: 12, scale: 2, default: 0.0 })
|
||||
vatOnFees!: number;
|
||||
|
||||
@Column({ name: 'card_id', type: 'uuid', nullable: true })
|
||||
cardId!: string;
|
||||
|
||||
@Column({ name: 'account_id', type: 'uuid', nullable: true })
|
||||
accountId!: string;
|
||||
|
||||
@ManyToOne(() => Card, (card) => card.transactions, { onDelete: 'CASCADE', nullable: true })
|
||||
@JoinColumn({ name: 'card_id' })
|
||||
card!: Card;
|
||||
|
||||
@ManyToOne(() => Account, (account) => account.transactions, { onDelete: 'CASCADE', nullable: true })
|
||||
@JoinColumn({ name: 'account_id' })
|
||||
account!: Account;
|
||||
|
||||
@CreateDateColumn({ name: 'created_at', type: 'timestamp with time zone' })
|
||||
createdAt!: Date;
|
||||
}
|
||||
4
src/card/enums/card-colors.enum.ts
Normal file
4
src/card/enums/card-colors.enum.ts
Normal file
@ -0,0 +1,4 @@
|
||||
export enum CardColors {
|
||||
RED = 'RED',
|
||||
BLUE = 'BLUE',
|
||||
}
|
||||
3
src/card/enums/card-issuers.enum.ts
Normal file
3
src/card/enums/card-issuers.enum.ts
Normal file
@ -0,0 +1,3 @@
|
||||
export enum CardIssuers {
|
||||
NEOLEAP = 'NEOLEAP',
|
||||
}
|
||||
4
src/card/enums/card-scheme.enum.ts
Normal file
4
src/card/enums/card-scheme.enum.ts
Normal file
@ -0,0 +1,4 @@
|
||||
export enum CardScheme {
|
||||
VISA = 'VISA',
|
||||
MASTERCARD = 'MASTERCARD',
|
||||
}
|
||||
68
src/card/enums/card-status-description.enum.ts
Normal file
68
src/card/enums/card-status-description.enum.ts
Normal file
@ -0,0 +1,68 @@
|
||||
/**
|
||||
* import { CardStatus, CardStatusDescription } from '../enums';
|
||||
|
||||
export const CardStatusMapper: Record<string, { description: CardStatusDescription; status: CardStatus }> = {
|
||||
//ACTIVE
|
||||
'00': { description: 'NORMAL', status: CardStatus.ACTIVE },
|
||||
|
||||
//PENDING
|
||||
'02': { description: 'NOT_YET_ISSUED', status: CardStatus.PENDING },
|
||||
'20': { description: 'PENDING_ISSUANCE', status: CardStatus.PENDING },
|
||||
'21': { description: 'CARD_EXTRACTED', status: CardStatus.PENDING },
|
||||
'22': { description: 'EXTRACTION_FAILED', status: CardStatus.PENDING },
|
||||
'23': { description: 'FAILED_PRINTING_BULK', status: CardStatus.PENDING },
|
||||
'24': { description: 'FAILED_PRINTING_INST', status: CardStatus.PENDING },
|
||||
'30': { description: 'PENDING_ACTIVATION', status: CardStatus.PENDING },
|
||||
'27': { description: 'PENDING_PIN', status: CardStatus.PENDING },
|
||||
'16': { description: 'PREPARE_TO_CLOSE', status: CardStatus.PENDING },
|
||||
|
||||
//BLOCKED
|
||||
'01': { description: 'PIN_TRIES_EXCEEDED', status: CardStatus.BLOCKED },
|
||||
'03': { description: 'CARD_EXPIRED', status: CardStatus.BLOCKED },
|
||||
'04': { description: 'LOST', status: CardStatus.BLOCKED },
|
||||
'05': { description: 'STOLEN', status: CardStatus.BLOCKED },
|
||||
'06': { description: 'CUSTOMER_CLOSE', status: CardStatus.BLOCKED },
|
||||
'07': { description: 'BANK_CANCELLED', status: CardStatus.BLOCKED },
|
||||
'08': { description: 'FRAUD', status: CardStatus.BLOCKED },
|
||||
'09': { description: 'DAMAGED', status: CardStatus.BLOCKED },
|
||||
'50': { description: 'SAFE_BLOCK', status: CardStatus.BLOCKED },
|
||||
'51': { description: 'TEMPORARY_BLOCK', status: CardStatus.BLOCKED },
|
||||
'52': { description: 'RISK_BLOCK', status: CardStatus.BLOCKED },
|
||||
'53': { description: 'OVERDRAFT', status: CardStatus.BLOCKED },
|
||||
'54': { description: 'BLOCKED_FOR_FEES', status: CardStatus.BLOCKED },
|
||||
'67': { description: 'CLOSED_CUSTOMER_DEAD', status: CardStatus.BLOCKED },
|
||||
'75': { description: 'RETURN_CARD', status: CardStatus.BLOCKED },
|
||||
|
||||
//Fallback
|
||||
'99': { description: 'UNKNOWN', status: CardStatus.PENDING },
|
||||
};
|
||||
|
||||
*/
|
||||
export enum CardStatusDescription {
|
||||
NORMAL = 'NORMAL',
|
||||
NOT_YET_ISSUED = 'NOT_YET_ISSUED',
|
||||
PENDING_ISSUANCE = 'PENDING_ISSUANCE',
|
||||
CARD_EXTRACTED = 'CARD_EXTRACTED',
|
||||
EXTRACTION_FAILED = 'EXTRACTION_FAILED',
|
||||
FAILED_PRINTING_BULK = 'FAILED_PRINTING_BULK',
|
||||
FAILED_PRINTING_INST = 'FAILED_PRINTING_INST',
|
||||
PENDING_ACTIVATION = 'PENDING_ACTIVATION',
|
||||
PENDING_PIN = 'PENDING_PIN',
|
||||
PREPARE_TO_CLOSE = 'PREPARE_TO_CLOSE',
|
||||
PIN_TRIES_EXCEEDED = 'PIN_TRIES_EXCEEDED',
|
||||
CARD_EXPIRED = 'CARD_EXPIRED',
|
||||
LOST = 'LOST',
|
||||
STOLEN = 'STOLEN',
|
||||
CUSTOMER_CLOSE = 'CUSTOMER_CLOSE',
|
||||
BANK_CANCELLED = 'BANK_CANCELLED',
|
||||
FRAUD = 'FRAUD',
|
||||
DAMAGED = 'DAMAGED',
|
||||
SAFE_BLOCK = 'SAFE_BLOCK',
|
||||
TEMPORARY_BLOCK = 'TEMPORARY_BLOCK',
|
||||
RISK_BLOCK = 'RISK_BLOCK',
|
||||
OVERDRAFT = 'OVERDRAFT',
|
||||
BLOCKED_FOR_FEES = 'BLOCKED_FOR_FEES',
|
||||
CLOSED_CUSTOMER_DEAD = 'CLOSED_CUSTOMER_DEAD',
|
||||
RETURN_CARD = 'RETURN_CARD',
|
||||
UNKNOWN = 'UNKNOWN',
|
||||
}
|
||||
6
src/card/enums/card-status.enum.ts
Normal file
6
src/card/enums/card-status.enum.ts
Normal file
@ -0,0 +1,6 @@
|
||||
export enum CardStatus {
|
||||
ACTIVE = 'ACTIVE',
|
||||
CANCELED = 'CANCELED',
|
||||
BLOCKED = 'BLOCKED',
|
||||
PENDING = 'PENDING',
|
||||
}
|
||||
4
src/card/enums/customer-type.enum.ts
Normal file
4
src/card/enums/customer-type.enum.ts
Normal file
@ -0,0 +1,4 @@
|
||||
export enum CustomerType {
|
||||
PARENT = 'PARENT',
|
||||
CHILD = 'CHILD',
|
||||
}
|
||||
8
src/card/enums/index.ts
Normal file
8
src/card/enums/index.ts
Normal file
@ -0,0 +1,8 @@
|
||||
export * from './card-colors.enum';
|
||||
export * from './card-issuers.enum';
|
||||
export * from './card-scheme.enum';
|
||||
export * from './card-status-description.enum';
|
||||
export * from './card-status.enum';
|
||||
export * from './customer-type.enum';
|
||||
export * from './transaction-scope.enum';
|
||||
export * from './transaction-type.enum';
|
||||
4
src/card/enums/transaction-scope.enum.ts
Normal file
4
src/card/enums/transaction-scope.enum.ts
Normal file
@ -0,0 +1,4 @@
|
||||
export enum TransactionScope {
|
||||
CARD = 'CARD',
|
||||
ACCOUNT = 'ACCOUNT',
|
||||
}
|
||||
4
src/card/enums/transaction-type.enum.ts
Normal file
4
src/card/enums/transaction-type.enum.ts
Normal file
@ -0,0 +1,4 @@
|
||||
export enum TransactionType {
|
||||
INTERNAL = 'INTERNAL',
|
||||
EXTERNAL = 'EXTERNAL',
|
||||
}
|
||||
109
src/card/mappers/card-status-description.mapper.ts
Normal file
109
src/card/mappers/card-status-description.mapper.ts
Normal file
@ -0,0 +1,109 @@
|
||||
import { UserLocale } from '~/core/enums';
|
||||
import { CardStatusDescription } from '../enums';
|
||||
|
||||
export const CardStatusMapper: Record<CardStatusDescription, { [key in UserLocale]: { description: string } }> = {
|
||||
[CardStatusDescription.NORMAL]: {
|
||||
[UserLocale.ENGLISH]: { description: 'The card is active' },
|
||||
[UserLocale.ARABIC]: { description: 'البطاقة نشطة' },
|
||||
},
|
||||
[CardStatusDescription.NOT_YET_ISSUED]: {
|
||||
[UserLocale.ENGLISH]: { description: 'The card is not yet issued' },
|
||||
[UserLocale.ARABIC]: { description: 'البطاقة لم تصدر بعد' },
|
||||
},
|
||||
[CardStatusDescription.PENDING_ISSUANCE]: {
|
||||
[UserLocale.ENGLISH]: { description: 'The card is pending issuance' },
|
||||
[UserLocale.ARABIC]: { description: 'البطاقة قيد الإصدار' },
|
||||
},
|
||||
[CardStatusDescription.CARD_EXTRACTED]: {
|
||||
[UserLocale.ENGLISH]: { description: 'The card has been extracted' },
|
||||
[UserLocale.ARABIC]: { description: 'تم استخراج البطاقة' },
|
||||
},
|
||||
[CardStatusDescription.EXTRACTION_FAILED]: {
|
||||
[UserLocale.ENGLISH]: { description: 'The card extraction has failed' },
|
||||
[UserLocale.ARABIC]: { description: 'فشل استخراج البطاقة' },
|
||||
},
|
||||
[CardStatusDescription.FAILED_PRINTING_BULK]: {
|
||||
[UserLocale.ENGLISH]: { description: 'The card printing in bulk has failed' },
|
||||
[UserLocale.ARABIC]: { description: 'فشل الطباعة بالجملة للبطاقة' },
|
||||
},
|
||||
[CardStatusDescription.FAILED_PRINTING_INST]: {
|
||||
[UserLocale.ENGLISH]: { description: 'The card printing in institution has failed' },
|
||||
[UserLocale.ARABIC]: { description: 'فشل الطباعة في المؤسسة للبطاقة' },
|
||||
},
|
||||
[CardStatusDescription.PENDING_ACTIVATION]: {
|
||||
[UserLocale.ENGLISH]: { description: 'The card is pending activation' },
|
||||
[UserLocale.ARABIC]: { description: 'البطاقة قيد التفعيل' },
|
||||
},
|
||||
[CardStatusDescription.PENDING_PIN]: {
|
||||
[UserLocale.ENGLISH]: { description: 'The card is pending PIN' },
|
||||
[UserLocale.ARABIC]: { description: 'البطاقة قيد الانتظار لرقم التعريف الشخصي' },
|
||||
},
|
||||
[CardStatusDescription.PREPARE_TO_CLOSE]: {
|
||||
[UserLocale.ENGLISH]: { description: 'The card is being prepared for closure' },
|
||||
[UserLocale.ARABIC]: { description: 'البطاقة قيد التحضير للإغلاق' },
|
||||
},
|
||||
[CardStatusDescription.PIN_TRIES_EXCEEDED]: {
|
||||
[UserLocale.ENGLISH]: { description: 'The card PIN tries have been exceeded' },
|
||||
[UserLocale.ARABIC]: { description: 'تم تجاوز محاولات رقم التعريف الشخصي للبطاقة' },
|
||||
},
|
||||
[CardStatusDescription.CARD_EXPIRED]: {
|
||||
[UserLocale.ENGLISH]: { description: 'The card has expired' },
|
||||
[UserLocale.ARABIC]: { description: 'انتهت صلاحية البطاقة' },
|
||||
},
|
||||
[CardStatusDescription.LOST]: {
|
||||
[UserLocale.ENGLISH]: { description: 'The card is lost' },
|
||||
[UserLocale.ARABIC]: { description: 'البطاقة ضائعة' },
|
||||
},
|
||||
[CardStatusDescription.STOLEN]: {
|
||||
[UserLocale.ENGLISH]: { description: 'The card is stolen' },
|
||||
[UserLocale.ARABIC]: { description: 'البطاقة مسروقة' },
|
||||
},
|
||||
[CardStatusDescription.CUSTOMER_CLOSE]: {
|
||||
[UserLocale.ENGLISH]: { description: 'The card is being closed by the customer' },
|
||||
[UserLocale.ARABIC]: { description: 'البطاقة قيد الإغلاق من قبل العميل' },
|
||||
},
|
||||
[CardStatusDescription.BANK_CANCELLED]: {
|
||||
[UserLocale.ENGLISH]: { description: 'The card has been cancelled by the bank' },
|
||||
[UserLocale.ARABIC]: { description: 'البطاقة ألغيت من قبل البنك' },
|
||||
},
|
||||
[CardStatusDescription.FRAUD]: {
|
||||
[UserLocale.ENGLISH]: { description: 'Fraud' },
|
||||
[UserLocale.ARABIC]: { description: 'احتيال' },
|
||||
},
|
||||
[CardStatusDescription.DAMAGED]: {
|
||||
[UserLocale.ENGLISH]: { description: 'The card is damaged' },
|
||||
[UserLocale.ARABIC]: { description: 'البطاقة تالفة' },
|
||||
},
|
||||
[CardStatusDescription.SAFE_BLOCK]: {
|
||||
[UserLocale.ENGLISH]: { description: 'The card is in a safe block' },
|
||||
[UserLocale.ARABIC]: { description: 'البطاقة في حظر آمن' },
|
||||
},
|
||||
[CardStatusDescription.TEMPORARY_BLOCK]: {
|
||||
[UserLocale.ENGLISH]: { description: 'The card is in a temporary block' },
|
||||
[UserLocale.ARABIC]: { description: 'البطاقة في حظر مؤقت' },
|
||||
},
|
||||
[CardStatusDescription.RISK_BLOCK]: {
|
||||
[UserLocale.ENGLISH]: { description: 'The card is in a risk block' },
|
||||
[UserLocale.ARABIC]: { description: 'البطاقة في حظر المخاطر' },
|
||||
},
|
||||
[CardStatusDescription.OVERDRAFT]: {
|
||||
[UserLocale.ENGLISH]: { description: 'The card is in overdraft' },
|
||||
[UserLocale.ARABIC]: { description: 'البطاقة في السحب على المكشوف' },
|
||||
},
|
||||
[CardStatusDescription.BLOCKED_FOR_FEES]: {
|
||||
[UserLocale.ENGLISH]: { description: 'The card is blocked for fees' },
|
||||
[UserLocale.ARABIC]: { description: 'البطاقة محظورة للرسوم' },
|
||||
},
|
||||
[CardStatusDescription.CLOSED_CUSTOMER_DEAD]: {
|
||||
[UserLocale.ENGLISH]: { description: 'The card is closed because the customer is dead' },
|
||||
[UserLocale.ARABIC]: { description: 'البطاقة مغلقة لأن العميل متوفى' },
|
||||
},
|
||||
[CardStatusDescription.RETURN_CARD]: {
|
||||
[UserLocale.ENGLISH]: { description: 'The card is being returned' },
|
||||
[UserLocale.ARABIC]: { description: 'البطاقة قيد الإرجاع' },
|
||||
},
|
||||
[CardStatusDescription.UNKNOWN]: {
|
||||
[UserLocale.ENGLISH]: { description: 'The card status is unknown' },
|
||||
[UserLocale.ARABIC]: { description: 'حالة البطاقة غير معروفة' },
|
||||
},
|
||||
};
|
||||
37
src/card/mappers/card-status.mapper.ts
Normal file
37
src/card/mappers/card-status.mapper.ts
Normal file
@ -0,0 +1,37 @@
|
||||
import { CardStatus, CardStatusDescription } from '../enums';
|
||||
|
||||
export const CardStatusMapper: Record<string, { description: CardStatusDescription; status: CardStatus }> = {
|
||||
//ACTIVE
|
||||
'00': { description: CardStatusDescription.NORMAL, status: CardStatus.ACTIVE },
|
||||
|
||||
//PENDING
|
||||
'02': { description: CardStatusDescription.NOT_YET_ISSUED, status: CardStatus.PENDING },
|
||||
'20': { description: CardStatusDescription.PENDING_ISSUANCE, status: CardStatus.PENDING },
|
||||
'21': { description: CardStatusDescription.CARD_EXTRACTED, status: CardStatus.PENDING },
|
||||
'22': { description: CardStatusDescription.EXTRACTION_FAILED, status: CardStatus.PENDING },
|
||||
'23': { description: CardStatusDescription.FAILED_PRINTING_BULK, status: CardStatus.PENDING },
|
||||
'24': { description: CardStatusDescription.FAILED_PRINTING_INST, status: CardStatus.PENDING },
|
||||
'30': { description: CardStatusDescription.PENDING_ACTIVATION, status: CardStatus.PENDING },
|
||||
'27': { description: CardStatusDescription.PENDING_PIN, status: CardStatus.PENDING },
|
||||
'16': { description: CardStatusDescription.PREPARE_TO_CLOSE, status: CardStatus.PENDING },
|
||||
|
||||
//BLOCKED
|
||||
'01': { description: CardStatusDescription.PIN_TRIES_EXCEEDED, status: CardStatus.BLOCKED },
|
||||
'03': { description: CardStatusDescription.CARD_EXPIRED, status: CardStatus.BLOCKED },
|
||||
'04': { description: CardStatusDescription.LOST, status: CardStatus.BLOCKED },
|
||||
'05': { description: CardStatusDescription.STOLEN, status: CardStatus.BLOCKED },
|
||||
'06': { description: CardStatusDescription.CUSTOMER_CLOSE, status: CardStatus.BLOCKED },
|
||||
'07': { description: CardStatusDescription.BANK_CANCELLED, status: CardStatus.BLOCKED },
|
||||
'08': { description: CardStatusDescription.FRAUD, status: CardStatus.BLOCKED },
|
||||
'09': { description: CardStatusDescription.DAMAGED, status: CardStatus.BLOCKED },
|
||||
'50': { description: CardStatusDescription.SAFE_BLOCK, status: CardStatus.BLOCKED },
|
||||
'51': { description: CardStatusDescription.TEMPORARY_BLOCK, status: CardStatus.BLOCKED },
|
||||
'52': { description: CardStatusDescription.RISK_BLOCK, status: CardStatus.BLOCKED },
|
||||
'53': { description: CardStatusDescription.OVERDRAFT, status: CardStatus.BLOCKED },
|
||||
'54': { description: CardStatusDescription.BLOCKED_FOR_FEES, status: CardStatus.BLOCKED },
|
||||
'67': { description: CardStatusDescription.CLOSED_CUSTOMER_DEAD, status: CardStatus.BLOCKED },
|
||||
'75': { description: CardStatusDescription.RETURN_CARD, status: CardStatus.BLOCKED },
|
||||
|
||||
//Fallback
|
||||
'99': { description: CardStatusDescription.UNKNOWN, status: CardStatus.PENDING },
|
||||
};
|
||||
34
src/card/repositories/account.repository.ts
Normal file
34
src/card/repositories/account.repository.ts
Normal file
@ -0,0 +1,34 @@
|
||||
import { Injectable } from '@nestjs/common';
|
||||
import { InjectRepository } from '@nestjs/typeorm';
|
||||
import { Repository } from 'typeorm';
|
||||
import { Account } from '../entities/account.entity';
|
||||
|
||||
@Injectable()
|
||||
export class AccountRepository {
|
||||
constructor(@InjectRepository(Account) private readonly accountRepository: Repository<Account>) {}
|
||||
|
||||
createAccount(accountId: string): Promise<Account> {
|
||||
return this.accountRepository.save(
|
||||
this.accountRepository.create({
|
||||
accountReference: accountId,
|
||||
balance: 0,
|
||||
currency: '682',
|
||||
}),
|
||||
);
|
||||
}
|
||||
|
||||
getAccountByReferenceNumber(accountReference: string): Promise<Account | null> {
|
||||
return this.accountRepository.findOne({
|
||||
where: { accountReference },
|
||||
relations: ['cards'],
|
||||
});
|
||||
}
|
||||
|
||||
topUpAccountBalance(accountReference: string, amount: number) {
|
||||
return this.accountRepository.increment({ accountReference }, 'balance', amount);
|
||||
}
|
||||
|
||||
decreaseAccountBalance(accountReference: string, amount: number) {
|
||||
return this.accountRepository.decrement({ accountReference }, 'balance', amount);
|
||||
}
|
||||
}
|
||||
49
src/card/repositories/card.repository.ts
Normal file
49
src/card/repositories/card.repository.ts
Normal file
@ -0,0 +1,49 @@
|
||||
import { Injectable } from '@nestjs/common';
|
||||
import { InjectRepository } from '@nestjs/typeorm';
|
||||
import { Repository } from 'typeorm';
|
||||
import { CreateApplicationResponse } from '~/common/modules/neoleap/dtos/response';
|
||||
import { Card } from '../entities';
|
||||
import { CardColors, CardIssuers, CardScheme, CardStatus, CardStatusDescription, CustomerType } from '../enums';
|
||||
|
||||
@Injectable()
|
||||
export class CardRepository {
|
||||
constructor(@InjectRepository(Card) private readonly cardRepository: Repository<Card>) {}
|
||||
|
||||
createCard(customerId: string, accountId: string, card: CreateApplicationResponse): Promise<Card> {
|
||||
return this.cardRepository.save(
|
||||
this.cardRepository.create({
|
||||
customerId: customerId,
|
||||
expiry: card.expiryDate,
|
||||
cardReference: card.cardId,
|
||||
customerType: CustomerType.PARENT,
|
||||
firstSixDigits: card.firstSixDigits,
|
||||
lastFourDigits: card.lastFourDigits,
|
||||
color: CardColors.BLUE,
|
||||
scheme: CardScheme.VISA,
|
||||
issuer: CardIssuers.NEOLEAP,
|
||||
accountId: accountId,
|
||||
}),
|
||||
);
|
||||
}
|
||||
|
||||
getCardById(id: string): Promise<Card | null> {
|
||||
return this.cardRepository.findOne({ where: { id } });
|
||||
}
|
||||
|
||||
getCardByReferenceNumber(referenceNumber: string): Promise<Card | null> {
|
||||
return this.cardRepository.findOne({ where: { cardReference: referenceNumber }, relations: ['account'] });
|
||||
}
|
||||
|
||||
getActiveCardForCustomer(customerId: string): Promise<Card | null> {
|
||||
return this.cardRepository.findOne({
|
||||
where: { customerId, status: CardStatus.ACTIVE },
|
||||
});
|
||||
}
|
||||
|
||||
updateCardStatus(id: string, status: CardStatus, statusDescription: CardStatusDescription) {
|
||||
return this.cardRepository.update(id, {
|
||||
status: status,
|
||||
statusDescription: statusDescription,
|
||||
});
|
||||
}
|
||||
}
|
||||
1
src/card/repositories/index.ts
Normal file
1
src/card/repositories/index.ts
Normal file
@ -0,0 +1 @@
|
||||
export * from './card.repository';
|
||||
65
src/card/repositories/transaction.repository.ts
Normal file
65
src/card/repositories/transaction.repository.ts
Normal file
@ -0,0 +1,65 @@
|
||||
import { Injectable } from '@nestjs/common';
|
||||
import { InjectRepository } from '@nestjs/typeorm';
|
||||
import moment from 'moment';
|
||||
import { Repository } from 'typeorm';
|
||||
import {
|
||||
AccountTransactionWebhookRequest,
|
||||
CardTransactionWebhookRequest,
|
||||
} from '~/common/modules/neoleap/dtos/requests';
|
||||
import { Card } from '../entities';
|
||||
import { Account } from '../entities/account.entity';
|
||||
import { Transaction } from '../entities/transaction.entity';
|
||||
import { TransactionScope, TransactionType } from '../enums';
|
||||
|
||||
@Injectable()
|
||||
export class TransactionRepository {
|
||||
constructor(@InjectRepository(Transaction) private transactionRepository: Repository<Transaction>) {}
|
||||
|
||||
createCardTransaction(card: Card, transactionData: CardTransactionWebhookRequest): Promise<Transaction> {
|
||||
return this.transactionRepository.save(
|
||||
this.transactionRepository.create({
|
||||
transactionId: transactionData.transactionId,
|
||||
cardReference: transactionData.cardId,
|
||||
transactionAmount: transactionData.transactionAmount,
|
||||
transactionCurrency: transactionData.transactionCurrency,
|
||||
billingAmount: transactionData.billingAmount,
|
||||
settlementAmount: transactionData.settlementAmount,
|
||||
transactionDate: moment(transactionData.date + transactionData.time, 'YYYYMMDDHHmmss').toDate(),
|
||||
rrn: transactionData.rrn,
|
||||
cardMaskedNumber: transactionData.cardMaskedNumber,
|
||||
fees: transactionData.fees,
|
||||
cardId: card.id,
|
||||
accountId: card.account!.id,
|
||||
transactionType: TransactionType.EXTERNAL,
|
||||
accountReference: card.account!.accountReference,
|
||||
transactionScope: TransactionScope.CARD,
|
||||
vatOnFees: transactionData.vatOnFees,
|
||||
}),
|
||||
);
|
||||
}
|
||||
|
||||
createAccountTransaction(account: Account, transactionData: AccountTransactionWebhookRequest): Promise<Transaction> {
|
||||
return this.transactionRepository.save(
|
||||
this.transactionRepository.create({
|
||||
transactionId: transactionData.transactionId,
|
||||
transactionAmount: transactionData.amount,
|
||||
transactionCurrency: transactionData.currency,
|
||||
billingAmount: 0,
|
||||
settlementAmount: 0,
|
||||
transactionDate: moment(transactionData.date + transactionData.time, 'YYYYMMDDHHmmss').toDate(),
|
||||
fees: 0,
|
||||
accountReference: account.accountReference,
|
||||
accountId: account.id,
|
||||
transactionType: TransactionType.EXTERNAL,
|
||||
transactionScope: TransactionScope.ACCOUNT,
|
||||
vatOnFees: 0,
|
||||
}),
|
||||
);
|
||||
}
|
||||
|
||||
findTransactionByReference(transactionId: string, accountReference: string): Promise<Transaction | null> {
|
||||
return this.transactionRepository.findOne({
|
||||
where: { transactionId, accountReference },
|
||||
});
|
||||
}
|
||||
}
|
||||
38
src/card/services/account.service.ts
Normal file
38
src/card/services/account.service.ts
Normal file
@ -0,0 +1,38 @@
|
||||
import { Injectable, UnprocessableEntityException } from '@nestjs/common';
|
||||
import { Account } from '../entities/account.entity';
|
||||
import { AccountRepository } from '../repositories/account.repository';
|
||||
|
||||
@Injectable()
|
||||
export class AccountService {
|
||||
constructor(private readonly accountRepository: AccountRepository) {}
|
||||
|
||||
createAccount(accountId: string): Promise<Account> {
|
||||
return this.accountRepository.createAccount(accountId);
|
||||
}
|
||||
|
||||
async getAccountByReferenceNumber(accountReference: string): Promise<Account> {
|
||||
const account = await this.accountRepository.getAccountByReferenceNumber(accountReference);
|
||||
if (!account) {
|
||||
throw new UnprocessableEntityException('ACCOUNT.NOT_FOUND');
|
||||
}
|
||||
return account;
|
||||
}
|
||||
|
||||
async creditAccountBalance(accountReference: string, amount: number) {
|
||||
return this.accountRepository.topUpAccountBalance(accountReference, amount);
|
||||
}
|
||||
|
||||
async decreaseAccountBalance(accountReference: string, amount: number) {
|
||||
const account = await this.getAccountByReferenceNumber(accountReference);
|
||||
/**
|
||||
* While there is no need to check for insufficient balance because this is a webhook handler,
|
||||
* I just added this check to ensure we don't have corruption in our data especially if this service is used elsewhere.
|
||||
*/
|
||||
|
||||
if (account.balance < amount) {
|
||||
throw new UnprocessableEntityException('ACCOUNT.INSUFFICIENT_BALANCE');
|
||||
}
|
||||
|
||||
return this.accountRepository.decreaseAccountBalance(accountReference, amount);
|
||||
}
|
||||
}
|
||||
54
src/card/services/card.service.ts
Normal file
54
src/card/services/card.service.ts
Normal file
@ -0,0 +1,54 @@
|
||||
import { BadRequestException, Injectable } from '@nestjs/common';
|
||||
import { Transactional } from 'typeorm-transactional';
|
||||
import { AccountCardStatusChangedWebhookRequest } from '~/common/modules/neoleap/dtos/requests';
|
||||
import { CreateApplicationResponse } from '~/common/modules/neoleap/dtos/response';
|
||||
import { Card } from '../entities';
|
||||
import { CardStatusMapper } from '../mappers/card-status.mapper';
|
||||
import { CardRepository } from '../repositories';
|
||||
import { AccountService } from './account.service';
|
||||
|
||||
@Injectable()
|
||||
export class CardService {
|
||||
constructor(private readonly cardRepository: CardRepository, private readonly accountService: AccountService) {}
|
||||
|
||||
@Transactional()
|
||||
async createCard(customerId: string, cardData: CreateApplicationResponse): Promise<Card> {
|
||||
const account = await this.accountService.createAccount(cardData.accountId);
|
||||
return this.cardRepository.createCard(customerId, account.id, cardData);
|
||||
}
|
||||
|
||||
async getCardById(id: string): Promise<Card> {
|
||||
const card = await this.cardRepository.getCardById(id);
|
||||
|
||||
if (!card) {
|
||||
throw new BadRequestException('CARD.NOT_FOUND');
|
||||
}
|
||||
|
||||
return card;
|
||||
}
|
||||
|
||||
async getCardByReferenceNumber(referenceNumber: string): Promise<Card> {
|
||||
const card = await this.cardRepository.getCardByReferenceNumber(referenceNumber);
|
||||
|
||||
if (!card) {
|
||||
throw new BadRequestException('CARD.NOT_FOUND');
|
||||
}
|
||||
|
||||
return card;
|
||||
}
|
||||
|
||||
async getActiveCardForCustomer(customerId: string): Promise<Card> {
|
||||
const card = await this.cardRepository.getActiveCardForCustomer(customerId);
|
||||
if (!card) {
|
||||
throw new BadRequestException('CARD.NOT_FOUND');
|
||||
}
|
||||
return card;
|
||||
}
|
||||
|
||||
async updateCardStatus(body: AccountCardStatusChangedWebhookRequest) {
|
||||
const card = await this.getCardByReferenceNumber(body.cardId);
|
||||
const { description, status } = CardStatusMapper[body.newStatus] || CardStatusMapper['99'];
|
||||
|
||||
return this.cardRepository.updateCardStatus(card.id, status, description);
|
||||
}
|
||||
}
|
||||
1
src/card/services/index.ts
Normal file
1
src/card/services/index.ts
Normal file
@ -0,0 +1 @@
|
||||
export * from './card.service';
|
||||
62
src/card/services/transaction.service.ts
Normal file
62
src/card/services/transaction.service.ts
Normal file
@ -0,0 +1,62 @@
|
||||
import { Injectable, UnprocessableEntityException } from '@nestjs/common';
|
||||
import Decimal from 'decimal.js';
|
||||
import { Transactional } from 'typeorm-transactional';
|
||||
import {
|
||||
AccountTransactionWebhookRequest,
|
||||
CardTransactionWebhookRequest,
|
||||
} from '~/common/modules/neoleap/dtos/requests';
|
||||
import { Transaction } from '../entities/transaction.entity';
|
||||
import { TransactionRepository } from '../repositories/transaction.repository';
|
||||
import { AccountService } from './account.service';
|
||||
import { CardService } from './card.service';
|
||||
|
||||
@Injectable()
|
||||
export class TransactionService {
|
||||
constructor(
|
||||
private readonly transactionRepository: TransactionRepository,
|
||||
private readonly cardService: CardService,
|
||||
private readonly accountService: AccountService,
|
||||
) {}
|
||||
|
||||
@Transactional()
|
||||
async createCardTransaction(body: CardTransactionWebhookRequest) {
|
||||
const card = await this.cardService.getCardByReferenceNumber(body.cardId);
|
||||
const existingTransaction = await this.findExistingTransaction(body.transactionId, card.account.accountReference);
|
||||
|
||||
if (existingTransaction) {
|
||||
throw new UnprocessableEntityException('TRANSACTION.ALREADY_EXISTS');
|
||||
}
|
||||
|
||||
const transaction = await this.transactionRepository.createCardTransaction(card, body);
|
||||
const total = new Decimal(body.transactionAmount).plus(body.billingAmount).plus(body.fees).plus(body.vatOnFees);
|
||||
|
||||
await this.accountService.decreaseAccountBalance(card.account.accountReference, total.toNumber());
|
||||
|
||||
return transaction;
|
||||
}
|
||||
|
||||
@Transactional()
|
||||
async createAccountTransaction(body: AccountTransactionWebhookRequest) {
|
||||
const account = await this.accountService.getAccountByReferenceNumber(body.accountId);
|
||||
|
||||
const existingTransaction = await this.findExistingTransaction(body.transactionId, account.accountReference);
|
||||
|
||||
if (existingTransaction) {
|
||||
throw new UnprocessableEntityException('TRANSACTION.ALREADY_EXISTS');
|
||||
}
|
||||
|
||||
const transaction = await this.transactionRepository.createAccountTransaction(account, body);
|
||||
await this.accountService.creditAccountBalance(account.accountReference, body.amount);
|
||||
|
||||
return transaction;
|
||||
}
|
||||
|
||||
private async findExistingTransaction(transactionId: string, accountReference: string): Promise<Transaction | null> {
|
||||
const existingTransaction = await this.transactionRepository.findTransactionByReference(
|
||||
transactionId,
|
||||
accountReference,
|
||||
);
|
||||
|
||||
return existingTransaction;
|
||||
}
|
||||
}
|
||||
253
src/common/constants/countries-numeric-iso.constant.ts
Normal file
253
src/common/constants/countries-numeric-iso.constant.ts
Normal file
@ -0,0 +1,253 @@
|
||||
import { CountryIso } from '../enums';
|
||||
|
||||
export const CountriesNumericISO: Record<CountryIso, string> = {
|
||||
[CountryIso.ARUBA]: '533',
|
||||
[CountryIso.AFGHANISTAN]: '004',
|
||||
[CountryIso.ANGOLA]: '024',
|
||||
[CountryIso.ANGUILLA]: '660',
|
||||
[CountryIso.ALAND_ISLANDS]: '248',
|
||||
[CountryIso.ALBANIA]: '008',
|
||||
[CountryIso.ANDORRA]: '020',
|
||||
[CountryIso.UNITED_ARAB_EMIRATES]: '784',
|
||||
[CountryIso.ARGENTINA]: '032',
|
||||
[CountryIso.ARMENIA]: '051',
|
||||
[CountryIso.AMERICAN_SAMOA]: '016',
|
||||
[CountryIso.ANTARCTICA]: '010',
|
||||
[CountryIso.FRENCH_SOUTHERN_TERRITORIES]: '260',
|
||||
[CountryIso.ANTIGUA_AND_BARBUDA]: '028',
|
||||
[CountryIso.AUSTRALIA]: '036',
|
||||
[CountryIso.AUSTRIA]: '040',
|
||||
[CountryIso.AZERBAIJAN]: '031',
|
||||
[CountryIso.BURUNDI]: '108',
|
||||
[CountryIso.BELGIUM]: '056',
|
||||
[CountryIso.BENIN]: '204',
|
||||
[CountryIso.BONAIRE_SINT_EUSTATIUS_AND_SABA]: '535',
|
||||
[CountryIso.BURKINA_FASO]: '854',
|
||||
[CountryIso.BANGLADESH]: '050',
|
||||
[CountryIso.BULGARIA]: '100',
|
||||
[CountryIso.BAHRAIN]: '048',
|
||||
[CountryIso.BAHAMAS]: '044',
|
||||
[CountryIso.BOSNIA_AND_HERZEGOVINA]: '070',
|
||||
[CountryIso.SAINT_BARTHÉLEMY]: '652',
|
||||
[CountryIso.BELARUS]: '112',
|
||||
[CountryIso.BELIZE]: '084',
|
||||
[CountryIso.BERMUDA]: '060',
|
||||
[CountryIso.BOLIVIA_PLURINATIONAL_STATE_OF]: '068',
|
||||
[CountryIso.BRAZIL]: '076',
|
||||
[CountryIso.BARBADOS]: '052',
|
||||
[CountryIso.BRUNEI_DARUSSALAM]: '096',
|
||||
[CountryIso.BHUTAN]: '064',
|
||||
[CountryIso.BOUVET_ISLAND]: '074',
|
||||
[CountryIso.BOTSWANA]: '072',
|
||||
[CountryIso.CENTRAL_AFRICAN_REPUBLIC]: '140',
|
||||
[CountryIso.CANADA]: '124',
|
||||
[CountryIso.COCOS_KEELING_ISLANDS]: '166',
|
||||
[CountryIso.SWITZERLAND]: '756',
|
||||
[CountryIso.CHILE]: '152',
|
||||
[CountryIso.CHINA]: '156',
|
||||
[CountryIso.COTE_DIVOIRE]: '384',
|
||||
[CountryIso.CAMEROON]: '120',
|
||||
[CountryIso.CONGO_THE_DEMOCRATIC_REPUBLIC_OF_THE]: '180',
|
||||
[CountryIso.CONGO]: '178',
|
||||
[CountryIso.COOK_ISLANDS]: '184',
|
||||
[CountryIso.COLOMBIA]: '170',
|
||||
[CountryIso.COMOROS]: '174',
|
||||
[CountryIso.CABO_VERDE]: '132',
|
||||
[CountryIso.COSTA_RICA]: '188',
|
||||
[CountryIso.CUBA]: '192',
|
||||
[CountryIso.CURAÇAO]: '531',
|
||||
[CountryIso.CHRISTMAS_ISLAND]: '162',
|
||||
[CountryIso.CAYMAN_ISLANDS]: '136',
|
||||
[CountryIso.CYPRUS]: '196',
|
||||
[CountryIso.CZECHIA]: '203',
|
||||
[CountryIso.GERMANY]: '276',
|
||||
[CountryIso.DJIBOUTI]: '262',
|
||||
[CountryIso.DOMINICA]: '212',
|
||||
[CountryIso.DENMARK]: '208',
|
||||
[CountryIso.DOMINICAN_REPUBLIC]: '214',
|
||||
[CountryIso.ALGERIA]: '012',
|
||||
[CountryIso.ECUADOR]: '218',
|
||||
[CountryIso.EGYPT]: '818',
|
||||
[CountryIso.ERITREA]: '232',
|
||||
[CountryIso.WESTERN_SAHARA]: '732',
|
||||
[CountryIso.SPAIN]: '724',
|
||||
[CountryIso.ESTONIA]: '233',
|
||||
[CountryIso.ETHIOPIA]: '231',
|
||||
[CountryIso.FINLAND]: '246',
|
||||
[CountryIso.FIJI]: '242',
|
||||
[CountryIso.FALKLAND_ISLANDS_MALVINAS]: '238',
|
||||
[CountryIso.FRANCE]: '250',
|
||||
[CountryIso.FAROE_ISLANDS]: '234',
|
||||
[CountryIso.MICRONESIA_FEDERATED_STATES_OF]: '583',
|
||||
[CountryIso.GABON]: '266',
|
||||
[CountryIso.UNITED_KINGDOM]: '826',
|
||||
[CountryIso.GEORGIA]: '268',
|
||||
[CountryIso.GUERNSEY]: '831',
|
||||
[CountryIso.GHANA]: '288',
|
||||
[CountryIso.GIBRALTAR]: '292',
|
||||
[CountryIso.GUINEA]: '324',
|
||||
[CountryIso.GUADELOUPE]: '312',
|
||||
[CountryIso.GAMBIA]: '270',
|
||||
[CountryIso.GUINEA_BISSAU]: '624',
|
||||
[CountryIso.EQUATORIAL_GUINEA]: '226',
|
||||
[CountryIso.GREECE]: '300',
|
||||
[CountryIso.GRENADA]: '308',
|
||||
[CountryIso.GREENLAND]: '304',
|
||||
[CountryIso.GUATEMALA]: '320',
|
||||
[CountryIso.FRENCH_GUIANA]: '254',
|
||||
[CountryIso.GUAM]: '316',
|
||||
[CountryIso.GUYANA]: '328',
|
||||
[CountryIso.HONG_KONG]: '344',
|
||||
[CountryIso.HEARD_ISLAND_AND_MCDONALD_ISLANDS]: '334',
|
||||
[CountryIso.HONDURAS]: '340',
|
||||
[CountryIso.CROATIA]: '191',
|
||||
[CountryIso.HAITI]: '332',
|
||||
[CountryIso.HUNGARY]: '348',
|
||||
[CountryIso.INDONESIA]: '360',
|
||||
[CountryIso.ISLE_OF_MAN]: '833',
|
||||
[CountryIso.INDIA]: '356',
|
||||
[CountryIso.BRITISH_INDIAN_OCEAN_TERRITORY]: '086',
|
||||
[CountryIso.IRELAND]: '372',
|
||||
[CountryIso.IRAN_ISLAMIC_REPUBLIC_OF]: '364',
|
||||
[CountryIso.IRAQ]: '368',
|
||||
[CountryIso.ICELAND]: '352',
|
||||
[CountryIso.ISRAEL]: '376',
|
||||
[CountryIso.ITALY]: '380',
|
||||
[CountryIso.JAMAICA]: '388',
|
||||
[CountryIso.JERSEY]: '832',
|
||||
[CountryIso.JORDAN]: '400',
|
||||
[CountryIso.JAPAN]: '392',
|
||||
[CountryIso.KAZAKHSTAN]: '398',
|
||||
[CountryIso.KENYA]: '404',
|
||||
[CountryIso.KYRGYZSTAN]: '417',
|
||||
[CountryIso.CAMBODIA]: '116',
|
||||
[CountryIso.KIRIBATI]: '296',
|
||||
[CountryIso.SAINT_KITTS_AND_NEVIS]: '659',
|
||||
[CountryIso.KOREA_REPUBLIC_OF]: '410',
|
||||
[CountryIso.KUWAIT]: '414',
|
||||
[CountryIso.LAO_PEOPLES_DEMOCRATIC_REPUBLIC]: '418',
|
||||
[CountryIso.LEBANON]: '422',
|
||||
[CountryIso.LIBERIA]: '430',
|
||||
[CountryIso.LIBYA]: '434',
|
||||
[CountryIso.SAINT_LUCIA]: '662',
|
||||
[CountryIso.LIECHTENSTEIN]: '438',
|
||||
[CountryIso.SRI_LANKA]: '144',
|
||||
[CountryIso.LESOTHO]: '426',
|
||||
[CountryIso.LITHUANIA]: '440',
|
||||
[CountryIso.LUXEMBOURG]: '442',
|
||||
[CountryIso.LATVIA]: '428',
|
||||
[CountryIso.MACAO]: '446',
|
||||
[CountryIso.SAINT_MARTIN_FRENCH_PART]: '663',
|
||||
[CountryIso.MOROCCO]: '504',
|
||||
[CountryIso.MONACO]: '492',
|
||||
[CountryIso.MOLDOVA_REPUBLIC_OF]: '498',
|
||||
[CountryIso.MADAGASCAR]: '450',
|
||||
[CountryIso.MALDIVES]: '462',
|
||||
[CountryIso.MEXICO]: '484',
|
||||
[CountryIso.MARSHALL_ISLANDS]: '584',
|
||||
[CountryIso.NORTH_MACEDONIA]: '807',
|
||||
[CountryIso.MALI]: '466',
|
||||
[CountryIso.MALTA]: '470',
|
||||
[CountryIso.MYANMAR]: '104',
|
||||
[CountryIso.MONTENEGRO]: '499',
|
||||
[CountryIso.MONGOLIA]: '496',
|
||||
[CountryIso.NORTHERN_MARIANA_ISLANDS]: '580',
|
||||
[CountryIso.MOZAMBIQUE]: '508',
|
||||
[CountryIso.MAURITANIA]: '478',
|
||||
[CountryIso.MONTSERRAT]: '500',
|
||||
[CountryIso.MARTINIQUE]: '474',
|
||||
[CountryIso.MAURITIUS]: '480',
|
||||
[CountryIso.MALAWI]: '454',
|
||||
[CountryIso.MALAYSIA]: '458',
|
||||
[CountryIso.MAYOTTE]: '175',
|
||||
[CountryIso.NAMIBIA]: '516',
|
||||
[CountryIso.NEW_CALEDONIA]: '540',
|
||||
[CountryIso.NIGER]: '562',
|
||||
[CountryIso.NORFOLK_ISLAND]: '574',
|
||||
[CountryIso.NIGERIA]: '566',
|
||||
[CountryIso.NICARAGUA]: '558',
|
||||
[CountryIso.NIUE]: '570',
|
||||
[CountryIso.NETHERLANDS]: '528',
|
||||
[CountryIso.NORWAY]: '578',
|
||||
[CountryIso.NEPAL]: '524',
|
||||
[CountryIso.NAURU]: '520',
|
||||
[CountryIso.NEW_ZEALAND]: '554',
|
||||
[CountryIso.OMAN]: '512',
|
||||
[CountryIso.PAKISTAN]: '586',
|
||||
[CountryIso.PANAMA]: '591',
|
||||
[CountryIso.PITCAIRN]: '612',
|
||||
[CountryIso.PERU]: '604',
|
||||
[CountryIso.PHILIPPINES]: '608',
|
||||
[CountryIso.PALAU]: '585',
|
||||
[CountryIso.PAPUA_NEW_GUINEA]: '598',
|
||||
[CountryIso.POLAND]: '616',
|
||||
[CountryIso.PUERTO_RICO]: '630',
|
||||
[CountryIso.KOREA_DEMOCRATIC_PEOPLES_REPUBLIC_OF]: '408',
|
||||
[CountryIso.PORTUGAL]: '620',
|
||||
[CountryIso.PARAGUAY]: '600',
|
||||
[CountryIso.PALESTINE_STATE_OF]: '275',
|
||||
[CountryIso.FRENCH_POLYNESIA]: '258',
|
||||
[CountryIso.QATAR]: '634',
|
||||
[CountryIso.REUNION]: '638',
|
||||
[CountryIso.ROMANIA]: '642',
|
||||
[CountryIso.RUSSIAN_FEDERATION]: '643',
|
||||
[CountryIso.RWANDA]: '646',
|
||||
[CountryIso.SAUDI_ARABIA]: '682',
|
||||
[CountryIso.SUDAN]: '729',
|
||||
[CountryIso.SENEGAL]: '686',
|
||||
[CountryIso.SINGAPORE]: '702',
|
||||
[CountryIso.SOUTH_GEORGIA_AND_THE_SOUTH_SANDWICH_ISLANDS]: '239',
|
||||
[CountryIso.SAINT_HELENA_ASCENSION_AND_TRISTAN_DA_CUNHA]: '654',
|
||||
[CountryIso.SVALBARD_AND_JAN_MAYEN]: '744',
|
||||
[CountryIso.SOLOMON_ISLANDS]: '090',
|
||||
[CountryIso.SIERRA_LEONE]: '694',
|
||||
[CountryIso.EL_SALVADOR]: '222',
|
||||
[CountryIso.SAN_MARINO]: '674',
|
||||
[CountryIso.SOMALIA]: '706',
|
||||
[CountryIso.SAINT_PIERRE_AND_MIQUELON]: '666',
|
||||
[CountryIso.SERBIA]: '688',
|
||||
[CountryIso.SOUTH_SUDAN]: '728',
|
||||
[CountryIso.SAO_TOME_AND_PRINCIPE]: '678',
|
||||
[CountryIso.SURINAME]: '740',
|
||||
[CountryIso.SLOVAKIA]: '703',
|
||||
[CountryIso.SLOVENIA]: '705',
|
||||
[CountryIso.SWEDEN]: '752',
|
||||
[CountryIso.ESWATINI]: '748',
|
||||
[CountryIso.SINT_MAARTEN_DUTCH_PART]: '534',
|
||||
[CountryIso.SEYCHELLES]: '690',
|
||||
[CountryIso.SYRIAN_ARAB_REPUBLIC]: '760',
|
||||
[CountryIso.TURKS_AND_CAICOS_ISLANDS]: '796',
|
||||
[CountryIso.CHAD]: '148',
|
||||
[CountryIso.TOGO]: '768',
|
||||
[CountryIso.THAILAND]: '764',
|
||||
[CountryIso.TAJIKISTAN]: '762',
|
||||
[CountryIso.TOKELAU]: '772',
|
||||
[CountryIso.TURKMENISTAN]: '795',
|
||||
[CountryIso.TIMOR_LESTE]: '626',
|
||||
[CountryIso.TONGA]: '776',
|
||||
[CountryIso.TRINIDAD_AND_TOBAGO]: '780',
|
||||
[CountryIso.TUNISIA]: '788',
|
||||
[CountryIso.TURKEY]: '792',
|
||||
[CountryIso.TUVALU]: '798',
|
||||
[CountryIso.TAIWAN_PROVINCE_OF_CHINA]: '158',
|
||||
[CountryIso.TANZANIA_UNITED_REPUBLIC_OF]: '834',
|
||||
[CountryIso.UGANDA]: '800',
|
||||
[CountryIso.UKRAINE]: '804',
|
||||
[CountryIso.UNITED_STATES_MINOR_OUTLYING_ISLANDS]: '581',
|
||||
[CountryIso.URUGUAY]: '858',
|
||||
[CountryIso.UNITED_STATES]: '840',
|
||||
[CountryIso.UZBEKISTAN]: '860',
|
||||
[CountryIso.HOLY_SEE_VATICAN_CITY_STATE]: '336',
|
||||
[CountryIso.SAINT_VINCENT_AND_THE_GRENADINES]: '670',
|
||||
[CountryIso.VENEZUELA_BOLIVARIAN_REPUBLIC_OF]: '862',
|
||||
[CountryIso.VIRGIN_ISLANDS_BRITISH]: '092',
|
||||
[CountryIso.VIRGIN_ISLANDS_US]: '850',
|
||||
[CountryIso.VIET_NAM]: '704',
|
||||
[CountryIso.VANUATU]: '548',
|
||||
[CountryIso.WALLIS_AND_FUTUNA]: '876',
|
||||
[CountryIso.SAMOA]: '882',
|
||||
[CountryIso.YEMEN]: '887',
|
||||
[CountryIso.SOUTH_AFRICA]: '710',
|
||||
[CountryIso.ZAMBIA]: '894',
|
||||
[CountryIso.ZIMBABWE]: '716',
|
||||
};
|
||||
@ -1 +1,2 @@
|
||||
export * from './countries-numeric-iso.constant';
|
||||
export * from './global.constant';
|
||||
|
||||
251
src/common/enums/countries-iso.enum.ts
Normal file
251
src/common/enums/countries-iso.enum.ts
Normal file
@ -0,0 +1,251 @@
|
||||
export enum CountryIso {
|
||||
ARUBA = 'AW',
|
||||
AFGHANISTAN = 'AF',
|
||||
ANGOLA = 'AO',
|
||||
ANGUILLA = 'AI',
|
||||
ALAND_ISLANDS = 'AX',
|
||||
ALBANIA = 'AL',
|
||||
ANDORRA = 'AD',
|
||||
UNITED_ARAB_EMIRATES = 'AE',
|
||||
ARGENTINA = 'AR',
|
||||
ARMENIA = 'AM',
|
||||
AMERICAN_SAMOA = 'AS',
|
||||
ANTARCTICA = 'AQ',
|
||||
FRENCH_SOUTHERN_TERRITORIES = 'TF',
|
||||
ANTIGUA_AND_BARBUDA = 'AG',
|
||||
AUSTRALIA = 'AU',
|
||||
AUSTRIA = 'AT',
|
||||
AZERBAIJAN = 'AZ',
|
||||
BURUNDI = 'BI',
|
||||
BELGIUM = 'BE',
|
||||
BENIN = 'BJ',
|
||||
BONAIRE_SINT_EUSTATIUS_AND_SABA = 'BQ',
|
||||
BURKINA_FASO = 'BF',
|
||||
BANGLADESH = 'BD',
|
||||
BULGARIA = 'BG',
|
||||
BAHRAIN = 'BH',
|
||||
BAHAMAS = 'BS',
|
||||
BOSNIA_AND_HERZEGOVINA = 'BA',
|
||||
SAINT_BARTHÉLEMY = 'BL',
|
||||
BELARUS = 'BY',
|
||||
BELIZE = 'BZ',
|
||||
BERMUDA = 'BM',
|
||||
BOLIVIA_PLURINATIONAL_STATE_OF = 'BO',
|
||||
BRAZIL = 'BR',
|
||||
BARBADOS = 'BB',
|
||||
BRUNEI_DARUSSALAM = 'BN',
|
||||
BHUTAN = 'BT',
|
||||
BOUVET_ISLAND = 'BV',
|
||||
BOTSWANA = 'BW',
|
||||
CENTRAL_AFRICAN_REPUBLIC = 'CF',
|
||||
CANADA = 'CA',
|
||||
COCOS_KEELING_ISLANDS = 'CC',
|
||||
SWITZERLAND = 'CH',
|
||||
CHILE = 'CL',
|
||||
CHINA = 'CN',
|
||||
COTE_DIVOIRE = 'CI',
|
||||
CAMEROON = 'CM',
|
||||
CONGO_THE_DEMOCRATIC_REPUBLIC_OF_THE = 'CD',
|
||||
CONGO = 'CG',
|
||||
COOK_ISLANDS = 'CK',
|
||||
COLOMBIA = 'CO',
|
||||
COMOROS = 'KM',
|
||||
CABO_VERDE = 'CV',
|
||||
COSTA_RICA = 'CR',
|
||||
CUBA = 'CU',
|
||||
CURAÇAO = 'CW',
|
||||
CHRISTMAS_ISLAND = 'CX',
|
||||
CAYMAN_ISLANDS = 'KY',
|
||||
CYPRUS = 'CY',
|
||||
CZECHIA = 'CZ',
|
||||
GERMANY = 'DE',
|
||||
DJIBOUTI = 'DJ',
|
||||
DOMINICA = 'DM',
|
||||
DENMARK = 'DK',
|
||||
DOMINICAN_REPUBLIC = 'DO',
|
||||
ALGERIA = 'DZ',
|
||||
ECUADOR = 'EC',
|
||||
EGYPT = 'EG',
|
||||
ERITREA = 'ER',
|
||||
WESTERN_SAHARA = 'EH',
|
||||
SPAIN = 'ES',
|
||||
ESTONIA = 'EE',
|
||||
ETHIOPIA = 'ET',
|
||||
FINLAND = 'FI',
|
||||
FIJI = 'FJ',
|
||||
FALKLAND_ISLANDS_MALVINAS = 'FK',
|
||||
FRANCE = 'FR',
|
||||
FAROE_ISLANDS = 'FO',
|
||||
MICRONESIA_FEDERATED_STATES_OF = 'FM',
|
||||
GABON = 'GA',
|
||||
UNITED_KINGDOM = 'GB',
|
||||
GEORGIA = 'GE',
|
||||
GUERNSEY = 'GG',
|
||||
GHANA = 'GH',
|
||||
GIBRALTAR = 'GI',
|
||||
GUINEA = 'GN',
|
||||
GUADELOUPE = 'GP',
|
||||
GAMBIA = 'GM',
|
||||
GUINEA_BISSAU = 'GW',
|
||||
EQUATORIAL_GUINEA = 'GQ',
|
||||
GREECE = 'GR',
|
||||
GRENADA = 'GD',
|
||||
GREENLAND = 'GL',
|
||||
GUATEMALA = 'GT',
|
||||
FRENCH_GUIANA = 'GF',
|
||||
GUAM = 'GU',
|
||||
GUYANA = 'GY',
|
||||
HONG_KONG = 'HK',
|
||||
HEARD_ISLAND_AND_MCDONALD_ISLANDS = 'HM',
|
||||
HONDURAS = 'HN',
|
||||
CROATIA = 'HR',
|
||||
HAITI = 'HT',
|
||||
HUNGARY = 'HU',
|
||||
INDONESIA = 'ID',
|
||||
ISLE_OF_MAN = 'IM',
|
||||
INDIA = 'IN',
|
||||
BRITISH_INDIAN_OCEAN_TERRITORY = 'IO',
|
||||
IRELAND = 'IE',
|
||||
IRAN_ISLAMIC_REPUBLIC_OF = 'IR',
|
||||
IRAQ = 'IQ',
|
||||
ICELAND = 'IS',
|
||||
ISRAEL = 'IL',
|
||||
ITALY = 'IT',
|
||||
JAMAICA = 'JM',
|
||||
JERSEY = 'JE',
|
||||
JORDAN = 'JO',
|
||||
JAPAN = 'JP',
|
||||
KAZAKHSTAN = 'KZ',
|
||||
KENYA = 'KE',
|
||||
KYRGYZSTAN = 'KG',
|
||||
CAMBODIA = 'KH',
|
||||
KIRIBATI = 'KI',
|
||||
SAINT_KITTS_AND_NEVIS = 'KN',
|
||||
KOREA_REPUBLIC_OF = 'KR',
|
||||
KUWAIT = 'KW',
|
||||
LAO_PEOPLES_DEMOCRATIC_REPUBLIC = 'LA',
|
||||
LEBANON = 'LB',
|
||||
LIBERIA = 'LR',
|
||||
LIBYA = 'LY',
|
||||
SAINT_LUCIA = 'LC',
|
||||
LIECHTENSTEIN = 'LI',
|
||||
SRI_LANKA = 'LK',
|
||||
LESOTHO = 'LS',
|
||||
LITHUANIA = 'LT',
|
||||
LUXEMBOURG = 'LU',
|
||||
LATVIA = 'LV',
|
||||
MACAO = 'MO',
|
||||
SAINT_MARTIN_FRENCH_PART = 'MF',
|
||||
MOROCCO = 'MA',
|
||||
MONACO = 'MC',
|
||||
MOLDOVA_REPUBLIC_OF = 'MD',
|
||||
MADAGASCAR = 'MG',
|
||||
MALDIVES = 'MV',
|
||||
MEXICO = 'MX',
|
||||
MARSHALL_ISLANDS = 'MH',
|
||||
NORTH_MACEDONIA = 'MK',
|
||||
MALI = 'ML',
|
||||
MALTA = 'MT',
|
||||
MYANMAR = 'MM',
|
||||
MONTENEGRO = 'ME',
|
||||
MONGOLIA = 'MN',
|
||||
NORTHERN_MARIANA_ISLANDS = 'MP',
|
||||
MOZAMBIQUE = 'MZ',
|
||||
MAURITANIA = 'MR',
|
||||
MONTSERRAT = 'MS',
|
||||
MARTINIQUE = 'MQ',
|
||||
MAURITIUS = 'MU',
|
||||
MALAWI = 'MW',
|
||||
MALAYSIA = 'MY',
|
||||
MAYOTTE = 'YT',
|
||||
NAMIBIA = 'NA',
|
||||
NEW_CALEDONIA = 'NC',
|
||||
NIGER = 'NE',
|
||||
NORFOLK_ISLAND = 'NF',
|
||||
NIGERIA = 'NG',
|
||||
NICARAGUA = 'NI',
|
||||
NIUE = 'NU',
|
||||
NETHERLANDS = 'NL',
|
||||
NORWAY = 'NO',
|
||||
NEPAL = 'NP',
|
||||
NAURU = 'NR',
|
||||
NEW_ZEALAND = 'NZ',
|
||||
OMAN = 'OM',
|
||||
PAKISTAN = 'PK',
|
||||
PANAMA = 'PA',
|
||||
PITCAIRN = 'PN',
|
||||
PERU = 'PE',
|
||||
PHILIPPINES = 'PH',
|
||||
PALAU = 'PW',
|
||||
PAPUA_NEW_GUINEA = 'PG',
|
||||
POLAND = 'PL',
|
||||
PUERTO_RICO = 'PR',
|
||||
KOREA_DEMOCRATIC_PEOPLES_REPUBLIC_OF = 'KP',
|
||||
PORTUGAL = 'PT',
|
||||
PARAGUAY = 'PY',
|
||||
PALESTINE_STATE_OF = 'PS',
|
||||
FRENCH_POLYNESIA = 'PF',
|
||||
QATAR = 'QA',
|
||||
REUNION = 'RE',
|
||||
ROMANIA = 'RO',
|
||||
RUSSIAN_FEDERATION = 'RU',
|
||||
RWANDA = 'RW',
|
||||
SAUDI_ARABIA = 'SA',
|
||||
SUDAN = 'SD',
|
||||
SENEGAL = 'SN',
|
||||
SINGAPORE = 'SG',
|
||||
SOUTH_GEORGIA_AND_THE_SOUTH_SANDWICH_ISLANDS = 'GS',
|
||||
SAINT_HELENA_ASCENSION_AND_TRISTAN_DA_CUNHA = 'SH',
|
||||
SVALBARD_AND_JAN_MAYEN = 'SJ',
|
||||
SOLOMON_ISLANDS = 'SB',
|
||||
SIERRA_LEONE = 'SL',
|
||||
EL_SALVADOR = 'SV',
|
||||
SAN_MARINO = 'SM',
|
||||
SOMALIA = 'SO',
|
||||
SAINT_PIERRE_AND_MIQUELON = 'PM',
|
||||
SERBIA = 'RS',
|
||||
SOUTH_SUDAN = 'SS',
|
||||
SAO_TOME_AND_PRINCIPE = 'ST',
|
||||
SURINAME = 'SR',
|
||||
SLOVAKIA = 'SK',
|
||||
SLOVENIA = 'SI',
|
||||
SWEDEN = 'SE',
|
||||
ESWATINI = 'SZ',
|
||||
SINT_MAARTEN_DUTCH_PART = 'SX',
|
||||
SEYCHELLES = 'SC',
|
||||
SYRIAN_ARAB_REPUBLIC = 'SY',
|
||||
TURKS_AND_CAICOS_ISLANDS = 'TC',
|
||||
CHAD = 'TD',
|
||||
TOGO = 'TG',
|
||||
THAILAND = 'TH',
|
||||
TAJIKISTAN = 'TJ',
|
||||
TOKELAU = 'TK',
|
||||
TURKMENISTAN = 'TM',
|
||||
TIMOR_LESTE = 'TL',
|
||||
TONGA = 'TO',
|
||||
TRINIDAD_AND_TOBAGO = 'TT',
|
||||
TUNISIA = 'TN',
|
||||
TURKEY = 'TR',
|
||||
TUVALU = 'TV',
|
||||
TAIWAN_PROVINCE_OF_CHINA = 'TW',
|
||||
TANZANIA_UNITED_REPUBLIC_OF = 'TZ',
|
||||
UGANDA = 'UG',
|
||||
UKRAINE = 'UA',
|
||||
UNITED_STATES_MINOR_OUTLYING_ISLANDS = 'UM',
|
||||
URUGUAY = 'UY',
|
||||
UNITED_STATES = 'US',
|
||||
UZBEKISTAN = 'UZ',
|
||||
HOLY_SEE_VATICAN_CITY_STATE = 'VA',
|
||||
SAINT_VINCENT_AND_THE_GRENADINES = 'VC',
|
||||
VENEZUELA_BOLIVARIAN_REPUBLIC_OF = 'VE',
|
||||
VIRGIN_ISLANDS_BRITISH = 'VG',
|
||||
VIRGIN_ISLANDS_US = 'VI',
|
||||
VIET_NAM = 'VN',
|
||||
VANUATU = 'VU',
|
||||
WALLIS_AND_FUTUNA = 'WF',
|
||||
SAMOA = 'WS',
|
||||
YEMEN = 'YE',
|
||||
SOUTH_AFRICA = 'ZA',
|
||||
ZAMBIA = 'ZM',
|
||||
ZIMBABWE = 'ZW',
|
||||
}
|
||||
1
src/common/enums/index.ts
Normal file
1
src/common/enums/index.ts
Normal file
@ -0,0 +1 @@
|
||||
export * from './countries-iso.enum';
|
||||
750
src/common/modules/neoleap/__mocks__/create-application.mock.ts
Normal file
750
src/common/modules/neoleap/__mocks__/create-application.mock.ts
Normal file
@ -0,0 +1,750 @@
|
||||
export const CREATE_APPLICATION_MOCK = {
|
||||
ResponseHeader: {
|
||||
Version: '1.0.0',
|
||||
MsgUid: 'adaa1893-9f95-48a8-b7a1-0422bcf629b5',
|
||||
Source: 'ZOD',
|
||||
ServiceId: 'CreateNewApplication',
|
||||
ReqDateTime: '2025-06-03T07:32:16.304Z',
|
||||
RspDateTime: '2025-06-03T08:21:15.662',
|
||||
ResponseCode: '000',
|
||||
ResponseType: 'Success',
|
||||
ProcessingTime: 1665,
|
||||
EncryptionKey: null,
|
||||
ResponseDescription: 'Operation Successful',
|
||||
LocalizedResponseDescription: null,
|
||||
CustomerSpecificResponseDescriptionList: null,
|
||||
HeaderUserDataList: null,
|
||||
},
|
||||
|
||||
CreateNewApplicationResponseDetails: {
|
||||
InstitutionCode: '1100',
|
||||
ApplicationTypeDetails: {
|
||||
TypeCode: '01',
|
||||
Description: 'Normal Primary',
|
||||
Additional: false,
|
||||
Corporate: false,
|
||||
UserData: null,
|
||||
},
|
||||
ApplicationDetails: {
|
||||
cif: null,
|
||||
ApplicationNumber: '3300000000073',
|
||||
ExternalApplicationNumber: '3',
|
||||
ApplicationStatus: '04',
|
||||
Organization: 0,
|
||||
Product: '1101',
|
||||
ApplicatonDate: '2025-05-29',
|
||||
ApplicationSource: 'O',
|
||||
SalesSource: null,
|
||||
DeliveryMethod: 'V',
|
||||
ProgramCode: null,
|
||||
Campaign: null,
|
||||
Plastic: null,
|
||||
Design: null,
|
||||
ProcessStage: '99',
|
||||
ProcessStageStatus: 'S',
|
||||
Score: null,
|
||||
ExternalScore: null,
|
||||
RequestedLimit: 0,
|
||||
SuggestedLimit: null,
|
||||
AssignedLimit: 0,
|
||||
AllowedLimitList: null,
|
||||
EligibilityCheckResult: '00',
|
||||
EligibilityCheckDescription: null,
|
||||
Title: 'Mr.',
|
||||
FirstName: 'Abdalhamid',
|
||||
SecondName: null,
|
||||
ThirdName: null,
|
||||
LastName: ' Ahmad',
|
||||
FullName: 'Abdalhamid Ahmad',
|
||||
EmbossName: 'ABDALHAMID AHMAD',
|
||||
PlaceOfBirth: null,
|
||||
DateOfBirth: '1999-01-07',
|
||||
LocalizedDateOfBirth: '1999-01-07',
|
||||
Age: 26,
|
||||
Gender: 'M',
|
||||
Married: 'U',
|
||||
Nationality: '682',
|
||||
IdType: '01',
|
||||
IdNumber: '1089055972',
|
||||
IdExpiryDate: '2031-09-17',
|
||||
EducationLevel: null,
|
||||
ProfessionCode: 0,
|
||||
NumberOfDependents: 0,
|
||||
EmployerName: 'N/A',
|
||||
EmploymentYears: 0,
|
||||
EmploymentMonths: 0,
|
||||
EmployerPhoneArea: null,
|
||||
EmployerPhoneNumber: null,
|
||||
EmployerPhoneExtension: null,
|
||||
EmployerMobile: null,
|
||||
EmployerFaxArea: null,
|
||||
EmployerFax: null,
|
||||
EmployerCity: null,
|
||||
EmployerAddress: null,
|
||||
EmploymentActivity: null,
|
||||
EmploymentStatus: null,
|
||||
CIF: null,
|
||||
BankAccountNumber: ' ',
|
||||
Currency: {
|
||||
CurrCode: '682',
|
||||
AlphaCode: 'SAR',
|
||||
},
|
||||
RequestedCurrencyList: null,
|
||||
CreditAccountNumber: '6000000000000000',
|
||||
AccountType: '30',
|
||||
OpenDate: null,
|
||||
Income: 0,
|
||||
AdditionalIncome: 0,
|
||||
TotalIncome: 0,
|
||||
CurrentBalance: 0,
|
||||
AverageBalance: 0,
|
||||
AssetsBalance: 0,
|
||||
InsuranceBalance: 0,
|
||||
DepositAmount: 0,
|
||||
GuarenteeAccountNumber: null,
|
||||
GuarenteeAmount: 0,
|
||||
InstalmentAmount: 0,
|
||||
AutoDebit: 'N',
|
||||
PaymentMethod: '2',
|
||||
BillingCycle: 'C1',
|
||||
OldIssueDate: null,
|
||||
OtherPaymentsDate: null,
|
||||
MaximumDelinquency: null,
|
||||
CreditBureauDecision: null,
|
||||
CreditBureauUserData: null,
|
||||
ECommerce: 'N',
|
||||
NumberOfCards: 0,
|
||||
OtherBank: null,
|
||||
OtherBankDescription: null,
|
||||
InsuranceProduct: null,
|
||||
SocialCode: '000',
|
||||
JobGrade: 0,
|
||||
Flags: [
|
||||
{
|
||||
Position: 1,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 2,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 3,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 4,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 5,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 6,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 7,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 8,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 9,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 10,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 11,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 12,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 13,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 14,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 15,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 16,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 17,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 18,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 19,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 20,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 21,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 22,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 23,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 24,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 25,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 26,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 27,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 28,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 29,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 30,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 31,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 32,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 33,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 34,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 35,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 36,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 37,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 38,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 39,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 40,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 41,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 42,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 43,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 44,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 45,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 46,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 47,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 48,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 49,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 50,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 51,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 52,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 53,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 54,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 55,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 56,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 57,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 58,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 59,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 60,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 61,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 62,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 63,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 64,
|
||||
Value: '0',
|
||||
},
|
||||
],
|
||||
CheckFlags: [
|
||||
{
|
||||
Position: 1,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 2,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 3,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 4,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 5,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 6,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 7,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 8,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 9,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 10,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 11,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 12,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 13,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 14,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 15,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 16,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 17,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 18,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 19,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 20,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 21,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 22,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 23,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 24,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 25,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 26,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 27,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 28,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 29,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 30,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 31,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 32,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 33,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 34,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 35,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 36,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 37,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 38,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 39,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 40,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 41,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 42,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 43,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 44,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 45,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 46,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 47,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 48,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 49,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 50,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 51,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 52,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 53,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 54,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 55,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 56,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 57,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 58,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 59,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 60,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 61,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 62,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 63,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 64,
|
||||
Value: '0',
|
||||
},
|
||||
],
|
||||
Maker: null,
|
||||
Checker: null,
|
||||
ReferredTo: null,
|
||||
ReferralReason: null,
|
||||
UserData1: null,
|
||||
UserData2: null,
|
||||
UserData3: null,
|
||||
UserData4: null,
|
||||
UserData5: null,
|
||||
AdditionalFields: [],
|
||||
},
|
||||
ApplicationStatusDetails: {
|
||||
StatusCode: '04',
|
||||
Description: 'Approved',
|
||||
Canceled: false,
|
||||
},
|
||||
CorporateDetails: null,
|
||||
CustomerDetails: {
|
||||
Id: 115158,
|
||||
CustomerCode: '100000024619',
|
||||
IdNumber: ' ',
|
||||
TypeId: 0,
|
||||
PreferredLanguage: 'EN',
|
||||
ExternalCustomerCode: null,
|
||||
Title: ' ',
|
||||
FirstName: ' ',
|
||||
LastName: ' ',
|
||||
DateOfBirth: null,
|
||||
UserData1: '2031-09-17',
|
||||
UserData2: '01',
|
||||
UserData3: null,
|
||||
UserData4: '682',
|
||||
CustomerSegment: null,
|
||||
Gender: 'U',
|
||||
Married: 'U',
|
||||
},
|
||||
AccountDetailsList: [
|
||||
{
|
||||
Id: 21017,
|
||||
InstitutionCode: '1100',
|
||||
AccountNumber: '6899999999999999',
|
||||
Currency: {
|
||||
CurrCode: '682',
|
||||
AlphaCode: 'SAR',
|
||||
},
|
||||
AccountTypeCode: '30',
|
||||
ClassId: '2',
|
||||
AccountStatus: '00',
|
||||
VipFlag: '0',
|
||||
BlockedAmount: 0,
|
||||
EquivalentBlockedAmount: null,
|
||||
UnclearCredit: 0,
|
||||
EquivalentUnclearCredit: null,
|
||||
AvailableBalance: 0,
|
||||
EquivalentAvailableBalance: null,
|
||||
AvailableBalanceToSpend: 0,
|
||||
CreditLimit: 0,
|
||||
RemainingCashLimit: null,
|
||||
UserData1: 'D36407C9AE4C28D2185',
|
||||
UserData2: null,
|
||||
UserData3: 'D36407C9AE4C28D2185',
|
||||
UserData4: null,
|
||||
UserData5: 'SA2380900000752991120011',
|
||||
},
|
||||
],
|
||||
CardDetailsList: [
|
||||
{
|
||||
pvv: null,
|
||||
ResponseCardIdentifier: {
|
||||
Id: 28595,
|
||||
Pan: 'DDDDDDDDDDDDDDDDDDD',
|
||||
MaskedPan: '999999_9999',
|
||||
VPan: '1100000000000000',
|
||||
Seqno: 0,
|
||||
},
|
||||
ExpiryDate: '2031-09-30',
|
||||
EffectiveDate: '2025-06-02',
|
||||
CardStatus: '30',
|
||||
OldPlasticExpiryDate: null,
|
||||
OldPlasticCardStatus: null,
|
||||
EmbossingName: 'ABDALHAMID AHMAD',
|
||||
Title: 'Mr.',
|
||||
FirstName: 'Abdalhamid',
|
||||
LastName: ' Ahmad',
|
||||
Additional: false,
|
||||
BatchNumber: 8849,
|
||||
ServiceCode: '226',
|
||||
Kinship: null,
|
||||
DateOfBirth: '1999-01-07',
|
||||
LastActivity: null,
|
||||
LastStatusChangeDate: '2025-06-03',
|
||||
ActivationDate: null,
|
||||
DateLastIssued: null,
|
||||
PVV: null,
|
||||
UserData: '4',
|
||||
UserData1: '3',
|
||||
UserData2: null,
|
||||
UserData3: null,
|
||||
UserData4: null,
|
||||
UserData5: null,
|
||||
Memo: null,
|
||||
CardAuthorizationParameters: null,
|
||||
L10NTitle: null,
|
||||
L10NFirstName: null,
|
||||
L10NLastName: null,
|
||||
PinStatus: '40',
|
||||
OldPinStatus: '0',
|
||||
CustomerIdNumber: '1089055972',
|
||||
Language: 0,
|
||||
},
|
||||
],
|
||||
},
|
||||
};
|
||||
2
src/common/modules/neoleap/__mocks__/index.ts
Normal file
2
src/common/modules/neoleap/__mocks__/index.ts
Normal file
@ -0,0 +1,2 @@
|
||||
export * from './create-application.mock';
|
||||
export * from './inquire-application.mock';
|
||||
728
src/common/modules/neoleap/__mocks__/inquire-application.mock.ts
Normal file
728
src/common/modules/neoleap/__mocks__/inquire-application.mock.ts
Normal file
@ -0,0 +1,728 @@
|
||||
export const INQUIRE_APPLICATION_MOCK = {
|
||||
ResponseHeader: {
|
||||
Version: '1.0.0',
|
||||
MsgUid: 'adaa1893-9f95-48a8-b7a1-0422bcf629b4',
|
||||
Source: 'ZOD',
|
||||
ServiceId: 'InquireApplication',
|
||||
ReqDateTime: '2023-07-18T10:34:12.553Z',
|
||||
RspDateTime: '2025-06-03T11:14:54.748',
|
||||
ResponseCode: '000',
|
||||
ResponseType: 'Success',
|
||||
ProcessingTime: 476,
|
||||
EncryptionKey: null,
|
||||
ResponseDescription: 'Operation Successful',
|
||||
LocalizedResponseDescription: null,
|
||||
CustomerSpecificResponseDescriptionList: null,
|
||||
HeaderUserDataList: null,
|
||||
},
|
||||
InquireApplicationResponseDetails: {
|
||||
InstitutionCode: '1100',
|
||||
ApplicationTypeDetails: {
|
||||
TypeCode: '01',
|
||||
Description: 'Normal Primary',
|
||||
Additional: false,
|
||||
Corporate: false,
|
||||
UserData: null,
|
||||
},
|
||||
ApplicationDetails: {
|
||||
cif: null,
|
||||
ApplicationNumber: '3300000000070',
|
||||
ExternalApplicationNumber: '10000002',
|
||||
ApplicationStatus: '04',
|
||||
Organization: 0,
|
||||
Product: '1101',
|
||||
ApplicatonDate: '2025-05-29',
|
||||
ApplicationSource: 'O',
|
||||
SalesSource: null,
|
||||
DeliveryMethod: 'V',
|
||||
ProgramCode: null,
|
||||
Campaign: null,
|
||||
Plastic: null,
|
||||
Design: null,
|
||||
ProcessStage: '99',
|
||||
ProcessStageStatus: 'S',
|
||||
Score: null,
|
||||
ExternalScore: null,
|
||||
RequestedLimit: 0,
|
||||
SuggestedLimit: null,
|
||||
AssignedLimit: 0,
|
||||
AllowedLimitList: null,
|
||||
EligibilityCheckResult: '00',
|
||||
EligibilityCheckDescription: null,
|
||||
Title: 'Mr.',
|
||||
FirstName: 'Abdalhamid',
|
||||
SecondName: null,
|
||||
ThirdName: null,
|
||||
LastName: ' Ahmad',
|
||||
FullName: 'Abdalhamid Ahmad',
|
||||
EmbossName: 'ABDALHAMID AHMAD',
|
||||
PlaceOfBirth: null,
|
||||
DateOfBirth: '1999-01-07',
|
||||
LocalizedDateOfBirth: '1999-01-07',
|
||||
Age: 26,
|
||||
Gender: 'M',
|
||||
Married: 'U',
|
||||
Nationality: '682',
|
||||
IdType: '01',
|
||||
IdNumber: '1089055972',
|
||||
IdExpiryDate: '2031-09-17',
|
||||
EducationLevel: null,
|
||||
ProfessionCode: 0,
|
||||
NumberOfDependents: 0,
|
||||
EmployerName: 'N/A',
|
||||
EmploymentYears: 0,
|
||||
EmploymentMonths: 0,
|
||||
EmployerPhoneArea: null,
|
||||
EmployerPhoneNumber: null,
|
||||
EmployerPhoneExtension: null,
|
||||
EmployerMobile: null,
|
||||
EmployerFaxArea: null,
|
||||
EmployerFax: null,
|
||||
EmployerCity: null,
|
||||
EmployerAddress: null,
|
||||
EmploymentActivity: null,
|
||||
EmploymentStatus: null,
|
||||
CIF: null,
|
||||
BankAccountNumber: ' ',
|
||||
Currency: {
|
||||
CurrCode: '682',
|
||||
AlphaCode: 'SAR',
|
||||
},
|
||||
RequestedCurrencyList: null,
|
||||
CreditAccountNumber: '6823000000000019',
|
||||
AccountType: '30',
|
||||
OpenDate: null,
|
||||
Income: 0,
|
||||
AdditionalIncome: 0,
|
||||
TotalIncome: 0,
|
||||
CurrentBalance: 0,
|
||||
AverageBalance: 0,
|
||||
AssetsBalance: 0,
|
||||
InsuranceBalance: 0,
|
||||
DepositAmount: 0,
|
||||
GuarenteeAccountNumber: null,
|
||||
GuarenteeAmount: 0,
|
||||
InstalmentAmount: 0,
|
||||
AutoDebit: 'N',
|
||||
PaymentMethod: '2',
|
||||
BillingCycle: 'C1',
|
||||
OldIssueDate: null,
|
||||
OtherPaymentsDate: null,
|
||||
MaximumDelinquency: null,
|
||||
CreditBureauDecision: null,
|
||||
CreditBureauUserData: null,
|
||||
ECommerce: 'N',
|
||||
NumberOfCards: 0,
|
||||
OtherBank: null,
|
||||
OtherBankDescription: null,
|
||||
InsuranceProduct: null,
|
||||
SocialCode: '000',
|
||||
JobGrade: 0,
|
||||
Flags: [
|
||||
{
|
||||
Position: 1,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 2,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 3,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 4,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 5,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 6,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 7,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 8,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 9,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 10,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 11,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 12,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 13,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 14,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 15,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 16,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 17,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 18,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 19,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 20,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 21,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 22,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 23,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 24,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 25,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 26,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 27,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 28,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 29,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 30,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 31,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 32,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 33,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 34,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 35,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 36,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 37,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 38,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 39,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 40,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 41,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 42,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 43,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 44,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 45,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 46,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 47,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 48,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 49,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 50,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 51,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 52,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 53,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 54,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 55,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 56,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 57,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 58,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 59,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 60,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 61,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 62,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 63,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 64,
|
||||
Value: '0',
|
||||
},
|
||||
],
|
||||
CheckFlags: [
|
||||
{
|
||||
Position: 1,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 2,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 3,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 4,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 5,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 6,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 7,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 8,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 9,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 10,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 11,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 12,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 13,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 14,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 15,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 16,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 17,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 18,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 19,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 20,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 21,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 22,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 23,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 24,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 25,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 26,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 27,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 28,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 29,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 30,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 31,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 32,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 33,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 34,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 35,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 36,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 37,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 38,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 39,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 40,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 41,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 42,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 43,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 44,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 45,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 46,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 47,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 48,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 49,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 50,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 51,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 52,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 53,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 54,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 55,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 56,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 57,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 58,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 59,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 60,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 61,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 62,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 63,
|
||||
Value: '0',
|
||||
},
|
||||
{
|
||||
Position: 64,
|
||||
Value: '0',
|
||||
},
|
||||
],
|
||||
Maker: null,
|
||||
Checker: null,
|
||||
ReferredTo: null,
|
||||
ReferralReason: null,
|
||||
UserData1: null,
|
||||
UserData2: null,
|
||||
UserData3: null,
|
||||
UserData4: null,
|
||||
UserData5: null,
|
||||
AdditionalFields: [],
|
||||
},
|
||||
ApplicationStatusDetails: {
|
||||
StatusCode: '04',
|
||||
Description: 'Approved',
|
||||
Canceled: false,
|
||||
},
|
||||
ApplicationHistoryList: null,
|
||||
ApplicationAddressList: [
|
||||
{
|
||||
Id: 43859,
|
||||
AddressLine1: '5536 abdullah Ibn al zubair ',
|
||||
AddressLine2: ' Umm Alarad Dist.',
|
||||
AddressLine3: null,
|
||||
AddressLine4: null,
|
||||
AddressLine5: null,
|
||||
Directions: null,
|
||||
City: 'AT TAIF',
|
||||
PostalCode: null,
|
||||
Province: null,
|
||||
Territory: null,
|
||||
State: null,
|
||||
Region: null,
|
||||
County: null,
|
||||
Country: '682',
|
||||
CountryDetails: {
|
||||
IsoCode: '682',
|
||||
Alpha3: 'SAU',
|
||||
Alpha2: 'SA',
|
||||
DefaultCurrency: {
|
||||
CurrCode: '682',
|
||||
AlphaCode: 'SAR',
|
||||
},
|
||||
Description: [
|
||||
{
|
||||
Language: 'EN',
|
||||
Description: 'SAUDI ARABIA',
|
||||
},
|
||||
{
|
||||
Language: 'GB',
|
||||
Description: 'SAUDI ARABIA',
|
||||
},
|
||||
],
|
||||
},
|
||||
Phone1: '+966541884784',
|
||||
Phone2: null,
|
||||
Extension: null,
|
||||
Email: 'a.ahmad@zod-alkhair.com',
|
||||
Fax: null,
|
||||
District: null,
|
||||
PoBox: null,
|
||||
OwnershipType: 'O',
|
||||
UserData1: null,
|
||||
UserData2: null,
|
||||
AddressRole: 0,
|
||||
AddressCustomValues: null,
|
||||
},
|
||||
],
|
||||
CorporateDetails: null,
|
||||
CustomerDetails: {
|
||||
Id: 115129,
|
||||
CustomerCode: '100000024552',
|
||||
IdNumber: ' ',
|
||||
TypeId: 0,
|
||||
PreferredLanguage: 'EN',
|
||||
ExternalCustomerCode: null,
|
||||
Title: ' ',
|
||||
FirstName: ' ',
|
||||
LastName: ' ',
|
||||
DateOfBirth: null,
|
||||
UserData1: '2031-09-17',
|
||||
UserData2: '01',
|
||||
UserData3: null,
|
||||
UserData4: '682',
|
||||
CustomerSegment: null,
|
||||
Gender: 'U',
|
||||
Married: 'U',
|
||||
},
|
||||
|
||||
BranchDetails: null,
|
||||
CardAccountLinkageList: null,
|
||||
},
|
||||
};
|
||||
@ -0,0 +1,29 @@
|
||||
import { Body, Controller, Post } from '@nestjs/common';
|
||||
import { ApiTags } from '@nestjs/swagger';
|
||||
import {
|
||||
AccountCardStatusChangedWebhookRequest,
|
||||
AccountTransactionWebhookRequest,
|
||||
CardTransactionWebhookRequest,
|
||||
} from '../dtos/requests';
|
||||
import { NeoLeapWebhookService } from '../services';
|
||||
|
||||
@Controller('neoleap-webhooks')
|
||||
@ApiTags('Neoleap Webhooks')
|
||||
export class NeoLeapWebhooksController {
|
||||
constructor(private readonly neoleapWebhookService: NeoLeapWebhookService) {}
|
||||
|
||||
@Post('card-transaction')
|
||||
async handleCardTransactionWebhook(@Body() body: CardTransactionWebhookRequest) {
|
||||
return this.neoleapWebhookService.handleCardTransactionWebhook(body);
|
||||
}
|
||||
|
||||
@Post('account-transaction')
|
||||
async handleAccountTransactionWebhook(@Body() body: AccountTransactionWebhookRequest) {
|
||||
return this.neoleapWebhookService.handleAccountTransactionWebhook(body);
|
||||
}
|
||||
|
||||
@Post('account-card-status-changed')
|
||||
async handleAccountCardStatusChangedWebhook(@Body() body: AccountCardStatusChangedWebhookRequest) {
|
||||
return this.neoleapWebhookService.handleAccountCardStatusChangedWebhook(body);
|
||||
}
|
||||
}
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user