@ebubekirylmaz/link-test 1.2.34 → 1.2.36

package/package.json

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

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

@@ -91,18 +91,22 @@ function ProjectBar() {
   const handleSelect = (project) => {
     const { id: projectId } = project;
 
-    const refreshToken = storage.get("link", "refreshToken");
-    const identityProvider = storage.get("link", "identityProvider");
+    const identityProviderRaw = storage.get("link", "identityProvider");
+    const identityProvider = identityProviderRaw?.toUpperCase();
 
     const payload = {
       appId,
       projectId,
       identityProvider,
-      refreshToken,
     };
-    if (identityProvider?.toUpperCase() === "DEMO") {
+
+    if (identityProvider === "DEMO") {
       payload.username = "admin";
       payload.password = "admin";
+    } else if (identityProvider === "COGNITO") {
+      payload.refreshToken = storage.get("link", "cognitoAccessToken");
+    } else {
+      payload.refreshToken = storage.get("link", "refreshToken");
     }
 
     const request = oauth.post("/oauth", payload);

package/src/widgets/Login/CognitoLogin.jsx

@@ -17,34 +17,34 @@ export default function CognitoLogin() {
 
   const handleLogin = async () => {
     try {
-      // 1️⃣ Login with Cognito
+      // 1) Cognito sign-in (SRP handled by Amplify)
       await login(username, password);
 
-      // 2️⃣ Get Cognito tokens
+      // 2) Get Cognito tokens
       const tokens = await getTokens();
-
-      if (!tokens?.accessToken) {
+      if (!tokens?.accessToken)
         throw new Error("No Cognito access token received");
-      }
 
+      // ✅ Store Cognito access token separately (external token)
+      storage.set("link", "cognitoAccessToken", tokens.accessToken);
+
+      // 3) Exchange Cognito token with YOUR backend
       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, // <-- external Cognito access token (JWT with kid)
         }),
       });
 
-      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)
+      // 4) Store INTERNAL tokens (issued by your backend)
       storage.set("link", "accessToken", data.accessToken);
       storage.set("link", "refreshToken", data.refreshToken);
       storage.set("link", "identityProvider", "COGNITO");