@squiz/resource-browser 2.2.2-rc.0 → 2.4.0-rc.0

package/.eslintrc

@@ -11,8 +11,8 @@
         "import/resolver": {
             "typescript": {
                 "alwaysTryTypes": true,
-            },
-        },
+            }
+        }
     },
     "ignorePatterns": ["**/lib/"],
     "overrides": [
@@ -21,19 +21,20 @@
             "rules": {
                 "no-var": 0,
                 "import/no-extraneous-dependencies": 0,
-            },
+            }
         },
         {
             "files": ["*.config.ts", "*.config.js", "build.js"],
             "rules": {
                 "import/no-extraneous-dependencies": 0,
-            },
+            }
         },
         {
             "files": ["*.stories.ts", "*.stories.tsx"],
             "rules": {
                 "import/no-extraneous-dependencies": 0,
-            },
-        },
-    ],
+                "no-console": "off"
+            }
+        }
+    ]
 }

package/CHANGELOG.md

@@ -3,7 +3,21 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-## [2.2.2-rc.0](https://gitlab.squiz.net/dxp/dxp-shared-ui/resource-browser/compare/@squiz/resource-browser@2.2.1-rc.0...@squiz/resource-browser@2.2.2-rc.0) (2024-06-10)
+# [2.4.0-rc.0](https://gitlab.squiz.net/dxp/dxp-shared-ui/resource-browser/compare/@squiz/resource-browser@2.3.0-rc.0...@squiz/resource-browser@2.4.0-rc.0) (2024-06-13)
+
+### Features
+
+-   **PRODAM-161:** updated versions ([8ed02b5](https://gitlab.squiz.net/dxp/dxp-shared-ui/resource-browser/commit/8ed02b5aa5b818c27a0d23d98cbbee468e4e559e))
+
+# [2.3.0-rc.0](https://gitlab.squiz.net/dxp/dxp-shared-ui/resource-browser/compare/@squiz/resource-browser@2.2.1...@squiz/resource-browser@2.3.0-rc.0) (2024-06-13)
+
+### Features
+
+-   **PRODAM-161:** lint ([7bc6f21](https://gitlab.squiz.net/dxp/dxp-shared-ui/resource-browser/commit/7bc6f2112a0364efb6c7e6e56c1fcfac61dc1086))
+-   **PRODAM-161:** linting ([afef928](https://gitlab.squiz.net/dxp/dxp-shared-ui/resource-browser/commit/afef928ac5a3fd05693f44995c144548e44b4392))
+-   **PRODAM-161:** route resource fetch tru internal api ([3073a7a](https://gitlab.squiz.net/dxp/dxp-shared-ui/resource-browser/commit/3073a7a34b8700f63f3b60070c489a7476c62122))
+
+## [2.2.1](https://gitlab.squiz.net/dxp/dxp-shared-ui/resource-browser/compare/@squiz/resource-browser@2.2.1-rc.0...@squiz/resource-browser@2.2.1) (2024-06-11)
 
 **Note:** Version bump only for package @squiz/resource-browser
 

package/lib/Hooks/useAuth.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.useAuth = void 0;
+/* eslint-disable no-console */
 const react_1 = require("react");
 const authUtils_1 = require("../utils/authUtils");
 const useAuth = (authConfig) => {
@@ -13,10 +14,11 @@ const useAuth = (authConfig) => {
         return newToken;
     }, [authConfig]);
     const handleLogin = (0, react_1.useCallback)(() => {
-        if (!authConfig?.redirectUrl && !authConfig?.authUrl && !authConfig?.redirectUrl && !authConfig?.scope) {
+        if (!authConfig?.redirectUrl && !authConfig?.authUrl && !authConfig?.scope) {
+            console.error('Auth config is misconfigured');
             return;
         }
-        const encodedRedirectUrl = encodeURIComponent(authConfig?.redirectUrl || '');
+        const encodedRedirectUrl = encodeURIComponent(authConfig.redirectUrl);
         const loginUrl = `${authConfig?.authUrl}?client_id=${authConfig?.clientId}&scope=${authConfig?.scope}&redirect_uri=${encodedRedirectUrl}&response_type=code&state=state`;
         const popup = window.open(loginUrl, 'Login', 'width=600,height=600');
         if (!popup) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@squiz/resource-browser",
-    "version": "2.2.2-rc.0",
+    "version": "2.4.0-rc.0",
     "main": "lib/index.js",
     "types": "lib/index.d.ts",
     "private": false,
@@ -24,8 +24,8 @@
         "@react-types/overlays": "^3.8.7",
         "@react-types/shared": "^3.23.1",
         "@squiz/dx-json-schema-lib": "^1.67.0",
-        "@squiz/generic-browser-lib": "^1.66.0",
-        "@squiz/resource-browser-ui-lib": "^0.8.3-rc.0",
+        "@squiz/generic-browser-lib": "1.67.2",
+        "@squiz/resource-browser-ui-lib": "^0.10.0-rc.0",
         "clsx": "^2.1.0",
         "expiry-map": "^2.0.0",
         "p-memoize": "^4.0.4",
@@ -87,5 +87,5 @@
     "volta": {
         "node": "18.18.0"
     },
-    "gitHead": "5d66e140b42ee6c9794ca079b1049289ca4f74f8"
+    "gitHead": "68102123c494f931e7b6e9d0f7548e9b95244466"
 }

package/src/Hooks/useAuth.spec.tsx

@@ -32,6 +32,22 @@ describe('useAuth', () => {
         });
     });
 
+    it('should do nothing if missing crucial props', async () => {
+        const authConfigMissingProps = {
+            clientId: 'example-client-id',
+            // Missing redirectUrl, authUrl, and scope
+        };
+        // @ts-ignore
+        const { result } = renderHook(() => useAuth(authConfigMissingProps));
+
+        result.current.login();
+
+        await waitFor(() => {
+            expect(result.current.authToken).toBe(undefined);
+            expect(result.current.isAuthenticated).toBe(false);
+        });
+    });
+
     it('should log error and return when popup fails to open', async () => {
         const consoleSpy = jest.spyOn(console, 'error').mockImplementation(() => {});
         jest.spyOn(window, 'open').mockImplementation(() => null);

package/src/Hooks/useAuth.ts

@@ -1,3 +1,4 @@
+/* eslint-disable no-console */
 import { useState, useCallback, useEffect } from 'react';
 import { AuthenticationConfiguration } from '../types';
 import { getCookieValue, refreshAccessToken as refreshTokenUtil } from '../utils/authUtils';
@@ -14,10 +15,11 @@ export const useAuth = (authConfig: AuthenticationConfiguration | undefined) =>
     }, [authConfig]);
 
     const handleLogin = useCallback((): void => {
-        if (!authConfig?.redirectUrl && !authConfig?.authUrl && !authConfig?.redirectUrl && !authConfig?.scope) {
+        if (!authConfig?.redirectUrl && !authConfig?.authUrl && !authConfig?.scope) {
+            console.error('Auth config is misconfigured');
             return;
         }
-        const encodedRedirectUrl = encodeURIComponent(authConfig?.redirectUrl || '');
+        const encodedRedirectUrl = encodeURIComponent(authConfig.redirectUrl);
         const loginUrl = `${authConfig?.authUrl}?client_id=${authConfig?.clientId}&scope=${authConfig?.scope}&redirect_uri=${encodedRedirectUrl}&response_type=code&state=state`;
         const popup = window.open(loginUrl, 'Login', 'width=600,height=600');