Removed subscription requirements for dev enf
This commit is contained in:
parent
1e902fdb25
commit
3820c24549
@ -11,11 +11,12 @@ import UsersService from "@Services/super-admin/UsersService/UsersService";
|
|||||||
import SubscriptionsService from "@Services/admin/SubscriptionsService/SubscriptionsService.ts";
|
import SubscriptionsService from "@Services/admin/SubscriptionsService/SubscriptionsService.ts";
|
||||||
import { ESubscriptionStatus } from "@prisma/client";
|
import { ESubscriptionStatus } from "@prisma/client";
|
||||||
import SeatsService from "@Services/admin/SeatsService/SeatsService";
|
import SeatsService from "@Services/admin/SeatsService/SeatsService";
|
||||||
|
import { BackendVariables } from "@Common/config/variables/Variables";
|
||||||
|
|
||||||
@Controller()
|
@Controller()
|
||||||
@Service()
|
@Service()
|
||||||
export default class UserController extends ApiController {
|
export default class UserController extends ApiController {
|
||||||
constructor(private authService: AuthService, private idNotService: IdNotService, private whitelistService: WhitelistService, private userService: UsersService, private subscriptionsService: SubscriptionsService, private seatsService: SeatsService) {
|
constructor(private authService: AuthService, private idNotService: IdNotService, private whitelistService: WhitelistService, private userService: UsersService, private subscriptionsService: SubscriptionsService, private seatsService: SeatsService, private backendVariables: BackendVariables) {
|
||||||
super();
|
super();
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -68,12 +69,12 @@ export default class UserController extends ApiController {
|
|||||||
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 } });
|
||||||
|
|
||||||
if(!subscriptions || subscriptions.length === 0) {
|
if(!subscriptions || subscriptions.length === 0) {
|
||||||
this.httpUnauthorized(response, "No subscription found");
|
isSubscribed = false;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if(subscriptions[0]?.status === ESubscriptionStatus.INACTIVE) {
|
if(subscriptions[0]?.status === ESubscriptionStatus.INACTIVE) {
|
||||||
this.httpUnauthorized(response, "Subscription inactive");
|
isSubscribed = false;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -95,12 +96,12 @@ export default class UserController extends ApiController {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
else{
|
else{
|
||||||
this.httpUnauthorized(response, "No seat available");
|
isSubscribed = false;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if(!isSubscribed) {
|
if(this.backendVariables.ENV !== 'dev' && !isSubscribed) {
|
||||||
this.httpUnauthorized(response, "User not subscribed");
|
this.httpUnauthorized(response, "User not subscribed");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user