Tracking pull request to merge release-3.0.0 to master

.github/workflows/dev-ci.yaml

@@ -1,8 +1,8 @@
-name: TFRS New Pipeline Dev release-2.22.0
+name: TFRS New Pipeline Dev release-3.0.0
 
 on:
   push:
-    branches: [release-2.22.0]
+    branches: [release-3.0.0]
     paths:
       - frontend/**
       - backend/**
@@ -13,7 +13,7 @@ env:
   GIT_URL: https://github.com/bcgov/tfrs.git
   TOOLS_NAMESPACE: ${{ secrets.OPENSHIFT_NAMESPACE_PLATE }}-tools
   DEV_NAMESPACE: ${{ secrets.OPENSHIFT_NAMESPACE_PLATE }}-dev
-  GIT_REF: "release-2.22.0"
+  GIT_REF: "release-3.0.0"
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
@@ -58,7 +58,7 @@ jobs:
     steps:
       - id: get-version
         run: |
-          echo "VERSION=2.22.0" >> $GITHUB_OUTPUT
+          echo "VERSION=3.0.0" >> $GITHUB_OUTPUT
 
   build-backend:
     name: Build tfrs Backend

.github/workflows/dev-release.yaml

@@ -1,11 +1,11 @@
 ## For each release, the value of name, branches, RELEASE_NAME and PR_NUMBER need to be adjusted accordingly
 ## For each release, update lib/config.js: version and releaseBranch
 
-name: TFRS Dev release-2.22.0
+name: TFRS Dev release-3.0.0
 
 on:
   push:
-    branches: [release-2.22.0]
+    branches: [release-3.0.0]
     paths:
       - frontend/**
       - backend/**
@@ -15,8 +15,8 @@ on:
 env:
   ## The pull request number of the Tracking pull request to merge the release branch to main
   ## Also remember to update the version in .pipeline/lib/config.js
-  PR_NUMBER: 2913
-  RELEASE_NAME: release-2.22.0
+  PR_NUMBER: 2956
+  RELEASE_NAME: release-3.0.0
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}

.github/workflows/prod-ci.yaml

@@ -1,4 +1,4 @@
-name: TFRS New Pipeline Prod release-2.22.0
+name: TFRS New Pipeline Prod release-3.0.0
 
 on:
   workflow_dispatch:

.github/workflows/test-ci.yaml

@@ -1,4 +1,4 @@
-name: TFRS New Pipeline Test release-2.22.0
+name: TFRS New Pipeline Test release-3.0.0
 
 on:
   workflow_dispatch:

.github/workflows/tfrs-release.yaml

@@ -1,7 +1,7 @@
 ## For each release, the value of name, branches, RELEASE_NAME and PR_NUMBER need to be adjusted accordingly
 ## For each release, update lib/config.js: version and releaseBranch
 
-name: TFRS release-2.22.0
+name: TFRS release-3.0.0
 
 on:
   workflow_dispatch:
@@ -10,8 +10,8 @@ on:
 env:
   ## The pull request number of the Tracking pull request to merge the release branch to main
   ## Also remember to update the version in .pipeline/lib/config.js
-  PR_NUMBER: 2913
-  RELEASE_NAME: release-2.22.0
+  PR_NUMBER: 2956
+  RELEASE_NAME: release-3.0.0
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
@@ -88,7 +88,7 @@ jobs:
           cd .pipeline
           npm install
           npm run build -- --pr=${{ env.PR_NUMBER }} --env=build
-  
+
   # comment out deploy-on-test as the deployment configs have been repaced by deployments at 2.21.1
   # deploy-on-test:
   #   name: Deploy TFRS on Test

.pipeline/lib/config.js

@@ -1,7 +1,7 @@
 "use strict";
 const options = require("@bcgov/pipeline-cli").Util.parseArguments();
 const changeId = options.pr; //aka pull-request
-const version = "2.22.0";
+const version = "3.0.0";
 const name = "tfrs";
 const ocpName = "apps.silver.devops";
 
@@ -20,7 +20,7 @@ const phases = {
     instance: `${name}-build-${changeId}`,
     version: `${version}-${changeId}`,
     tag: `build-${version}-${changeId}`,
-    releaseBranch: "release-2.22.0",
+    releaseBranch: "release-3.0.0",
   },
   dev: {
     namespace: "0ab226-dev",
@@ -264,4 +264,4 @@ process.on("unhandledRejection", (reason) => {
   process.exit(1);
 });
 
-module.exports = exports = { phases, options };
+module.exports = exports = { phases, options };

frontend/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tfrs",
-  "version": "2.22.0",
+  "version": "3.0.0",
   "dependencies": {
     "@babel/eslint-parser": "^7.19.1",
     "@babel/plugin-proposal-object-rest-spread": "^7.20.7",
@@ -28,7 +28,7 @@
     "jest-environment-jsdom": "^29.4.3",
     "jsonwebtoken": "^9.0.0",
     "jwks-rsa": "^2.0.0",
-    "keycloak-js": "^19.0.3",
+    "keycloak-js": "^26.1.2",
     "lodash": "^4.17.21",
     "mini-css-extract-plugin": "^2.6.1",
     "minimist": "^1.2.7",

frontend/src/actions/keycloakActions.js

@@ -59,13 +59,18 @@ export const logoutKeycloakUser = () => ({
 })
 
 export const login = (idpHint = IDENTITY_PROVIDERS.IDIR) => (dispatch) => {
-  const kc = keycloak()
-  kc.login({
-    pkceMethod: 'S256',
-    redirectUri: CONFIG.KEYCLOAK.CALLBACK_URL,
-    idpHint
-  })
-}
+    const kc = keycloak()
+
+    const currentPath = window.location.pathname + window.location.search + window.location.hash
+    const callbackWithoutSlash = CONFIG.KEYCLOAK.CALLBACK_URL.replace(/\/$/,"")
+    const redirectUri = `${callbackWithoutSlash}${currentPath}`
+
+    kc.login({
+      pkceMethod: 'S256',
+      redirectUri,
+      idpHint
+    })
+  }
 
 export const logout = () => (dispatch) => {
   const userAuth = store.getState().userAuth