fix: allow proxy for oauth2 using oauth2_proxy (#841)

AnWeber · Jan 11, 2025 · 1889adf · 1889adf
1 parent 8cbc1ea
commit 1889adf
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,9 @@
 
+## [6.16.6] (2025-01-11)
+
+### Fix
+- allow proxy for oauth2 using `oauth2_proxy` (#841)
+
 ## [6.16.5] (2025-01-06)
 
 ### Features

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -4,7 +4,7 @@
   "license": "MIT",
   "publisher": "AnWeber",
   "description": "HTTP/REST CLI Client for *.http files",
-  "version": "6.16.5",
+  "version": "6.16.6",
   "homepage": "https://github.com/AnWeber/httpyac",
   "repository": {
     "type": "git",

diff --git a/src/models/openIdInformation.ts b/src/models/openIdInformation.ts
@@ -19,6 +19,7 @@ export interface OpenIdConfiguration {
   keepAlive?: boolean;
   username?: string | null;
   password?: string | null;
+  proxy?: string | null;
   subjectIssuer?: string | null;
   useAuthorizationHeader?: boolean;
   useDeviceCodeClientSecret?: boolean;

diff --git a/src/plugins/oauth2/flow/requestOpenIdInformation.ts b/src/plugins/oauth2/flow/requestOpenIdInformation.ts
@@ -63,6 +63,7 @@ export async function addConfigRequestOptions(
   context: models.OpenIdContext
 ) {
   if (utils.isProcessorContext(context)) {
+    request.proxy = config.proxy || undefined;
     if (context.config?.request?.rejectUnauthorized !== undefined) {
       request.noRejectUnauthorized = !utils.toBoolean(context.config?.request?.rejectUnauthorized);
     }

diff --git a/src/plugins/oauth2/openIdConfiguration.ts b/src/plugins/oauth2/openIdConfiguration.ts
@@ -95,6 +95,7 @@ export function getOpenIdConfiguration(
     resource: getArrayOrString('resource'),
     username: getString('username'),
     password: getString('password'),
+    proxy: getString('proxy'),
     subjectIssuer: getString('subjectIssuer') || undefined,
     redirectUri: getUrl('redirectUri', DEFAULT_CALLBACK_URI),
     keepAlive: getBoolean('keepAlive', true),