delete api key in logout inline

coder · AbhineetJain · May 27, 2022 · May 26, 2022 · May 26, 2022 · May 26, 2022
commit 994a29477e0c9cf98b32033921fa6fa04f70576e
diff --git a/coderd/users.go b/coderd/users.go
@@ -670,10 +670,14 @@ func (api *API) postAPIKey(rw http.ResponseWriter, r *http.Request) {
 }
 
 // Clear the user's session cookie
-func (api *api) postLogout(rw http.ResponseWriter, r *http.Request) {
+func (api *API) postLogout(rw http.ResponseWriter, r *http.Request) {
 	// Delete the session token from database
-	ok := api.deleteAPIKey(rw, r)
-	if !ok {
+	apiKey := httpmw.APIKey(r)
+	err := api.Database.DeleteAPIKeyByID(r.Context(), apiKey.ID)
+	if err != nil {
+		httpapi.Write(rw, http.StatusInternalServerError, httpapi.Response{
+			Message: fmt.Sprintf("delete api key: %s", err.Error()),
+		})
 		return
 	}
 
@@ -749,19 +753,7 @@ func (api *API) createAPIKey(rw http.ResponseWriter, r *http.Request, params dat
 	return sessionToken, true
 }
 
-func (api *api) deleteAPIKey(rw http.ResponseWriter, r *http.Request) bool {
-	apiKey := httpmw.APIKey(r)
-	err := api.Database.DeleteAPIKeyByID(r.Context(), apiKey.ID)
-	if err != nil {
-		httpapi.Write(rw, http.StatusInternalServerError, httpapi.Response{
-			Message: fmt.Sprintf("delete api key: %s", err.Error()),
-		})
-		return false
-	}
-	return true
-}
-
-func (api *api) createUser(ctx context.Context, req codersdk.CreateUserRequest) (database.User, uuid.UUID, error) {
+func (api *API) createUser(ctx context.Context, req codersdk.CreateUserRequest) (database.User, uuid.UUID, error) {
 	var user database.User
 	return user, req.OrganizationID, api.Database.InTx(func(db database.Store) error {
 		var orgRoles []string