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

Merge branch 'main' into preprod

Browse Source
This commit is contained in:
Maxime Lalo 2024-04-25 11:36:32 +02:00
commit 4b243fe1a4
2 changed files with 31 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/app/api/admin/StripeController.ts
View File

@ -2,7 +2,7 @@ import authHandler from "@App/middlewares/AuthHandler";
import ruleHandler from "@App/middlewares/RulesHandler"; import ruleHandler from "@App/middlewares/RulesHandler";
// import roleHandler from "@App/middlewares/RolesHandler"; // import roleHandler from "@App/middlewares/RolesHandler";
import ApiController from "@Common/system/controller-pattern/ApiController"; import ApiController from "@Common/system/controller-pattern/ApiController";
import { Controller, Get, Post} from "@ControllerPattern/index"; import { Controller, Get, Post } from "@ControllerPattern/index";
import StripeService from "@Services/common/StripeService/StripeService"; import StripeService from "@Services/common/StripeService/StripeService";
import { validateOrReject } from "class-validator"; import { validateOrReject } from "class-validator";
import { Request, Response } from "express"; import { Request, Response } from "express";
@ -28,13 +28,13 @@ export default class StripeController extends ApiController {
//add office id to request body //add office id to request body
req.body.office = { uid: officeId }; req.body.office = { uid: officeId };
const frequency : EPaymentFrequency = req.body.frequency; const frequency: EPaymentFrequency = req.body.frequency;
if(!frequency || !Object.values(EPaymentFrequency).includes(frequency)) { if (!frequency || !Object.values(EPaymentFrequency).includes(frequency)) {
this.httpBadRequest(response, "Invalid frequency"); this.httpBadRequest(response, "Invalid frequency");
return; return;
} }
//init Subscription resource with request body values //init Subscription resource with request body valuess
const subscriptionEntity = Subscription.hydrate<Subscription>(req.body, { strategy: "excludeAll" }); const subscriptionEntity = Subscription.hydrate<Subscription>(req.body, { strategy: "excludeAll" });
await validateOrReject(subscriptionEntity, { groups: ["createSubscription"], forbidUnknownValues: false }); await validateOrReject(subscriptionEntity, { groups: ["createSubscription"], forbidUnknownValues: false });
@ -42,7 +42,6 @@ export default class StripeController extends ApiController {
const stripeSession = await this.stripeService.createCheckoutSession(subscriptionEntity, frequency); const stripeSession = await this.stripeService.createCheckoutSession(subscriptionEntity, frequency);
this.httpCreated(response, stripeSession); this.httpCreated(response, stripeSession);
} catch (error) { } catch (error) {
this.httpInternalError(response, error); this.httpInternalError(response, error);
return; return;
@ -70,7 +69,6 @@ export default class StripeController extends ApiController {
@Get("/api/v1/admin/stripe/:uid/client-portal", [authHandler, ruleHandler]) @Get("/api/v1/admin/stripe/:uid/client-portal", [authHandler, ruleHandler])
protected async getClientPortalSession(req: Request, response: Response) { protected async getClientPortalSession(req: Request, response: Response) {
try { try {
const uid = req.params["uid"]; const uid = req.params["uid"];
if (!uid) { if (!uid) {
this.httpBadRequest(response, "No uid provided"); this.httpBadRequest(response, "No uid provided");
@ -95,7 +93,7 @@ export default class StripeController extends ApiController {
return; return;
} }
const customer = await this.stripeService.getCustomerBySubscription(uid); const customer = await this.stripeService.getCustomerBySubscription(uid);
this.httpSuccess(response, customer); this.httpSuccess(response, customer);
} catch (error) { } catch (error) {
this.httpInternalError(response, error); this.httpInternalError(response, error);

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

@ -57,7 +57,8 @@ export default class UserController extends ApiController {
//Whitelist feature //Whitelist feature
//Get user with contact //Get user with contact
const prismaUser = await this.userService.getByUid(user.uid, { contact: true, role: true, office_membership: true}); const prismaUser = await this.userService.getByUid(user.uid, { contact: true, role: true, office_membership: true});
console.log(prismaUser);
if (!prismaUser) { if (!prismaUser) {
this.httpNotFoundRequest(response, "user not found"); this.httpNotFoundRequest(response, "user not found");
@ -66,6 +67,7 @@ export default class UserController extends ApiController {
//Hydrate user to be able to use his contact //Hydrate user to be able to use his contact
const userHydrated = User.hydrate<User>(prismaUser, { strategy: "excludeAll" }); const userHydrated = User.hydrate<User>(prismaUser, { strategy: "excludeAll" });
console.log(userHydrated);
if (!userHydrated.contact?.email || userHydrated.contact?.email === "") { if (!userHydrated.contact?.email || userHydrated.contact?.email === "") {
this.httpUnauthorized(response, "Email not found"); this.httpUnauthorized(response, "Email not found");
@ -73,14 +75,18 @@ export default class UserController extends ApiController {
} }
let isSubscribed = false; let isSubscribed = false;
const subscriptions = await this.subscriptionsService.get({ where: { office_uid: userHydrated.office_membership?.uid } }); const subscriptions = await this.subscriptionsService.get({ where: { office_uid: userHydrated.office_membership?.uid } });
console.log(subscriptions);
if (!subscriptions || subscriptions.length === 0 || subscriptions[0]?.status === ESubscriptionStatus.INACTIVE) { if (!subscriptions || subscriptions.length === 0 || subscriptions[0]?.status === ESubscriptionStatus.INACTIVE) {
console.log("No subscription found");
isSubscribed = false; isSubscribed = false;
} }
else if (subscriptions[0]?.type === EType.Unlimited) { else if (subscriptions[0]?.type === EType.Unlimited) {
console.log("Unlimited subscription found");
isSubscribed = true; isSubscribed = true;
} else { } else {
console.log("Standard subscription found");
const hasSeat = await this.subscriptionsService.get({ const hasSeat = await this.subscriptionsService.get({
where: { status: ESubscriptionStatus.ACTIVE, seats: { some: { user_uid: userHydrated.uid } } }, where: { status: ESubscriptionStatus.ACTIVE, seats: { some: { user_uid: userHydrated.uid } } },
}); });
@ -116,10 +122,22 @@ export default class UserController extends ApiController {
await this.idNotService.updateOffice(user.office_uid); await this.idNotService.updateOffice(user.office_uid);
const payload = await this.authService.getUserJwtPayload(user.idNot); const payload = await this.authService.getUserJwtPayload(user.idNot);
console.log(payload);
if(!payload) return; if(!payload) return;
if(!isSubscribed && userHydrated.role?.name === "admin" || userHydrated.role?.name === "super-admin"){ console.log(isSubscribed, userHydrated.role?.name);
if(!isSubscribed && userHydrated.role?.name === "admin"){
const manageSubscriptionRulesEntity = await this.rulesGroupsService.get({ where: { uid: "94343601-04c8-44ef-afb9-3047597528a9" }, include: { rules: true } });
const manageSubscriptionRules = RulesGroup.hydrateArray<RulesGroup>(manageSubscriptionRulesEntity, { strategy: "excludeAll" });
if(!manageSubscriptionRules[0]) return;
payload.rules = manageSubscriptionRules[0].rules!.map((rule) => rule.name) || [];
isSubscribed = true;
}
if(!isSubscribed && userHydrated.role?.name === "super-admin"){
const manageSubscriptionRulesEntity = await this.rulesGroupsService.get({ where: { uid: "94343601-04c8-44ef-afb9-3047597528a9" }, include: { rules: true } }); const manageSubscriptionRulesEntity = await this.rulesGroupsService.get({ where: { uid: "94343601-04c8-44ef-afb9-3047597528a9" }, include: { rules: true } });
const manageSubscriptionRules = RulesGroup.hydrateArray<RulesGroup>(manageSubscriptionRulesEntity, { strategy: "excludeAll" }); const manageSubscriptionRules = RulesGroup.hydrateArray<RulesGroup>(manageSubscriptionRulesEntity, { strategy: "excludeAll" });