docpouch-client 1.1.1 → 1.1.3

package/dist/index.d.ts

@@ -11,6 +11,18 @@ export default class docPouchClient {
      * @type {string}
      */
     baseUrl: string;
+    /**
+     * The port number to use for HTTP and WebSocket connections when the
+     * base URL does not already include an explicit port. Stored from
+     * the constructor argument so the {@link request} method can
+     * build full URLs (e.g. for the OIDC dynamic client registration
+     * endpoint at `/oidc/reg`) even when the caller passes a host
+     * without a port. A port that already appears in the base URL
+     * takes precedence.
+     *
+     * @type {number}
+     */
+    port: number;
     /**
      * Socket.IO socket instance for real-time communication with the server.
      *
@@ -58,8 +70,14 @@ export default class docPouchClient {
     /**
      * Creates an instance of docPouchClient.
      *
-     * @param {string} host - The base URL for the server.
-     * @param {number} [port=80] - The port number to connect to (default is 80).
+     * @param {string} host - The base URL for the server. May be a bare
+     *   host (`http://localhost`), a host with an explicit port
+     *   (`http://localhost:3030`), or a full URL with a path. When the
+     *   value does not already contain a port number, the supplied
+     *   `port` argument is appended to every HTTP request built by
+     *   {@link request} (in addition to the WebSocket connection).
+     * @param {number} [port=80] - The port number to use when the
+     *   `host` does not already specify one (default is 80).
      * @param {(event: I_EventString, data: I_WsMessage) => void} [callback] - Optional callback function for socket events.
      */
     constructor(host: string, port?: number, callback?: (event: I_EventString, data: I_WsMessage) => void);

package/dist/index.js

@@ -9,8 +9,14 @@ export default class docPouchClient {
     /**
      * Creates an instance of docPouchClient.
      *
-     * @param {string} host - The base URL for the server.
-     * @param {number} [port=80] - The port number to connect to (default is 80).
+     * @param {string} host - The base URL for the server. May be a bare
+     *   host (`http://localhost`), a host with an explicit port
+     *   (`http://localhost:3030`), or a full URL with a path. When the
+     *   value does not already contain a port number, the supplied
+     *   `port` argument is appended to every HTTP request built by
+     *   {@link request} (in addition to the WebSocket connection).
+     * @param {number} [port=80] - The port number to use when the
+     *   `host` does not already specify one (default is 80).
      * @param {(event: I_EventString, data: I_WsMessage) => void} [callback] - Optional callback function for socket events.
      */
     constructor(host, port = 80, callback) {
@@ -47,6 +53,7 @@ export default class docPouchClient {
          */
         this.events = {};
         this.baseUrl = host;
+        this.port = port;
         const socketUrl = host.includes('://') ? host : `https://${host}`;
         const socketUrlWithPort = socketUrl.includes(':') && !socketUrl.endsWith(':')
             ? socketUrl
@@ -499,12 +506,11 @@ export default class docPouchClient {
             if (idToken) {
                 url += `&id_token_hint=${idToken}`;
             }
-            // Clear tokens before redirect
-            this.authToken = null;
-            this.clearOidcTokens();
-            this.authMethod = 'none';
-            if (this.socket.connected)
-                this.socket.disconnect();
+            // DO NOT clear tokens before redirect - wait for redirect back to determine actual logout status
+            // Instead, set a flag to indicate we're in logout process
+            if (typeof window !== 'undefined' && window.sessionStorage) {
+                sessionStorage.setItem('docpouch_logout_in_progress', 'true');
+            }
             // Redirect to OIDC logout endpoint
             window.location.href = url;
             return;
@@ -552,12 +558,11 @@ export default class docPouchClient {
         else if (this.oidcIdToken) {
             url += `&id_token_hint=${this.oidcIdToken}`;
         }
-        // Clear tokens before redirect
-        this.authToken = null;
-        this.clearOidcTokens();
-        this.authMethod = 'none';
-        if (this.socket.connected)
-            this.socket.disconnect();
+        // DO NOT clear tokens before redirect - wait for redirect back to determine actual logout status
+        // Instead, set a flag to indicate we're in logout process
+        if (typeof window !== 'undefined' && window.sessionStorage) {
+            sessionStorage.setItem('docpouch_logout_in_progress', 'true');
+        }
         // Emit OIDC logout event
         this.emit('oidc-logout');
         this.emit('logout');
@@ -613,18 +618,71 @@ export default class docPouchClient {
      * @returns {boolean} True if user was just logged out
      */
     wasJustLoggedOut() {
-        // Check URL query parameter
+        // Check if we're in the middle of a logout process
+        const logoutInProgress = typeof window !== 'undefined' && window.sessionStorage
+            ? sessionStorage.getItem('docpouch_logout_in_progress') === 'true'
+            : false;
+        if (!logoutInProgress) {
+            return false;
+        }
+        // Check URL query parameters for logout confirmation
         const urlParams = new URLSearchParams(window.location.search);
-        if (urlParams.get('logout') === 'true') {
-            return true;
+        const logoutParam = urlParams.get('logout');
+        // If logout parameter is explicitly 'no', user cancelled
+        if (logoutParam === 'no') {
+            // Clear the logout in progress flag
+            if (typeof window !== 'undefined' && window.sessionStorage) {
+                sessionStorage.removeItem('docpouch_logout_in_progress');
+            }
+            return false;
         }
-        // Check localStorage flag
-        const lastAuthMethod = localStorage.getItem('lastAuthMethod');
-        const currentAuthMethod = localStorage.getItem('authMethod');
-        // If last was OIDC/JWT but current is none, was logged out
-        if (lastAuthMethod && currentAuthMethod === null) {
+        // If logout parameter is 'yes' or 'true', user confirmed logout
+        if (logoutParam === 'yes' || logoutParam === 'true') {
+            // Clear the logout in progress flag
+            if (typeof window !== 'undefined' && window.sessionStorage) {
+                sessionStorage.removeItem('docpouch_logout_in_progress');
+            }
+            // Clear tokens as user confirmed logout
+            this.authToken = null;
+            this.clearOidcTokens();
+            this.authMethod = 'none';
+            if (this.socket.connected)
+                this.socket.disconnect();
             return true;
         }
+        // If no logout parameter but we were in logout process, 
+        // check if OIDC provider sent us back without confirmation
+        // This could happen if there was an error or user cancelled in another way
+        if (logoutParam === null) {
+            // Check if this is a post-logout redirect - assume logout was successful
+            // unless there's an error parameter
+            const errorParam = urlParams.get('error');
+            if (!errorParam) {
+                // Clear the logout in progress flag
+                if (typeof window !== 'undefined' && window.sessionStorage) {
+                    sessionStorage.removeItem('docpouch_logout_in_progress');
+                }
+                // Clear tokens
+                this.authToken = null;
+                this.clearOidcTokens();
+                this.authMethod = 'none';
+                if (this.socket.connected)
+                    this.socket.disconnect();
+                return true;
+            }
+            else {
+                // There was an error, assume logout was cancelled
+                // Clear the logout in progress flag
+                if (typeof window !== 'undefined' && window.sessionStorage) {
+                    sessionStorage.removeItem('docpouch_logout_in_progress');
+                }
+                return false;
+            }
+        }
+        // Default case - clear the flag to prevent stuck state
+        if (typeof window !== 'undefined' && window.sessionStorage) {
+            sessionStorage.removeItem('docpouch_logout_in_progress');
+        }
         return false;
     }
     // OIDC Dynamic Client Registration Methods
@@ -780,7 +838,16 @@ export default class docPouchClient {
             body: body ? JSON.stringify(body) : undefined
         };
         const normalizedEndpoint = endpoint.startsWith('/') ? endpoint : `/${endpoint}`;
-        const normalizedBaseUrl = this.baseUrl.endsWith('/') ? this.baseUrl.slice(0, -1) : this.baseUrl;
+        const trimmedBaseUrl = this.baseUrl.endsWith('/') ? this.baseUrl.slice(0, -1) : this.baseUrl;
+        // If the caller's `host` already includes a port (e.g.
+        // `http://localhost:3030`) we must not append `this.port` or
+        // the URL would end up like `http://localhost:3030:3030` or
+        // `http://localhost:3030:80`. Only fall back to the constructor
+        // `port` argument when the URL has no port of its own.
+        const hasExplicitPort = /:\d+(?=\/|$)/.test(trimmedBaseUrl);
+        const normalizedBaseUrl = !hasExplicitPort && this.port
+            ? `${trimmedBaseUrl}:${this.port}`
+            : trimmedBaseUrl;
         const url = `${normalizedBaseUrl}${normalizedEndpoint}`;
         const response = await fetch(url, options);
         if (!response.ok) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "docpouch-client",
-  "version": "1.1.1",
+  "version": "1.1.3",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "exports": {