chore: PR feedback tweaks

Author: DanielRivers

lib/utils/token/getFlag.ts

@@ -15,14 +15,11 @@ export const getFlag = async <T = string | boolean | number | object>(
   }
 
   const flags = claims.feature_flags || claims["x-hasura-feature-flags"];
-  console.log("flags", flags);
+
   if (!flags) {
     return null;
   }
 
-  if (name) {
-    const value = flags[name];
-    return value ? (value?.v as T) : null;
-  }
-  return null;
+  const value = flags[name];
+  return (value?.v as T) ?? null;
 };

lib/utils/token/getFlagHasura.test.ts

@@ -11,7 +11,7 @@ describe("getFlag - Hasura", () => {
   });
 
   it("when no token", async () => {
-    await storage.setSessionItem(StorageKeys.idToken, null);
+    await storage.setSessionItem(StorageKeys.accessToken, null);
     const idToken = await getFlag("test");
 
     expect(idToken).toStrictEqual(null);

lib/utils/token/getPermissionsHasura.test.ts

@@ -16,7 +16,7 @@ describe("getPermissions - Hasura", () => {
   });
 
   it("when no token", async () => {
-    await storage.setSessionItem(StorageKeys.idToken, null);
+    await storage.setSessionItem(StorageKeys.accessToken, null);
     const idToken = await getPermissions();
 
     expect(idToken).toStrictEqual({

lib/utils/token/getUserOrganistaions.test.ts lib/utils/token/getUserOrganizations.test.ts

@@ -10,7 +10,7 @@ describe("getUserOrganizations", () => {
     setActiveStorage(storage);
   });
 
-  it("When single org", async () => {
+  it("when token is null", async () => {
     await storage.setSessionItem(StorageKeys.idToken, null);
     const idToken = await getUserOrganizations();
 

lib/utils/token/getUserOrganistaions.ts lib/utils/token/getUserOrganizations.ts

@@ -5,9 +5,7 @@ import { getDecodedToken } from ".";
  * @returns { Promise<string[] | null> }
  */
 export const getUserOrganizations = async (): Promise<string[] | null> => {
-  const token = await getDecodedToken<{
-    org_codes: string[];
-  }>("idToken");
+  const token = await getDecodedToken("idToken");
 
   if (!token) {
     return null;

lib/utils/token/getUserOrganistaionsHasura.test.ts lib/utils/token/getUserOrganizationsHasura.test.ts

@@ -8,7 +8,7 @@ import { getFlag } from "./getFlag";
 import { getUserProfile, UserProfile } from "./getUserProfile";
 import { getPermission, PermissionAccess } from "./getPermission";
 import { getPermissions, Permissions } from "./getPermissions";
-import { getUserOrganizations } from "./getUserOrganistaions";
+import { getUserOrganizations } from "./getUserOrganizations";
 import { getRoles } from "./getRoles";
 import { isAuthenticated } from "./isAuthenticated";
 import { refreshToken } from "./refreshToken";