even more rewriting

coder · sreya · Aug 17, 2022 · Aug 9, 2022 · Aug 9, 2022 · Aug 9, 2022
commit bb9b77760543a6f4bb0fda0f773f3364e53ce9e1
diff --git a/coderd/database/databasefake/databasefake.go b/coderd/database/databasefake/databasefake.go
@@ -73,6 +73,7 @@ type data struct {
 	organizations       []database.Organization
 	organizationMembers []database.OrganizationMember
 	users               []database.User
+	userLinks           []database.UserLink
 
 	// New tables
 	auditLogs                      []database.AuditLog
@@ -2252,3 +2253,79 @@ func (q *fakeQuerier) GetDeploymentID(_ context.Context) (string, error) {
 
 	return q.deploymentID, nil
 }
+
+func (q *fakeQuerier) GetUserLinkByLinkedID(_ context.Context, id string) (database.UserLink, error) {
+	q.mutex.RLock()
+	defer q.mutex.RUnlock()
+
+	for _, link := range q.userLinks {
+		if link.LinkedID == id {
+			return link, nil
+		}
+	}
+	return database.UserLink{}, sql.ErrNoRows
+}
+
+func (q *fakeQuerier) GetUserLinkByUserIDLoginType(_ context.Context, params database.GetUserLinkByUserIDLoginTypeParams) (database.UserLink, error) {
+	q.mutex.RLock()
+	defer q.mutex.RUnlock()
+
+	for _, link := range q.userLinks {
+		if link.UserID == params.UserID && link.LoginType == params.LoginType {
+			return link, nil
+		}
+	}
+	return database.UserLink{}, sql.ErrNoRows
+}
+
+func (q *fakeQuerier) InsertUserLink(_ context.Context, params database.InsertUserLinkParams) (database.UserLink, error) {
+	q.mutex.RLock()
+	defer q.mutex.RUnlock()
+
+	link := database.UserLink{
+		UserID:            params.UserID,
+		LoginType:         params.LoginType,
+		LinkedID:          params.LinkedID,
+		OAuthAccessToken:  params.OAuthAccessToken,
+		OAuthRefreshToken: params.OAuthRefreshToken,
+		OAuthExpiry:       params.OAuthExpiry,
+	}
+
+	q.userLinks = append(q.userLinks, link)
+
+	return link, nil
+}
+
+func (q *fakeQuerier) UpdateUserLinkedID(_ context.Context, params database.UpdateUserLinkedIDParams) (database.UserLink, error) {
+	q.mutex.RLock()
+	defer q.mutex.RUnlock()
+
+	for i, link := range q.userLinks {
+		if link.UserID == params.UserID && link.LoginType == params.LoginType {
+			link.LinkedID = params.LinkedID
+
+			q.userLinks[i] = link
+			return link, nil
+		}
+	}
+
+	return database.UserLink{}, sql.ErrNoRows
+}
+
+func (q *fakeQuerier) UpdateUserLink(_ context.Context, params database.UpdateUserLinkParams) (database.UserLink, error) {
+	q.mutex.RLock()
+	defer q.mutex.RUnlock()
+
+	for i, link := range q.userLinks {
+		if link.UserID == params.UserID && link.LoginType == params.LoginType {
+			link.OAuthAccessToken = params.OAuthAccessToken
+			link.OAuthRefreshToken = params.OAuthRefreshToken
+			link.OAuthExpiry = params.OAuthExpiry
+
+			q.userLinks[i] = link
+			return link, nil
+		}
+	}
+
+	return database.UserLink{}, sql.ErrNoRows
+}
diff --git a/coderd/database/dump.sql b/coderd/database/dump.sql
diff --git a/coderd/database/migrations/000034_linked_user_id.up.sql b/coderd/database/migrations/000034_linked_user_id.up.sql
@@ -6,7 +6,6 @@ CREATE TABLE IF NOT EXISTS user_links (
 	linked_id text DEFAULT ''::text NOT NULL,
 	oauth_access_token text DEFAULT ''::text NOT NULL,
 	oauth_refresh_token text DEFAULT ''::text NOT NULL,
-	oauth_id_token text DEFAULT ''::text NOT NULL,
 	oauth_expiry timestamp with time zone DEFAULT '0001-01-01 00:00:00+00'::timestamp with time zone NOT NULL,
 	UNIQUE(user_id, login_type)
 );
@@ -18,7 +17,6 @@ INSERT INTO user_links
 		linked_id,
 		oauth_access_token,
 		oauth_refresh_token,
-		oauth_id_token,
 		oauth_expiry
 	)
 SELECT 
@@ -27,7 +25,6 @@ SELECT
 	'',
 	keys.oauth_access_token,
 	keys.oauth_refresh_token,
-	keys.oauth_id_token,
 	keys.oauth_expiry 
 FROM 
 	( 

diff --git a/coderd/database/models.go b/coderd/database/models.go
diff --git a/coderd/database/queries.sql.go b/coderd/database/queries.sql.go
diff --git a/coderd/httpmw/apikey.go b/coderd/httpmw/apikey.go
@@ -254,7 +254,13 @@ func ExtractAPIKey(db database.Store, oauth *OAuth2Configs, redirectToLogin bool
 						OAuthRefreshToken: link.OAuthRefreshToken,
 						OAuthExpiry:       link.OAuthExpiry,
 					})
-
+					if err != nil {
+						write(http.StatusInternalServerError, codersdk.Response{
+							Message: internalErrorMessage,
+							Detail:  fmt.Sprintf("update user_link: %s.", err.Error()),
+						})
+						return
+					}
 				}
 			}
 

