Merge branch 'fix/createFolder' into dev

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

@@ -1,5 +1,4 @@
 import { File } from "le-coffre-resources/dist/SuperAdmin";
-
 import BaseSuperAdmin from "../BaseSuperAdmin";
 
 // TODO Type get query params -> Where + inclue + orderby

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

@@ -21,6 +21,7 @@ import { ActionMeta, MultiValue } from "react-select";
 
 import BasePage from "../../Base";
 import classes from "./classes.module.scss";
+import JwtService from "@Front/Services/JwtService/JwtService";
 
 type IFormValues = {
 	folder_number: string;
@@ -233,16 +234,12 @@ class CreateFolderClass extends BasePage<IPropsClass, IState> {
 			[key: string]: any;
 		},
 	) {
+		const officeId = (JwtService.getInstance().decodeJwt())?.office_Id;
+		console.log('form initializdd');
 		const selectedDeedTypeUid: DeedType | undefined = this.state.deedTypes.find(
 			(deedType) => deedType.uid === this.state.formValues.act_typ?.value,
 		);
 
-		/**
-		 * MOCK DATA
-		 */
-		const usersMock = await Users.getInstance().get({ include: { office_membership: true } });
-		const userMock = usersMock[0];
-
 		let stakeholders = this.state.collaborators;
 		if (this.state.folder_access === "select_collaborators") {
 			stakeholders = this.state.collaborators.filter((collaborator) => {
@@ -261,23 +258,27 @@ class CreateFolderClass extends BasePage<IPropsClass, IState> {
 				}),
 			}),
 			office: Office.hydrate<Office>({
-				uid: userMock?.office_membership?.uid,
+				uid: officeId,
 			}),
 			customers: [],
 			stakeholders
 		});
 
+		console.log('form');
+
 		try {
 			await officeFolderForm.validateOrReject?.({ groups: ["createFolder"], forbidUnknownValues: false });
 		} catch (validationErrors) {
 			this.setState({
 				validationError: validationErrors as ValidationError[],
 			});
+			console.log('validation errros');
 			return;
 		}
 
 		try {
 			const newOfficeFolder = await Folders.getInstance().post(officeFolderForm);
+			console.log('new office folder: ',newOfficeFolder)
 			if (!newOfficeFolder) return;
 			this.props.router.push(`/folders/${newOfficeFolder.uid}`);
 		} catch (backError: any) {

src/front/Config/VariablesFront.ts

@@ -11,8 +11,6 @@ export class FrontendVariables {
 
 	public FRONT_APP_HOST!: string;
 
-	public FRONT_APP_PORT!: string;
-
 	public IDNOT_AUTHORIZE_ENDPOINT!: string;
 
 	public IDNOT_CLIENT_ID!: string;

src/front/Services/JwtService/JwtService.ts

@@ -26,15 +26,19 @@ export default class JwtService {
 		return (this.instance ??= new this());
 	}
 
+	public decodeJwt(): IUserJwtPayload | 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
 	 */
 	public async checkJwt() {
-		const accessToken = CookieService.getInstance().getCookie("leCoffreAccessToken");
+		const decodedToken = this.decodeJwt();
-
+		if(!decodedToken) return;
-		if (!accessToken) return;
-		const decodedToken: IUserJwtPayload = jwt_decode(accessToken);
 
 		const now = Math.floor(Date.now() / 1000);
 

src/pages/_app.tsx

@@ -17,7 +17,6 @@ type AppPropsWithLayout = AppProps & {
 	backApiRootUrl: string;
 	backApiVersion: string;
 	frontAppHost: string;
-	frontAppPort: string;
 	idNotAuthorizeEndpoint: string;
 	idNotClientId: string;
 	fcAuthorizeEndpoint: string;
@@ -32,7 +31,6 @@ const MyApp = (({
 	backApiRootUrl,
 	backApiVersion,
 	frontAppHost,
-	frontAppPort,
 	idNotAuthorizeEndpoint,
 	idNotClientId,
 	fcAuthorizeEndpoint,
@@ -46,7 +44,6 @@ const MyApp = (({
 	instance.BACK_API_ROOT_URL = backApiRootUrl ?? "/api";
 	instance.BACK_API_VERSION = backApiVersion ?? "/v1";
 	instance.FRONT_APP_HOST = frontAppHost ?? "app.stg.lecoffre.smart-chain.fr";
-	instance.FRONT_APP_PORT = frontAppPort ?? "3000";
 	instance.IDNOT_AUTHORIZE_ENDPOINT = idNotAuthorizeEndpoint ?? "https://qual-connexion.idnot.fr/IdPOAuth2/authorize/idnot_idp_v1";
 	instance.IDNOT_CLIENT_ID = idNotClientId ?? "4501646203F3EF67";
 	instance.FC_AUTHORIZE_ENDPOINT= fcAuthorizeEndpoint ?? "https://fcp.integ01.dev-franceconnect.fr/api/v1/authorize";