comparison pkg/controllers/token.go @ 5490:5f47eeea988d logging

Use own logging package.
author Sascha L. Teichmann <sascha.teichmann@intevation.de>
date Mon, 20 Sep 2021 17:45:39 +0200
parents 4394daeea96a
children
comparison
equal deleted inserted replaced
5488:a726a92ea5c9 5490:5f47eeea988d
14 package controllers 14 package controllers
15 15
16 import ( 16 import (
17 "encoding/json" 17 "encoding/json"
18 "fmt" 18 "fmt"
19 "log"
20 "net/http" 19 "net/http"
21 20
22 "gemma.intevation.de/gemma/pkg/auth" 21 "gemma.intevation.de/gemma/pkg/auth"
23 "gemma.intevation.de/gemma/pkg/models" 22 "gemma.intevation.de/gemma/pkg/models"
24 23
24 "gemma.intevation.de/gemma/pkg/log"
25 mw "gemma.intevation.de/gemma/pkg/middleware" 25 mw "gemma.intevation.de/gemma/pkg/middleware"
26 ) 26 )
27 27
28 func renew(rw http.ResponseWriter, req *http.Request) { 28 func renew(rw http.ResponseWriter, req *http.Request) {
29 token, _ := auth.GetToken(req) 29 token, _ := auth.GetToken(req)
31 switch { 31 switch {
32 case err == auth.ErrNoSuchToken: 32 case err == auth.ErrNoSuchToken:
33 http.NotFound(rw, req) 33 http.NotFound(rw, req)
34 return 34 return
35 case err != nil: 35 case err != nil:
36 log.Printf("error: %v\n", err) 36 log.Errorf("%v\n", err)
37 http.Error(rw, fmt.Sprintf("error: %v", err), http.StatusInternalServerError) 37 http.Error(rw, fmt.Sprintf("error: %v", err), http.StatusInternalServerError)
38 return 38 return
39 } 39 }
40 40
41 session, _ := auth.GetSession(req) 41 session, _ := auth.GetSession(req)
71 User models.UserName `json:"user"` 71 User models.UserName `json:"user"`
72 Password string `json:"password"` 72 Password string `json:"password"`
73 } 73 }
74 defer req.Body.Close() 74 defer req.Body.Close()
75 if err := json.NewDecoder(req.Body).Decode(&input); err != nil { 75 if err := json.NewDecoder(req.Body).Decode(&input); err != nil {
76 log.Printf("%v\n", err) 76 log.Errorf("%v\n", err)
77 http.Error(rw, "error: "+err.Error(), http.StatusBadRequest) 77 http.Error(rw, "error: "+err.Error(), http.StatusBadRequest)
78 return 78 return
79 } 79 }
80 80
81 if input.Password == "" { 81 if input.Password == "" {
85 85
86 token, session, err := auth.GenerateSession( 86 token, session, err := auth.GenerateSession(
87 string(input.User), 87 string(input.User),
88 input.Password) 88 input.Password)
89 if err != nil { 89 if err != nil {
90 log.Printf("error: %v\n", err) 90 log.Errorf("%v\n", err)
91 http.Error(rw, http.StatusText(http.StatusUnauthorized), http.StatusUnauthorized) 91 http.Error(rw, http.StatusText(http.StatusUnauthorized), http.StatusUnauthorized)
92 return 92 return
93 } 93 }
94 94
95 var result = struct { 95 var result = struct {