@ebubekirylmaz/link-test 1.2.35 → 1.2.37

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ebubekirylmaz/link-test",
-  "version": "1.2.35",
+  "version": "1.2.37",
   "type": "module",
   "exports": {
     ".": "./index.js",

package/src/layouts/common/ProjectBar/index.jsx

@@ -1,10 +1,3 @@
-import { Button, DialogActions } from "@mui/material";
-import Dialog, { dialogClasses } from "@mui/material/Dialog";
-import React, { useCallback, useState } from "react";
-import { publish, useEvent } from "@nucleoidai/react-event";
-import { storage, useStorage } from "@nucleoidjs/webstorage";
-import { useMediaQuery, useTheme } from "@mui/material";
-
 import Box from "@mui/material/Box";
 import IconButton from "@mui/material/IconButton";
 import Iconify from "../../../components/Iconify";
@@ -29,6 +22,13 @@ import { useEventListener } from "../../../hooks/use-event-listener";
 import { useNavigate } from "react-router-dom";
 import useProjects from "../../../hooks/useProjects";
 
+import { Button, DialogActions } from "@mui/material";
+import Dialog, { dialogClasses } from "@mui/material/Dialog";
+import React, { useCallback, useState } from "react";
+import { publish, useEvent } from "@nucleoidai/react-event";
+import { storage, useStorage } from "@nucleoidjs/webstorage";
+import { useMediaQuery, useTheme } from "@mui/material";
+
 function ProjectBar() {
   const label = config().template?.projectBar?.label;
   const { appId } = config();
@@ -104,7 +104,7 @@ function ProjectBar() {
       payload.username = "admin";
       payload.password = "admin";
     } else if (identityProvider === "COGNITO") {
-      payload.refreshToken = storage.get("link", "accessToken");
+      payload.refreshToken = storage.get("link", "cognitoRefresh");
     } else {
       payload.refreshToken = storage.get("link", "refreshToken");
     }

package/src/widgets/Login/CognitoLogin.jsx

@@ -1,10 +1,10 @@
-import { Button, Stack, TextField, Typography } from "@mui/material";
-import { confirmSignup, getTokens, login, signup } from "./amplifyAuth";
-
 import config from "../../config/config";
 import { storage } from "@nucleoidjs/webstorage";
 import { useState } from "react";
 
+import { Button, Stack, TextField, Typography } from "@mui/material";
+import { confirmSignup, getTokens, login, signup } from "./amplifyAuth";
+
 export default function CognitoLogin() {
   const [mode, setMode] = useState("login");
 
@@ -17,34 +17,29 @@ export default function CognitoLogin() {
 
   const handleLogin = async () => {
     try {
-      // 1️⃣ Login with Cognito
       await login(username, password);
 
-      // 2️⃣ Get Cognito tokens
       const tokens = await getTokens();
-
-      if (!tokens?.accessToken) {
+      if (!tokens?.accessToken)
         throw new Error("No Cognito access token received");
-      }
+
+      storage.set("link", "cognitoRefresh", tokens.accessToken);
 
       const res = await fetch("/api/oauth", {
         method: "POST",
         headers: { "Content-Type": "application/json" },
         body: JSON.stringify({
-          appId: appId,
+          appId,
           projectId: "cb16e069-6214-47f1-9922-1f7fe7629525",
           identityProvider: "COGNITO",
-          refreshToken: tokens.accessToken, // 🔥 Cognito ACCESS token
+          refreshToken: tokens.accessToken,
         }),
       });
 
-      if (!res.ok) {
-        throw new Error("Backend OAuth exchange failed");
-      }
+      if (!res.ok) throw new Error("Backend OAuth exchange failed");
 
       const data = await res.json();
 
-      // 4️⃣ Store INTERNAL tokens (same as Demo)
       storage.set("link", "accessToken", data.accessToken);
       storage.set("link", "refreshToken", data.refreshToken);
       storage.set("link", "identityProvider", "COGNITO");

package/src/widgets/Login/amplifyConfig.js

@@ -1,20 +0,0 @@
-import { Amplify } from "aws-amplify";
-import config from "../../config/config";
-
-export function configureAmplify() {
-  const { credentials } = config();
-
-  if (!credentials) {
-    throw new Error("CONFIG not initialized yet");
-  }
-
-  Amplify.configure({
-    Auth: {
-      Cognito: {
-        userPoolId: credentials.userPoolId,
-        userPoolClientId: credentials.clientId,
-        region: credentials.region,
-      },
-    },
-  });
-}