From c327833314fafd4accb9bbfbaf01f0dbee7a9a10 Mon Sep 17 00:00:00 2001
From: Frédéric Guillot <fred@miniflux.net>
Date: Sat, 25 Aug 2018 09:50:43 -0700
Subject: Simplify context keys

---
 middleware/context_keys.go | 64 ++++++++++++----------------------------------
 1 file changed, 17 insertions(+), 47 deletions(-)

(limited to 'middleware')

diff --git a/middleware/context_keys.go b/middleware/context_keys.go
index 80b5e96..77a1655 100644
--- a/middleware/context_keys.go
+++ b/middleware/context_keys.go
@@ -5,51 +5,21 @@
 package middleware // import "miniflux.app/middleware"
 
 // ContextKey represents a context key.
-type ContextKey struct {
-	name string
-}
-
-func (c ContextKey) String() string {
-	return c.name
-}
-
-var (
-	// UserIDContextKey is the context key used to store the user ID.
-	UserIDContextKey = &ContextKey{"UserID"}
-
-	// UserTimezoneContextKey is the context key used to store the user timezone.
-	UserTimezoneContextKey = &ContextKey{"UserTimezone"}
-
-	// IsAdminUserContextKey is the context key used to store the user role.
-	IsAdminUserContextKey = &ContextKey{"IsAdminUser"}
-
-	// IsAuthenticatedContextKey is the context key used to store the authentication flag.
-	IsAuthenticatedContextKey = &ContextKey{"IsAuthenticated"}
-
-	// UserSessionTokenContextKey is the context key used to store the user session ID.
-	UserSessionTokenContextKey = &ContextKey{"UserSessionToken"}
-
-	// UserLanguageContextKey is the context key to store user language.
-	UserLanguageContextKey = &ContextKey{"UserLanguageContextKey"}
-
-	// UserThemeContextKey is the context key to store user theme.
-	UserThemeContextKey = &ContextKey{"UserThemeContextKey"}
-
-	// SessionIDContextKey is the context key used to store the session ID.
-	SessionIDContextKey = &ContextKey{"SessionID"}
-
-	// CSRFContextKey is the context key used to store CSRF token.
-	CSRFContextKey = &ContextKey{"CSRF"}
-
-	// OAuth2StateContextKey is the context key used to store OAuth2 state.
-	OAuth2StateContextKey = &ContextKey{"OAuth2State"}
-
-	// FlashMessageContextKey is the context key used to store a flash message.
-	FlashMessageContextKey = &ContextKey{"FlashMessage"}
-
-	// FlashErrorMessageContextKey is the context key used to store a flash error message.
-	FlashErrorMessageContextKey = &ContextKey{"FlashErrorMessage"}
-
-	// PocketRequestTokenContextKey is the context key for Pocket Request Token.
-	PocketRequestTokenContextKey = &ContextKey{"PocketRequestToken"}
+type ContextKey int
+
+// List of context keys.
+const (
+	UserIDContextKey ContextKey = iota
+	UserTimezoneContextKey
+	IsAdminUserContextKey
+	IsAuthenticatedContextKey
+	UserSessionTokenContextKey
+	UserLanguageContextKey
+	UserThemeContextKey
+	SessionIDContextKey
+	CSRFContextKey
+	OAuth2StateContextKey
+	FlashMessageContextKey
+	FlashErrorMessageContextKey
+	PocketRequestTokenContextKey
 )
-- 
cgit v1.2.3