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

✨ refresh token refreshes rules

Browse Source
This commit is contained in:
Maxime Lalo 2024-04-24 11:23:01 +02:00
parent 32f92787cc
commit e4f40336c7
2 changed files with 38 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,7 +2,7 @@ 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, { IUserJwtPayload } from "@Services/common/AuthService/AuthService";
import AuthService, { IUserJwtPayload, PROVIDER_OPENID } from "@Services/common/AuthService/AuthService";
import IdNotService from "@Services/common/IdNotService/IdNotService";
import User, { RulesGroup } from "le-coffre-resources/dist/Admin";
@ -22,7 +22,7 @@ export default class UserController extends ApiController {
private userService: UsersService,
private subscriptionsService: SubscriptionsService,
private seatsService: SeatsService,
private rulesGroupsService: RulesGroupsService
private rulesGroupsService: RulesGroupsService,
) {
super();
}
@ -49,7 +49,6 @@ export default class UserController extends ApiController {
const user = await this.idNotService.getOrCreateUser(idNotToken);
console.log(user);
if (!user) {
this.httpUnauthorized(response, "User not found");
return;
@ -62,7 +61,6 @@ export default class UserController extends ApiController {
const prismaUser = await this.userService.getByUid(user.uid, { contact: true, role: true });
console.log(prismaUser);
if (!prismaUser) {
this.httpNotFoundRequest(response, "user not found");
return;
@ -72,7 +70,6 @@ export default class UserController extends ApiController {
const userHydrated = User.hydrate<User>(prismaUser, { strategy: "excludeAll" });
console.log(userHydrated);
if (!userHydrated.contact?.email || userHydrated.contact?.email === "") {
this.httpUnauthorized(response, "Email not found");
return;
@ -86,8 +83,7 @@ export default class UserController extends ApiController {
console.log("no subscription");
isSubscribed = false;
}
else if (subscriptions[0]?.type === EType.Unlimited) {
} else if (subscriptions[0]?.type === EType.Unlimited) {
console.log("unlimited subscription");
isSubscribed = true;
@ -134,11 +130,16 @@ export default class UserController extends ApiController {
console.log(isSubscribed, userHydrated.role?.name);
if(!isSubscribed && userHydrated.role?.name === "admin" || userHydrated.role?.name === "super-admin"){
const manageSubscriptionRulesEntity = await this.rulesGroupsService.get({ where: { uid: "94343601-04c8-44ef-afb9-3047597528a9" }, include: { rules: true } });
if ((!isSubscribed && userHydrated.role?.name === "admin") || userHydrated.role?.name === "super-admin") {
const manageSubscriptionRulesEntity = await this.rulesGroupsService.get({
where: { uid: "94343601-04c8-44ef-afb9-3047597528a9" },
include: { rules: true },
});
console.log(manageSubscriptionRulesEntity);
const manageSubscriptionRules = RulesGroup.hydrateArray<RulesGroup>(manageSubscriptionRulesEntity, { strategy: "excludeAll" });
const manageSubscriptionRules = RulesGroup.hydrateArray<RulesGroup>(manageSubscriptionRulesEntity, {
strategy: "excludeAll",
});
if (!manageSubscriptionRules[0]) return;
payload.rules = manageSubscriptionRules[0].rules!.map((rule) => rule.name) || [];
@ -147,7 +148,6 @@ export default class UserController extends ApiController {
isSubscribed = true;
}
if (!isSubscribed) {
this.httpUnauthorized(response, "User not subscribed");
return;
@ -176,21 +176,24 @@ export default class UserController extends ApiController {
}
let accessToken;
this.authService.verifyRefreshToken(token, (err, userPayload) => {
this.authService.verifyRefreshToken(token, async (err, userPayload) => {
if (err) {
console.log(err);
this.httpUnauthorized(response);
return;
}
const user = userPayload as IUserJwtPayload;
const openId = (userPayload as IUserJwtPayload).openId.userId;
if (!openId) return;
const newUserPayload = await this.authService.getUserJwtPayload(openId.toString(), PROVIDER_OPENID.idNot);
const user = newUserPayload as IUserJwtPayload;
delete user.iat;
delete user.exp;
accessToken = this.authService.generateAccessToken(user);
this.httpSuccess(response, { accessToken });
});
//success
this.httpSuccess(response, { accessToken });
} catch (error) {
console.log(error);
this.httpInternalError(response);

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

@ -8,7 +8,7 @@ import { ECustomerStatus } from "@prisma/client";
import { Customer } from "le-coffre-resources/dist/Notary";
import bcrypt from "bcrypt";
enum PROVIDER_OPENID {
export enum PROVIDER_OPENID {
idNot = "idNot",
}