4nk/lecoffre-front
5
0
Fork 0
Code Issues 3 Pull Requests 2 Actions Packages Projects Releases Wiki Activity

WIP: titouan #23

Closed
Titouan wants to merge 6 commits from titouan into dev
pull from: titouan
merge into: 4nk:dev
Conversation 0 Commits 6 Files Changed 8 +54 -48
8 changed files with 54 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.env.example
View File

@ -1,6 +1,11 @@
4NK_URL=
FRONT_APP_HOST=
IDNOT_BASE_URL=
IDNOT_AUTHORIZE_ENDPOINT=
IDNOT_CLIENT_ID=
BACK_API_PROTOCOL= BACK_API_PROTOCOL=
BACK_API_HOSTNAME= BACK_API_HOSTNAME=
BACK_API_PORT= BACK_API_PORT=
BACK_API_ROOT_URL= BACK_API_ROOT_URL=
BACK_API_VERSION= BACK_API_VERSION=
ANK_BASE_REDIRECT_URI=

5
.github/workflows/dev.yml → .github/workflows/titouan.yml vendored
View File

@ -2,7 +2,7 @@ name: Build and Push to Registry
on: on:
push: push:
branches: [ dev ] branches: [ titouan ]
env: env:
REGISTRY: git.4nkweb.com REGISTRY: git.4nkweb.com
@ -37,6 +37,5 @@ jobs:
push: true push: true
ssh: default ssh: default
tags: | tags: |
${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:titouan
${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:dev
${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ gitea.sha }} ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ gitea.sha }}

3
next.config.js
View File

@ -22,6 +22,7 @@ const nextConfig = {
NEXT_PUBLIC_HOTJAR_VERSION: process.env.NEXT_PUBLIC_HOTJAR_VERSION, NEXT_PUBLIC_HOTJAR_VERSION: process.env.NEXT_PUBLIC_HOTJAR_VERSION,
NEXT_PUBLIC_4NK_URL: process.env.NEXT_PUBLIC_4NK_URL, NEXT_PUBLIC_4NK_URL: process.env.NEXT_PUBLIC_4NK_URL,
NEXT_PUBLIC_API_URL: process.env.NEXT_PUBLIC_API_URL, NEXT_PUBLIC_API_URL: process.env.NEXT_PUBLIC_API_URL,
NEXT_PUBLICK_ANK_BASE_REDIRECT_URI: process.env.NEXT_PUBLIC_ANK_BASE_REDIRECT_URI,
NEXT_PUBLIC_DEFAULT_VALIDATOR_ID: process.env.NEXT_PUBLIC_DEFAULT_VALIDATOR_ID, NEXT_PUBLIC_DEFAULT_VALIDATOR_ID: process.env.NEXT_PUBLIC_DEFAULT_VALIDATOR_ID,
NEXT_PUBLIC_DEFAULT_STORAGE_URLS: process.env.NEXT_PUBLIC_DEFAULT_STORAGE_URLS, NEXT_PUBLIC_DEFAULT_STORAGE_URLS: process.env.NEXT_PUBLIC_DEFAULT_STORAGE_URLS,
}, },
@ -42,6 +43,7 @@ const nextConfig = {
NEXT_PUBLIC_HOTJAR_VERSION: process.env.NEXT_PUBLIC_HOTJAR_VERSION, NEXT_PUBLIC_HOTJAR_VERSION: process.env.NEXT_PUBLIC_HOTJAR_VERSION,
NEXT_PUBLIC_4NK_URL: process.env.NEXT_PUBLIC_4NK_URL, NEXT_PUBLIC_4NK_URL: process.env.NEXT_PUBLIC_4NK_URL,
NEXT_PUBLIC_API_URL: process.env.NEXT_PUBLIC_API_URL, NEXT_PUBLIC_API_URL: process.env.NEXT_PUBLIC_API_URL,
NEXT_PUBLICK_ANK_BASE_REDIRECT_URI: process.env.NEXT_PUBLIC_ANK_BASE_REDIRECT_URI,
NEXT_PUBLIC_DEFAULT_VALIDATOR_ID: process.env.NEXT_PUBLIC_DEFAULT_VALIDATOR_ID, NEXT_PUBLIC_DEFAULT_VALIDATOR_ID: process.env.NEXT_PUBLIC_DEFAULT_VALIDATOR_ID,
NEXT_PUBLIC_DEFAULT_STORAGE_URLS: process.env.NEXT_PUBLIC_DEFAULT_STORAGE_URLS, NEXT_PUBLIC_DEFAULT_STORAGE_URLS: process.env.NEXT_PUBLIC_DEFAULT_STORAGE_URLS,
}, },
@ -62,6 +64,7 @@ const nextConfig = {
NEXT_PUBLIC_HOTJAR_VERSION: process.env.NEXT_PUBLIC_HOTJAR_VERSION, NEXT_PUBLIC_HOTJAR_VERSION: process.env.NEXT_PUBLIC_HOTJAR_VERSION,
NEXT_PUBLIC_4NK_URL: process.env.NEXT_PUBLIC_4NK_URL, NEXT_PUBLIC_4NK_URL: process.env.NEXT_PUBLIC_4NK_URL,
NEXT_PUBLIC_API_URL: process.env.NEXT_PUBLIC_API_URL, NEXT_PUBLIC_API_URL: process.env.NEXT_PUBLIC_API_URL,
NEXT_PUBLICK_ANK_BASE_REDIRECT_URI: process.env.NEXT_PUBLIC_ANK_BASE_REDIRECT_URI,
NEXT_PUBLIC_DEFAULT_VALIDATOR_ID: process.env.NEXT_PUBLIC_DEFAULT_VALIDATOR_ID, NEXT_PUBLIC_DEFAULT_VALIDATOR_ID: process.env.NEXT_PUBLIC_DEFAULT_VALIDATOR_ID,
NEXT_PUBLIC_DEFAULT_STORAGE_URLS: process.env.NEXT_PUBLIC_DEFAULT_STORAGE_URLS, NEXT_PUBLIC_DEFAULT_STORAGE_URLS: process.env.NEXT_PUBLIC_DEFAULT_STORAGE_URLS,
}, },

