From 05634ebdb7666ec07b54c0217cec775d3e5e02fa Mon Sep 17 00:00:00 2001
From: Nazar Kanaev <nkanaev@live.com>
Date: Tue, 10 Nov 2020 23:34:38 +0000
Subject: [PATCH] rename skipauth -> manualauth

---
 server/handlers.go | 7 ++++---
 server/router.go   | 6 +++---
 server/server.go   | 2 +-
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/server/handlers.go b/server/handlers.go
index bfae5be..5b09d5a 100644
--- a/server/handlers.go
+++ b/server/handlers.go
@@ -22,8 +22,10 @@ import (
 )
 
 var routes []Route = []Route{
-	p("/", IndexHandler).SkipAuth(),
-	p("/static/*path", StaticHandler).SkipAuth(),
+	p("/", IndexHandler).ManualAuth(),
+	p("/static/*path", StaticHandler).ManualAuth(),
+	p("/fever/", FeverHandler).ManualAuth(),
+
 	p("/api/status", StatusHandler),
 	p("/api/folders", FolderListHandler),
 	p("/api/folders/:id", FolderHandler),
@@ -38,7 +40,6 @@ var routes []Route = []Route{
 	p("/opml/import", OPMLImportHandler),
 	p("/opml/export", OPMLExportHandler),
 	p("/page", PageCrawlHandler),
-	p("/fever/", FeverHandler).SkipAuth(),
 }
 
 type asset struct {
diff --git a/server/router.go b/server/router.go
index e6dc32f..00c800f 100644
--- a/server/router.go
+++ b/server/router.go
@@ -9,11 +9,11 @@ type Route struct {
 	url      string
 	urlRegex *regexp.Regexp
 	handler  func(http.ResponseWriter, *http.Request)
-	skipAuth bool
+	manualAuth bool
 }
 
-func (r Route) SkipAuth() Route {
-	r.skipAuth = true
+func (r Route) ManualAuth() Route {
+	r.manualAuth = true
 	return r
 }
 
diff --git a/server/server.go b/server/server.go
index 11937c1..a3fd25b 100644
--- a/server/server.go
+++ b/server/server.go
@@ -50,7 +50,7 @@ func (h Handler) ServeHTTP(rw http.ResponseWriter, req *http.Request) {
 		return
 	}
 
-	if h.requiresAuth() && !route.skipAuth {
+	if h.requiresAuth() && !route.manualAuth {
 		if !userIsAuthenticated(req, h.Username, h.Password) {
 			rw.WriteHeader(http.StatusUnauthorized)
 			return