4nk/lecoffre-back
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge Dev in Staging

Browse Source
This commit is contained in:
Arnaud D. Natali 2023-10-11 13:02:59 +02:00 committed by GitHub
commit 5ab418748c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 44 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
src/app/api/franceConnect/CustomerController.ts
View File

@ -1,67 +0,0 @@
import { Response, Request } from "express";
import { Controller, Post } from "@ControllerPattern/index";
import ApiController from "@Common/system/controller-pattern/ApiController";
import { Service } from "typedi";
import AuthService, { ICustomerJwtPayload } from "@Services/common/AuthService/AuthService";
import { JwtPayload } from "jsonwebtoken";
@Controller()
@Service()
export default class CustomerController extends ApiController {
constructor(private authService: AuthService) {
super();
}
// @Post("/api/v1/france-connect/customer/login/:email")
// protected async login(req: Request, response: Response) {
// try {
// const email = req.params["email"];
// if (!email) throw new Error("email is required");
// const payload = await this.authService.getCustomerJwtPayload(email);
// if (!payload) {
// this.httpNotFoundRequest(response);
// return;
// }
// const accessToken = this.authService.generateAccessToken(payload);
// const refreshToken = this.authService.generateRefreshToken(payload);
// //success
// this.httpSuccess(response, { accessToken, refreshToken });
// } catch (error) {
// this.httpInternalError(response);
// return;
// }
// }
@Post("/api/v1/france-connect/customer/refresh-token")
protected async refreshToken(req: Request, response: Response) {
try {
const authHeader = req.headers["authorization"];
const token = authHeader && authHeader.split(" ")[1];
if (!token) {
this.httpBadRequest(response);
return;
}
let accessToken;
this.authService.verifyRefreshToken(token, (err, customerPayload) => {
if (err) {
this.httpUnauthorized(response);
return;
}
const customer = customerPayload as JwtPayload;
delete customer.iat;
delete customer!.exp;
accessToken = this.authService.generateAccessToken({...customer} as ICustomerJwtPayload);
});
//success
this.httpSuccess(response, {accessToken});
} catch (error) {
this.httpInternalError(response);
return;
}
}
}

40
src/app/api/id360/CustomerController.ts
View File

@ -4,7 +4,7 @@ import ApiController from "@Common/system/controller-pattern/ApiController";
import { Service } from "typedi";
import Id360Service, { EnrollmentResponse } from "@Services/common/Id360Service/Id360Service";
import CustomersService from "@Services/customer/CustomersService/CustomersService";
import AuthService from "@Services/common/AuthService/AuthService";
import AuthService, { ICustomerJwtPayload } from "@Services/common/AuthService/AuthService";
import { Customer } from "le-coffre-resources/dist/SuperAdmin";
@Controller()
@ -34,11 +34,9 @@ export default class CustomerController extends ApiController {
return;
}
try {
await new Promise( resolve => setTimeout(resolve, 3000)); // wait 3 seconds to be sure that the enrollment is finilazed
const res = await this.id360Service.getEnrollment(callbackToken);
const enrollment = await res.json() as EnrollmentResponse;
if(enrollment.status === "STARTED") {
this.loginCallback(req, response);
}
if (enrollment.status !== "OK") {
this.httpUnauthorized(response, "Enrollment status is not OK");
return;
@ -88,4 +86,38 @@ export default class CustomerController extends ApiController {
return;
}
}
@Post("/api/v1/id360/customers/refresh-token")
protected async refreshToken(req: Request, response: Response) {
try {
const authHeader = req.headers["authorization"];
const token = authHeader && authHeader.split(" ")[1];
if (!token) {
this.httpBadRequest(response);
return;
}
let accessToken;
this.authService.verifyRefreshToken(token, (err, userPayload) => {
if (err) {
console.log(err);
this.httpUnauthorized(response);
return;
}
const user = userPayload as ICustomerJwtPayload;
delete user.iat;
delete user.exp;
accessToken = this.authService.generateAccessToken(user);
});
//success
this.httpSuccess(response, { accessToken });
} catch (error) {
console.log(error);
this.httpInternalError(response);
return;
}
}
}

