Merge pull request #14344 from influxdata/auth_create_user_fix

fix(http): fixed auth userid overwrite
2019-07-15 14:19:34 -04:00 · 2019-07-15 14:19:34 -04:00 · d45bd1bb83
parent 63aeff31b1 b4eb32c222
commit d45bd1bb83
1 changed files with 6 additions and 1 deletions
--- a/http/auth_service.go
+++ b/http/auth_service.go
@ -198,7 +198,12 @@ func (h *AuthorizationHandler) handlePostAuthorization(w http.ResponseWriter, r
 		return
 	}

-	auth := req.toPlatform(user.ID)
+	userID := user.ID
+	if req.UserID != nil && req.UserID.Valid() {
+		userID = *req.UserID
+	}
+
+	auth := req.toPlatform(userID)

 	org, err := h.OrganizationService.FindOrganizationByID(ctx, auth.OrgID)
 	if err != nil {