coder · sreya · Aug 17, 2022 · Aug 9, 2022 · Aug 9, 2022 · Aug 9, 2022
diff --git a/coderd/audit/diff_test.go b/coderd/audit/diff_test.go
@@ -158,6 +158,8 @@ func TestDiff(t *testing.T) {
 				UpdatedAt:      time.Now(),
 				Status:         database.UserStatusActive,
 				RBACRoles:      []string{"omega admin"},
+				LoginType:      database.LoginTypePassword,
+				LinkedID:       "foobar",
 			},
 			exp: audit.Map{
 				"id":              uuid.UUID{1}.String(),
@@ -166,6 +168,8 @@ func TestDiff(t *testing.T) {
 				"hashed_password": ([]byte)(nil),
 				"status":          database.UserStatusActive,
 				"rbac_roles":      []string{"omega admin"},
+				"login_type":      database.LoginTypePassword,
+				"linked_id":       "foobar",
 			},
 		},
 	})

diff --git a/coderd/audit/table.go b/coderd/audit/table.go
@@ -94,6 +94,8 @@ var AuditableResources = auditMap(map[any]map[string]Action{
 		"updated_at":      ActionIgnore, // Changes, but is implicit and not helpful in a diff.
 		"status":          ActionTrack,
 		"rbac_roles":      ActionTrack,
+		"login_type":      ActionTrack,
+		"linked_id":       ActionTrack,
 	},
 	&database.Workspace{}: {
 		"id":                 ActionTrack,

diff --git a/coderd/database/databasefake/databasefake.go b/coderd/database/databasefake/databasefake.go
@@ -1743,6 +1743,8 @@ func (q *fakeQuerier) InsertUser(_ context.Context, arg database.InsertUserParam
 		Username:       arg.Username,
 		Status:         database.UserStatusActive,
 		RBACRoles:      arg.RBACRoles,
+		LoginType:      arg.LoginType,
+		LinkedID:       arg.LinkedID,
 	}
 	q.users = append(q.users, user)
 	return user, nil
@@ -2259,3 +2261,30 @@ func (q *fakeQuerier) GetDeploymentID(_ context.Context) (string, error) {
 
 	return q.deploymentID, nil
 }
+
+func (q *fakeQuerier) UpdateUserLinkedID(_ context.Context, arg database.UpdateUserLinkedIDParams) (database.User, error) {
+	q.mutex.Lock()
+	defer q.mutex.Unlock()
+
+	for index, user := range q.users {
+		if user.ID != arg.ID {
+			continue
+		}
+		user.LinkedID = arg.LinkedID
+		q.users[index] = user
+		return user, nil
+	}
+	return database.User{}, sql.ErrNoRows
+}
+
+func (q *fakeQuerier) GetUserByLinkedID(_ context.Context, linkedID string) (database.User, error) {
+	q.mutex.RLock()
+	defer q.mutex.RUnlock()
+
+	for _, user := range q.users {
+		if user.LinkedID == linkedID {
+			return user, nil
+		}
+	}
+	return database.User{}, sql.ErrNoRows
+}
diff --git a/coderd/database/db_test.go b/coderd/database/db_test.go
@@ -37,6 +37,8 @@ func TestNestedInTx(t *testing.T) {
 				CreatedAt:      database.Now(),
 				UpdatedAt:      database.Now(),
 				RBACRoles:      []string{},
+				LoginType:      database.LoginTypePassword,
+				LinkedID:       uuid.NewString(),
 			})
 			return err
 		})

diff --git a/coderd/database/dump.sql b/coderd/database/dump.sql
diff --git a/coderd/database/generate.sh b/coderd/database/generate.sh
@@ -13,6 +13,8 @@ SCRIPT_DIR=$(dirname "${BASH_SOURCE[0]}")
 (
 	cd "$SCRIPT_DIR"
 
+	# Dump the updated schema.
+	go run dump/main.go
 	# The logic below depends on the exact version being correct :(
 	go run github.com/kyleconroy/sqlc/cmd/sqlc@v1.13.0 generate
 

diff --git a/coderd/database/migrations/000034_linked_user_id.down.sql b/coderd/database/migrations/000034_linked_user_id.down.sql
@@ -0,0 +1,6 @@
+BEGIN;
+
+ALTER TABLE users DROP COLUMN linked_id;
+ALTER TABLE users DROP COLUMN login_type;
+
+COMMIT;
diff --git a/coderd/database/migrations/000034_linked_user_id.up.sql b/coderd/database/migrations/000034_linked_user_id.up.sql
@@ -0,0 +1,20 @@
+BEGIN;
+
+ALTER TABLE users ADD COLUMN login_type login_type NOT NULL DEFAULT 'password'; 
+ALTER TABLE users ADD COLUMN linked_id text NOT NULL DEFAULT ''; 
+
+UPDATE 
+  users
+SET
+  login_type = (
+    SELECT 
+      login_type
+    FROM
+      api_keys
+    WHERE
+      api_keys.user_id = users.id
+    ORDER BY updated_at DESC
+    LIMIT 1
+  );
+
+COMMIT;
diff --git a/coderd/database/models.go b/coderd/database/models.go
diff --git a/coderd/database/querier.go b/coderd/database/querier.go
diff --git a/coderd/database/queries.sql.go b/coderd/database/queries.sql.go