Merge remote-tracking branch 'origin/main' into 2024_update_dependencies

package.json

@@ -38,7 +38,7 @@
         "typescript": "5.1.6"
     },
     "scripts": {
-        "start": "react-scripts start",
+        "start": "PORT=3001 react-scripts start",
         "build": "react-scripts build",
         "test": "react-scripts test --watchAll=false --passWithNoTests",
         "eject": "react-scripts eject",

public/idpSettings.json

@@ -1,8 +1,8 @@
 {
     "authority": "http://172.17.0.1:9090/",
-    "client_id": "my-client-2",
-    "redirect_uri": "http://localhost:3000/sign-in-callback",
-    "post_logout_redirect_uri": "http://localhost:3000/logout-callback",
-    "silent_redirect_uri": "http://localhost:3000/silent-renew-callback",
+    "client_id": "gridmerge-local",
+    "redirect_uri": "http://localhost:3001/sign-in-callback",
+    "post_logout_redirect_uri": "http://localhost:3001/logout-callback",
+    "silent_redirect_uri": "http://localhost:3001/silent-renew-callback",
     "scope": "openid"
 }