@squiz/resource-browser 3.3.4 → 3.3.6

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Change Log
 
+## 3.3.6
+
+### Patch Changes
+
+-   bd748ea: Better support for AssetBank resources
+
+## 3.3.5
+
+### Patch Changes
+
+-   856a08e: Support AssetBank resources
+
 ## 3.3.4
 
 ### Patch Changes

package/lib/Hooks/useAuth.js

@@ -17,6 +17,8 @@ const useAuth = (authConfig) => {
         catch {
             setAuthToken(null);
             setIsAuthenticated(false);
+            // Clear cookies associated with invalidated tokens
+            (0, authUtils_1.logout)();
             throw new Error('Session expired. Please log in again.');
         }
     }, [authConfig]);

package/lib/index.js

@@ -71,25 +71,28 @@ const ResourceBrowser = (props) => {
     }, [setSource, setMode]);
     // If an existing resource is passed in auto select its source
     (0, react_1.useEffect)(() => {
-        let source = null;
+        let newSource = null;
         setError(null);
+        if (source !== null) {
+            return;
+        }
         // If there is a provided value try to use its source
         if (value) {
             // Search the sources for it matching against the value.source property
-            source = sources.find((source) => source.id === value?.sourceId) || null;
+            newSource = sources.find((source) => source.id === value?.sourceId) || null;
             // If the source is null and we arent loading the sources
-            if (source === null && !isLoading) {
+            if (newSource === null && !isLoading) {
                 // Set an error as the passed in value's source wasnt returned by onRequestSources
                 setError(new Error('Unable to find resource source.'));
             }
         }
         else if (sources?.length === 1 && !searchEnabled) {
             // If only one source is passed and search is not enabled select it automatically
-            source = sources[0];
+            newSource = sources[0];
         }
-        setSource(source);
+        setSource(newSource);
         setMode(null); // Passed in resource will always use the default mode
-    }, [value, isLoading, sources, setSource, setError]);
+    }, [value, isLoading, sources, source]);
     // The modal has some control over it own open/closed state (for WCAG reasons) so keep this in sync with our state
     const handleModalStateChange = (0, react_1.useCallback)((isOpen) => {
         setIsModalOpen(isOpen);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@squiz/resource-browser",
-    "version": "3.3.4",
+    "version": "3.3.6",
     "main": "lib/index.js",
     "types": "lib/index.d.ts",
     "private": false,

package/src/Hooks/useAuth.ts

@@ -1,7 +1,7 @@
 /* eslint-disable no-console */
 import { useState, useCallback, useEffect } from 'react';
 import { AuthenticationConfiguration } from '../types';
-import { getCookieValue, refreshAccessToken as refreshTokenUtil } from '../utils/authUtils';
+import { getCookieValue, refreshAccessToken as refreshTokenUtil, logout } from '../utils/authUtils';
 
 export const useAuth = (authConfig: AuthenticationConfiguration | undefined) => {
     const [authToken, setAuthToken] = useState<string | null>(getCookieValue('authToken'));
@@ -16,6 +16,8 @@ export const useAuth = (authConfig: AuthenticationConfiguration | undefined) =>
         } catch {
             setAuthToken(null);
             setIsAuthenticated(false);
+            // Clear cookies associated with invalidated tokens
+            logout();
             throw new Error('Session expired. Please log in again.');
         }
     }, [authConfig]);

package/src/index.tsx

@@ -70,26 +70,29 @@ export const ResourceBrowser = (props: ResourceBrowserProps) => {
 
     // If an existing resource is passed in auto select its source
     useEffect(() => {
-        let source: ResourceBrowserSourceWithPlugin | null = null;
+        let newSource: ResourceBrowserSourceWithPlugin | null = null;
         setError(null);
+        if (source !== null) {
+            return;
+        }
 
         // If there is a provided value try to use its source
         if (value) {
             // Search the sources for it matching against the value.source property
-            source = sources.find((source) => source.id === value?.sourceId) || null;
+            newSource = sources.find((source) => source.id === value?.sourceId) || null;
             // If the source is null and we arent loading the sources
-            if (source === null && !isLoading) {
+            if (newSource === null && !isLoading) {
                 // Set an error as the passed in value's source wasnt returned by onRequestSources
                 setError(new Error('Unable to find resource source.'));
             }
         } else if (sources?.length === 1 && !searchEnabled) {
             // If only one source is passed and search is not enabled select it automatically
-            source = sources[0];
+            newSource = sources[0];
         }
 
-        setSource(source);
+        setSource(newSource);
         setMode(null); // Passed in resource will always use the default mode
-    }, [value, isLoading, sources, setSource, setError]);
+    }, [value, isLoading, sources, source]);
 
     // The modal has some control over it own open/closed state (for WCAG reasons) so keep this in sync with our state
     const handleModalStateChange = useCallback(