From e1cb01d0b45c3472dc83cb544ea68a641db23889 Mon Sep 17 00:00:00 2001
From: Evgeny Kurnevsky <kurnevsky@gmail.com>
Date: Sun, 14 Sep 2025 09:05:39 +0200
Subject: [PATCH] oauth2-proxy: fix nginx variables

They are properly set only inside location block.
---
 nixos/modules/services/security/oauth2-proxy-nginx.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/services/security/oauth2-proxy-nginx.nix b/nixos/modules/services/security/oauth2-proxy-nginx.nix
index 307d73adea3d..97e50f1c6fbb 100644
--- a/nixos/modules/services/security/oauth2-proxy-nginx.nix
+++ b/nixos/modules/services/security/oauth2-proxy-nginx.nix
@@ -97,6 +97,10 @@ in
         virtualHosts.${vhost} = {
           locations = {
             "/".extraConfig = ''
+              auth_request_set $user   $upstream_http_x_auth_request_user;
+              auth_request_set $email  $upstream_http_x_auth_request_email;
+              auth_request_set $auth_cookie $upstream_http_set_cookie;
+
               # pass information via X-User and X-Email headers to backend, requires running with --set-xauthrequest flag
               proxy_set_header X-User  $user;
               proxy_set_header X-Email $email;
@@ -141,11 +145,6 @@ in
           extraConfig = ''
             auth_request /oauth2/auth;
             error_page 401 = @redirectToAuth2ProxyLogin;
-
-            # set variables being used in locations."/".extraConfig
-            auth_request_set $user   $upstream_http_x_auth_request_user;
-            auth_request_set $email  $upstream_http_x_auth_request_email;
-            auth_request_set $auth_cookie $upstream_http_set_cookie;
           '';
         };
       }) cfg.virtualHosts)