🎨 patch popup add documents

package-lock.json

@@ -16,11 +16,12 @@
 				"@types/react-dom": "18.0.11",
 				"class-validator": "^0.14.0",
 				"classnames": "^2.3.2",
+				"crypto-random-string": "^5.0.0",
 				"dotenv": "^16.0.3",
 				"eslint": "8.36.0",
 				"eslint-config-next": "13.2.4",
 				"form-data": "^4.0.0",
-				"le-coffre-resources": "git@github.com:smart-chain-fr/leCoffre-resources.git#v2.44",
+				"le-coffre-resources": "git@github.com:smart-chain-fr/leCoffre-resources.git#v2.47",
 				"next": "13.2.4",
 				"prettier": "^2.8.7",
 				"react": "18.2.0",
@@ -1535,6 +1536,20 @@
 				"node": ">= 8"
 			}
 		},
+		"node_modules/crypto-random-string": {
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-5.0.0.tgz",
+			"integrity": "sha512-KWjTXWwxFd6a94m5CdRGW/t82Tr8DoBc9dNnPCAbFI1EBweN6v1tv8y4Y1m7ndkp/nkIBRxUxAzpaBnR2k3bcQ==",
+			"dependencies": {
+				"type-fest": "^2.12.2"
+			},
+			"engines": {
+				"node": ">=14.16"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
 		"node_modules/csstype": {
 			"version": "3.1.2",
 			"resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.2.tgz",
@@ -2551,6 +2566,17 @@
 				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
+		"node_modules/globals/node_modules/type-fest": {
+			"version": "0.20.2",
+			"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
+			"integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
 		"node_modules/globalthis": {
 			"version": "1.0.3",
 			"resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.3.tgz",
@@ -3202,7 +3228,7 @@
 			}
 		},
 		"node_modules/le-coffre-resources": {
-			"resolved": "git+ssh://git@github.com/smart-chain-fr/leCoffre-resources.git#30c8ee50b872a8bc6bec0f5d8c4626d8f4490177",
+			"resolved": "git+ssh://git@github.com/smart-chain-fr/leCoffre-resources.git#467b34a484adbd6dfa3fd6082bb7677f6178da51",
 			"license": "MIT",
 			"dependencies": {
 				"class-transformer": "^0.5.1",
@@ -4474,11 +4500,11 @@
 			}
 		},
 		"node_modules/type-fest": {
-			"version": "0.20.2",
+			"version": "2.19.0",
-			"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
+			"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-2.19.0.tgz",
-			"integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
+			"integrity": "sha512-RAH822pAdBgcNMAfWnCBU3CFZcfZ/i1eZjwFU/dsLKumyuuP3niueg2UAukXYF0E2AAoc82ZSSf9J0WQBinzHA==",
 			"engines": {
-				"node": ">=10"
+				"node": ">=12.20"
 			},
 			"funding": {
 				"url": "https://github.com/sponsors/sindresorhus"

package.json

@@ -18,11 +18,12 @@
 		"@types/react-dom": "18.0.11",
 		"class-validator": "^0.14.0",
 		"classnames": "^2.3.2",
+		"crypto-random-string": "^5.0.0",
 		"dotenv": "^16.0.3",
 		"eslint": "8.36.0",
 		"eslint-config-next": "13.2.4",
 		"form-data": "^4.0.0",
-		"le-coffre-resources": "git@github.com:smart-chain-fr/leCoffre-resources.git#v2.44",
+		"le-coffre-resources": "git@github.com:smart-chain-fr/leCoffre-resources.git#v2.47",
 		"next": "13.2.4",
 		"prettier": "^2.8.7",
 		"react": "18.2.0",

src/front/Api/LeCoffreApi/SuperAdmin/Files/Files.ts

@@ -1,7 +1,6 @@
 import { File } from "le-coffre-resources/dist/SuperAdmin";
 
 import BaseSuperAdmin from "../BaseSuperAdmin";
-import CryptoService from "@Front/Services/CryptoService/CryptoService";
 
 
 // TODO Type get query params -> Where + inclue + orderby
@@ -20,7 +19,6 @@ export default class Files extends BaseSuperAdmin {
 	private static instance: Files;
 	private readonly baseURl = this.namespaceUrl.concat("/files");
 
-	private cryptoService: CryptoService = CryptoService.getInstance();
 	private constructor() {
 		super();
 	}
@@ -35,9 +33,6 @@ export default class Files extends BaseSuperAdmin {
 		if (q) Object.entries(query).forEach(([key, value]) => url.searchParams.set(key, JSON.stringify(value)));
 		try {
 			const files = await this.getRequest<File[]>(url);
-			files.forEach(async (file) => {
-				file.file_path = await this.cryptoService.decrypt(file.file_path!, file.iv);
-			});
 			return files;
 		} catch (err) {
 			this.onError(err);
@@ -58,13 +53,17 @@ export default class Files extends BaseSuperAdmin {
 		}
 	}
 
+	public getUploadLink(uid: string): string {
+		return this.baseURl.concat(`/upload/${uid}`);
+	}
+
+
 	public async getByUid(uid: string, q?: any): Promise<File> {
 		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 {
 			const file = await this.getRequest<File>(url);
-			file.file_path = await this.cryptoService.decrypt(file.file_path!, file.iv);
 			return file;
 		} catch (err) {
 			this.onError(err);

src/front/Components/LayoutTemplates/DefaultTemplate/index.tsx

@@ -1,9 +1,9 @@
-
-import React, { ReactNode } from "react";
-import classes from "./classes.module.scss";
 import Header from "@Front/Components/DesignSystem/Header";
 import Version from "@Front/Components/DesignSystem/Version";
 import classNames from "classnames";
+import React, { ReactNode } from "react";
+
+import classes from "./classes.module.scss";
 
 type IProps = {
 	title: string;
@@ -13,6 +13,7 @@ type IProps = {
 	 */
 	scrollTop: number | null;
 	isPadding?: boolean;
+	hasHeaderLinks: boolean;
 };
 type IState = {};
 
@@ -20,12 +21,13 @@ export default class DefaultTemplate extends React.Component<IProps, IState> {
 	public static defaultProps = {
 		scrollTop: 0,
 		isPadding: true,
+		hasHeaderLinks: true,
 	};
 
 	public override render(): JSX.Element {
 		return (
 			<>
-				<Header isUserConnected={true} />
+				<Header isUserConnected={this.props.hasHeaderLinks} />
 				<div className={classNames(classes["root"], this.props.isPadding && classes["padding"])}>{this.props.children}</div>
 				<Version />
 			</>

src/front/Components/Layouts/ClientDashboard/index.tsx

@@ -1,3 +1,4 @@
+import Documents, { IGetDocumentsparams } from "@Front/Api/LeCoffreApi/SuperAdmin/Documents/Documents";
 import Button, { EButtonVariant } from "@Front/Components/DesignSystem/Button";
 import DepositDocument from "@Front/Components/DesignSystem/DepositDocument";
 import InputField from "@Front/Components/DesignSystem/Form/Elements/InputField";
@@ -7,9 +8,8 @@ import Base from "@Front/Components/Layouts/Base";
 import DefaultTemplate from "@Front/Components/LayoutTemplates/DefaultTemplate";
 import React from "react";
 import classes from "./classes.module.scss";
-import Documents, { IGetDocumentsparams } from "@Front/Api/LeCoffreApi/SuperAdmin/Documents/Documents";
-import Customer, { Document } from "le-coffre-resources/dist/Customer";
 import Customers from "@Front/Api/LeCoffreApi/SuperAdmin/Customers/Customers";
+import Customer, { Document } from "le-coffre-resources/dist/Customer";
 import { document } from "./../../../Components/Layouts/DesignSystem/dummyData";
 
 type IProps = {};
@@ -34,7 +34,7 @@ export default class ClientDashboard extends Base<IProps, IState> {
 
 	public override render(): JSX.Element {
 		return (
-			<DefaultTemplate title={"Mon compte"} isPadding={false}>
+			<DefaultTemplate title={"Mon compte"} isPadding={false} hasHeaderLinks={false}>
 				<div className={classes["root"]}>
 					{this.renderHeader()}
 					<div className={classes["sub-container"]}>
@@ -96,7 +96,9 @@ export default class ClientDashboard extends Base<IProps, IState> {
 						l’aide du bouton ci-dessus.
 					</Typography>
 				</div>
-				<Button className={classes["button"]}>Contacter mon notaire</Button>
+				<a href="mailto:g.texier@notaires.fr">
+					<Button className={classes["button"]}>Contacter mon notaire</Button>
+				</a>
 			</div>
 		);
 	}

src/front/Components/Layouts/DesignSystem/dummyData.ts

@@ -146,7 +146,7 @@ export const fileMock: File = {
 	file_name: "file_1",
 	file_path:
 		"https://minteed-stg-euwest3-s3.s3.eu-west-3.amazonaws.com/Qmf_Yb_Eh_X9st_F_Srq_Ve_Bj_Yb_Aj56xv_AV_Nj6_Wjypo_B4r5ubce_U_ae3303e7ab.pdf",
-	iv: "1",
+	archived_at: null,
 };
 
 export const fileMock2: File = {
@@ -157,7 +157,7 @@ export const fileMock2: File = {
 	file_name: "file_2",
 	file_path:
 		"https://minteed-prod-euwest3-s3.s3.eu-west-3.amazonaws.com/Qm_Wq_En1_DCA_8yt_RX_Qx_QFA_9_Fm_ZKZH_Qqb_VH_1_Q_Mnv_G_Jtt1_FS_Xp_2a35a36e19",
-	iv: "2",
+	archived_at: null,
 };
 
 export const identityFile: File = {
@@ -167,7 +167,7 @@ export const identityFile: File = {
 	document: document,
 	file_name: "file_3",
 	file_path: "https://minteed-stg-euwest3-s3.s3.eu-west-3.amazonaws.com/cni_fake_c7259d4923.png",
-	iv: "3",
+	archived_at: null,
 };
 
 export const documentIdentity: Document = {

src/front/Components/Layouts/Folder/ViewDocuments/index.tsx

@@ -20,6 +20,7 @@ import React from "react";
 import BasePage from "../../Base";
 import classes from "./classes.module.scss";
 import OcrResult from "./OcrResult";
+import Files from "@Front/Api/LeCoffreApi/SuperAdmin/Files/Files";
 
 
 type IProps = {};
@@ -90,7 +91,7 @@ class ViewDocumentsClass extends BasePage<IPropsClass, IState> {
 								</div>
 							)}
 							<div className={classes["file-container"]}>
-								<FilePreview href={this.state.selectedFile.file_path as string} key={this.state.selectedFile.uid} />
+								<FilePreview href={Files.getInstance().getUploadLink(this.state.selectedFile?.uid as string)} key={this.state.selectedFile.uid} />
 							</div>
 							{this.state.document.files.length > 1 && (
 								<div
@@ -199,7 +200,7 @@ class ViewDocumentsClass extends BasePage<IPropsClass, IState> {
 
 	private downloadFile() {
 		const fileName = this.state.selectedFile?.file_path?.split("/").pop();
-		fetch(this.state.selectedFile?.file_path as string)
+		fetch(Files.getInstance().getUploadLink(this.state.selectedFile?.uid as string))
 			.then((resp) => resp.blob())
 			.then((blob) => {
 				const url = window.URL.createObjectURL(blob);

src/front/Components/Layouts/LoginCallback/index.tsx

@@ -10,7 +10,7 @@ import { useRouter } from "next/router";
 //import React, { useEffect, useState } from "react";
 import React from "react";
 //import Loader from "@Front/Components/DesignSystem/Loader";
-import Auth from "@Front/Api/Auth/IdNot";
+//import Auth from "@Front/Api/Auth/IdNot";
 import Folder from "../Folder";
 import LoginClass from "../Login";
 
@@ -75,15 +75,15 @@ export default function LoginCallBack(props: IPropsClass) {
 	const router = useRouter();
 	const { code } = router.query;
 	if (code) {
-		const getIdNotJwt = async () => {
+		// const getIdNotJwt = async () => {
-			try {
+		// 	try {
-				const authService = Auth.getInstance();
+		// 		const authService = Auth.getInstance();
-				await authService.getIdnotJwt(code);
+		// 		await authService.getIdnotJwt(code);
-			} catch (error) {
+		// 	} catch (error) {
-				console.error(error);
+		// 		console.error(error);
-			}
+		// 	}
-		};
+		// };
-		getIdNotJwt();
+		//getIdNotJwt();
 		return <Folder {...props} />;
 	}
 	return <LoginClass {...props} />;

src/front/Components/Layouts/LoginCustomer/index.tsx

@@ -6,6 +6,8 @@ import Image from "next/image";
 import DefaultDoubleSidePage from "@Front/Components/LayoutTemplates/DefaultDoubleSidePage";
 import FranceConnectIcon from "./france-connect.svg";
 import ExportIcon from "@Assets/Icons/export.svg";
+import { FrontendVariables } from "@Front/Config/VariablesFront";
+import cryptoRandomString from "crypto-random-string";
 
 export default class LoginCustomer extends BasePage {
 	public override render(): JSX.Element {
@@ -35,12 +37,12 @@ export default class LoginCustomer extends BasePage {
 	}
 
 	private redirectUserOnConnection() {
-		// const variables = FrontendVariables.getInstance();
+		const variables = FrontendVariables.getInstance();
 		// const baseFronturl =
 		// 	variables.BACK_API_PROTOCOL + variables.FRONT_APP_HOST + (variables.FRONT_APP_PORT ? ":" + variables.FRONT_APP_PORT : "");
-		// const authorizeEndPoint = variables.IDNOT_AUTHORIZE_ENDPOINT;
+		const authorizeEndPoint = variables.FC_AUTHORIZE_ENDPOINT;
-		// const clientId = variables.IDNOT_CLIENT_ID;
+		const clientId = variables.FC_CLIENT_ID;
-		// const url = `${authorizeEndPoint}?client_id=${clientId}&redirect_uri=${baseFronturl}/authorized-client&scope=openid,profile,offline_access&response_type=code`;
+		const url = `${authorizeEndPoint}?client_id=${clientId}&redirect_uri=http://localhost:8080/login-callback&scope=openid&response_type=code&state=${cryptoRandomString({length: 64})}&nonce=${cryptoRandomString({length: 64})}&acr_values=eidas1`;
-		// window.location.assign(url);
+		window.location.assign(url);
 	}
 }

src/front/Components/Layouts/MyAccount/index.tsx

@@ -25,10 +25,10 @@ export default class MyAccount extends Base<IProps, IState> {
 							</Typography>
 							<Form onSubmit={this.onFormSubmit}>
 								<div className={classes["form-container"]}>
-									<InputField name="name" fakeplaceholder="Nom" type="text" disabled />
+									<InputField name="name" fakeplaceholder="Nom" type="text" defaultValue={"TEXIER"} disabled />
-									<InputField name="surname" fakeplaceholder="Prénom" type="text" disabled />
+									<InputField name="surname" fakeplaceholder="Prénom" type="text" defaultValue={"Gwendal"} disabled />
-									<InputField name="email" fakeplaceholder="E-mail" type="email" disabled />
+									<InputField name="email" fakeplaceholder="E-mail" type="email" defaultValue={"g.texier@notaires.fr"} disabled />
-									<InputField name="phone" fakeplaceholder="Numéro de téléphone" type="tel" disabled />
+									<InputField name="phone" fakeplaceholder="Numéro de téléphone" type="tel" defaultValue={"06 74 83 90 23"} disabled />
 								</div>
 							</Form>
 						</div>
@@ -42,11 +42,12 @@ export default class MyAccount extends Base<IProps, IState> {
 										name="office_denomination"
 										fakeplaceholder="Dénomination de l'office"
 										type="text"
+										defaultValue="AP NOTAIRES"
 										disabled
 									/>
-									<InputField name="crpcen" fakeplaceholder="CRPCEN" type="number" disabled />
+									<InputField name="crpcen" fakeplaceholder="CRPCEN" type="number" defaultValue="04839284" disabled />
-									<InputField name="cp_address" fakeplaceholder="Adresse CP" type="text" disabled />
+									<InputField name="cp_address" fakeplaceholder="Adresse CP" defaultValue="4 Avenue de La Forêt" type="text" disabled />
-									<InputField name="city" fakeplaceholder="Ville" type="text" disabled />
+									<InputField name="city" fakeplaceholder="Ville" type="text" defaultValue="35340 LIFFRE" disabled />
 								</div>
 							</Form>
 						</div>

src/front/Config/VariablesFront.ts

@@ -19,6 +19,10 @@ export class FrontendVariables {
 
 	public KEY_DATA!: string;
 
+	public FC_AUTHORIZE_ENDPOINT!: string;
+
+	public FC_CLIENT_ID!: string;
+
 	private constructor() {}
 
 	public static getInstance(): FrontendVariables {

src/pages/_app.tsx

@@ -20,6 +20,8 @@ type AppPropsWithLayout = AppProps & {
 	frontAppPort: string;
 	idNotAuthorizeEndpoint: string;
 	idNotClientId: string;
+	fcAuthorizeEndpoint: string;
+	fcClientId: string;
 };
 
 const MyApp = (({
@@ -33,6 +35,8 @@ const MyApp = (({
 	frontAppPort,
 	idNotAuthorizeEndpoint,
 	idNotClientId,
+	fcAuthorizeEndpoint,
+	fcClientId
 }: AppPropsWithLayout) => {
 	const getLayout = Component.getLayout ?? ((page) => <DefaultLayout children={page}></DefaultLayout>);
 
@@ -45,6 +49,8 @@ const MyApp = (({
 	instance.FRONT_APP_PORT = frontAppPort;
 	instance.IDNOT_AUTHORIZE_ENDPOINT = idNotAuthorizeEndpoint;
 	instance.IDNOT_CLIENT_ID = idNotClientId;
+	instance.FC_AUTHORIZE_ENDPOINT= fcAuthorizeEndpoint;
+	instance.FC_CLIENT_ID = fcClientId
 
 	return getLayout(<Component {...pageProps} />);
 }) as AppType;
@@ -59,6 +65,8 @@ MyApp.getInitialProps = async () => {
 		frontAppPort: process.env["NEXT_PUBLIC_FRONT_APP_PORT"],
 		idNotAuthorizeEndpoint: process.env["NEXT_PUBLIC_IDNOT_AUTHORIZE_ENDPOINT"],
 		idNotClientId: process.env["NEXT_PUBLIC_IDNOT_CLIENT_ID"],
+		fcAuthorizeEndpoint: process.env["NEXT_PUBLIC_FC_AUTHORIZE_ENDPOINT"],
+		fcClientId: process.env["NEXT_PUBLIC_FC_CLIENT_ID"]
 	};
 };
 

src/pages/login-callback.tsx

@@ -0,0 +1,5 @@
+import ClientDashboard from "@Front/Components/Layouts/ClientDashboard";
+
+export default function Route() {
+	return <ClientDashboard />;
+}