Mercurial > gemma

comparison pkg/controllers/user.go @ 425:c49f4c1808b1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Simplified user validation with new UserName type.
author Sascha L. Teichmann <sascha.teichmann@intevation.de>
date Thu, 16 Aug 2018 17:31:25 +0200
parents c70ddc6eb168
children fc37e7072022
comparison
equal deleted inserted replaced
424:abe4efa339bc 425:c49f4c1808b1
55 _ interface{}, req *http.Request, 55 _ interface{}, req *http.Request,
56 db *sql.DB, 56 db *sql.DB,
57 ) (jr JSONResult, err error) { 57 ) (jr JSONResult, err error) {
58 58
59 user := mux.Vars(req)["user"] 59 user := mux.Vars(req)["user"]
60 if user == "" { 60 if !UserName(user).isValid() {
61 err = JSONError{http.StatusBadRequest, "error: user empty"} 61 err = JSONError{http.StatusBadRequest, "error: user invalid"}
62 return 62 return
63 } 63 }
64 64
65 session, _ := auth.GetSession(req) 65 session, _ := auth.GetSession(req)
66 if session.User == user { 66 if session.User == user {
93 input interface{}, req *http.Request, 93 input interface{}, req *http.Request,
94 db *sql.DB, 94 db *sql.DB,
95 ) (jr JSONResult, err error) { 95 ) (jr JSONResult, err error) {
96 96
97 user := UserName(mux.Vars(req)["user"]) 97 user := UserName(mux.Vars(req)["user"])
98 if user == "" || !user.isValid() { 98 if !user.isValid() {
99 err = JSONError{http.StatusBadRequest, "error: user invalid"} 99 err = JSONError{http.StatusBadRequest, "error: user invalid"}
100 return 100 return
101 } 101 }
102 102
103 newUser := input.(*User) 103 newUser := input.(*User)
252 _ interface{}, req *http.Request, 252 _ interface{}, req *http.Request,
253 db *sql.DB, 253 db *sql.DB,
254 ) (jr JSONResult, err error) { 254 ) (jr JSONResult, err error) {
255 255
256 user := UserName(mux.Vars(req)["user"]) 256 user := UserName(mux.Vars(req)["user"])
257 if user == "" || !user.isValid() { 257 if !user.isValid() {
258 err = JSONError{http.StatusBadRequest, "error: user invalid"} 258 err = JSONError{http.StatusBadRequest, "error: user invalid"}
259 return 259 return
260 } 260 }
261 261
262 result := &User{ 262 result := &User{