diff --git a/coderd/httpmw/authorize_test.go b/coderd/httpmw/authorize_test.go
@@ -115,8 +115,6 @@ func addUser(t *testing.T, db database.Store, roles ...string) (database.User, s
 		Email:     "[email protected]",
 		Username:  "admin",
 		RBACRoles: roles,
-		LinkedID:  uuid.NewString(),
-		LoginType: database.LoginTypePassword,
 	})
 	require.NoError(t, err)
 

diff --git a/coderd/httpmw/organizationparam_test.go b/coderd/httpmw/organizationparam_test.go
@@ -45,8 +45,6 @@ func TestOrganizationParam(t *testing.T) {
 			Username:       username,
 			CreatedAt:      database.Now(),
 			UpdatedAt:      database.Now(),
-			LinkedID:       uuid.NewString(),
-			LoginType:      database.LoginTypePassword,
 		})
 		require.NoError(t, err)
 		_, err = db.InsertAPIKey(r.Context(), database.InsertAPIKeyParams{

diff --git a/coderd/httpmw/templateparam_test.go b/coderd/httpmw/templateparam_test.go
@@ -44,8 +44,6 @@ func TestTemplateParam(t *testing.T) {
 			Username:       username,
 			CreatedAt:      database.Now(),
 			UpdatedAt:      database.Now(),
-			LinkedID:       uuid.NewString(),
-			LoginType:      database.LoginTypePassword,
 		})
 		require.NoError(t, err)
 

diff --git a/coderd/httpmw/templateversionparam_test.go b/coderd/httpmw/templateversionparam_test.go
@@ -44,8 +44,6 @@ func TestTemplateVersionParam(t *testing.T) {
 			Username:       username,
 			CreatedAt:      database.Now(),
 			UpdatedAt:      database.Now(),
-			LinkedID:       uuid.NewString(),
-			LoginType:      database.LoginTypePassword,
 		})
 		require.NoError(t, err)
 

diff --git a/coderd/httpmw/userparam_test.go b/coderd/httpmw/userparam_test.go
@@ -35,11 +35,9 @@ func TestUserParam(t *testing.T) {
 		})
 
 		user, err := db.InsertUser(r.Context(), database.InsertUserParams{
-			ID:        uuid.New(),
-			Email:     "[email protected]",
-			Username:  "admin",
-			LinkedID:  uuid.NewString(),
-			LoginType: database.LoginTypePassword,
+			ID:       uuid.New(),
+			Email:    "[email protected]",
+			Username: "admin",
 		})
 		require.NoError(t, err)
 

diff --git a/coderd/httpmw/workspaceagentparam_test.go b/coderd/httpmw/workspaceagentparam_test.go
@@ -44,8 +44,6 @@ func TestWorkspaceAgentParam(t *testing.T) {
 			Username:       username,
 			CreatedAt:      database.Now(),
 			UpdatedAt:      database.Now(),
-			LinkedID:       uuid.NewString(),
-			LoginType:      database.LoginTypePassword,
 		})
 		require.NoError(t, err)
 

diff --git a/coderd/httpmw/workspacebuildparam_test.go b/coderd/httpmw/workspacebuildparam_test.go
@@ -44,8 +44,6 @@ func TestWorkspaceBuildParam(t *testing.T) {
 			Username:       username,
 			CreatedAt:      database.Now(),
 			UpdatedAt:      database.Now(),
-			LinkedID:       uuid.NewString(),
-			LoginType:      database.LoginTypePassword,
 		})
 		require.NoError(t, err)
 

diff --git a/coderd/httpmw/workspaceparam_test.go b/coderd/httpmw/workspaceparam_test.go
@@ -44,8 +44,6 @@ func TestWorkspaceParam(t *testing.T) {
 			Username:       username,
 			CreatedAt:      database.Now(),
 			UpdatedAt:      database.Now(),
-			LinkedID:       uuid.NewString(),
-			LoginType:      database.LoginTypePassword,
 		})
 		require.NoError(t, err)
 

diff --git a/coderd/provisionerjobs_internal_test.go b/coderd/provisionerjobs_internal_test.go
@@ -78,8 +78,6 @@ func TestProvisionerJobLogs_Unit(t *testing.T) {
 		_, err = fDB.InsertUser(ctx, database.InsertUserParams{
 			ID:        userID,
 			RBACRoles: []string{"admin"},
-			LinkedID:  uuid.NewString(),
-			LoginType: database.LoginTypePassword,
 		})
 		require.NoError(t, err)
 		_, err = fDB.InsertWorkspaceBuild(ctx, database.InsertWorkspaceBuildParams{

diff --git a/coderd/telemetry/telemetry_test.go b/coderd/telemetry/telemetry_test.go
@@ -59,8 +59,6 @@ func TestTelemetry(t *testing.T) {
 		_, err = db.InsertUser(ctx, database.InsertUserParams{
 			ID:        uuid.New(),
 			CreatedAt: database.Now(),
-			LinkedID:  uuid.NewString(),
-			LoginType: database.LoginTypePassword,
 		})
 		require.NoError(t, err)
 		_, err = db.InsertWorkspace(ctx, database.InsertWorkspaceParams{
@@ -107,8 +105,6 @@ func TestTelemetry(t *testing.T) {
 			ID:        uuid.New(),
 			Email:     "[email protected]",
 			CreatedAt: database.Now(),
-			LinkedID:  uuid.NewString(),
-			LoginType: database.LoginTypePassword,
 		})
 		require.NoError(t, err)
 		snapshot := collectSnapshot(t, db)