coder · kylecarbs · Jun 29, 2023 · Jun 27, 2023 · Jun 27, 2023 · Jun 27, 2023
diff --git a/cli/cliui/gitauth_test.go b/cli/cliui/gitauth_test.go
@@ -2,7 +2,6 @@ package cliui_test
 
 import (
 	"context"
-	"net/url"
 	"sync/atomic"
 	"testing"
 	"time"
@@ -33,7 +32,7 @@ func TestGitAuth(t *testing.T) {
 						ID:              "github",
 						Type:            codersdk.GitProviderGitHub,
 						Authenticated:   fetched.Load(),
-						AuthenticateURL: "https://example.com/gitauth/github?redirect=" + url.QueryEscape("/gitauth?notify"),
+						AuthenticateURL: "https://example.com/gitauth/github",
 					}}, nil
 				},
 				FetchInterval: time.Millisecond,

diff --git a/cli/gitaskpass.go b/cli/gitaskpass.go
@@ -51,9 +51,9 @@ func (r *RootCmd) gitAskpass() *clibase.Cmd {
 			}
 			if token.URL != "" {
 				if err := openURL(inv, token.URL); err == nil {
-					cliui.Infof(inv.Stderr, "Your browser has been opened to authenticate with Git:\n\n\t%s\n\n", token.URL)
+					cliui.Infof(inv.Stderr, "Your browser has been opened to authenticate with Git:\n\n%s\n", token.URL)
 				} else {
-					cliui.Infof(inv.Stderr, "Open the following URL to authenticate with Git:\n\n\t%s\n\n", token.URL)
+					cliui.Infof(inv.Stderr, "Open the following URL to authenticate with Git:\n\n%s\n", token.URL)
 				}
 
 				for r := retry.New(250*time.Millisecond, 10*time.Second); r.Wait(ctx); {

diff --git a/cli/server.go b/cli/server.go
@@ -148,6 +148,14 @@ func ReadGitAuthProvidersFromEnv(environ []string) ([]codersdk.GitAuthConfig, er
 			provider.ValidateURL = v.Value
 		case "REGEX":
 			provider.Regex = v.Value
+		case "DEVICE_FLOW":
+			b, err := strconv.ParseBool(v.Value)
+			if err != nil {
+				return nil, xerrors.Errorf("parse bool: %s", v.Value)
+			}
+			provider.DeviceFlow = b
+		case "DEVICE_CODE_URL":
+			provider.DeviceCodeURL = v.Value
 		case "NO_REFRESH":
 			b, err := strconv.ParseBool(v.Value)
 			if err != nil {
@@ -156,6 +164,10 @@ func ReadGitAuthProvidersFromEnv(environ []string) ([]codersdk.GitAuthConfig, er
 			provider.NoRefresh = b
 		case "SCOPES":
 			provider.Scopes = strings.Split(v.Value, " ")
+		case "APP_INSTALL_URL":
+			provider.AppInstallURL = v.Value
+		case "APP_INSTALLATIONS_URL":
+			provider.AppInstallationsURL = v.Value
 		}
 		providers[providerNum] = provider
 	}

diff --git a/coderd/apidoc/docs.go b/coderd/apidoc/docs.go