From e7b9f5e9c0ebe2e91888b0ace279cfd059effb37 Mon Sep 17 00:00:00 2001
From: Pavel Sorokin <pasoroki@microsoft.com>
Date: Wed, 13 Dec 2017 03:59:54 +0000
Subject: [PATCH] Change default approval promt value to none Update README

---
 README.md  | 4 ++--
 main.go    | 2 +-
 options.go | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 747738eb..a9d84c84 100644
--- a/README.md
+++ b/README.md
@@ -189,7 +189,7 @@ An example [oauth2_proxy.cfg](contrib/oauth2_proxy.cfg.example) config file is i
 
 ```
 Usage of oauth2_proxy:
-  -approval-prompt string: OAuth approval_prompt (default "force")
+  -approval-prompt string: OAuth approval_prompt. Possible options: "", "force|consent", "login" (AAD), "select_account" (Google). (default "")
   -authenticated-emails-file string: authenticate against emails via file (one per line)
   -azure-tenant string: go to a tenant-specific or common (tenant-independent) endpoint. (default "common")
   -basic-auth-password string: the password to set when passing the HTTP Basic Auth header
@@ -218,7 +218,7 @@ Usage of oauth2_proxy:
   -http-address string: [http://]<addr>:<port> or unix://<path> to listen on for HTTP clients (default "127.0.0.1:4180")
   -https-address string: <addr>:<port> to listen on for HTTPS clients (default ":443")
   -login-url string: Authentication endpoint
-  -pass-access-token: pass OAuth access_token to upstream via X-Forwarded-Access-Token header
+  -pass-access-token: pass OAuth access_token to upstream via X-Forwarded-Access-Token header (default false)
   -pass-basic-auth: pass HTTP Basic Auth, X-Forwarded-User and X-Forwarded-Email information to upstream (default true)
   -pass-host-header: pass the request Host Header to upstream (default true)
   -pass-user-headers: pass X-Forwarded-User and X-Forwarded-Email information to upstream (default true)
diff --git a/main.go b/main.go
index 5363b8d1..31cc9542 100644
--- a/main.go
+++ b/main.go
@@ -82,7 +82,7 @@ func main() {
 	flagSet.String("resource", "", "The resource that is protected (Azure AD only)")
 	flagSet.String("validate-url", "", "Access token validation endpoint")
 	flagSet.String("scope", "", "OAuth scope specification")
-	flagSet.String("approval-prompt", "force", "OAuth approval_prompt")
+	flagSet.String("approval-prompt", "", "OAuth approval_prompt")
 
 	flagSet.String("signature-key", "", "GAP-Signature request signature key (algorithm:secretkey)")
 
diff --git a/options.go b/options.go
index bb07d80f..76dd5706 100644
--- a/options.go
+++ b/options.go
@@ -118,7 +118,7 @@ func NewOptions() *Options {
 		GroupsDelimiter:      "|",
 		PassAccessToken:      false,
 		PassHostHeader:       true,
-		ApprovalPrompt:       "force",
+		ApprovalPrompt:       "",
 		RequestLogging:       true,
 		RequestLoggingFormat: defaultRequestLoggingFormat,
 	}