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

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
line wrap: on
line diff
--- a/pkg/controllers/json.go	Fri Aug 24 14:28:05 2018 +0200
+++ b/pkg/controllers/json.go	Fri Aug 24 15:12:22 2018 +0200
@@ -48,13 +48,14 @@
 	var err error
 
 	if token, ok := auth.GetToken(req); ok && !j.NoConn {
-		var session *auth.Session
-		if session, err = auth.Sessions.Do(token); err != nil {
+		if session := auth.Sessions.Session(token); session != nil {
 			var conn *sql.Conn
 			if conn, err = auth.MetamorphConn(req.Context(), session.User); err != nil {
 				defer conn.Close()
 				jr, err = j.Handle(input, req, conn)
 			}
+		} else {
+			err = auth.ErrNoSuchToken
 		}
 	} else {
 		jr, err = j.Handle(input, req, nil)