1diff --git a/pkg/ext/middleware.go b/pkg/ext/middleware.go
2index fe2d185be75a28df5f686dabb664b237f85d56ae..2cf70cf0567b5348c7bc2cd459340d233c1db35d 100644
3--- a/pkg/ext/middleware.go
4+++ b/pkg/ext/middleware.go
5@@ -56,7 +56,7 @@ }
6
7 func (a *AuthMiddleware) LoggedIn(next http.HandlerFunc) http.HandlerFunc {
8 return func(w http.ResponseWriter, r *http.Request) {
9- path := string(r.URL.Path)
10+ path := r.URL.Path
11 if path == "/login" || path == "/initial" {
12 next(w, r)
13 return
14@@ -82,7 +82,7 @@ a.entry.Error(err)
15 http.Redirect(w, r, redirectLogin, http.StatusTemporaryRedirect)
16 return
17 }
18- r = r.WithContext(context.WithValue(r.Context(), "token", token))
19+ r = r.WithContext(context.WithValue(r.Context(), service.TokenKey, token))
20 a.entry.
21 WithField("userID", token.UserID).
22 WithField("username", token.Username).
23@@ -91,8 +91,8 @@ next(w, r)
24 }
25 }
26
27-func GetTokenFromCtx(w http.ResponseWriter, r *http.Request) *service.Token {
28- tokenValue := r.Context().Value("token")
29+func GetTokenFromCtx(r *http.Request) *service.Token {
30+ tokenValue := r.Context().Value(service.TokenKey)
31 if token, ok := tokenValue.(*service.Token); ok {
32 return token
33 }
34@@ -112,7 +112,7 @@
35 func (i *InitialSetupMiddleware) Check(next http.HandlerFunc) http.HandlerFunc {
36 return func(w http.ResponseWriter, r *http.Request) {
37 // if user has been set to context it is logged in already
38- token := GetTokenFromCtx(w, r)
39+ token := GetTokenFromCtx(r)
40 if token == nil {
41 next(w, r)
42 return
43diff --git a/pkg/ext/responses.go b/pkg/ext/responses.go
44index ba58dd5d54d2a7d27a5a3a0c241240d3ec747614..34e5f278bf1d8e22dc9af9a9fd2584060b81abb1 100644
45--- a/pkg/ext/responses.go
46+++ b/pkg/ext/responses.go
47@@ -7,7 +7,7 @@
48 "git.sr.ht/~gabrielgio/img/templates"
49 )
50
51-func NotFound(w http.ResponseWriter, r *http.Request) {
52+func NotFound(w http.ResponseWriter) {
53 templates.WritePageTemplate(w, &templates.ErrorPage{
54 Err: "Not Found",
55 })
56diff --git a/pkg/list/list.go b/pkg/list/list.go
57index b6b6b89135839693af2eb32d797c76492381af2c..482e5bfeb2622dd890a125085cf3ad7e0e676b44 100644
58--- a/pkg/list/list.go
59+++ b/pkg/list/list.go
60@@ -26,7 +26,6 @@ }
61
62 chuncks[x] = append(chuncks[x], slice[end])
63 }
64-
65 }
66
67 return chuncks
68diff --git a/pkg/service/auth.go b/pkg/service/auth.go
69index f27cf885dc73e0bd3b3ff706a129388ea0b65a9a..30e574a9690f2c33f6a89f08fa089f8776020102 100644
70--- a/pkg/service/auth.go
71+++ b/pkg/service/auth.go
72@@ -105,7 +105,7 @@ path string,
73 ) error {
74 if id != nil {
75 if err := u.userRepository.Update(ctx, *id, &repository.UpdateUser{
76- Username: string(username),
77+ Username: username,
78 Name: name,
79 IsAdmin: isAdmin,
80 Path: path,
81@@ -140,10 +140,15 @@
82 return err
83 }
84
85-type Token struct {
86- UserID uint
87- Username string
88-}
89+type (
90+ AuthKey string
91+ Token struct {
92+ UserID uint
93+ Username string
94+ }
95+)
96+
97+const TokenKey AuthKey = "token"
98
99 func ReadToken(data []byte, key []byte) (*Token, error) {
100 block, err := aes.NewCipher(key)
101diff --git a/pkg/view/album.go b/pkg/view/album.go
102index 9e70b4b7b832bae74032c8d9ca67cfac613de5b8..b19e381bb5008ca4468fc6bd5f7b492ab07d8148 100644
103--- a/pkg/view/album.go
104+++ b/pkg/view/album.go
105@@ -30,7 +30,7 @@ }
106
107 func (self *AlbumView) Index(w http.ResponseWriter, r *http.Request) error {
108 p := getPagination(r)
109- token := ext.GetTokenFromCtx(w, r)
110+ token := ext.GetTokenFromCtx(r)
111
112 // TODO: optmize call, GetPathFromUserID may no be necessary
113 userPath, err := self.userRepository.GetPathFromUserID(r.Context(), token.UserID)
114@@ -67,7 +67,6 @@ albums, err = self.mediaRepository.ListAlbums(r.Context(), *p.AlbumID)
115 if err != nil {
116 return err
117 }
118-
119 }
120
121 medias, err := self.mediaRepository.List(r.Context(), p)
122diff --git a/pkg/view/auth.go b/pkg/view/auth.go
123index 2a4b95e77f23249aaa99b9c644ae39e6926029db..1b87235ed7a45f011cc695a650c793d3d493bc91 100644
124--- a/pkg/view/auth.go
125+++ b/pkg/view/auth.go
126@@ -19,7 +19,7 @@ userController: userController,
127 }
128 }
129
130-func (v *AuthView) LoginView(w http.ResponseWriter, r *http.Request) error {
131+func (v *AuthView) LoginView(w http.ResponseWriter, _ *http.Request) error {
132 templates.WritePageTemplate(w, &templates.LoginPage{})
133 return nil
134 }
135@@ -72,7 +72,7 @@ func Index(w http.ResponseWriter, r *http.Request) {
136 http.Redirect(w, r, "/login", http.StatusTemporaryRedirect)
137 }
138
139-func (v *AuthView) InitialRegisterView(w http.ResponseWriter, r *http.Request) error {
140+func (v *AuthView) InitialRegisterView(w http.ResponseWriter, _ *http.Request) error {
141 templates.WritePageTemplate(w, &templates.RegisterPage{})
142 return nil
143 }
144diff --git a/pkg/view/filesystem.go b/pkg/view/filesystem.go
145index d49ad4ff02e0b62f151c8570ed4598b73d504cde..24f0ce61e6d169b2406b7081feeb965377b63036 100644
146--- a/pkg/view/filesystem.go
147+++ b/pkg/view/filesystem.go
148@@ -34,7 +34,7 @@
149 func (self *FileSystemView) Index(w http.ResponseWriter, r *http.Request) error {
150 var (
151 pathValue = r.FormValue("path")
152- token = ext.GetTokenFromCtx(w, r)
153+ token = ext.GetTokenFromCtx(r)
154 )
155
156 page, err := self.fsService.GetPage(r.Context(), token.UserID, pathValue)
157diff --git a/pkg/view/media.go b/pkg/view/media.go
158index f490ce1e77f979d19c995e17be7b382a34aee3d1..3041998f465d49976d644a3a8b83f292ebe8cb87 100644
159--- a/pkg/view/media.go
160+++ b/pkg/view/media.go
161@@ -71,7 +71,7 @@ }
162
163 func (self *MediaView) Index(w http.ResponseWriter, r *http.Request) error {
164 p := getPagination(r)
165- token := ext.GetTokenFromCtx(w, r)
166+ token := ext.GetTokenFromCtx(r)
167
168 userPath, err := self.userRepository.GetPathFromUserID(r.Context(), token.UserID)
169 if err != nil {
170diff --git a/pkg/worker/scanner/album_scanner.go b/pkg/worker/scanner/album_scanner.go
171index 04af9bceac2ed534d76640f3682c558ade815986..6413cb194b5dcf2605fb8c3c6656309bc2f404df 100644
172--- a/pkg/worker/scanner/album_scanner.go
173+++ b/pkg/worker/scanner/album_scanner.go
174@@ -85,7 +85,6 @@ ParentID: &a.ID,
175 Name: filepath.Base(paths[0]),
176 Path: paths[0],
177 })
178-
179 }
180
181 func FanInwards(paths []string) []string {