@ebubekirylmaz/link-test 1.2.23 → 1.2.24

package/package.json

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

package/src/Platform.jsx

@@ -14,10 +14,13 @@ import { SettingsProvider } from "./components/settings";
 import { SnackbarProvider } from "notistack";
 import ThemeProvider from "./theme";
 import config from "./config/config";
+import { configureAmplify } from "./widgets/Login/amplifyConfig";
 import http from "./http";
 import { init } from "./config/config";
 import oauth from "./http/oauth";
 
+configureAmplify();
+
 init();
 
 window["@nucleoidai"] = {

package/src/pages/LoginPage.jsx

@@ -1,4 +1,3 @@
-import AmplifyLogin from "../widgets/Login/AmplifyLogin";
 import CognitoLogin from "../widgets/Login/CognitoLogin";
 import DemoLogin from "../widgets/Login/DemoLogin";
 import LoginForm from "../widgets/LoginForm/LoginForm";
@@ -32,7 +31,7 @@ function LoginPage() {
   }, [navigate]);
 
   if (credentials?.provider === "COGNITO") {
-    return <AmplifyLogin />;
+    return <CognitoLogin />;
   }
 
   if (credentials?.provider === "DEMO") {

package/src/widgets/Login/CognitoLogin.jsx

@@ -1,16 +1,17 @@
+import { Button, Stack, TextField, Typography } from "@mui/material";
+
+import { login } from "./auth/amplifyAuth";
 import { loginWithCognito } from "./cognitoAuth";
 import { storage } from "@nucleoidjs/webstorage";
 import { useState } from "react";
 
-import { Button, Stack, TextField, Typography } from "@mui/material";
-
 export default function CognitoLogin() {
   const [username, setUsername] = useState("");
   const [password, setPassword] = useState("");
 
   const handleLogin = async () => {
     try {
-      const tokens = await loginWithCognito(username, password);
+      const tokens = await login(username, password);
       console.log("Login successful, tokens:", tokens);
       storage.set("link", "accessToken", tokens.AccessToken);
       storage.set("link", "refreshToken", tokens.RefreshToken);

package/src/widgets/Login/amplifyAuth.js

@@ -1,28 +1,19 @@
-import { Amplify } from "aws-amplify";
-import config from "../../config/config";
+import { fetchAuthSession, signIn, signOut } from "aws-amplify/auth";
 
-let initialized = false;
-
-export function ensureAmplifyAuth() {
-  if (initialized) return;
+export async function login(username, password) {
+  return signIn({ username, password });
+}
 
-  const { credentials } = config();
-  if (!credentials) {
-    // 👈 do NOT throw here
-    return false;
-  }
+export async function logout() {
+  await signOut();
+}
 
-  Amplify.configure({
-    Auth: {
-      region: credentials.region,
-      userPoolId: credentials.userPoolId,
-      userPoolWebClientId: credentials.clientId,
-      authenticationFlowType: "USER_SRP_AUTH",
-      oauth: undefined, // disable Hosted UI
-    },
-  });
+export async function getTokens() {
+  const session = await fetchAuthSession();
 
-  initialized = true;
-  console.log("✅ Amplify Auth configured");
-  return true;
+  return {
+    accessToken: session.tokens?.accessToken?.toString(),
+    refreshToken: session.tokens?.refreshToken?.toString(),
+    idToken: session.tokens?.idToken?.toString(),
+  };
 }

package/src/widgets/Login/amplifyConfig.js

@@ -0,0 +1,20 @@
+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,
+      },
+    },
+  });
+}

package/src/widgets/Login/AmplifyLogin.jsx

@@ -1,54 +0,0 @@
-import { Button, Stack, TextField, Typography } from "@mui/material";
-
-import { loginWithAmplify } from "./amplify";
-import { storage } from "@nucleoidjs/webstorage";
-import { useState } from "react";
-
-export default function AmplifyLogin() {
-  const [username, setUsername] = useState("");
-  const [password, setPassword] = useState("");
-
-  const handleLogin = async () => {
-    try {
-      const result = await loginWithAmplify(username, password);
-
-      if (result.challenge) {
-        console.log("Challenge required:", result.challenge);
-        alert(`Challenge required: ${result.challenge}`);
-        return;
-      }
-
-      console.log("Login successful, tokens:", result);
-
-      storage.set("link", "accessToken", result.AccessToken);
-      storage.set("link", "refreshToken", result.RefreshToken);
-
-      window.location.href = "/";
-    } catch (e) {
-      console.error("Login error:", e);
-      alert(`Login failed: ${e.message || e}`);
-    }
-  };
-
-  return (
-    <>
-      <Typography variant="h4">Login</Typography>
-      <Stack spacing={2}>
-        <TextField
-          label="Username or Email"
-          value={username}
-          onChange={(e) => setUsername(e.target.value)}
-        />
-        <TextField
-          type="password"
-          label="Password"
-          value={password}
-          onChange={(e) => setPassword(e.target.value)}
-        />
-        <Button variant="contained" onClick={handleLogin}>
-          Login
-        </Button>
-      </Stack>
-    </>
-  );
-}

package/src/widgets/Login/amplify.jsx

@@ -1,30 +0,0 @@
-import { fetchAuthSession, signIn } from "aws-amplify/auth";
-
-import { ensureAmplifyAuth } from "./amplifyAuth";
-
-export async function loginWithAmplify(username, password) {
-  const ready = ensureAmplifyAuth();
-  if (!ready) {
-    throw new Error("Auth not ready yet. Please try again.");
-  }
-
-  const result = await signIn({
-    username,
-    password,
-  });
-
-  if (result.nextStep?.signInStep !== "DONE") {
-    return {
-      challenge: result.nextStep.signInStep,
-      result,
-    };
-  }
-
-  const session = await fetchAuthSession();
-
-  return {
-    AccessToken: session.tokens?.accessToken?.toString(),
-    IdToken: session.tokens?.idToken?.toString(),
-    RefreshToken: session.tokens?.refreshToken?.toString(),
-  };
-}