New option -auto to use device authorization depending on environment variable XDG_SESSION_TYPE

Author: hickford

main.go

@@ -149,9 +149,11 @@ func parse(input string) map[string]string {
 
 func main() {
 	ctx := context.Background()
-	flag.BoolVar(&verbose, "verbose", false, "log debug information to stderr")
+	flag.BoolVar(&verbose, "verbose", false, "Log debug information to standard error stream")
 	var device bool
-	flag.BoolVar(&device, "device", false, "instead of opening a web browser locally, print a code to enter on another device")
+	flag.BoolVar(&device, "device", false, "Instead of opening a web browser locally, print a code to enter on another device. OAuth device authorization is useful for systems without a web browser.")
+	var auto bool
+	flag.BoolVar(&auto, "auto", false, "Automatically use device authorization when environment variable XDG_SESSION_TYPE has value 'tty'")
 	var bearer bool
 	flag.BoolVar(&bearer, "bearer", false, "Prefer Bearer authentication for supported hosts")
 	flag.Usage = func() {
@@ -308,7 +310,7 @@ func main() {
 
 		if token == nil {
 			// Generate new token (opens browser, may require user input)
-			if device {
+			if device || (auto && os.Getenv("XDG_SESSION_TYPE") == "tty") {
 				token, err = getDeviceToken(ctx, c)
 			} else {
 				token, err = getToken(ctx, c, authURLSuffix)
@@ -369,9 +371,12 @@ func main() {
 				// six hours
 				storage = "cache --timeout 21600"
 			}
-			commands = []*exec.Cmd{exec.Command(gitPath, "config", "--global", "--unset-all", "credential.helper"),
+			commands = []*exec.Cmd{
+				exec.Command(gitPath, "config", "--global", "--unset-all", "credential.helper"),
 				exec.Command(gitPath, "config", "--global", "--add", "credential.helper", storage),
-				exec.Command(gitPath, "config", "--global", "--add", "credential.helper", "oauth")}
+				exec.Command(gitPath, "config", "--global", "--add", "credential.helper", "oauth -auto"),
+				exec.Command(gitPath, "config", "--global", "--unset-all", "credential.useHttpPath"),
+			}
 		} else if args[0] == "unconfigure" {
 			commands = []*exec.Cmd{exec.Command(gitPath, "config", "--global", "--unset-all", "credential.helper", "oauth")}
 		}