@hotosm/hanko-auth 0.3.1 → 0.3.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hotosm/hanko-auth",
-  "version": "0.3.1",
+  "version": "0.3.3",
   "description": "Web component for HOTOSM SSO authentication with Hanko and OSM integration",
   "type": "module",
   "main": "dist/hanko-auth.umd.js",

package/src/hanko-auth.ts

@@ -607,10 +607,17 @@ export class HankoAuth extends LitElement {
       // Configure cookie domain for cross-subdomain SSO
       const hostname = window.location.hostname;
       const isLocalhost = hostname === "localhost" || hostname === "127.0.0.1";
+
+      // Extract base domain for cookie (e.g., "login.hotosm.org" -> ".hotosm.org")
+      // Handles both production (.hotosm.org) and dev (.hotosm.test)
+      const parts = hostname.split(".");
+      const baseDomain =
+        parts.length >= 2 ? `.${parts.slice(-2).join(".")}` : hostname;
+
       const cookieOptions = isLocalhost
         ? {}
         : {
-            cookieDomain: ".hotosm.org",
+            cookieDomain: baseDomain,
             cookieName: "hanko",
             cookieSameSite: "lax",
           };
@@ -818,6 +825,12 @@ export class HankoAuth extends LitElement {
   }
 
   private async checkOSMConnection() {
+    // Skip OSM check if not required
+    if (!this.osmRequired) {
+      this.log("⏭️ OSM not required, skipping connection check");
+      return;
+    }
+
     if (this.osmConnected) {
       this.log("⏭️ Already connected to OSM, skipping check");
       return;
@@ -1292,10 +1305,16 @@ export class HankoAuth extends LitElement {
       "✅ Logout complete - component will re-render with updated state",
     );
 
-    // Redirect after logout if configured
+    // Redirect after logout if configured (but not if already there)
     if (this.redirectAfterLogout) {
-      this.log("🔄 Redirecting after logout to:", this.redirectAfterLogout);
-      window.location.href = this.redirectAfterLogout;
+      const currentUrl = window.location.href.replace(/\/$/, "");
+      const targetUrl = this.redirectAfterLogout.replace(/\/$/, "");
+      if (currentUrl !== targetUrl && !currentUrl.startsWith(targetUrl + "#")) {
+        this.log("🔄 Redirecting after logout to:", this.redirectAfterLogout);
+        window.location.href = this.redirectAfterLogout;
+      } else {
+        this.log("⏭️ Already on logout target, skipping redirect");
+      }
     }
     // Otherwise let Lit's reactivity handle the re-render
   }
@@ -1344,8 +1363,16 @@ export class HankoAuth extends LitElement {
     this.log("📊 Current state:", {
       user: this.user,
       osmConnected: this.osmConnected,
+      loading: this.loading,
     });
 
+    // If still loading, wait for session check to complete before acting
+    // The SDK may fire this event for old/stale sessions during init
+    if (this.loading) {
+      this.log("⏳ Still loading, ignoring session expired event during init");
+      return;
+    }
+
     // If we have an active user, the session is still valid
     // The SDK may fire this event for old/stale sessions while a new session exists
     if (this.user) {
@@ -1384,13 +1411,19 @@ export class HankoAuth extends LitElement {
 
     this.log("✅ Session cleanup complete");
 
-    // Redirect after session expired if configured
+    // Redirect after session expired if configured (but not if already there)
     if (this.redirectAfterLogout) {
-      this.log(
-        "🔄 Redirecting after session expired to:",
-        this.redirectAfterLogout,
-      );
-      window.location.href = this.redirectAfterLogout;
+      const currentUrl = window.location.href.replace(/\/$/, ""); // Remove trailing slash
+      const targetUrl = this.redirectAfterLogout.replace(/\/$/, "");
+      if (currentUrl !== targetUrl && !currentUrl.startsWith(targetUrl + "#")) {
+        this.log(
+          "🔄 Redirecting after session expired to:",
+          this.redirectAfterLogout,
+        );
+        window.location.href = this.redirectAfterLogout;
+      } else {
+        this.log("⏭️ Already on logout target, skipping redirect");
+      }
     }
     // Otherwise component will re-render and show login button
   }
@@ -1406,11 +1439,11 @@ export class HankoAuth extends LitElement {
     this.log("🎯 Dropdown item selected:", selectedValue);
 
     if (selectedValue === "profile") {
-      // Profile page lives on the login site
-      // Pass return URL so profile can navigate back to the app
-      const baseUrl = this.hankoUrl;
+      // Profile page lives on the login site (or standalone app's login page)
+      // Use loginUrl if set (standalone mode), otherwise hankoUrl
+      const baseUrl = this.loginUrl || this.hankoUrl;
       const returnTo = this.redirectAfterLogin || window.location.origin;
-      window.location.href = `${baseUrl}/app/profile?return_to=${encodeURIComponent(returnTo)}`;
+      window.location.href = `${baseUrl}/profile?return_to=${encodeURIComponent(returnTo)}`;
     } else if (selectedValue === "connect-osm") {
       // Smart return_to: if already on a login page, redirect to home instead
       const currentPath = window.location.pathname;