From 5b423cff583e662f9080d173cb27d2ebf84cecb3 Mon Sep 17 00:00:00 2001
From: Ruslan Nasyrov <ruslan.nasyrov.f@gmail.com>
Date: Fri, 25 Oct 2024 12:47:57 +0500
Subject: [PATCH] review changes #2

Signed-off-by: Ruslan Nasyrov <ruslan.nasyrov.f@gmail.com>
---
 .../auth-backend-module-oidc-provider/package.json   |  1 +
 .../src/authenticator.ts                             | 12 ++++++------
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/plugins/auth-backend-module-oidc-provider/package.json b/plugins/auth-backend-module-oidc-provider/package.json
index 3e82e6183e..7d6dc841ab 100644
--- a/plugins/auth-backend-module-oidc-provider/package.json
+++ b/plugins/auth-backend-module-oidc-provider/package.json
@@ -35,6 +35,7 @@
   },
   "dependencies": {
     "@backstage/backend-plugin-api": "workspace:^",
+    "@backstage/config": "workspace:^",
     "@backstage/plugin-auth-backend": "workspace:^",
     "@backstage/plugin-auth-node": "workspace:^",
     "@backstage/types": "workspace:^",
diff --git a/plugins/auth-backend-module-oidc-provider/src/authenticator.ts b/plugins/auth-backend-module-oidc-provider/src/authenticator.ts
index 9c4589a73e..b98bec3cc4 100644
--- a/plugins/auth-backend-module-oidc-provider/src/authenticator.ts
+++ b/plugins/auth-backend-module-oidc-provider/src/authenticator.ts
@@ -33,6 +33,7 @@ import {
   PassportOAuthPrivateInfo,
 } from '@backstage/plugin-auth-node';
 import { durationToMilliseconds, HumanDuration } from '@backstage/types';
+import { readDurationFromConfig } from '@backstage/config';
 
 const HTTP_OPTION_TIMEOUT = 10000;
 const createHttpOptionsProvider =
@@ -88,12 +89,11 @@ export const oidcAuthenticator = createOAuthAuthenticator({
       );
     }
 
-    const timeoutHumanDuration = config.getOptional<HumanDuration>('timeout');
-    const timeoutMilliseconds =
-      typeof timeoutHumanDuration === 'object'
-        ? durationToMilliseconds(timeoutHumanDuration)
-        : undefined;
-
+    const timeoutMilliseconds = config.has('timeout')
+      ? durationToMilliseconds(
+          readDurationFromConfig(config, { key: 'timeout' }),
+        )
+      : undefined;
     const httpOptionsProvider = createHttpOptionsProvider({
       timeout: timeoutMilliseconds,
     });