From f70085a7aca13279355d90d8b2fb6abbf1420631 Mon Sep 17 00:00:00 2001
From: Vins <vincent.alamelle@smart-chain.fr>
Date: Wed, 24 Apr 2024 09:50:26 +0200
Subject: [PATCH] Fixed login

---
 src/app/api/admin/OfficeRolesController.ts | 4 +---
 src/app/api/idnot/UserController.ts        | 3 ++-
 src/common/config/variables/Variables.ts   | 8 --------
 src/common/databases/seeders/seeder.ts     | 2 ++
 src/entries/App.ts                         | 4 +---
 5 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/src/app/api/admin/OfficeRolesController.ts b/src/app/api/admin/OfficeRolesController.ts
index 649e4ade..29cec7ad 100644
--- a/src/app/api/admin/OfficeRolesController.ts
+++ b/src/app/api/admin/OfficeRolesController.ts
@@ -124,9 +124,7 @@ export default class OfficeRolesController extends ApiController {
 				return;
 			}
 
-			if (req.body.rules) {
-				console.log(req.body.rules);
-				
+			if (req.body.rules) {				
 				const allRules = await this.rulesService.get({
 					where: {
 						namespace: "global",
diff --git a/src/app/api/idnot/UserController.ts b/src/app/api/idnot/UserController.ts
index f151c8f6..5d8bc8e4 100644
--- a/src/app/api/idnot/UserController.ts
+++ b/src/app/api/idnot/UserController.ts
@@ -121,7 +121,8 @@ export default class UserController extends ApiController {
 
 
 			if(!isSubscribed && userHydrated.role?.name === "admin" || userHydrated.role?.name === "super-admin"){
-				const manageSubscriptionRulesEntity = await this.rulesGroupsService.get({ where: { name: "Gestion de l'abonnement" }, include: { rules: true } });				
+				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" });				
 				if(!manageSubscriptionRules[0]) return;
 	
diff --git a/src/common/config/variables/Variables.ts b/src/common/config/variables/Variables.ts
index 4ff86cab..ac3179db 100644
--- a/src/common/config/variables/Variables.ts
+++ b/src/common/config/variables/Variables.ts
@@ -157,12 +157,6 @@ export class BackendVariables {
 	@IsNotEmpty()
 	public readonly STRIPE_UNLIMITED_ANNUAL_SUBSCRIPTION_PRICE_ID!: string;
 
-	@IsNotEmpty()
-	public readonly STRIPE_PAYMENT_SUCCESS_URL!: string;
-
-	@IsNotEmpty()
-	public readonly STRIPE_PAYMENT_CANCEL_URL!: string;
-
 	@IsNotEmpty()
 	public readonly IDNOT_PROD_BASE_URL!: string;
 
@@ -219,8 +213,6 @@ export class BackendVariables {
 		this.STRIPE_STANDARD_ANNUAL_SUBSCRIPTION_PRICE_ID = process.env["STRIPE_STANDARD_ANNUAL_SUBSCRIPTION_PRICE_ID"]!;
 		this.STRIPE_UNLIMITED_SUBSCRIPTION_PRICE_ID = process.env["STRIPE_UNLIMITED_SUBSCRIPTION_PRICE_ID"]!;
 		this.STRIPE_UNLIMITED_ANNUAL_SUBSCRIPTION_PRICE_ID = process.env["STRIPE_UNLIMITED_ANNUAL_SUBSCRIPTION_PRICE_ID"]!;
-		this.STRIPE_PAYMENT_SUCCESS_URL = process.env["STRIPE_PAYMENT_SUCCESS_URL"]!;
-		this.STRIPE_PAYMENT_CANCEL_URL = process.env["STRIPE_PAYMENT_CANCEL_URL"]!;
 		this.IDNOT_PROD_BASE_URL = process.env["IDNOT_PROD_BASE_URL"]!;
 	}
 	public async validate(groups?: string[]) {
diff --git a/src/common/databases/seeders/seeder.ts b/src/common/databases/seeders/seeder.ts
index 70b74df4..ce7da8bb 100644
--- a/src/common/databases/seeders/seeder.ts
+++ b/src/common/databases/seeders/seeder.ts
@@ -874,6 +874,7 @@ export default async function main() {
 			},
 			{
 				name: "Gestion de l'abonnement",
+				uid: "94343601-04c8-44ef-afb9-3047597528a9",
 				created_at: new Date(),
 				updated_at: new Date(),
 				rules : [
@@ -1973,6 +1974,7 @@ export default async function main() {
 		for (const ruleGroup of rulesGroups) {
 			await prisma.rulesGroups.create({
 				data: {
+					uid: ruleGroup.uid,
 					name: ruleGroup.name,
 					rules: {
 						connect: ruleGroup.rules?.map((rule) => ({
diff --git a/src/entries/App.ts b/src/entries/App.ts
index e04e9db3..d94c9766 100644
--- a/src/entries/App.ts
+++ b/src/entries/App.ts
@@ -14,9 +14,7 @@ const storage = multer.memoryStorage();
 
 (async () => {
 	try {
-		const variables = await Container.get(BackendVariables).validate();
-		console.log(variables.DATABASE_NAME);
-		
+		const variables = await Container.get(BackendVariables).validate();		
 		const port = variables.APP_PORT;
 		const rootUrl = variables.APP_ROOT_URL;
 		const label = variables.APP_LABEL ?? "Unknown Service";