Rename basic authentication to password

kylecarbs · kylecarbs · commit 02ff06692281 · 2022-04-17T22:32:49.000Z
diff --git a/coderd/database/dump.sql b/coderd/database/dump.sql
diff --git a/coderd/database/migrations/000001_base.up.sql b/coderd/database/migrations/000001_base.up.sql
@@ -5,7 +5,7 @@
 -- https://github.com/coder/m/blob/47b6fc383347b9f9fab424d829c482defd3e1fe2/product/coder/pkg/database/dump.sql
 
 CREATE TYPE login_type AS ENUM (
-    'basic',
+    'password',
     'github'
 );
 
diff --git a/coderd/database/models.go b/coderd/database/models.go
diff --git a/coderd/httpmw/apikey.go b/coderd/httpmw/apikey.go
@@ -99,7 +99,7 @@ func ExtractAPIKey(db database.Store, oauth *OAuth2Configs) func(http.Handler) h
 			// Tracks if the API key has properties updated!
 			changed := false
 
-			if key.LoginType != database.LoginTypeBasic {
+			if key.LoginType != database.LoginTypePassword {
 				// Check if the OAuth token is expired!
 				if key.OAuthExpiry.Before(now) && !key.OAuthExpiry.IsZero() {
 					var oauthConfig OAuth2Config
diff --git a/coderd/httpmw/oauth2.go b/coderd/httpmw/oauth2.go
@@ -40,9 +40,9 @@ func OAuth2(r *http.Request) OAuth2State {
 	return oauth
 }
 
-// ExtractOAuth2 adds a middleware for handling OAuth2 callbacks.
-// Any route that does not have a "code" URL parameter will be redirected
-// to the handler configuration provided.
+// ExtractOAuth2 is a middleware for automatically redirecting to OAuth
+// URLs, and handling the exchange inbound. Any route that does not have
+// a "code" URL parameter will be redirected.
 func ExtractOAuth2(config OAuth2Config) func(http.Handler) http.Handler {
 	return func(next http.Handler) http.Handler {
 		return http.HandlerFunc(func(rw http.ResponseWriter, r *http.Request) {
diff --git a/coderd/httpmw/organizationparam_test.go b/coderd/httpmw/organizationparam_test.go
@@ -41,7 +41,7 @@ func TestOrganizationParam(t *testing.T) {
 			ID:             userID,
 			Email:          "testaccount@coder.com",
 			Name:           "example",
-			LoginType:      database.LoginTypeBasic,
+			LoginType:      database.LoginTypePassword,
 			HashedPassword: hashed[:],
 			Username:       username,
 			CreatedAt:      database.Now(),
diff --git a/coderd/httpmw/templateparam_test.go b/coderd/httpmw/templateparam_test.go
@@ -40,7 +40,7 @@ func TestTemplateParam(t *testing.T) {
 			ID:             userID,
 			Email:          "testaccount@coder.com",
 			Name:           "example",
-			LoginType:      database.LoginTypeBasic,
+			LoginType:      database.LoginTypePassword,
 			HashedPassword: hashed[:],
 			Username:       username,
 			CreatedAt:      database.Now(),
diff --git a/coderd/httpmw/templateversionparam_test.go b/coderd/httpmw/templateversionparam_test.go
@@ -40,7 +40,7 @@ func TestTemplateVersionParam(t *testing.T) {
 			ID:             userID,
 			Email:          "testaccount@coder.com",
 			Name:           "example",
-			LoginType:      database.LoginTypeBasic,
+			LoginType:      database.LoginTypePassword,
 			HashedPassword: hashed[:],
 			Username:       username,
 			CreatedAt:      database.Now(),
diff --git a/coderd/httpmw/workspaceagentparam_test.go b/coderd/httpmw/workspaceagentparam_test.go
@@ -40,7 +40,7 @@ func TestWorkspaceAgentParam(t *testing.T) {
 			ID:             userID,
 			Email:          "testaccount@coder.com",
 			Name:           "example",
-			LoginType:      database.LoginTypeBasic,
+			LoginType:      database.LoginTypePassword,
 			HashedPassword: hashed[:],
 			Username:       username,
 			CreatedAt:      database.Now(),
diff --git a/coderd/httpmw/workspacebuildparam_test.go b/coderd/httpmw/workspacebuildparam_test.go
@@ -40,7 +40,7 @@ func TestWorkspaceBuildParam(t *testing.T) {
 			ID:             userID,
 			Email:          "testaccount@coder.com",
 			Name:           "example",
-			LoginType:      database.LoginTypeBasic,
+			LoginType:      database.LoginTypePassword,
 			HashedPassword: hashed[:],
 			Username:       username,
 			CreatedAt:      database.Now(),
diff --git a/coderd/httpmw/workspaceparam_test.go b/coderd/httpmw/workspaceparam_test.go
@@ -40,7 +40,7 @@ func TestWorkspaceParam(t *testing.T) {
 			ID:             userID,
 			Email:          "testaccount@coder.com",
 			Name:           "example",
-			LoginType:      database.LoginTypeBasic,
+			LoginType:      database.LoginTypePassword,
 			HashedPassword: hashed[:],
 			Username:       username,
 			CreatedAt:      database.Now(),
diff --git a/coderd/userauth_test.go b/coderd/userauth_test.go
@@ -33,7 +33,7 @@ func (*oauth2Config) TokenSource(context.Context, *oauth2.Token) oauth2.TokenSou
 
 func TestUserAuthMethods(t *testing.T) {
 	t.Parallel()
-	t.Run("Basic", func(t *testing.T) {
+	t.Run("Password", func(t *testing.T) {
 		t.Parallel()
 		client := coderdtest.New(t, nil)
 		methods, err := client.AuthMethods(context.Background())
diff --git a/coderd/users.go b/coderd/users.go
@@ -377,7 +377,7 @@ func (api *api) postLogin(rw http.ResponseWriter, r *http.Request) {
 
 	sessionToken, created := api.createAPIKey(rw, r, database.InsertAPIKeyParams{
 		UserID:    user.ID,
-		LoginType: database.LoginTypeBasic,
+		LoginType: database.LoginTypePassword,
 	})
 	if !created {
 		return
@@ -402,7 +402,7 @@ func (api *api) postAPIKey(rw http.ResponseWriter, r *http.Request) {
 
 	sessionToken, created := api.createAPIKey(rw, r, database.InsertAPIKeyParams{
 		UserID:    user.ID,
-		LoginType: database.LoginTypeBasic,
+		LoginType: database.LoginTypePassword,
 	})
 	if !created {
 		return
@@ -843,7 +843,7 @@ func (api *api) createUser(ctx context.Context, req codersdk.CreateUserRequest)
 			ID:        uuid.New(),
 			Email:     req.Email,
 			Username:  req.Username,
-			LoginType: database.LoginTypeBasic,
+			LoginType: database.LoginTypePassword,
 			CreatedAt: database.Now(),
 			UpdatedAt: database.Now(),
 		}
diff --git a/peerbroker/proto/peerbroker.pb.go b/peerbroker/proto/peerbroker.pb.go
diff --git a/provisionerd/proto/provisionerd.pb.go b/provisionerd/proto/provisionerd.pb.go
diff --git a/provisionersdk/proto/provisioner.pb.go b/provisionersdk/proto/provisioner.pb.go
diff --git a/site/src/pages/login.test.tsx b/site/src/pages/login.test.tsx
@@ -19,11 +19,14 @@ describe("SignInPage", () => {
     // only leave password auth enabled by default
     server.use(
       rest.get("/api/v2/users/auth", (req, res, ctx) => {
-        return res(ctx.status(200), ctx.json({
-          password: true,
-          github: false,
-        }))
-      })
+        return res(
+          ctx.status(200),
+          ctx.json({
+            password: true,
+            github: false,
+          }),
+        )
+      }),
     )
   })
 
@@ -64,10 +67,13 @@ describe("SignInPage", () => {
     // Given
     server.use(
       rest.get("/api/v2/users/auth", async (req, res, ctx) => {
-        return res(ctx.status(200), ctx.json({ 
-          password: true,
-          github: true,
-        }))
+        return res(
+          ctx.status(200),
+          ctx.json({
+            password: true,
+            github: true,
+          }),
+        )
       }),
     )
 
diff --git a/site/src/pages/login.tsx b/site/src/pages/login.tsx
@@ -47,7 +47,12 @@ export const SignInPage: React.FC = () => {
       <div className={styles.root}>
         <div className={styles.layout}>
           <div className={styles.container}>
-            <SignInForm authMethods={authState.context.methods} isLoading={isLoading} authErrorMessage={authErrorMessage} onSubmit={onSubmit} />
+            <SignInForm
+              authMethods={authState.context.methods}
+              isLoading={isLoading}
+              authErrorMessage={authErrorMessage}
+              onSubmit={onSubmit}
+            />
           </div>
 
           <Footer />
