diff --git a/src/app/api/franceConnect/CustomerController.ts b/src/app/api/franceConnect/CustomerController.ts index 633bed86..f4a4ed20 100644 --- a/src/app/api/franceConnect/CustomerController.ts +++ b/src/app/api/franceConnect/CustomerController.ts @@ -54,7 +54,7 @@ export default class CustomerController extends ApiController { }); //success - this.httpSuccess(response, accessToken); + this.httpSuccess(response, {accessToken}); } catch (error) { this.httpInternalError(response); return; diff --git a/src/app/api/idnot/UserController.ts b/src/app/api/idnot/UserController.ts index ebd1c50b..e15b0c47 100644 --- a/src/app/api/idnot/UserController.ts +++ b/src/app/api/idnot/UserController.ts @@ -63,7 +63,7 @@ export default class UserController extends ApiController { } } - @Post("/api/v1/idnot/user/refresh-token") + @Post("/api/v1/idnot/user/auth/refresh-token") protected async refreshToken(req: Request, response: Response) { try { const authHeader = req.headers["authorization"]; @@ -77,6 +77,7 @@ export default class UserController extends ApiController { let accessToken; this.authService.verifyRefreshToken(token, (err, userPayload) => { if (err) { + console.log(err) this.httpUnauthorized(response); return; } @@ -88,7 +89,7 @@ export default class UserController extends ApiController { }); //success - this.httpSuccess(response, accessToken); + this.httpSuccess(response, {accessToken}); } catch (error) { this.httpInternalError(response); return; diff --git a/src/common/databases/seeders/seeder.ts b/src/common/databases/seeders/seeder.ts index 5cd50974..89b9aebe 100644 --- a/src/common/databases/seeders/seeder.ts +++ b/src/common/databases/seeders/seeder.ts @@ -598,20 +598,8 @@ export default async function main() { updated_at: new Date(), }, { - name: "PUT users", - label: "Modification des utilisateurs", - created_at: new Date(), - updated_at: new Date(), - }, - { - name: "PUT offices", - label: "Modification des offices", - created_at: new Date(), - updated_at: new Date(), - }, - { - name: "PUT customers", - label: "Modification des clients", + name: "POST deeds", + label: "Création des actes", created_at: new Date(), updated_at: new Date(), }, @@ -622,38 +610,8 @@ export default async function main() { updated_at: new Date(), }, { - name: "PUT deed-types", - label: "Modification des types d'actes", - created_at: new Date(), - updated_at: new Date(), - }, - { - name: "PUT documents", - label: "Modification des documents", - created_at: new Date(), - updated_at: new Date(), - }, - { - name: "PUT document-types", - label: "Modification des types de documents", - created_at: new Date(), - updated_at: new Date(), - }, - { - name: "PUT files", - label: "Modification des fichiers", - created_at: new Date(), - updated_at: new Date(), - }, - { - name: "PUT folders", - label: "Modification des dossiers", - created_at: new Date(), - updated_at: new Date(), - }, - { - name: "PUT roles", - label: "Modification des rôles", + name: "DELETE deeds", + label: "Suppression des actes", created_at: new Date(), updated_at: new Date(), }, @@ -664,128 +622,8 @@ export default async function main() { updated_at: new Date(), }, { - name: "PUT rules", - label: "Modification des droits", - created_at: new Date(), - updated_at: new Date(), - }, - { - name: "PUT office-roles", - label: "Modification des rôles d'office", - created_at: new Date(), - updated_at: new Date(), - }, - { - name: "POST users", - label: "Création des utilisateurs", - created_at: new Date(), - updated_at: new Date(), - }, - { - name: "POST offices", - label: "Création des offices", - created_at: new Date(), - updated_at: new Date(), - }, - { - name: "POST customers", - label: "Création des clients", - created_at: new Date(), - updated_at: new Date(), - }, - { - name: "POST deeds", - label: "Création des actes", - created_at: new Date(), - updated_at: new Date(), - }, - { - name: "POST deed-types", - label: "Création des types d'actes", - created_at: new Date(), - updated_at: new Date(), - }, - { - name: "POST documents", - label: "Création des documents", - created_at: new Date(), - updated_at: new Date(), - }, - { - name: "POST document-types", - label: "Création des types de documents", - created_at: new Date(), - updated_at: new Date(), - }, - { - name: "POST files", - label: "Création des fichiers", - created_at: new Date(), - updated_at: new Date(), - }, - { - name: "POST roles", - label: "Création des rôles", - created_at: new Date(), - updated_at: new Date(), - }, - { - name: "POST rules", - label: "Création des droits", - created_at: new Date(), - updated_at: new Date(), - }, - { - name: "POST office-roles", - label: "Création des rôles d'office", - created_at: new Date(), - updated_at: new Date(), - }, - { - name: "DELETE users", - label: "Suppression des utilisateurs", - created_at: new Date(), - updated_at: new Date(), - }, - { - name: "DELETE offices", - label: "Suppression des offices", - created_at: new Date(), - updated_at: new Date(), - }, - { - name: "DELETE customers", - label: "Suppression des clients", - created_at: new Date(), - updated_at: new Date(), - }, - { - name: "DELETE deeds", - label: "Suppression des actes", - created_at: new Date(), - updated_at: new Date(), - }, - { - name: "DELETE deed-types", - label: "Suppression des types d'actes", - created_at: new Date(), - updated_at: new Date(), - }, - { - name: "DELETE documents", - label: "Suppression des documents", - created_at: new Date(), - updated_at: new Date(), - }, - { - name: "DELETE document-types", - label: "Suppression des types de documents", - created_at: new Date(), - updated_at: new Date(), - }, - { - name: "DELETE files", - label: "Suppression des fichiers", + name: "PUT folders", + label: "Modification des dossiers", created_at: new Date(), updated_at: new Date(), }, @@ -796,14 +634,86 @@ export default async function main() { updated_at: new Date(), }, { - name: "DELETE roles", - label: "Suppression des rôles", + name: "POST documents", + label: "Création des documents", created_at: new Date(), updated_at: new Date(), }, { - name: "DELETE rules", - label: "Suppression des droits", + name: "PUT documents", + label: "Modification des documents", + created_at: new Date(), + updated_at: new Date(), + }, + { + name: "DELETE documents", + label: "Suppression des documents", + created_at: new Date(), + updated_at: new Date(), + }, + { + name: "POST customers", + label: "Création des clients", + created_at: new Date(), + updated_at: new Date(), + }, + { + name: "PUT customers", + label: "Modification des clients", + created_at: new Date(), + updated_at: new Date(), + }, + { + name: "DELETE customers", + label: "Suppression des clients", + created_at: new Date(), + updated_at: new Date(), + }, + { + name: "POST deed-types", + label: "Création des types d'actes", + created_at: new Date(), + updated_at: new Date(), + }, + { + name: "PUT deed-types", + label: "Modification des types d'actes", + created_at: new Date(), + updated_at: new Date(), + }, + { + name: "DELETE deed-types", + label: "Suppression des types d'actes", + created_at: new Date(), + updated_at: new Date(), + }, + { + name: "POST document-types", + label: "Création des types de documents", + created_at: new Date(), + updated_at: new Date(), + }, + { + name: "PUT document-types", + label: "Modification des types de documents", + created_at: new Date(), + updated_at: new Date(), + }, + { + name: "DELETE document-types", + label: "Suppression des types de documents", + created_at: new Date(), + updated_at: new Date(), + }, + { + name: "POST office-roles", + label: "Création des rôles d'office", + created_at: new Date(), + updated_at: new Date(), + }, + { + name: "PUT office-roles", + label: "Modification des rôles d'office", created_at: new Date(), updated_at: new Date(), }, @@ -813,6 +723,24 @@ export default async function main() { created_at: new Date(), updated_at: new Date(), }, + { + name: "DELETE office-roles", + label: "Suppression des rôles d'office", + created_at: new Date(), + updated_at: new Date(), + }, + { + name: "PUT users", + label: "Modification des utilisateurs", + created_at: new Date(), + updated_at: new Date(), + }, + { + name: "PUT offices", + label: "Modification des offices", + created_at: new Date(), + updated_at: new Date(), + }, ]; const roles: Role[] = [ @@ -842,7 +770,7 @@ export default async function main() { label: "Utilisateur", created_at: new Date(), updated_at: new Date(), - rules: rules.slice(0, 11), + rules: rules.slice(0,1), }, ]; @@ -1378,7 +1306,7 @@ export default async function main() { city: office.address!.city, }, }, - office_status: EOfficeStatus.DESACTIVATED, + office_status: EOfficeStatus.ACTIVATED, }, }); office.uid = officeCreated.uid; diff --git a/src/services/common/AuthService/AuthService.ts b/src/services/common/AuthService/AuthService.ts index 07a5f7bf..fe8d4ded 100644 --- a/src/services/common/AuthService/AuthService.ts +++ b/src/services/common/AuthService/AuthService.ts @@ -84,7 +84,7 @@ export default class AuthService extends BaseService { }; } public generateAccessToken(user: any): string { - return jwt.sign({ ...user }, this.variables.ACCESS_TOKEN_SECRET, { expiresIn: "1h" }); + return jwt.sign({ ...user }, this.variables.ACCESS_TOKEN_SECRET, { expiresIn: "15m" }); } public generateRefreshToken(user: any): string {