Alexander Belanger 5 лет назад
Родитель
Сommit
d478352e15
3 измененных файлов с 5 добавлено и 5 удалено
  1. 1 1
      internal/forms/user.go
  2. 2 2
      server/api/errors.go
  3. 2 2
      server/api/user_handler.go

+ 1 - 1
internal/forms/user.go

@@ -61,7 +61,7 @@ func (luf *LoginUserForm) ToUser() (*models.User, error) {
 type UpdateUserForm struct {
 	WriteUserForm
 	ID              uint     `form:"required"`
-	RawKubeConfig   string   `json:"rawKubeConfig,omitempty"`
+	RawKubeConfig   string   `json:"rawKubeConfig" form:"required"`
 	AllowedClusters []string `json:"allowedClusters,omitempty"`
 }
 

+ 2 - 2
server/api/errors.go

@@ -120,7 +120,7 @@ func (app *App) handleErrorRead(err error, code ErrorCode, w http.ResponseWriter
 		return
 	}
 
-	app.handleErrorDataRead(err, code, w)
+	app.handleErrorDataRead(err, w)
 }
 
 // handleErrorDataWrite handles a database write error due to either a connection
@@ -131,7 +131,7 @@ func (app *App) handleErrorDataWrite(err error, w http.ResponseWriter) {
 
 // handleErrorDataRead handles a database read error due to an internal error, such as
 // the database connection or gorm internals
-func (app *App) handleErrorDataRead(err error, code ErrorCode, w http.ResponseWriter) {
+func (app *App) handleErrorDataRead(err error, w http.ResponseWriter) {
 	app.sendExternalError(err, http.StatusInternalServerError, ErrorDataRead, w)
 }
 

+ 2 - 2
server/api/user_handler.go

@@ -31,7 +31,7 @@ func (app *App) HandleCreateUser(w http.ResponseWriter, r *http.Request) {
 	session, err := app.store.Get(r, app.cookieName)
 
 	if err != nil {
-		app.handleErrorDataRead(err, ErrUserDataRead, w)
+		app.handleErrorDataRead(err, w)
 	}
 
 	form := &forms.CreateUserForm{}
@@ -58,7 +58,7 @@ func (app *App) HandleLoginUser(w http.ResponseWriter, r *http.Request) {
 	session, err := app.store.Get(r, app.cookieName)
 
 	if err != nil {
-		app.handleErrorDataRead(err, ErrUserDataRead, w)
+		app.handleErrorDataRead(err, w)
 	}
 
 	form := &forms.LoginUserForm{}