diff --git a/omadata-oauth2-sample/client/package-lock.json b/omadata-oauth2-sample/client/package-lock.json
index 5107ecbc30..9bbd17ebfd 100644
--- a/omadata-oauth2-sample/client/package-lock.json
+++ b/omadata-oauth2-sample/client/package-lock.json
@@ -22,6 +22,7 @@
         "eslint-config-prettier": "^9.1.0",
         "eslint-plugin-prettier": "^5.2.1",
         "eslint-plugin-react-hooks": "^5.0.0",
+        "http-proxy-middleware": "^3.0.3",
         "npm-run-all": "^4.1.5",
         "prettier": "^3.3.3",
         "prettier-plugin-organize-imports": "^4.1.0",
@@ -9624,26 +9625,20 @@
       }
     },
     "node_modules/http-proxy-middleware": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.6.tgz",
-      "integrity": "sha512-ya/UeJ6HVBYxrgYotAZo1KvPWlgB48kUJLDePFeneHsVujFaW5WNj2NgWCAE//B1Dl02BIfYlpNgBy8Kf8Rjmw==",
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-3.0.3.tgz",
+      "integrity": "sha512-usY0HG5nyDUwtqpiZdETNbmKtw3QQ1jwYFZ9wi5iHzX2BcILwQKtYDJPo7XHTsu5Z0B2Hj3W9NNnbd+AjFWjqg==",
+      "license": "MIT",
       "dependencies": {
-        "@types/http-proxy": "^1.17.8",
+        "@types/http-proxy": "^1.17.15",
+        "debug": "^4.3.6",
         "http-proxy": "^1.18.1",
-        "is-glob": "^4.0.1",
-        "is-plain-obj": "^3.0.0",
-        "micromatch": "^4.0.2"
+        "is-glob": "^4.0.3",
+        "is-plain-object": "^5.0.0",
+        "micromatch": "^4.0.8"
       },
       "engines": {
-        "node": ">=12.0.0"
-      },
-      "peerDependencies": {
-        "@types/express": "^4.17.13"
-      },
-      "peerDependenciesMeta": {
-        "@types/express": {
-          "optional": true
-        }
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
     "node_modules/https-proxy-agent": {
@@ -10105,6 +10100,7 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-3.0.0.tgz",
       "integrity": "sha512-gwsOE28k+23GP1B6vFl1oVh/WOzmawBrKwo5Ev6wMKzPkaXaCDIQKzLnvsA42DRlbVTWorkgTKIviAKCWkfUwA==",
+      "license": "MIT",
       "engines": {
         "node": ">=10"
       },
@@ -10112,6 +10108,15 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/is-plain-object": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz",
+      "integrity": "sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/is-potential-custom-element-name": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz",
@@ -18873,6 +18878,30 @@
         }
       }
     },
