@koloseum/utils 0.2.18 → 0.2.20

package/dist/utils.d.ts

@@ -163,7 +163,7 @@ export declare const Utility: {
     isUserAuthorised: (supabase: SupabaseClient<Database>, user: UserWithCustomMetadata, options: {
         microserviceGroup: MicroserviceGroup;
         microservice: Microservice<MicroserviceGroup> | string;
-        playersUrl: string;
+        playersUrl?: string;
         requestedPermission?: (role: string) => string;
     }) => Promise<{
         isAuthorised?: boolean;

package/dist/utils.js

@@ -385,8 +385,13 @@ export const Utility = {
         // Validate base URL
         if (typeof base !== "string")
             return "";
+        // Format base URL
+        if (base === "/")
+            base = "";
+        if (base.charAt(base.length - 1) === "/")
+            base = base.slice(0, -1);
         // Return URL
-        return `${base}${slug && typeof slug === "string" ? `/${slug}` : ""}`;
+        return `${base}${slug === "/" ? slug : typeof slug === "string" ? `/${slug}` : ""}`;
     },
     /**
      * Returns the parent URL for a given base URL.
@@ -710,20 +715,31 @@ export const Utility = {
         const roles = [];
         const rolePrefix = microserviceGroup === "backroom" ? "backroom" : microserviceGroup.slice(0, -1);
         for (const role of user.app_metadata.roles) {
-            if (role === "player")
-                continue;
+            if (role === "player") {
+                if (microserviceGroup === "players")
+                    roles.push(role);
+                else
+                    continue;
+            }
             if (role.startsWith(`${rolePrefix}_`))
                 roles.push(role.replace(`${rolePrefix}_`, ""));
         }
         // Redirect to Players microservices if user does not have any roles for the microservice group
-        if (roles.length === 0)
+        if (roles.length === 0 && microserviceGroup !== "players") {
+            // Return error if Players URL is not provided
+            if (!playersUrl)
+                return { error: Utility.customError(400, "Players URL is required.") };
+            // Redirect to Players microservices
             return { redirect: { code: 307, url: playersUrl } };
+        }
         // Destructure role
         const [role] = roles;
-        let isAuthorised = false;
-        // Grant access if superuser or account microservice
+        // Define condition variables
+        const isPlayer = microserviceGroup === "players" && role === "player";
         const isSuperuser = (microserviceGroup === "backroom" || microserviceGroup === "lounges") && role === "superuser";
-        if (isSuperuser || microservice === "account")
+        let isAuthorised = false;
+        // Grant access if Player (accessing Players microservices), superuser, or account microservice
+        if (isPlayer || isSuperuser || microservice === "account")
             isAuthorised = true;
         // Evaluate access
         else if (microserviceGroup !== "players") {
@@ -1066,50 +1082,14 @@ export const Utility = {
             },
             {
                 name: "KLSM",
-                description: "Management of KLSM store products and tracking of orders and payments.",
+                description: "Management of game and console trades between users.",
                 slug: "commerce",
-                features: [
-                    {
-                        name: "Sections",
-                        description: "Manage store sections.",
-                        slug: "sections"
-                    },
-                    {
-                        name: "Products",
-                        description: "Manage store products.",
-                        slug: "products"
-                    },
-                    {
-                        name: "Bundles",
-                        description: "Manage store bundles.",
-                        slug: "bundles"
-                    },
-                    {
-                        name: "Inventory",
-                        description: "Manage store inventory.",
-                        slug: "inventory"
-                    },
-                    {
-                        name: "Orders",
-                        description: "Manage store orders.",
-                        slug: "orders"
-                    }
-                ],
+                features: [],
                 roles: [
                     {
                         name: "Commerce",
                         slug: "commerce",
                         root: true
-                    },
-                    {
-                        name: "Storefront",
-                        slug: "storefront",
-                        featureSlugs: ["sections", "products", "bundles"]
-                    },
-                    {
-                        name: "Warehouse",
-                        slug: "warehouse",
-                        featureSlugs: ["inventory", "orders"]
                     }
                 ]
             },
@@ -1136,21 +1116,60 @@ export const Utility = {
                         root: true
                     }
                 ]
+            }
+        ],
+        players: [
+            {
+                name: "Sessions",
+                description: "Track your gaming sessions at registered lounges.",
+                slug: "sessions",
+                features: [],
+                roles: null
             },
             {
-                name: "Account",
-                description: "Review Backroom account settings and preferences.",
-                slug: "account",
+                name: "KLSM",
+                description: "Trade used games and consoles with other users at affordable prices.",
+                slug: "commerce",
+                features: [],
+                roles: null
+            },
+            {
+                name: "Savanna FGC",
+                description: "Check out the latest news and competitions from Savanna FGC.",
+                slug: "fgc",
                 features: [
                     {
-                        name: "Access",
-                        description: "Review access to Backroom microservices.",
-                        slug: "access"
+                        name: "Home",
+                        description: "Learn more about the Savanna Circuit.",
+                        root: true
                     },
+                    {
+                        name: "Rules",
+                        description: "Review the rules and regulations of the Savanna Circuit.",
+                        slug: "rules"
+                    },
+                    {
+                        name: "Tournaments",
+                        description: "Review and join upcoming tournaments on the Savanna Circuit.",
+                        slug: "tournaments"
+                    }
+                ],
+                roles: null
+            },
+            {
+                name: "Account",
+                description: "Review Player account settings and preferences.",
+                slug: "account",
+                features: [
                     {
                         name: "Notifications",
-                        description: "Review and manage Backroom notification preferences.",
+                        description: "Review and manage notification preferences.",
                         slug: "notifications"
+                    },
+                    {
+                        name: "Access",
+                        description: "Review access to various microservices.",
+                        slug: "access"
                     }
                 ],
                 roles: null

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@koloseum/utils",
-	"version": "0.2.18",
+	"version": "0.2.20",
 	"author": "Koloseum Technologies Limited",
 	"type": "module",
 	"description": "Utility logic for use across Koloseum web apps (TypeScript)",
@@ -38,7 +38,7 @@
 		"validator": "^13.15.15"
 	},
 	"devDependencies": {
-		"@koloseum/types": "^0.2.6",
+		"@koloseum/types": "^0.2.7",
 		"@playwright/test": "^1.55.0",
 		"@suprsend/web-components": "^0.4.0",
 		"@types/sanitize-html": "^2.16.0",