diff --git a/package.json b/package.json index f3c96218..879bcacf 100644 --- a/package.json +++ b/package.json @@ -24,7 +24,7 @@ "eslint-config-next": "13.2.4", "form-data": "^4.0.0", "jwt-decode": "^3.1.2", - "le-coffre-resources": "git@github.com:smart-chain-fr/leCoffre-resources.git#v2.68", + "le-coffre-resources": "git@github.com:smart-chain-fr/leCoffre-resources.git#v2.71", "next": "13.2.4", "prettier": "^2.8.7", "react": "18.2.0", @@ -33,5 +33,7 @@ "sass": "^1.59.2", "sharp": "^0.32.1", "typescript": "4.9.5" + }, + "devDependencies": { } } diff --git a/src/front/Api/Auth/IdNot/User.ts b/src/front/Api/Auth/IdNot/User.ts index 7e1643fc..96c54a77 100644 --- a/src/front/Api/Auth/IdNot/User.ts +++ b/src/front/Api/Auth/IdNot/User.ts @@ -2,7 +2,7 @@ import BaseApiService from "@Front/Api/BaseApiService"; export default class User extends BaseApiService { private static instance: User; - private readonly baseURl = this.getBaseUrl().concat("/idnot/user"); + private readonly baseURl = `${this.getBaseUrl()}/idnot/user`; private constructor() { super(); @@ -17,7 +17,18 @@ export default class User extends BaseApiService { } public async login(uid: string) { - const url = new URL(this.baseURl.concat("/login/").concat(uid)); + const url = new URL(`${this.baseURl}/login/${uid}`); + try { + return await this.postRequest(url); + } catch (err) { + this.onError(err); + return Promise.reject(err); + } + } + + public async verifyJwt(jwt: string) { + console.log(this.baseURl); + const url = new URL(`${this.baseURl}/verify-token/${jwt}`); try { return await this.postRequest(url); } catch (err) { @@ -27,7 +38,7 @@ export default class User extends BaseApiService { } public async refreshToken(refreshToken: string): Promise<{ accessToken: string }> { - const url = new URL(this.baseURl.concat("/refresh-token")); + const url = new URL(`${this.baseURl}/refresh-token`); try { return await this.postRequest(url, {}, refreshToken); } catch (err) { diff --git a/src/front/Api/BaseApiService.ts b/src/front/Api/BaseApiService.ts index 003a902d..cd6e75d7 100644 --- a/src/front/Api/BaseApiService.ts +++ b/src/front/Api/BaseApiService.ts @@ -11,13 +11,13 @@ export default abstract class BaseApiService { protected constructor() { BaseApiService.baseUrl ??= - FrontendVariables.getInstance().BACK_API_PROTOCOL + - FrontendVariables.getInstance().BACK_API_HOST + - FrontendVariables.getInstance().BACK_API_ROOT_URL + - FrontendVariables.getInstance().BACK_API_VERSION; + this.variables.BACK_API_PROTOCOL + + this.variables.BACK_API_HOST + + this.variables.BACK_API_ROOT_URL + + this.variables.BACK_API_VERSION; } - protected getBaseUrl() { + protected getBaseUrl(): string { return BaseApiService.baseUrl; } diff --git a/src/front/Api/LeCoffreApi/Admin/DocumentTypes/DocumentTypes.ts b/src/front/Api/LeCoffreApi/Admin/DocumentTypes/DocumentTypes.ts index 05003ce4..67851626 100644 --- a/src/front/Api/LeCoffreApi/Admin/DocumentTypes/DocumentTypes.ts +++ b/src/front/Api/LeCoffreApi/Admin/DocumentTypes/DocumentTypes.ts @@ -1,4 +1,4 @@ -import { DocumentType } from "le-coffre-resources/dist/SuperAdmin"; +import { DocumentType } from "le-coffre-resources/dist/Admin"; import BaseAdmin from "../BaseAdmin"; diff --git a/src/front/Api/LeCoffreApi/Notary/Customers/Customers.ts b/src/front/Api/LeCoffreApi/Notary/Customers/Customers.ts new file mode 100644 index 00000000..c6c3918e --- /dev/null +++ b/src/front/Api/LeCoffreApi/Notary/Customers/Customers.ts @@ -0,0 +1,90 @@ +import { Contact, Customer } from "le-coffre-resources/dist/Notary"; + +import BaseNotary from "../BaseNotary"; +import { ECivility } from "le-coffre-resources/dist/Customer/Contact"; + +// TODO Type get query params -> Where + inclue + orderby +export interface IGetCustomersparams { + where?: {}; + include?: {}; +} + +// TODO Type getbyuid query params + +export type IPutCustomersParams = { + uid?: Customer["uid"]; + contact?: Customer["contact"]; +}; + +export interface IPostCustomersParams { + first_name: string; + last_name: string; + email: string; + cell_phone_number: string; + civility: ECivility; + address?: Contact["address"]; +} + +export default class Customers extends BaseNotary { + private static instance: Customers; + private readonly baseURl = this.namespaceUrl.concat("/customers"); + + private constructor() { + super(); + } + + public static getInstance() { + if (!this.instance) { + return new this(); + } else { + return this.instance; + } + } + + public async get(q: IGetCustomersparams): Promise { + const url = new URL(this.baseURl); + const query = { q }; + Object.entries(query).forEach(([key, value]) => url.searchParams.set(key, JSON.stringify(value))); + try { + return await this.getRequest(url); + } catch (err) { + this.onError(err); + return Promise.reject(err); + } + } + + /** + * @description : Create a Customer + */ + public async post(body: any): Promise { + const url = new URL(this.baseURl); + try { + return await this.postRequest(url, body); + } catch (err) { + this.onError(err); + return Promise.reject(err); + } + } + + public async getByUid(uid: string, q?: any): Promise { + const url = new URL(this.baseURl.concat(`/${uid}`)); + const query = { q }; + if (q) Object.entries(query).forEach(([key, value]) => url.searchParams.set(key, JSON.stringify(value))); + try { + return await this.getRequest(url); + } catch (err) { + this.onError(err); + return Promise.reject(err); + } + } + + public async put(uid: string, body: IPutCustomersParams): Promise { + const url = new URL(this.baseURl.concat(`/${uid}`)); + try { + return await this.putRequest(url, body); + } catch (err) { + this.onError(err); + return Promise.reject(err); + } + } +} diff --git a/src/front/Api/LeCoffreApi/Notary/DeedTypes/DeedTypes.ts b/src/front/Api/LeCoffreApi/Notary/DeedTypes/DeedTypes.ts new file mode 100644 index 00000000..e4889a18 --- /dev/null +++ b/src/front/Api/LeCoffreApi/Notary/DeedTypes/DeedTypes.ts @@ -0,0 +1,84 @@ +import { DeedType } from "le-coffre-resources/dist/Notary"; + +import BaseNotary from "../BaseNotary"; + +export type IPutDeedTypesParams = { + uid?: DeedType["uid"]; + name?: DeedType["name"]; + description?: DeedType["description"]; + deed?: DeedType["deed"]; + office?: DeedType["office"]; + archived_at?: DeedType["archived_at"]; + document_types?: DeedType["document_types"]; +}; + +export type IPostDeedTypesParams = { + name?: DeedType["name"]; + description?: DeedType["description"]; +}; + +export type IGetDeedTypesParams = { + where?: {}; + include?: {}; + select?: {}; +}; + +export default class DeedTypes extends BaseNotary { + private static instance: DeedTypes; + private readonly baseURl = this.namespaceUrl.concat("/deed-types"); + + private constructor() { + super(); + } + + public static getInstance() { + if (!this.instance) { + return new DeedTypes(); + } else { + return this.instance; + } + } + + public async get(q?: IGetDeedTypesParams): Promise { + const url = new URL(this.baseURl); + const query = { q }; + Object.entries(query).forEach(([key, value]) => url.searchParams.set(key, JSON.stringify(value))); + try { + return await this.getRequest(url); + } catch (err) { + this.onError(err); + return Promise.reject(err); + } + } + + public async getByUid(uid: string, q?: any): Promise { + const url = new URL(this.baseURl.concat(`/${uid}`)); + if (q) Object.entries(q).forEach(([key, value]) => url.searchParams.set(key, JSON.stringify(value))); + try { + return await this.getRequest(url); + } catch (err) { + this.onError(err); + return Promise.reject(err); + } + } + + public async put(uid: string, body: IPutDeedTypesParams) { + const url = new URL(this.baseURl.concat(`/${uid}`)); + try { + return await this.putRequest(url, body); + } catch (err) { + this.onError(err); + return Promise.reject(err); + } + } + + public async post(body: IPostDeedTypesParams) { + const url = new URL(this.baseURl); + try { + return await this.postRequest(url, body); + } catch (err) { + this.onError(err); + return Promise.reject(err); + } + } +} \ No newline at end of file diff --git a/src/front/Api/LeCoffreApi/Notary/Deeds/Deeds.ts b/src/front/Api/LeCoffreApi/Notary/Deeds/Deeds.ts new file mode 100644 index 00000000..6e4c4dba --- /dev/null +++ b/src/front/Api/LeCoffreApi/Notary/Deeds/Deeds.ts @@ -0,0 +1,72 @@ +import { Deed, OfficeFolder } from "le-coffre-resources/dist/Notary"; + +import BaseAdmin from "../BaseNotary"; + +export type IGetDeedsParams = { + where?: {}; + include?: {}; + select?: {}; +}; + +export type IPutDeedsParams = { + uid?: OfficeFolder["uid"]; + folder_number?: OfficeFolder["folder_number"]; + name?: OfficeFolder["name"]; + description?: OfficeFolder["description"]; + archived_description?: OfficeFolder["archived_description"]; + status?: OfficeFolder["status"]; + document_types?: Deed["document_types"]; +}; + +export default class Deeds extends BaseAdmin { + private static instance: Deeds; + private readonly baseURl = this.namespaceUrl.concat("/deeds"); + + private constructor() { + super(); + } + + public static getInstance() { + if (!this.instance) { + return new Deeds(); + } else { + return this.instance; + } + } + + public async get(q: IGetDeedsParams): Promise { + const url = new URL(this.baseURl); + const query = { q }; + Object.entries(query).forEach(([key, value]) => url.searchParams.set(key, JSON.stringify(value))); + try { + return await this.getRequest(url); + } catch (err) { + this.onError(err); + return Promise.reject(err); + } + } + + public async getByUid(uid: string, q?: any): Promise { + const url = new URL(this.baseURl.concat(`/${uid}`)); + if (q) Object.entries(q).forEach(([key, value]) => url.searchParams.set(key, JSON.stringify(value))); + try { + return await this.getRequest(url); + } catch (err) { + this.onError(err); + return Promise.reject(err); + } + } + + /** + * @description : Update the folder description + */ + public async put(uid: string, body: IPutDeedsParams): Promise { + const url = new URL(this.baseURl.concat(`/${uid}`)); + try { + return await this.putRequest(url, body); + } catch (err) { + this.onError(err); + return Promise.reject(err); + } + } +} diff --git a/src/front/Api/LeCoffreApi/Notary/DocumentTypes/DocumentTypes.ts b/src/front/Api/LeCoffreApi/Notary/DocumentTypes/DocumentTypes.ts new file mode 100644 index 00000000..3737ddf3 --- /dev/null +++ b/src/front/Api/LeCoffreApi/Notary/DocumentTypes/DocumentTypes.ts @@ -0,0 +1,86 @@ +import { DocumentType } from "le-coffre-resources/dist/Notary"; + +import BaseNotary from "../BaseNotary"; + +// TODO Type get query params -> Where + inclue + orderby +export interface IGetDocumentTypesparams { + where?: {}; + include?: {}; +} + +// TODO Type getbyuid query params + +export type IPutDocumentTypesParams = {}; + +export interface IPostDocumentTypesParams { + name: string; + public_description: string; + private_description: string | null; + office?: { + uid?: string; + }; +} + +export default class DocumentTypes extends BaseNotary { + private static instance: DocumentTypes; + private readonly baseURl = this.namespaceUrl.concat("/document-types"); + + private constructor() { + super(); + } + + public static getInstance() { + if (!this.instance) { + return new this(); + } else { + return this.instance; + } + } + + public async get(q: IGetDocumentTypesparams): Promise { + const url = new URL(this.baseURl); + const query = { q }; + if (q) Object.entries(query).forEach(([key, value]) => url.searchParams.set(key, JSON.stringify(value))); + try { + return await this.getRequest(url); + } catch (err) { + this.onError(err); + return Promise.reject(err); + } + } + + /** + * @description : Create a Document + */ + public async post(body: IPostDocumentTypesParams): Promise { + const url = new URL(this.baseURl); + try { + return await this.postRequest(url, body as any); + } catch (err) { + this.onError(err); + return Promise.reject(err); + } + } + + public async getByUid(uid: string, q?: any): Promise { + const url = new URL(this.baseURl.concat(`/${uid}`)); + const query = { q }; + if (q) Object.entries(query).forEach(([key, value]) => url.searchParams.set(key, JSON.stringify(value))); + try { + return await this.getRequest(url); + } catch (err) { + this.onError(err); + return Promise.reject(err); + } + } + + public async put(uid: string, body: IPutDocumentTypesParams): Promise { + const url = new URL(this.baseURl.concat(`/${uid}`)); + try { + return await this.putRequest(url, body); + } catch (err) { + this.onError(err); + return Promise.reject(err); + } + } +} diff --git a/src/front/Api/LeCoffreApi/Notary/Documents/Documents.ts b/src/front/Api/LeCoffreApi/Notary/Documents/Documents.ts new file mode 100644 index 00000000..45e68b9e --- /dev/null +++ b/src/front/Api/LeCoffreApi/Notary/Documents/Documents.ts @@ -0,0 +1,93 @@ +import { EDocumentStatus } from "le-coffre-resources/dist/Customer/Document"; +import { Document } from "le-coffre-resources/dist/Notary"; + +import BaseNotary from "../BaseNotary"; + +// TODO Type get query params -> Where + inclue + orderby +export interface IGetDocumentsparams { + where?: {}; + include?: {}; +} + +// TODO Type getbyuid query params + +export type IPutDocumentsParams = { + document_status?: EDocumentStatus; + refused_reason?: string; +}; + +export interface IPostDocumentsParams {} + +export default class Documents extends BaseNotary { + private static instance: Documents; + private readonly baseURl = this.namespaceUrl.concat("/documents"); + + private constructor() { + super(); + } + + public static getInstance() { + if (!this.instance) { + return new this(); + } else { + return this.instance; + } + } + + public async get(q: IGetDocumentsparams): Promise { + const url = new URL(this.baseURl); + const query = { q }; + if (q) Object.entries(query).forEach(([key, value]) => url.searchParams.set(key, JSON.stringify(value))); + try { + return await this.getRequest(url); + } catch (err) { + this.onError(err); + return Promise.reject(err); + } + } + + /** + * @description : Create a Document + */ + public async post(body: any): Promise { + const url = new URL(this.baseURl); + try { + return await this.postRequest(url, body); + } catch (err) { + this.onError(err); + return Promise.reject(err); + } + } + + public async getByUid(uid: string, q?: any): Promise { + const url = new URL(this.baseURl.concat(`/${uid}`)); + const query = { q }; + if (q) Object.entries(query).forEach(([key, value]) => url.searchParams.set(key, JSON.stringify(value))); + try { + return await this.getRequest(url); + } catch (err) { + this.onError(err); + return Promise.reject(err); + } + } + + public async put(uid: string, body: IPutDocumentsParams): Promise { + const url = new URL(this.baseURl.concat(`/${uid}`)); + try { + return await this.putRequest(url, body); + } catch (err) { + this.onError(err); + return Promise.reject(err); + } + } + + public async delete(uid: string): Promise { + const url = new URL(this.baseURl.concat(`/${uid}`)); + try { + return await this.deleteRequest(url); + } catch (err) { + this.onError(err); + return Promise.reject(err); + } + } +} diff --git a/src/front/Api/LeCoffreApi/Notary/Folders/Folders.ts b/src/front/Api/LeCoffreApi/Notary/Folders/Folders.ts new file mode 100644 index 00000000..800d3c96 --- /dev/null +++ b/src/front/Api/LeCoffreApi/Notary/Folders/Folders.ts @@ -0,0 +1,119 @@ +import { type OfficeFolder } from "le-coffre-resources/dist/Notary"; + +import BaseNotary from "../BaseNotary"; +import EFolderStatus from "le-coffre-resources/dist/Customer/EFolderStatus"; + +// TODO Type get query params -> Where + inclue + orderby +export interface IGetFoldersParams { + q?: { + select?: {}; + where?: {}; + include?: {}; + }; +} + +export default class Folders extends BaseNotary { + private static instance: Folders; + private readonly baseURl = this.namespaceUrl.concat("/folders"); + + private constructor() { + super(); + } + + public static getInstance() { + if (!this.instance) { + return new this(); + } else { + return this.instance; + } + } + + /** + * @description : Get all folders + */ + public async get(q: IGetFoldersParams): Promise { + const url = new URL(this.baseURl); + Object.entries(q).forEach(([key, value]) => url.searchParams.set(key, JSON.stringify(value))); + try { + return await this.getRequest(url); + } catch (err) { + this.onError(err); + return Promise.reject(err); + } + } + + /** + * @description : Get a folder by uid + */ + public async getByUid(uid: string, q?: any): Promise { + const url = new URL(this.baseURl.concat(`/${uid}`)); + if (q) Object.entries(q).forEach(([key, value]) => url.searchParams.set(key, JSON.stringify(value))); + try { + return await this.getRequest(url); + } catch (err) { + this.onError(err); + return Promise.reject(err); + } + } + + /** + * @description : Create a folder + */ + public async post(officeFolder: Partial): Promise { + const url = new URL(this.baseURl); + try { + return await this.postRequest(url, officeFolder); + } catch (err) { + this.onError(err); + return Promise.reject(err); + } + } + + /** + * @description : Update the folder description + */ + public async put(uid: string, body: Partial): Promise { + const url = new URL(this.baseURl.concat(`/${uid}`)); + try { + return await this.putRequest(url, body); + } catch (err) { + this.onError(err); + return Promise.reject(err); + } + } + + /** + * @description : Delete a folder only if the folder don't contains customers + */ + public async delete(uid: string): Promise { + const url = new URL(this.baseURl.concat(`/${uid}`)); + const targetedFolder = await this.getByUid(uid); + if (targetedFolder.customers) return Promise.reject(`The folder ${uid} contains customers`); + try { + return await this.deleteRequest(url); + } catch (err) { + this.onError(err); + return Promise.reject(err); + } + } + + public async archive(uid: string, body: Partial): Promise { + body.status = EFolderStatus.ARCHIVED; + try { + return await this.put(uid, body); + } catch (err) { + this.onError(err); + return Promise.reject(err); + } + } + + public async restore(uid: string, body: Partial): Promise { + body.status = EFolderStatus.LIVE; + try { + return await this.put(uid, body); + } catch (err) { + this.onError(err); + return Promise.reject(err); + } + } +} diff --git a/src/front/Api/LeCoffreApi/Notary/Users/Users.ts b/src/front/Api/LeCoffreApi/Notary/Users/Users.ts index 15da8be9..14f31371 100644 --- a/src/front/Api/LeCoffreApi/Notary/Users/Users.ts +++ b/src/front/Api/LeCoffreApi/Notary/Users/Users.ts @@ -1,9 +1,15 @@ import BaseNotary from "../BaseNotary"; import User from "le-coffre-resources/dist/Notary"; +export type IGetUsersParams = { + where?: {}; + include?: {}; + select?: {}; +}; + export default class Users extends BaseNotary { private static instance: Users; - private readonly baseURl = this.namespaceUrl.concat("/Users"); + private readonly baseURl = this.namespaceUrl.concat("/users"); private constructor() { super(); @@ -17,8 +23,10 @@ export default class Users extends BaseNotary { } } - public async get(): Promise { + public async get(q?: IGetUsersParams): Promise { const url = new URL(this.baseURl); + const query = { q }; + if (q) Object.entries(query).forEach(([key, value]) => url.searchParams.set(key, JSON.stringify(value))); try { return await this.getRequest(url); } catch (err) { @@ -27,21 +35,6 @@ export default class Users extends BaseNotary { } } - public async getAuthorizationCode(): Promise { - try { - const url = new URL(`https://qual-connexion.idnot.fr/IdPOAuth2/authorize/idnot_idp_v1? - client_id=4501646203F3EF67 - &redirect_uri=https://app.stg.lecoffre.smart-chain.fr/ - &scope=openid,profile,offline_access - &response_type=code`); - // const url = new URL("https://jsonplaceholder.typicode.com/todos/1"); - await this.getRequest(url); - } catch (err) { - this.onError(err); - return Promise.reject(err); - } - } - public async getByUid(uid: string): Promise { const url = new URL(this.baseURl.concat("/").concat(uid)); try { @@ -51,14 +44,4 @@ export default class Users extends BaseNotary { return Promise.reject(err); } } - - // public async post(params: User): Promise { - // const url = new URL(this.baseURl); - // try { - // return await this.postRequest(url, params); - // } catch (err) { - // this.onError(err); - // return Promise.reject(err); - // } - // } } diff --git a/src/front/Components/DesignSystem/BlockList/index.tsx b/src/front/Components/DesignSystem/BlockList/index.tsx index 5f00c739..2f2b7410 100644 --- a/src/front/Components/DesignSystem/BlockList/index.tsx +++ b/src/front/Components/DesignSystem/BlockList/index.tsx @@ -17,18 +17,18 @@ type IProps = { export default function BlockList({ blocks, onSelectedBlock }: IProps) { const selectBlock = useCallback( (e: React.MouseEvent) => { - onSelectedBlock && onSelectedBlock(blocks.find((block) => block.id === e.currentTarget.id)!); + onSelectedBlock && onSelectedBlock(blocks.find((folder) => folder.id === e.currentTarget.id)!); }, [blocks, onSelectedBlock], ); return (
- {blocks.map((block) => { + {blocks.map((folder) => { return ( -
-
+
+
- {block.name} + {folder.name}
chevron
diff --git a/src/front/Components/DesignSystem/Switch/classes.module.scss b/src/front/Components/DesignSystem/Switch/classes.module.scss index c900ab5e..21873d6a 100644 --- a/src/front/Components/DesignSystem/Switch/classes.module.scss +++ b/src/front/Components/DesignSystem/Switch/classes.module.scss @@ -3,6 +3,12 @@ gap: 16px; cursor: pointer; width: fit-content; + + .disabled { + cursor: not-allowed; + opacity: 0.5; + } + .switch-container { position: relative; width: 46px; diff --git a/src/front/Components/DesignSystem/Switch/index.tsx b/src/front/Components/DesignSystem/Switch/index.tsx index 3b911bb7..c2b10c85 100644 --- a/src/front/Components/DesignSystem/Switch/index.tsx +++ b/src/front/Components/DesignSystem/Switch/index.tsx @@ -7,8 +7,9 @@ type IProps = { onChange?: (checked: boolean) => void; checked?: boolean; label: string; + disabled?: boolean; }; -export default function Switch({ onChange, checked, label }: IProps) { +export default function Switch({ onChange, checked, label, disabled }: IProps) { const [isChecked, setIsChecked] = useState(checked ? checked : false); useEffect(() => { @@ -21,9 +22,11 @@ export default function Switch({ onChange, checked, label }: IProps) { }, [isChecked, onChange]); return ( -
-
-
+
+
{} : handleChange}> +
+
+
{label} diff --git a/src/front/Components/LayoutTemplates/DefaultCollaboratorDashboard/index.tsx b/src/front/Components/LayoutTemplates/DefaultCollaboratorDashboard/index.tsx index 0ce3a812..6b3c124b 100644 --- a/src/front/Components/LayoutTemplates/DefaultCollaboratorDashboard/index.tsx +++ b/src/front/Components/LayoutTemplates/DefaultCollaboratorDashboard/index.tsx @@ -7,7 +7,7 @@ import BackArrow from "@Front/Components/Elements/BackArrow"; import JwtService from "@Front/Services/JwtService/JwtService"; import WindowStore from "@Front/Stores/WindowStore"; import classNames from "classnames"; -import User from "le-coffre-resources/dist/Notary"; +import User from "le-coffre-resources/dist/Admin"; import Image from "next/image"; import React, { ReactNode } from "react"; @@ -91,7 +91,7 @@ export default class DefaultCollaboratorDashboard extends React.Component({ + uid: jwt.office_Id, + }); const documentToCreate = DocumentType.hydrate({ ...values, - office: Office.hydrate({ - uid: jwt.office_Id, - }), + office: office }); await validateOrReject(documentToCreate, { groups: ["createDocumentType"] }); const documentTypeCreated = await DocumentTypes.getInstance().post(documentToCreate); diff --git a/src/front/Components/Layouts/DocumentTypes/DocumentTypesEdit/index.tsx b/src/front/Components/Layouts/DocumentTypes/DocumentTypesEdit/index.tsx index f1f3c3cc..2f811f0f 100644 --- a/src/front/Components/Layouts/DocumentTypes/DocumentTypesEdit/index.tsx +++ b/src/front/Components/Layouts/DocumentTypes/DocumentTypesEdit/index.tsx @@ -1,4 +1,4 @@ -import DocumentTypes from "@Front/Api/LeCoffreApi/Admin/DocumentTypes/DocumentTypes"; +import DocumentTypes from "@Front/Api/LeCoffreApi/Notary/DocumentTypes/DocumentTypes"; import Button, { EButtonVariant } from "@Front/Components/DesignSystem/Button"; import Form from "@Front/Components/DesignSystem/Form"; import TextAreaField from "@Front/Components/DesignSystem/Form/TextareaField"; @@ -7,7 +7,7 @@ import Typography, { ITypo } from "@Front/Components/DesignSystem/Typography"; import DefaultDocumentTypesDashboard from "@Front/Components/LayoutTemplates/DefaultDocumentTypesDashboard"; import Module from "@Front/Config/Module"; import { validateOrReject } from "class-validator"; -import { DocumentType } from "le-coffre-resources/dist/Admin"; +import { DocumentType } from "le-coffre-resources/dist/Notary"; import { useRouter } from "next/router"; import { useCallback, useEffect, useState } from "react"; diff --git a/src/front/Components/Layouts/DocumentTypes/DocumentTypesInformations/index.tsx b/src/front/Components/Layouts/DocumentTypes/DocumentTypesInformations/index.tsx index 2ada9aa3..f07303e6 100644 --- a/src/front/Components/Layouts/DocumentTypes/DocumentTypesInformations/index.tsx +++ b/src/front/Components/Layouts/DocumentTypes/DocumentTypesInformations/index.tsx @@ -1,9 +1,9 @@ import PenICon from "@Assets/Icons/pen.svg"; -import DocumentTypes from "@Front/Api/LeCoffreApi/Admin/DocumentTypes/DocumentTypes"; +import DocumentTypes from "@Front/Api/LeCoffreApi/Notary/DocumentTypes/DocumentTypes"; import Typography, { ITypo, ITypoColor } from "@Front/Components/DesignSystem/Typography"; import DefaultDocumentTypesDashboard from "@Front/Components/LayoutTemplates/DefaultDocumentTypesDashboard"; import Module from "@Front/Config/Module"; -import { DocumentType } from "le-coffre-resources/dist/Admin"; +import { DocumentType } from "le-coffre-resources/dist/Notary"; import Image from "next/image"; import Link from "next/link"; import { useRouter } from "next/router"; diff --git a/src/front/Components/Layouts/Folder/AddClientToFolder/index.tsx b/src/front/Components/Layouts/Folder/AddClientToFolder/index.tsx index f39bec59..397a902b 100644 --- a/src/front/Components/Layouts/Folder/AddClientToFolder/index.tsx +++ b/src/front/Components/Layouts/Folder/AddClientToFolder/index.tsx @@ -1,5 +1,5 @@ -import Customers from "@Front/Api/LeCoffreApi/SuperAdmin/Customers/Customers"; -import Folders from "@Front/Api/LeCoffreApi/SuperAdmin/Folders/Folders"; +import Customers from "@Front/Api/LeCoffreApi/Notary/Customers/Customers"; +import Folders from "@Front/Api/LeCoffreApi/Notary/Folders/Folders"; import Button, { EButtonVariant } from "@Front/Components/DesignSystem/Button"; import Form from "@Front/Components/DesignSystem/Form"; import { IOption } from "@Front/Components/DesignSystem/Form/SelectField"; diff --git a/src/front/Components/Layouts/Folder/AskDocuments/index.tsx b/src/front/Components/Layouts/Folder/AskDocuments/index.tsx index ff18c0c4..48dc1450 100644 --- a/src/front/Components/Layouts/Folder/AskDocuments/index.tsx +++ b/src/front/Components/Layouts/Folder/AskDocuments/index.tsx @@ -1,8 +1,8 @@ import PlusIcon from "@Assets/Icons/plus.svg"; -import Deeds from "@Front/Api/LeCoffreApi/SuperAdmin/Deeds/Deeds"; -import Documents from "@Front/Api/LeCoffreApi/SuperAdmin/Documents/Documents"; -import DocumentTypes from "@Front/Api/LeCoffreApi/SuperAdmin/DocumentTypes/DocumentTypes"; -import Folders from "@Front/Api/LeCoffreApi/SuperAdmin/Folders/Folders"; +import Deeds from "@Front/Api/LeCoffreApi/Notary/Deeds/Deeds"; +import Documents from "@Front/Api/LeCoffreApi/Notary/Documents/Documents"; +import DocumentTypes from "@Front/Api/LeCoffreApi/Notary/DocumentTypes/DocumentTypes"; +import Folders from "@Front/Api/LeCoffreApi/Notary/Folders/Folders"; import Button, { EButtonVariant } from "@Front/Components/DesignSystem/Button"; import CheckBox from "@Front/Components/DesignSystem/CheckBox"; import Form from "@Front/Components/DesignSystem/Form"; diff --git a/src/front/Components/Layouts/Folder/CreateFolder/index.tsx b/src/front/Components/Layouts/Folder/CreateFolder/index.tsx index 4f30884c..be8558a2 100644 --- a/src/front/Components/Layouts/Folder/CreateFolder/index.tsx +++ b/src/front/Components/Layouts/Folder/CreateFolder/index.tsx @@ -1,7 +1,7 @@ import backgroundImage from "@Assets/images/404-background-image.jpeg"; -import DeedTypes from "@Front/Api/LeCoffreApi/SuperAdmin/DeedTypes/DeedTypes"; -import Folders from "@Front/Api/LeCoffreApi/SuperAdmin/Folders/Folders"; -import Users from "@Front/Api/LeCoffreApi/SuperAdmin/Users/Users"; +import DeedTypes from "@Front/Api/LeCoffreApi/Notary/DeedTypes/DeedTypes"; +import Folders from "@Front/Api/LeCoffreApi/Notary/Folders/Folders"; +import Users from "@Front/Api/LeCoffreApi/Notary/Users/Users"; import Button from "@Front/Components/DesignSystem/Button"; import Form from "@Front/Components/DesignSystem/Form"; import SelectField, { IOption } from "@Front/Components/DesignSystem/Form/SelectField"; @@ -152,13 +152,8 @@ class CreateFolderClass extends BasePage { public override async componentDidMount() { const deedTypes = await DeedTypes.getInstance().get(); - - // TODO SETUP userStore and get the user's office membership -> Replace IwJ70M471c by the user's office membership uid - const usersMock = await Users.getInstance().get({ include: { office_membership: true } }); - const userMock = usersMock[0]; - // ------------------- + // no need to pass query 'where' param here, default query for notaries include only users which are in the same office as the caller const collaborators = await Users.getInstance().get({ - where: { office_membership: { uid: userMock?.office_membership?.uid } }, include: { contact: true }, }); this.setState({ diff --git a/src/front/Components/Layouts/Folder/FolderInformation/index.tsx b/src/front/Components/Layouts/Folder/FolderInformation/index.tsx index b2dfb2ec..bb6a30c5 100644 --- a/src/front/Components/Layouts/Folder/FolderInformation/index.tsx +++ b/src/front/Components/Layouts/Folder/FolderInformation/index.tsx @@ -1,5 +1,5 @@ import ChevronIcon from "@Assets/Icons/chevron.svg"; -import Folders from "@Front/Api/LeCoffreApi/SuperAdmin/Folders/Folders"; +import Folders from "@Front/Api/LeCoffreApi/Notary/Folders/Folders"; import Button, { EButtonVariant } from "@Front/Components/DesignSystem/Button"; import FolderBoxInformation, { EFolderBoxInformationType } from "@Front/Components/DesignSystem/FolderBoxInformation"; import TextAreaField from "@Front/Components/DesignSystem/Form/TextareaField"; diff --git a/src/front/Components/Layouts/Folder/UpdateClient/index.tsx b/src/front/Components/Layouts/Folder/UpdateClient/index.tsx index 0905f976..df51d182 100644 --- a/src/front/Components/Layouts/Folder/UpdateClient/index.tsx +++ b/src/front/Components/Layouts/Folder/UpdateClient/index.tsx @@ -1,4 +1,4 @@ -import Customers from "@Front/Api/LeCoffreApi/SuperAdmin/Customers/Customers"; +import Customers from "@Front/Api/LeCoffreApi/Notary/Customers/Customers"; import Button, { EButtonVariant } from "@Front/Components/DesignSystem/Button"; import Form from "@Front/Components/DesignSystem/Form"; import TextField from "@Front/Components/DesignSystem/Form/TextField"; diff --git a/src/front/Components/Layouts/Folder/UpdateFolderCollaborators/index.tsx b/src/front/Components/Layouts/Folder/UpdateFolderCollaborators/index.tsx index c207f938..4c3ea3ea 100644 --- a/src/front/Components/Layouts/Folder/UpdateFolderCollaborators/index.tsx +++ b/src/front/Components/Layouts/Folder/UpdateFolderCollaborators/index.tsx @@ -1,5 +1,5 @@ -import Folders from "@Front/Api/LeCoffreApi/SuperAdmin/Folders/Folders"; -import Users, { IGetUsersparams } from "@Front/Api/LeCoffreApi/SuperAdmin/Users/Users"; +import Folders from "@Front/Api/LeCoffreApi/Notary/Folders/Folders"; +import Users, { IGetUsersParams } from "@Front/Api/LeCoffreApi/Notary/Users/Users"; import Button, { EButtonVariant } from "@Front/Components/DesignSystem/Button"; import Form from "@Front/Components/DesignSystem/Form"; import { IOption } from "@Front/Components/DesignSystem/Form/SelectField"; @@ -127,10 +127,8 @@ class UpdateFolderCollaboratorsClass extends BasePage { return; } - const userQuery: IGetUsersparams = { - where: { - office_uid: folder.office?.uid, - }, + // no need to pass query 'where' param here, default query for notaries include only users which are in the same office as the caller + const userQuery: IGetUsersParams = { include: { contact: { select: { @@ -142,6 +140,7 @@ class UpdateFolderCollaboratorsClass extends BasePage { }; const availableCollaborators = await Users.getInstance().get(userQuery); + console.log(availableCollaborators) this.setState({ availableCollaborators }); } diff --git a/src/front/Components/Layouts/Folder/UpdateFolderDescription/index.tsx b/src/front/Components/Layouts/Folder/UpdateFolderDescription/index.tsx index fb572b5d..211ec64f 100644 --- a/src/front/Components/Layouts/Folder/UpdateFolderDescription/index.tsx +++ b/src/front/Components/Layouts/Folder/UpdateFolderDescription/index.tsx @@ -1,4 +1,4 @@ -import Folders from "@Front/Api/LeCoffreApi/SuperAdmin/Folders/Folders"; +import Folders from "@Front/Api/LeCoffreApi/Notary/Folders/Folders"; import Button, { EButtonVariant } from "@Front/Components/DesignSystem/Button"; import Form from "@Front/Components/DesignSystem/Form"; import TextAreaField from "@Front/Components/DesignSystem/Form/TextareaField"; diff --git a/src/front/Components/Layouts/Folder/UpdateFolderMetadata/index.tsx b/src/front/Components/Layouts/Folder/UpdateFolderMetadata/index.tsx index b66a90f0..75501e12 100644 --- a/src/front/Components/Layouts/Folder/UpdateFolderMetadata/index.tsx +++ b/src/front/Components/Layouts/Folder/UpdateFolderMetadata/index.tsx @@ -1,4 +1,4 @@ -import Folders from "@Front/Api/LeCoffreApi/SuperAdmin/Folders/Folders"; +import Folders from "@Front/Api/LeCoffreApi/Notary/Folders/Folders"; import Button, { EButtonVariant } from "@Front/Components/DesignSystem/Button"; import Form from "@Front/Components/DesignSystem/Form"; import Select, { IOption } from "@Front/Components/DesignSystem/Form/SelectField"; diff --git a/src/front/Components/Layouts/Folder/ViewDocuments/index.tsx b/src/front/Components/Layouts/Folder/ViewDocuments/index.tsx index c45a73df..81bb3a8d 100644 --- a/src/front/Components/Layouts/Folder/ViewDocuments/index.tsx +++ b/src/front/Components/Layouts/Folder/ViewDocuments/index.tsx @@ -1,6 +1,6 @@ import LeftArrowIcon from "@Assets/Icons/left-arrow.svg"; import RightArrowIcon from "@Assets/Icons/right-arrow.svg"; -import Documents from "@Front/Api/LeCoffreApi/SuperAdmin/Documents/Documents"; +import Documents from "@Front/Api/LeCoffreApi/Notary/Documents/Documents"; import ValidateAnchoringGif from "@Front/Assets/images/validate_anchoring.gif"; import Button, { EButtonVariant } from "@Front/Components/DesignSystem/Button"; import CheckBox from "@Front/Components/DesignSystem/CheckBox"; @@ -9,8 +9,8 @@ import Confirm from "@Front/Components/DesignSystem/Modal/Confirm"; import Typography, { ITypo, ITypoColor } from "@Front/Components/DesignSystem/Typography"; import DefaultNotaryDashboard from "@Front/Components/LayoutTemplates/DefaultNotaryDashboard"; import Module from "@Front/Config/Module"; -import { Document, File } from "le-coffre-resources/dist/Customer"; -import { EDocumentStatus } from "le-coffre-resources/dist/Customer/Document"; +import { Document, File } from "le-coffre-resources/dist/Notary"; +import { EDocumentStatus } from "le-coffre-resources/dist/Notary/Document"; import Image from "next/image"; import { NextRouter, useRouter } from "next/router"; import React from "react"; diff --git a/src/front/Components/Layouts/FolderArchived/FolderInformation/index.tsx b/src/front/Components/Layouts/FolderArchived/FolderInformation/index.tsx index 0e8b2cc0..aa4a20bf 100644 --- a/src/front/Components/Layouts/FolderArchived/FolderInformation/index.tsx +++ b/src/front/Components/Layouts/FolderArchived/FolderInformation/index.tsx @@ -1,5 +1,5 @@ import ChevronIcon from "@Assets/Icons/chevron.svg"; -import Folders from "@Front/Api/LeCoffreApi/SuperAdmin/Folders/Folders"; +import Folders from "@Front/Api/LeCoffreApi/Notary/Folders/Folders"; import Button, { EButtonVariant } from "@Front/Components/DesignSystem/Button"; import FolderBoxInformation, { EFolderBoxInformationType } from "@Front/Components/DesignSystem/FolderBoxInformation"; import QuantityProgressBar from "@Front/Components/DesignSystem/QuantityProgressBar"; diff --git a/src/front/Components/Layouts/Login/index.tsx b/src/front/Components/Layouts/Login/index.tsx index 3145b579..ac8d81e5 100644 --- a/src/front/Components/Layouts/Login/index.tsx +++ b/src/front/Components/Layouts/Login/index.tsx @@ -19,7 +19,7 @@ export default function Login() { const redirectUserOnConnection = useCallback(() => { async function getUser() { try { - await UserStore.instance.connect("jelkvelknvlkn"); + await UserStore.instance.connect("ljfeflecnmd"); await JwtService.getInstance().checkJwt(); router.push(Module.getInstance().get().modules.pages.Folder.props.path); } catch (e) { diff --git a/src/front/Components/Layouts/SelectFolder/index.tsx b/src/front/Components/Layouts/SelectFolder/index.tsx index 881f7f78..7d5068fd 100644 --- a/src/front/Components/Layouts/SelectFolder/index.tsx +++ b/src/front/Components/Layouts/SelectFolder/index.tsx @@ -16,15 +16,16 @@ export default function SelectFolder() { useEffect(() => { async function getFolders() { - const jwt = JwtService.getInstance().decodeJwt(); + const jwt = JwtService.getInstance().decodeCustomerJwt(); if (!jwt) return; + console.log(jwt) const folders = await Folders.getInstance().get({ q: { where: { customers: { some: { - uid: jwt.userId, + uid: jwt.customerId, }, }, }, @@ -37,8 +38,8 @@ export default function SelectFolder() { }, []); const handleSelectBlock = useCallback( - (block: IBlock) => { - router.push("/client-dashboard/" + block.id); + (folder: IBlock) => { + router.push("/client-dashboard/" + folder.id); }, [router], ); diff --git a/src/front/Components/Layouts/Users/UserInformations/index.tsx b/src/front/Components/Layouts/Users/UserInformations/index.tsx index 4bff2860..08e3c512 100644 --- a/src/front/Components/Layouts/Users/UserInformations/index.tsx +++ b/src/front/Components/Layouts/Users/UserInformations/index.tsx @@ -81,7 +81,7 @@ export default function UserInformations(props: IProps) { useEffect(() => { if (!userSelected) return; - setCurrentAppointment(userSelected?.appointment?.find((appointment) => appointment.status === EAppointmentStatus.OPEN) ?? null); + setCurrentAppointment(userSelected?.appointment?.find((appointment) => appointment.status === EAppointmentStatus.OPEN && appointment.votes?.length != 0) ?? null); }, [userSelected]); /** Functions for the admin modal */ @@ -282,7 +282,7 @@ export default function UserInformations(props: IProps) {
- + {currentAppointment && (
diff --git a/src/front/Services/JwtService/JwtService.ts b/src/front/Services/JwtService/JwtService.ts index 41b84d92..37a78e48 100644 --- a/src/front/Services/JwtService/JwtService.ts +++ b/src/front/Services/JwtService/JwtService.ts @@ -6,7 +6,7 @@ enum PROVIDER_OPENID { idNot = "idNot", } -interface IUserJwtPayload { +export interface IUserJwtPayload { userId: string; email: string | null; openId: { @@ -19,6 +19,11 @@ interface IUserJwtPayload { exp: number; } +export interface ICustomerJwtPayload { + customerId: string; + email: string; +} + export default class JwtService { private static instance: JwtService; private constructor() {} @@ -33,6 +38,12 @@ export default class JwtService { return jwt_decode(accessToken); } + public decodeCustomerJwt(): ICustomerJwtPayload | undefined { + const accessToken = CookieService.getInstance().getCookie("leCoffreAccessToken"); + if (!accessToken) return; + return jwt_decode(accessToken); + } + /** * @description : set a cookie with a name and a value that expire in 7 days * @throws {Error} If the name or the value is empty diff --git a/src/front/Stores/UserStore.ts b/src/front/Stores/UserStore.ts index 06c70182..d8c2c874 100644 --- a/src/front/Stores/UserStore.ts +++ b/src/front/Stores/UserStore.ts @@ -4,6 +4,7 @@ import User from "@Front/Api/Auth/IdNot/User"; import Customer from "@Front/Api/Auth/franceConnect/Customer"; import CookieService from "@Front/Services/CookieService/CookieService"; import EventEmitter from "@Front/Services/EventEmitter"; +import JwtService from "@Front/Services/JwtService/JwtService"; export default class UserStore { public static readonly instance = new this(); @@ -17,6 +18,11 @@ export default class UserStore { return !!this.accessToken; } + public getRole(): string | undefined { + const decodedPayload = JwtService.getInstance().decodeJwt(); + return decodedPayload?.role; + } + public async connect(idnotUid: string) { try { //call connection function diff --git a/src/middleware.ts b/src/middleware.ts new file mode 100644 index 00000000..e5c65548 --- /dev/null +++ b/src/middleware.ts @@ -0,0 +1,44 @@ +import { ICustomerJwtPayload, IUserJwtPayload } from "@Front/Services/JwtService/JwtService"; +import jwt_decode from "jwt-decode"; +import { NextResponse } from "next/server"; +import type { NextRequest } from "next/server"; + +export async function middleware(request: NextRequest) { + const cookies = request.cookies.get("leCoffreAccessToken"); + if (!cookies) return NextResponse.redirect(new URL("/login", request.url)); + const userDecodedToken = jwt_decode(cookies.value) as IUserJwtPayload; + const customerDecodedToken = jwt_decode(cookies.value) as ICustomerJwtPayload; + if (!userDecodedToken && !customerDecodedToken) return NextResponse.redirect(new URL("/login", request.url)); + const requestUrlPath = request.nextUrl.pathname; + if ( + requestUrlPath.startsWith("/collaborators") || + requestUrlPath.startsWith("/deed-types") || + requestUrlPath.startsWith("/customer") || + requestUrlPath.startsWith("/offices") || + requestUrlPath.startsWith("/roles") || + requestUrlPath.startsWith("/users") + ) { + if (userDecodedToken.role !== "admin" && userDecodedToken.role !== "super-admin") + return NextResponse.redirect(new URL("/404", request.url)); + } + if ((requestUrlPath.startsWith("/my-account") || requestUrlPath.startsWith("/document-types")) && !userDecodedToken) return NextResponse.redirect(new URL("/404", request.url)); + if (requestUrlPath.startsWith("/client-dashboard") && !customerDecodedToken) return NextResponse.redirect(new URL("/404", request.url)); + + return NextResponse.next(); +} + +export const config = { + matcher: [ + "/client-dashboard/:path*", + "/collaborators/:path*", + "/customer/:path*", + "/document-types/:path*", + "/deed-types/:path*", + "/folders/:path*", + "/my-account/:path*", + "/offices/:path*", + "/roles/:path*", + "/users/:path*", + "/", + ], +};