+    "node_modules/webpack-dev-server/node_modules/http-proxy-middleware": {
+      "version": "2.0.7",
+      "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.7.tgz",
+      "integrity": "sha512-fgVY8AV7qU7z/MmXJ/rxwbrtQH4jBQ9m7kp3llF0liB7glmFeVZFBepQb32T3y8n8k2+AEYuMPCpinYW+/CuRA==",
+      "license": "MIT",
+      "dependencies": {
+        "@types/http-proxy": "^1.17.8",
+        "http-proxy": "^1.18.1",
+        "is-glob": "^4.0.1",
+        "is-plain-obj": "^3.0.0",
+        "micromatch": "^4.0.2"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      },
+      "peerDependencies": {
+        "@types/express": "^4.17.13"
+      },
+      "peerDependenciesMeta": {
+        "@types/express": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/webpack-dev-server/node_modules/ws": {
       "version": "8.18.0",
       "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.0.tgz",
diff --git a/omadata-oauth2-sample/client/package.json b/omadata-oauth2-sample/client/package.json
index b188a4e73a..3468926c93 100644
--- a/omadata-oauth2-sample/client/package.json
+++ b/omadata-oauth2-sample/client/package.json
@@ -17,6 +17,7 @@
     "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-prettier": "^5.2.1",
     "eslint-plugin-react-hooks": "^5.0.0",
+    "http-proxy-middleware": "^3.0.3",
     "npm-run-all": "^4.1.5",
     "prettier": "^3.3.3",
     "prettier-plugin-organize-imports": "^4.1.0",
@@ -26,7 +27,6 @@
     "typescript": "^4.9.5",
     "web-vitals": "^2.1.4"
   },
-  "proxy": "http://localhost:7051",
   "scripts": {
     "start": "FORCE_COLOR=true npm run start-react-scripts | cat",
     "start-react-scripts": "react-scripts start",
diff --git a/omadata-oauth2-sample/client/src/App.css b/omadata-oauth2-sample/client/src/App.css
index 74b5e05345..4b1c5cb40e 100644
--- a/omadata-oauth2-sample/client/src/App.css
+++ b/omadata-oauth2-sample/client/src/App.css
@@ -15,7 +15,7 @@
 
 .App-header {
   background-color: #282c34;
-  min-height: 100vh;
+  min-height: 20vh;
   display: flex;
   flex-direction: column;
   align-items: center;
diff --git a/omadata-oauth2-sample/client/src/App.tsx b/omadata-oauth2-sample/client/src/App.tsx
index e53f723068..9a60e2eb1e 100644
--- a/omadata-oauth2-sample/client/src/App.tsx
+++ b/omadata-oauth2-sample/client/src/App.tsx
@@ -28,9 +28,18 @@ function App() {
     <div className="App">
       <header className="App-header">
         <p>OmaDataOAuth2 Sample app</p>
-        <p>{!data ? "Loading..." : JSON.stringify(data)}</p>
-        <p>{!error ? "Checking errors..." : error}</p>
       </header>
+      <p>
+        <a href={"/api/openid-api-test"}>Test whole authorization code flow</a>
+      </p>
+      <p>
+        <a href={"/api/openid-api-test/invalid-redirect-uri"}>
+          Test authorization code flow with invalid redirect_uri
+        </a>
+      </p>
+      <h2>Fetch resource using access token result:</h2>
+      <p>{!data ? "Loading..." : JSON.stringify(data)}</p>
+      <p>{!error ? "Checking errors..." : error}</p>
     </div>
   )
 }
diff --git a/omadata-oauth2-sample/client/src/setupProxy.js b/omadata-oauth2-sample/client/src/setupProxy.js
new file mode 100644
index 0000000000..cd9c0b0d42
--- /dev/null
+++ b/omadata-oauth2-sample/client/src/setupProxy.js
@@ -0,0 +1,11 @@
+const { createProxyMiddleware } = require('http-proxy-middleware');
+
+module.exports = function(app) {
+  app.use(
+    '/api',
+    createProxyMiddleware({
+      target: 'http://localhost:7051/api',
+      changeOrigin: true,
+    })
+  );
+};
diff --git a/omadata-oauth2-sample/client/test/e2e/front-page.spec.ts b/omadata-oauth2-sample/client/test/e2e/front-page.spec.ts
index f1cd3aae4c..171cf654da 100644
--- a/omadata-oauth2-sample/client/test/e2e/front-page.spec.ts
+++ b/omadata-oauth2-sample/client/test/e2e/front-page.spec.ts
@@ -9,7 +9,7 @@ test("Front page opens", async ({ page }) => {
 
 test("Front page contains content from KOSKI", async ({ page }) => {
   await page.goto("/")
-  await expect(page.getByRole("banner")).toContainText("SUCCESS")
-  await expect(page.getByRole("banner")).toContainText("henkilö")
-  await expect(page.getByRole("banner")).toContainText("opiskeluoikeudet")
+  await expect(page.getByText("SUCCESS")).toBeVisible()
+  await expect(page.locator("#root")).toContainText("henkilö")
+  await expect(page.locator("#root")).toContainText("opiskeluoikeudet")
 })