3
src/app/api/idnot/UserController.ts
View File

@ -70,12 +70,15 @@ export default class UserController extends ApiController {
}
const user = userPayload as IUserJwtPayload;
delete user.iat;
delete user.exp;
accessToken = this.authService.generateAccessToken(user);
});
//success
this.httpSuccess(response, { accessToken });
} catch (error) {
console.log(error);
this.httpInternalError(response);
return;
}

2
src/app/index.ts
View File

@ -9,7 +9,6 @@ import DeedTypesControllerSuperAdmin from "./api/super-admin/DeedTypesController
import DocumentsControllerSuperAdmin from "./api/super-admin/DocumentsController";
import DocumentTypesControllerSuperAdmin from "./api/super-admin/DocumentTypesController";
import IdNotUserController from "./api/idnot/UserController";
import FranceConnectCustomerController from "./api/franceConnect/CustomerController";
import FilesControllerSuperAdmin from "./api/super-admin/FilesController";
import RulesControllerSuperAdmin from "./api/super-admin/RulesController";
import RolesControllerSuperAdmin from "./api/super-admin/RolesController";
@ -64,7 +63,6 @@ export default {
Container.get(DocumentTypesControllerSuperAdmin);
Container.get(LiveVoteController);
Container.get(IdNotUserController);
Container.get(FranceConnectCustomerController);
Container.get(FilesControllerSuperAdmin);
Container.get(DocumentsControllerSuperAdmin);
Container.get(RulesControllerSuperAdmin);

1
src/common/system/controller-pattern/BaseController.ts
View File

@ -45,6 +45,7 @@ export default abstract class BaseController {
}
protected httpResponse(response: Response, httpCode: HttpCodes, responseData: IResponseData = {}) {
console.log("httpResponse", httpCode, responseData);
if (responseData instanceof Error) {
throw responseData;
}

1
src/services/admin/DocumentsService/DocumentsService.ts
View File

@ -46,7 +46,6 @@ export default class DocumentsService extends BaseService {
public async refuse(uid: string, document: Partial<Document>, refused_reason: string): Promise<Documents> {
if (document.files) {
for (let i = 0; i < document.files.length; i++) {
console.log("archiving file", document.files[i]?.uid);
await this.filesRepository.deleteKeyAndArchive(document.files[i]?.uid as string);
}
}

4
src/services/common/AuthService/AuthService.ts
View File

@ -14,6 +14,8 @@ enum PROVIDER_OPENID {
export interface ICustomerJwtPayload {
customerId: string;
email: string;
iat?: number;
exp?: number;
}
export interface IdNotJwtPayload {
@ -31,6 +33,8 @@ export interface IUserJwtPayload {
office_Id: string;
role: string;
rules: string[];
iat?: number;
exp?: number;
}
@Service()

1
src/services/notary/DocumentsService/DocumentsService.ts
View File

@ -46,7 +46,6 @@ export default class DocumentsService extends BaseService {
public async refuse(uid: string, document: Partial<Document>, refused_reason: string): Promise<Documents> {
if (document.files) {
for (let i = 0; i < document.files.length; i++) {
console.log("archiving file", document.files[i]?.uid);
await this.filesRepository.deleteKeyAndArchive(document.files[i]?.uid as string);
}
}

1
src/services/super-admin/DocumentsService/DocumentsService.ts
View File

@ -46,7 +46,6 @@ export default class DocumentsService extends BaseService {
public async refuse(uid: string, document: Partial<Document>, refused_reason: string): Promise<Documents> {
if (document.files) {
for (let i = 0; i < document.files.length; i++) {
console.log("archiving file", document.files[i]?.uid);
await this.filesRepository.deleteKeyAndArchive(document.files[i]?.uid as string);
}
}