Mercurial > gemma

comparison pkg/controllers/token.go @ 4244:4394daeea96a json-handler-middleware

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Moved JSONHandler into middleware package.
author Sascha L. Teichmann <sascha.teichmann@intevation.de>
date Thu, 22 Aug 2019 11:26:48 +0200
parents 4f9a1ff2c2ee
children 5f47eeea988d
comparison
equal deleted inserted replaced
4243:d776110b4db0 4244:4394daeea96a
19 "log" 19 "log"
20 "net/http" 20 "net/http"
21 21
22 "gemma.intevation.de/gemma/pkg/auth" 22 "gemma.intevation.de/gemma/pkg/auth"
23 "gemma.intevation.de/gemma/pkg/models" 23 "gemma.intevation.de/gemma/pkg/models"
24
25 mw "gemma.intevation.de/gemma/pkg/middleware"
24 ) 26 )
25 27
26 func renew(rw http.ResponseWriter, req *http.Request) { 28 func renew(rw http.ResponseWriter, req *http.Request) {
27 token, _ := auth.GetToken(req) 29 token, _ := auth.GetToken(req)
28 newToken, err := auth.Sessions.Renew(token) 30 newToken, err := auth.Sessions.Renew(token)
48 Expires: session.ExpiresAt, 50 Expires: session.ExpiresAt,
49 User: session.User, 51 User: session.User,
50 Roles: session.Roles, 52 Roles: session.Roles,
51 } 53 }
52 54
53 SendJSON(rw, http.StatusOK, &result) 55 mw.SendJSON(rw, http.StatusOK, &result)
54 } 56 }
55 57
56 func logout(rw http.ResponseWriter, req *http.Request) { 58 func logout(rw http.ResponseWriter, req *http.Request) {
57 token, ok := auth.GetToken(req) 59 token, ok := auth.GetToken(req)
58 if !ok || !auth.Sessions.Delete(token) { 60 if !ok || !auth.Sessions.Delete(token) {
102 Roles: session.Roles, 104 Roles: session.Roles,
103 } 105 }
104 106
105 go deletePasswordResetRequest(session.User) 107 go deletePasswordResetRequest(session.User)
106 108
107 SendJSON(rw, http.StatusCreated, &result) 109 mw.SendJSON(rw, http.StatusCreated, &result)
108 } 110 }