fix: send latest created roles first

supertokens · Nov 14, 2023 · 362da88 · 362da88
1 parent 3cb4c2e
commit 362da88
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 26 deletions.
diff --git a/lib/build/recipe/dashboard/api/userroles/roles/getAllRoles.js b/lib/build/recipe/dashboard/api/userroles/roles/getAllRoles.js
@@ -43,15 +43,11 @@ const getAllRoles = async (_, __, options, ____) => {
         const response = await userroles_1.default.getAllRoles();
         const totalPages = Math.ceil(response.roles.length / limit);
         const rolesCount = response.roles.length;
-        if (page > totalPages) {
-            return {
-                roles: [],
-                rolesCount,
-                totalPages,
-                status: "OK",
-            };
+        if (page > totalPages && page !== 1) {
+            throw new Error("Please provide a valid page number");
         }
-        const paginatedRoles = response.roles.slice(skip, skip + limit);
+        //reversing the roles to show latest created roles at first.
+        const paginatedRoles = response.roles.reverse().slice(skip, skip + limit);
         let roles = [];
         for (let i = 0; i < paginatedRoles.length; i++) {
             const role = paginatedRoles[i];
@@ -64,10 +60,7 @@ const getAllRoles = async (_, __, options, ____) => {
                     });
                 } else {
                     //this case should never happen.
-                    roles.push({
-                        role,
-                        permissions: [],
-                    });
+                    throw new Error("Should never come here.");
                 }
             } catch (_) {}
         }
@@ -79,7 +72,11 @@ const getAllRoles = async (_, __, options, ____) => {
         };
     } else {
         const response = await userroles_1.default.getAllRoles();
-        return response;
+        //reversing the roles to show latest created roles at first.
+        return {
+            status: "OK",
+            roles: response.roles.reverse(),
+        };
     }
 };
 exports.default = getAllRoles;
diff --git a/lib/ts/recipe/dashboard/api/userroles/roles/getAllRoles.ts b/lib/ts/recipe/dashboard/api/userroles/roles/getAllRoles.ts
@@ -69,15 +69,12 @@ const getAllRoles: APIFunction = async (
         const totalPages = Math.ceil(response.roles.length / limit);
         const rolesCount = response.roles.length;
 
-        if (page > totalPages) {
-            return {
-                roles: [],
-                rolesCount,
-                totalPages,
-                status: "OK",
-            };
+        if (page > totalPages && page !== 1) {
+            throw new Error("Please provide a valid page number");
         }
-        const paginatedRoles = response.roles.slice(skip, skip + limit);
+
+        //reversing the roles to show latest created roles at first.
+        const paginatedRoles = response.roles.reverse().slice(skip, skip + limit);
 
         let roles: Roles = [];
 
@@ -93,10 +90,7 @@ const getAllRoles: APIFunction = async (
                     });
                 } else {
                     //this case should never happen.
-                    roles.push({
-                        role,
-                        permissions: [],
-                    });
+                    throw new Error("Should never come here.");
                 }
             } catch (_) {}
         }
@@ -109,7 +103,11 @@ const getAllRoles: APIFunction = async (
         };
     } else {
         const response = await UserRoles.getAllRoles();
-        return response;
+        //reversing the roles to show latest created roles at first.
+        return {
+            status: "OK",
+            roles: response.roles.reverse(),
+        };
     }
 };