[fix] Don't overwrite existing rules if admin is not subscribed
All checks were successful
Test - Build & Deploy to Scaleway / build-and-push-images-lecoffre (push) Successful in 1m55s
Test - Build & Deploy to Scaleway / deploy-back-lecoffre (push) Successful in 4s
Test - Build & Deploy to Scaleway / deploy-cron-lecoffre (push) Successful in 3s

This commit is contained in:
Sosthene 2025-08-03 21:10:22 +02:00
parent 17c4347e98
commit 7f52b2c5af

View File

@ -112,7 +112,9 @@ export default class UserController extends ApiController {
});
if (!manageSubscriptionRules[0]) return;
payload.rules = manageSubscriptionRules[0].rules!.map((rule) => rule.name) || [];
// Merge subscription rules with existing rules instead of replacing them
const subscriptionRules = manageSubscriptionRules[0].rules!.map((rule) => rule.name) || [];
payload.rules = [...new Set([...payload.rules, ...subscriptionRules])];
isSubscribed = true;
}
@ -173,7 +175,9 @@ export default class UserController extends ApiController {
});
if (!manageSubscriptionRules[0]) return;
newUserPayload.rules = manageSubscriptionRules[0].rules!.map((rule) => rule.name) || [];
// Merge subscription rules with existing rules instead of replacing them
const subscriptionRules = manageSubscriptionRules[0].rules!.map((rule) => rule.name) || [];
newUserPayload.rules = [...new Set([...newUserPayload.rules, ...subscriptionRules])];
isSubscribed = true;
}