33
src/front/Api/Auth/IdNot/index.ts
View File

@ -41,12 +41,8 @@ export default class Auth extends BaseApiService {
} }
public async idNotAuth(autorizationCode: string | string[]): Promise<{ idNotUser: any; authToken: string }> { public async idNotAuth(autorizationCode: string | string[]): Promise<{ idNotUser: any; authToken: string }> {
// const variables = FrontendVariables.getInstance(); const variables = FrontendVariables.getInstance();
const url = new URL(`${variables.BACK_API_PROTOCOL}://${variables.BACK_API_HOST}:${variables.BACK_API_PORT}/api/v1/idnot/auth/${autorizationCode}`);
// TODO: review
const baseBackUrl = 'http://localhost:8080';//variables.BACK_API_PROTOCOL + variables.BACK_API_HOST;
const url = new URL(`${baseBackUrl}/api/v1/idnot/auth/${autorizationCode}`);
try { try {
return await this.postRequest<{ idNotUser: any; authToken: string }>(url); return await this.postRequest<{ idNotUser: any; authToken: string }>(url);
} catch (err) { } catch (err) {
@ -56,9 +52,8 @@ export default class Auth extends BaseApiService {
} }
public async getIdNotUser(): Promise<{ success: boolean; data: any }> { public async getIdNotUser(): Promise<{ success: boolean; data: any }> {
const baseBackUrl = 'http://localhost:8080';//variables.BACK_API_PROTOCOL + variables.BACK_API_HOST; const variables = FrontendVariables.getInstance();
const url = new URL(`${variables.BACK_API_PROTOCOL}://${variables.BACK_API_HOST}:${variables.BACK_API_PORT}/api/v1/idnot/user`);
const url = new URL(`${baseBackUrl}/api/v1/idnot/user`);
try { try {
return await this.getRequest(url); return await this.getRequest(url);
} }
@ -69,9 +64,8 @@ export default class Auth extends BaseApiService {
} }
public async getIdNotOfficeForUser(userId: string): Promise<any[]> { public async getIdNotOfficeForUser(userId: string): Promise<any[]> {
const baseBackUrl = 'http://localhost:8080';//variables.BACK_API_PROTOCOL + variables.BACK_API_HOST; const variables = FrontendVariables.getInstance();
const url = new URL(`${variables.BACK_API_PROTOCOL}://${variables.BACK_API_HOST}:${variables.BACK_API_PORT}/api/v1/idnot/user/rattachements`);
const url = new URL(`${baseBackUrl}/api/v1/idnot/user/rattachements`);
url.searchParams.set('idNot', userId); url.searchParams.set('idNot', userId);
try { try {
return await this.getRequest(url); return await this.getRequest(url);
@ -83,9 +77,8 @@ export default class Auth extends BaseApiService {
} }
public async getIdNotUserForOffice(officeId: string): Promise<any[]> { public async getIdNotUserForOffice(officeId: string): Promise<any[]> {
const baseBackUrl = 'http://localhost:8080';//variables.BACK_API_PROTOCOL + variables.BACK_API_HOST; const variables = FrontendVariables.getInstance();
const url = new URL(`${variables.BACK_API_PROTOCOL}://${variables.BACK_API_HOST}:${variables.BACK_API_PORT}/api/v1/idnot/office/rattachements`);
const url = new URL(`${baseBackUrl}/api/v1/idnot/office/rattachements`);
url.searchParams.set('idNot', officeId); url.searchParams.set('idNot', officeId);
try { try {
return await this.getRequest(url); return await this.getRequest(url);
@ -96,9 +89,8 @@ export default class Auth extends BaseApiService {
} }
public async getUserProcessByIdNot(pairingId: string): Promise<{ success: boolean; data: { processId: string, processData: { [key: string]: any } } }> { public async getUserProcessByIdNot(pairingId: string): Promise<{ success: boolean; data: { processId: string, processData: { [key: string]: any } } }> {
const baseBackUrl = 'http://localhost:8080';//variables.BACK_API_PROTOCOL + variables.BACK_API_HOST; const variables = FrontendVariables.getInstance();
const url = new URL(`${variables.BACK_API_PROTOCOL}://${variables.BACK_API_HOST}:${variables.BACK_API_PORT}/api/v1/process/user`);
const url = new URL(`${baseBackUrl}/api/v1/process/user`);
url.searchParams.set('pairingId', pairingId); url.searchParams.set('pairingId', pairingId);
try { try {
return await this.getRequest(url); return await this.getRequest(url);
@ -109,9 +101,8 @@ export default class Auth extends BaseApiService {
} }
public async getOfficeProcessByIdNot(): Promise<{ success: boolean; data: { processId: string, processData: { [key: string]: any } } }> { public async getOfficeProcessByIdNot(): Promise<{ success: boolean; data: { processId: string, processData: { [key: string]: any } } }> {
const baseBackUrl = 'http://localhost:8080';//variables.BACK_API_PROTOCOL + variables.BACK_API_HOST; const variables = FrontendVariables.getInstance();
const url = new URL(`${variables.BACK_API_PROTOCOL}://${variables.BACK_API_HOST}:${variables.BACK_API_PORT}/api/v1/process/office`);
const url = new URL(`${baseBackUrl}/api/v1/process/office`);
try { try {
return await this.getRequest(url); return await this.getRequest(url);
} catch (err) { } catch (err) {

5
src/front/Api/LeCoffreApi/Notary/Customers/Customers.ts
View File

@ -89,10 +89,7 @@ export default class Customers extends BaseNotary {
} }
public async sendReminder(office: any, customer: any): Promise<void> { public async sendReminder(office: any, customer: any): Promise<void> {
// TODO: review const url = new URL(`${this.variables.BACK_API_PROTOCOL}://${this.variables.BACK_API_HOST}:${this.variables.BACK_API_PORT}/api/send_reminder`);
const baseBackUrl = 'http://localhost:8080';//variables.BACK_API_PROTOCOL + variables.BACK_API_HOST;
const url = new URL(`${baseBackUrl}/api/send_reminder`);
//const url = new URL(this.baseURl.concat(`/${uid}/send_reminder`)); //const url = new URL(this.baseURl.concat(`/${uid}/send_reminder`));
try { try {

8
src/front/Components/Layouts/Login/StepEmail/index.tsx
View File

@ -41,18 +41,18 @@ export default function StepEmail(props: IProps) {
const router = useRouter(); const router = useRouter();
const error = router.query["error"]; const error = router.query["error"];
const variables = FrontendVariables.getInstance();
const redirectUserOnConnection = useCallback(() => { const redirectUserOnConnection = useCallback(() => {
/* TODO: review /* TODO: review
const variables = FrontendVariables.getInstance();
router.push( router.push(
`${variables.IDNOT_BASE_URL + variables.IDNOT_AUTHORIZE_ENDPOINT}?client_id=${variables.IDNOT_CLIENT_ID}&redirect_uri=${ `${variables.IDNOT_BASE_URL + variables.IDNOT_AUTHORIZE_ENDPOINT}?client_id=${variables.IDNOT_CLIENT_ID}&redirect_uri=${
variables.FRONT_APP_HOST variables.FRONT_APP_HOST
}/authorized-client&scope=openid,profile&response_type=code`, }/authorized-client&scope=openid,profile&response_type=code`,
); );
*/ */
const redirectUri = 'http://local.4nkweb.com:3000/authorized-client';
router.push( router.push(
`https://qual-connexion.idnot.fr/user/IdPOAuth2/authorize/idnot_idp_v1?client_id=B3CE56353EDB15A9&redirect_uri=${redirectUri}&scope=openid,profile&response_type=code`, `${variables.IDNOT_BASE_URL}/user/${variables.IDNOT_AUTHORIZE_ENDPOINT}?client_id=${variables.IDNOT_CLIENT_ID}&redirect_uri=${variables.ANK_BASE_REDIRECT_URI}&scope=openid,profile&response_type=code`,
); );
}, [router]); }, [router]);
@ -66,7 +66,7 @@ export default function StepEmail(props: IProps) {
const closeNoEmailModal = useCallback(() => { const closeNoEmailModal = useCallback(() => {
setIsErrorModalOpen(0); setIsErrorModalOpen(0);
router.push("https://connexion.idnot.fr/"); router.push(variables.IDNOT_BASE_URL);
}, [router]); }, [router]);
// const closeContactAdminModal = () => { // const closeContactAdminModal = () => {

39
src/front/Components/Layouts/LoginCallback/index.tsx
View File

@ -23,6 +23,7 @@ import Iframe from "src/sdk/Iframe";
import LoaderService from "src/common/Api/LeCoffreApi/sdk/Loader/LoaderService"; import LoaderService from "src/common/Api/LeCoffreApi/sdk/Loader/LoaderService";
import { ProgressInfo } from "src/common/Api/LeCoffreApi/sdk/ImportData"; import { ProgressInfo } from "src/common/Api/LeCoffreApi/sdk/ImportData";
import { FrontendVariables } from "@Front/Config/VariablesFront";
export default function LoginCallBack() { export default function LoginCallBack() {
const router = useRouter(); const router = useRouter();
@ -44,7 +45,7 @@ export default function LoginCallBack() {
resolve(UserStore.instance.getUser()); resolve(UserStore.instance.getUser());
return; return;
} }
// Poll for userInfo every 100ms // Poll for userInfo every 100ms
const checkInterval = setInterval(() => { const checkInterval = setInterval(() => {
if (UserStore.instance.getUser()) { if (UserStore.instance.getUser()) {
@ -52,7 +53,7 @@ export default function LoginCallBack() {
resolve(UserStore.instance.getUser()); resolve(UserStore.instance.getUser());
} }
}, 100); }, 100);
// Timeout after 60 seconds // Timeout after 60 seconds
setTimeout(() => { setTimeout(() => {
clearInterval(checkInterval); clearInterval(checkInterval);
@ -65,14 +66,22 @@ export default function LoginCallBack() {
async function getUser() { async function getUser() {
UserStore.instance.disconnect(); UserStore.instance.disconnect();
// TODO: review const variables = FrontendVariables.getInstance();
// HACK: If start with http://local.lecoffreio.4nkweb:3000/authorized-client if (!variables?.ANK_BASE_REDIRECT_URI || !variables?.FRONT_APP_HOST) {
// Replace with http://localhost:3000/authorized-client console.error("Redirect URIs not properly configured");
if (window.location.href.startsWith('http://local.4nkweb.com')) { } else if (window.location.href.startsWith(`${variables.ANK_BASE_REDIRECT_URI}/authorized-client`)) {
window.location.href = window.location.href.replace('http://local.4nkweb.com:3000/authorized-client', 'http://localhost:3000/authorized-client'); const newUrl = window.location.href.replace(
return; `${variables.ANK_BASE_REDIRECT_URI}/authorized-client`,
`${variables.FRONT_APP_HOST}/authorized-client`
);
history.replaceState(null, '', newUrl); // Change l'URL sans rechargement
} }
// else if (window.location.href.startsWith(variables.ANK_BASE_REDIRECT_URI)) {
// window.location.href = window.location.href.replace(`${variables.ANK_BASE_REDIRECT_URI}/authorized-client`, `${variables.FRONT_APP_HOST}/authorized-client`);
// return;
// }
const code = router.query["code"]; const code = router.query["code"];
if (code) { if (code) {
try { try {
@ -83,15 +92,15 @@ export default function LoginCallBack() {
} }
const user: any = await Auth.getInstance().idNotAuth(code as string); const user: any = await Auth.getInstance().idNotAuth(code as string);
// Extract both user data and auth token from the response // Extract both user data and auth token from the response
const { idNotUser, authToken } = user; const { idNotUser, authToken } = user;
if (!authToken) { if (!authToken) {
console.error('[LoginCallback] No authToken received from backend'); console.error('[LoginCallback] No authToken received from backend');
return router.push(Module.getInstance().get().modules.pages.Login.props.path + "?error=1"); return router.push(Module.getInstance().get().modules.pages.Login.props.path + "?error=1");
} }
// Store the auth token for API authentication // Store the auth token for API authentication
// TODO The authToken is just a uuid for now, it's very broken // TODO The authToken is just a uuid for now, it's very broken
CookieService.getInstance().setCookie("leCoffreAccessToken", authToken); CookieService.getInstance().setCookie("leCoffreAccessToken", authToken);
@ -109,7 +118,7 @@ export default function LoginCallBack() {
CookieService.getInstance().setCookie("leCoffreUserInfo", JSON.stringify(userInfoResponse.data)); CookieService.getInstance().setCookie("leCoffreUserInfo", JSON.stringify(userInfoResponse.data));
setIsAuthModalOpen(true); setIsAuthModalOpen(true);
console.log('[LoginCallback] authToken stored successfully'); console.log('[LoginCallback] authToken stored successfully');
return; return;
} catch (e: any) { } catch (e: any) {
if (e.http_status === 401 && e.message === "Email not found") { if (e.http_status === 401 && e.message === "Email not found") {
@ -217,7 +226,7 @@ export default function LoginCallBack() {
// Office may not have a process too // Office may not have a process too
let collaboratorProcess: { processId: string, processData: { [key: string]: any } } | null = null; let collaboratorProcess: { processId: string, processData: { [key: string]: any } } | null = null;
let officeProcess: { processId: string, processData: { [key: string]: any } } | null = null; let officeProcess: { processId: string, processData: { [key: string]: any } } | null = null;
// Initialize collaborator process // Initialize collaborator process
try { try {
// Wait for pairing ID to be available before proceeding // Wait for pairing ID to be available before proceeding
@ -225,7 +234,7 @@ export default function LoginCallBack() {
console.log('[LoginCallback] Pairing ID obtained:', pairingId); console.log('[LoginCallback] Pairing ID obtained:', pairingId);
// Check if we are part of the right collaborator process // Check if we are part of the right collaborator process
const myCollaboratorProcessesData = await MessageBus.getInstance().getProcessesDecoded((processId: string, values: { [key: string]: any }) => { const myCollaboratorProcessesData = await MessageBus.getInstance().getProcessesDecoded((processId: string, values: { [key: string]: any }) => {
return values['utype'] === 'collaborator' return values['utype'] === 'collaborator'
&& values['idNot'] === userInfo.idNot && values['idNot'] === userInfo.idNot
&& values['isDeleted'] === 'false'; && values['isDeleted'] === 'false';
}); });
@ -261,7 +270,7 @@ export default function LoginCallBack() {
console.log('[LoginCallback] Pairing ID obtained:', pairingId); console.log('[LoginCallback] Pairing ID obtained:', pairingId);
// Now we need to check for office process // Now we need to check for office process
const myOfficeProcessesData = await MessageBus.getInstance().getProcessesDecoded((processId: string, values: { [key: string]: any }) => { const myOfficeProcessesData = await MessageBus.getInstance().getProcessesDecoded((processId: string, values: { [key: string]: any }) => {
return values['utype'] === 'office' return values['utype'] === 'office'
&& values['idNot'] === userInfo.office.idNot && values['idNot'] === userInfo.office.idNot
&& values['isDeleted'] === 'false'; && values['isDeleted'] === 'false';
}); });

2
src/front/Config/VariablesFront.ts
View File

@ -35,6 +35,8 @@ export class FrontendVariables {
public API_URL!: string; public API_URL!: string;
public ANK_BASE_REDIRECT_URI!: string;
private constructor() {} private constructor() {}
public static getInstance(): FrontendVariables { public static getInstance(): FrontendVariables {