Mercurial > gemma

comparison pkg/controllers/json.go @ 498:22e1bf563a04 metamorph-for-all

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Throw away the connection level for sessions. This is not needed any more because the db connection are not bound to the sessions any more.
author Sascha L. Teichmann <sascha.teichmann@intevation.de>
date Fri, 24 Aug 2018 15:12:22 +0200
parents 8a0737aa6ab6
children e41b48825f5f
comparison
equal deleted inserted replaced
495:5c08afd15ce7 498:22e1bf563a04
46 46
47 var jr JSONResult 47 var jr JSONResult
48 var err error 48 var err error
49 49
50 if token, ok := auth.GetToken(req); ok && !j.NoConn { 50 if token, ok := auth.GetToken(req); ok && !j.NoConn {
51 var session *auth.Session 51 if session := auth.Sessions.Session(token); session != nil {
52 if session, err = auth.Sessions.Do(token); err != nil {
53 var conn *sql.Conn 52 var conn *sql.Conn
54 if conn, err = auth.MetamorphConn(req.Context(), session.User); err != nil { 53 if conn, err = auth.MetamorphConn(req.Context(), session.User); err != nil {
55 defer conn.Close() 54 defer conn.Close()
56 jr, err = j.Handle(input, req, conn) 55 jr, err = j.Handle(input, req, conn)
57 } 56 }
57 } else {
58 err = auth.ErrNoSuchToken
58 } 59 }
59 } else { 60 } else {
60 jr, err = j.Handle(input, req, nil) 61 jr, err = j.Handle(input, req, nil)
61 } 62 }
62 63