use pricing matrix in existing usePaidStatus funcitons

server/lib/billing/tierMatrix.ts

@@ -1,3 +1,5 @@
+import { Tier } from "@server/types/Tiers";
+
 export enum TierFeature {
     OrgOidc = "orgOidc",
     CustomAuthenticationDomain = "customAuthenticationDomain",
@@ -14,7 +16,7 @@ export enum TierFeature {
     PasswordExpirationPolicies = "passwordExpirationPolicies"
 }
 
-export const tierMatrix: Record<TierFeature, string[]> = {
+export const tierMatrix: Record<TierFeature, Tier[]> = {
     [TierFeature.OrgOidc]: ["tier1", "tier2", "tier3", "enterprise"],
     [TierFeature.CustomAuthenticationDomain]: [
         "tier1",

server/lib/isLicencedOrSubscribed.ts

@@ -1,6 +1,8 @@
+import { Tier } from "@server/types/Tiers";
+
 export async function isLicensedOrSubscribed(
     orgId: string,
-    tiers: string[]
+    tiers: Tier[]
 ): Promise<boolean> {
     return false;
 }

server/lib/isSubscribed.ts

@@ -1,6 +1,8 @@
+import { Tier } from "@server/types/Tiers";
+
 export async function isSubscribed(
     orgId: string,
-    tiers: string[]
+    tiers: Tier[]
 ): Promise<boolean> {
     return false;
 }

server/private/lib/isLicencedOrSubscribed.ts

@@ -14,10 +14,11 @@
 import { build } from "@server/build";
 import license from "#private/license/license";
 import { isSubscribed } from "#private/lib/isSubscribed";
+import { Tier } from "@server/types/Tiers";
 
 export async function isLicensedOrSubscribed(
     orgId: string,
-    tiers: string[]
+    tiers: Tier[]
 ): Promise<boolean> {
     if (build === "enterprise") {
         return await license.isUnlocked();

server/private/lib/isSubscribed.ts

@@ -13,10 +13,11 @@
 
 import { build } from "@server/build";
 import { getOrgTierData } from "#private/lib/billing";
+import { Tier } from "@server/types/Tiers";
 
 export async function isSubscribed(
     orgId: string,
-    tiers: string[]
+    tiers: Tier[]
 ): Promise<boolean> {
     if (build === "saas") {
         const { tier, active } = await getOrgTierData(orgId);

server/private/middlewares/verifySubscription.ts

@@ -16,8 +16,9 @@ import createHttpError from "http-errors";
 import HttpCode from "@server/types/HttpCode";
 import { build } from "@server/build";
 import { getOrgTierData } from "#private/lib/billing";
+import { Tier } from "@server/types/Tiers";
 
-export function verifyValidSubscription(tiers: string[]) {
+export function verifyValidSubscription(tiers: Tier[]) {
     return async function (
         req: Request,
         res: Response,