comparison pkg/controllers/user.go @ 4506:e020e6e34ad7

Made 'go vet' happy again.
author Sascha L. Teichmann <sascha.teichmann@intevation.de>
date Wed, 02 Oct 2019 16:09:10 +0200
parents 4394daeea96a
children b1b9b384540d
comparison
equal deleted inserted replaced
4505:30c499f996d7 4506:e020e6e34ad7
101 101
102 func deleteUser(req *http.Request) (jr mw.JSONResult, err error) { 102 func deleteUser(req *http.Request) (jr mw.JSONResult, err error) {
103 103
104 user := mux.Vars(req)["user"] 104 user := mux.Vars(req)["user"]
105 if !models.UserName(user).IsValid() { 105 if !models.UserName(user).IsValid() {
106 err = mw.JSONError{http.StatusBadRequest, "error: user invalid"} 106 err = mw.JSONError{
107 Code: http.StatusBadRequest,
108 Message: "error: user invalid",
109 }
107 return 110 return
108 } 111 }
109 112
110 session, _ := auth.GetSession(req) 113 session, _ := auth.GetSession(req)
111 if session.User == user { 114 if session.User == user {
112 err = mw.JSONError{http.StatusBadRequest, "error: cannot delete yourself"} 115 err = mw.JSONError{
116 Code: http.StatusBadRequest,
117 Message: "error: cannot delete yourself",
118 }
113 return 119 return
114 } 120 }
115 121
116 ctx := req.Context() 122 ctx := req.Context()
117 123
150 156
151 func updateUser(req *http.Request) (jr mw.JSONResult, err error) { 157 func updateUser(req *http.Request) (jr mw.JSONResult, err error) {
152 158
153 user := models.UserName(mux.Vars(req)["user"]) 159 user := models.UserName(mux.Vars(req)["user"])
154 if !user.IsValid() { 160 if !user.IsValid() {
155 err = mw.JSONError{http.StatusBadRequest, "error: user invalid"} 161 err = mw.JSONError{
162 Code: http.StatusBadRequest,
163 Message: "error: user invalid",
164 }
156 return 165 return
157 } 166 }
158 167
159 newUser := mw.JSONInput(req).(*models.User) 168 newUser := mw.JSONInput(req).(*models.User)
160 var res sql.Result 169 var res sql.Result
187 newUser.Email, 196 newUser.Email,
188 ) 197 )
189 } 198 }
190 } else { 199 } else {
191 if newUser.Extent == nil { 200 if newUser.Extent == nil {
192 err = mw.JSONError{http.StatusBadRequest, "extent is mandatory"} 201 err = mw.JSONError{
202 Code: http.StatusBadRequest,
203 Message: "extent is mandatory",
204 }
193 return 205 return
194 } 206 }
195 res, err = db.ExecContext( 207 res, err = db.ExecContext(
196 req.Context(), 208 req.Context(),
197 updateUserUnprivSQL, 209 updateUserUnprivSQL,
311 323
312 func listUser(req *http.Request) (jr mw.JSONResult, err error) { 324 func listUser(req *http.Request) (jr mw.JSONResult, err error) {
313 325
314 user := models.UserName(mux.Vars(req)["user"]) 326 user := models.UserName(mux.Vars(req)["user"])
315 if !user.IsValid() { 327 if !user.IsValid() {
316 err = mw.JSONError{http.StatusBadRequest, "error: user invalid"} 328 err = mw.JSONError{
329 Code: http.StatusBadRequest,
330 Message: "error: user invalid",
331 }
317 return 332 return
318 } 333 }
319 334
320 result := &models.User{ 335 result := &models.User{
321 User: user, 336 User: user,
347 362
348 func sendTestMail(req *http.Request) (jr mw.JSONResult, err error) { 363 func sendTestMail(req *http.Request) (jr mw.JSONResult, err error) {
349 364
350 user := models.UserName(mux.Vars(req)["user"]) 365 user := models.UserName(mux.Vars(req)["user"])
351 if !user.IsValid() { 366 if !user.IsValid() {
352 err = mw.JSONError{http.StatusBadRequest, "error: user invalid"} 367 err = mw.JSONError{
368 Code: http.StatusBadRequest,
369 Message: "error: user invalid",
370 }
353 return 371 return
354 } 372 }
355 373
356 userData := &models.User{ 374 userData := &models.User{
357 User: user, 375 User: user,