@canmingir/link 1.2.49 → 1.2.51

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@canmingir/link",
-  "version": "1.2.49",
+  "version": "1.2.51",
   "type": "module",
   "bin": {
     "link-server": "./server/server.ts"

package/src/http/index.js

@@ -40,6 +40,20 @@ instance.interceptors.response.use(
   async (error) => {
     publish("LOADED", { loading: false });
     const statusCode = error.response?.status;
+    const identityProvider = storage.get("link", "identityProvider");
+
+    if (statusCode === 500 && identityProvider === "DEMO") {
+      const token = storage.get("link", "accessToken");
+      try {
+        const decodedToken = jwtDecode(token);
+        if (decodedToken.exp * 1000 < Date.now()) {
+          return Promise.reject(error);
+        }
+      } catch (_) {
+        return Promise.reject(error);
+      }
+    }
+
     switch (statusCode) {
       case 400:
         publish("GLOBAL_MESSAGE_POSTED", {
@@ -78,7 +92,7 @@ instance.interceptors.response.use(
         break;
     }
     return Promise.reject(error);
-  }
+  },
 );
 
 export const fetcher = (url) => instance.get(url).then((res) => res.data);
@@ -128,26 +142,41 @@ const refreshInterceptor =
     : createAuthRefreshInterceptor.default;
 
 refreshInterceptor(instance, refreshAuthLogic, {
-  statusCodes: [401, 403],
-  shouldRefresh: () => {
-    const { name, base } = config();
+  statusCodes: [401, 403, 500],
+  pauseInstanceWhileRefreshing: true,
+  shouldRefresh: (error) => {
+    const { base } = config();
     const token = storage.get("link", "accessToken");
+    const identityProvider = storage.get("link", "identityProvider");
+    const statusCode = error.response?.status;
 
     if (!token) {
       window.location.href = `${window.location.origin}${base}/login`;
       return false;
     }
 
+if (identityProvider === "DEMO") {
+  if (statusCode !== 500) {
+    return true;
+  }
+
+  try {
+    const decodedToken = jwtDecode(token);
+    return decodedToken.exp * 1000 < Date.now();
+  } catch (_) {
+    // If we can't decode, attempt refresh once.
+    return true;
+  }
+}
+
+    if (statusCode === 500) {
+      return false;
+    }
+
     try {
       const decodedToken = jwtDecode(token);
       if (decodedToken.exp * 1000 < Date.now()) {
         return true;
-      } else {
-        publish("GLOBAL_MESSAGE_POSTED", {
-          status: true,
-          message: "UNAUTHORIZED",
-          severity: "warning",
-        });
       }
     } catch (err) {
       window.location.href = `${window.location.origin}${base}/login`;

package/src/http/user.js

@@ -43,7 +43,7 @@ instance.getUserDetails = async () => {
 
       if (isExpired) {
         console.log(
-          "Access token expired, refreshing before fetching user details..."
+          "Access token expired, refreshing before fetching user details...",
         );
         const { appId } = config();
         const projectId = storage.get("projectId");
@@ -54,12 +54,16 @@ instance.getUserDetails = async () => {
           appId,
           projectId,
           identityProvider,
+          ...(identityProvider === "DEMO" && {
+            username: "admin",
+            password: "admin",
+          }),
         });
 
         accessToken = data.accessToken;
         storage.set("link", "accessToken", accessToken);
         console.log(
-          "Access token refreshed successfully, now fetching user details"
+          "Access token refreshed successfully, now fetching user details",
         );
       }
     } catch (error) {
@@ -86,25 +90,91 @@ instance.getUserDetails = async () => {
 };
 
 instance.getPermittedUsers = async () => {
-  const userIds = [];
-  const refreshToken = await storage.get("link", "refreshToken");
+  const { appId } = config();
+  const projectId = storage.get("projectId");
+  const identityProvider = storage.get("link", "identityProvider");
+
   const response = await http.get("/permissions");
 
-  response.data.forEach((permission) => {
-    userIds.push(permission.userId);
-  });
-
-  const users = await Promise.all(
-    userIds.map(async (userId) => {
-      const response = await axios.get(
-        `https://api.github.com/user/${userId}`,
-        { headers: { Authorization: `Bearer ${refreshToken}` } }
-      );
-      return response.data;
-    })
-  );
-
-  return users;
+  const uniqueUserIds = [
+    ...new Set(
+      response.data
+        .filter((p) => p.appId === appId && p.projectId === projectId)
+        .map((p) => p.userId),
+    ),
+  ];
+
+  const UUID_REGEX =
+    /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
+
+  if (identityProvider?.toUpperCase() === "GITHUB") {
+    const results = await Promise.allSettled(
+      uniqueUserIds.map(async (userId) => {
+        if (UUID_REGEX.test(userId)) {
+          return {
+            id: String(userId),
+            identityProvider,
+            name: String(userId),
+            displayName: null,
+            avatarUrl: `https://api.dicebear.com/7.x/bottts/svg?seed=${userId}`,
+            email: null,
+          };
+        }
+        const { data } = await axios.get(
+          `https://api.github.com/user/${userId}`,
+          { headers: { Accept: "application/vnd.github+json" } },
+        );
+        return {
+          id: String(data.id),
+          identityProvider: "GITHUB",
+          name: data.login,
+          displayName: data.name || null,
+          avatarUrl: data.avatar_url || null,
+          email: data.email || null,
+        };
+      }),
+    );
+
+    return results
+      .filter((r) => r.status === "fulfilled" && r.value !== null)
+      .map((r) => r.value);
+  }
+
+  if (identityProvider?.toUpperCase() === "DEMO") {
+    return [
+      {
+        id: "1001",
+        identityProvider: "DEMO",
+        name: "admin",
+        displayName: "Demo Admin",
+        avatarUrl: `https://api.dicebear.com/7.x/bottts/svg?seed=1001`,
+        email: "admin@demo.local",
+      },
+    ];
+  }
+
+  if (identityProvider?.toUpperCase() === "COGNITO") {
+    const accessToken = await storage.get("link", "accessToken");
+    let currentUserId = null;
+
+    try {
+      const decoded = jwtDecode(accessToken);
+      currentUserId = decoded.sub;
+    } catch (_) {}
+
+    return uniqueUserIds
+      .filter((id) => !UUID_REGEX.test(id))
+      .map((id) => ({
+        id: String(id),
+        identityProvider: "COGNITO",
+        name: id === currentUserId ? "You" : "Cognito User",
+        displayName: id === currentUserId ? "Cognito Admin" : null,
+        avatarUrl: `https://api.dicebear.com/7.x/bottts/svg?seed=${id}`,
+        email: null,
+      }));
+  }
+
+  return [];
 };
 
 export default instance;

package/src/widgets/SettingsDialog.jsx

@@ -1,10 +1,3 @@
-import Iconify from "../components/Iconify";
-import config from "../config/config";
-import { useEvent } from "@nucleoidai/react-event";
-import useSettings from "../hooks/useSettings";
-import { useSettingsContext } from "../components/settings/context";
-import { useUser } from "../hooks/use-user";
-
 import {
   Avatar,
   Box,
@@ -30,6 +23,13 @@ import {
 import { Button, Dialog, DialogActions, DialogContent } from "@mui/material";
 import React, { useEffect, useState } from "react";
 
+import Iconify from "../components/Iconify";
+import config from "../config/config";
+import { useEvent } from "@nucleoidai/react-event";
+import useSettings from "../hooks/useSettings";
+import { useSettingsContext } from "../components/settings/context";
+import { useUser } from "../hooks/use-user";
+
 let pkg = {
   name: "",
   version: "",
@@ -173,7 +173,7 @@ function SettingsDialog({ handleClose, open }) {
             color: "white",
             minHeight: 600,
           },
-        }
+        },
       }}
     >
       <DialogContent>
@@ -211,16 +211,24 @@ const Permission = () => {
 
   useEffect(() => {
     getPermittedUsers();
+    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [event, event2]);
 
   return (
-    <Stack direction="column" spacing={2} sx={{
-      p: 2
-    }}>
+    <Stack
+      direction="column"
+      spacing={2}
+      sx={{
+        p: 2,
+      }}
+    >
       <Typography variant="h6">Users</Typography>
-      <Typography variant="subtitle2" sx={{
-        color: "text.secondary"
-      }}>
+      <Typography
+        variant="subtitle2"
+        sx={{
+          color: "text.secondary",
+        }}
+      >
         Users with access to the project.
       </Typography>
       <List>
@@ -238,7 +246,7 @@ const Permission = () => {
             }}
           >
             <ListItemAvatar>
-              <Avatar src={user.avatar_url} alt={user.name} />
+              <Avatar src={user.avatarUrl} alt={user.name} />
             </ListItemAvatar>
             <ListItemText primary={user.name} />
             <ListItemSecondaryAction>
@@ -306,13 +314,20 @@ const Settings = () => {
   };
 
   return (
-    <Stack direction="column" spacing={2} sx={{
-      p: 2
-    }}>
+    <Stack
+      direction="column"
+      spacing={2}
+      sx={{
+        p: 2,
+      }}
+    >
       <Typography variant="h6">Settings</Typography>
-      <Typography variant="subtitle2" sx={{
-        color: "text.secondary"
-      }}>
+      <Typography
+        variant="subtitle2"
+        sx={{
+          color: "text.secondary",
+        }}
+      >
         Configure your application settings.
       </Typography>
       <List>
@@ -373,9 +388,13 @@ const About = () => {
   const description = pkg.description;
 
   return (
-    <Stack direction="column" spacing={2} sx={{
-      p: 2
-    }}>
+    <Stack
+      direction="column"
+      spacing={2}
+      sx={{
+        p: 2,
+      }}
+    >
       <Box
         sx={{
           p: 3,
@@ -386,9 +405,13 @@ const About = () => {
             "linear-gradient(135deg, rgba(255,255,255,0.06), rgba(255,255,255,0.01))",
         }}
       >
-        <Stack direction="row" spacing={2.5} sx={{
-          alignItems: "center"
-        }}>
+        <Stack
+          direction="row"
+          spacing={2.5}
+          sx={{
+            alignItems: "center",
+          }}
+        >
           <Avatar
             src={iconSrc}
             variant="rounded"
@@ -404,9 +427,12 @@ const About = () => {
           </Avatar>
 
           <Box sx={{ flex: 1, minWidth: 0 }}>
-            <Typography variant="h5" sx={{
-              fontWeight: 600
-            }}>
+            <Typography
+              variant="h5"
+              sx={{
+                fontWeight: 600,
+              }}
+            >
               {appName.toUpperCase()}
             </Typography>
 
@@ -416,8 +442,9 @@ const About = () => {
                 sx={{
                   color: "text.secondary",
                   mt: 0.5,
-                  maxWidth: 520
-                }}>
+                  maxWidth: 520,
+                }}
+              >
                 {description}
               </Typography>
             )}
@@ -460,9 +487,12 @@ const About = () => {
             textAlign: "center",
           }}
         >
-          <Typography variant="caption" sx={{
-            color: "text.secondary"
-          }}>
+          <Typography
+            variant="caption"
+            sx={{
+              color: "text.secondary",
+            }}
+          >
             © 2026 greycollar.ai. All rights reserved.
           </Typography>
         </Box>
@@ -473,15 +503,20 @@ const About = () => {
 
 const InfoRow = ({ label, value, link }) => {
   return (
-    <Stack direction="row" spacing={1.5} sx={{
-      alignItems: "center"
-    }}>
+    <Stack
+      direction="row"
+      spacing={1.5}
+      sx={{
+        alignItems: "center",
+      }}
+    >
       <Typography
         variant="body2"
         sx={{
           color: "text.secondary",
-          minWidth: 110
-        }}>
+          minWidth: 110,
+        }}
+      >
         {label}
       </Typography>
       {link ? (