From f257101c41c4f9580704b2184be92d5d5b71ee90 Mon Sep 17 00:00:00 2001
From: bergquist <carl.bergquist@gmail.com>
Date: Thu, 24 Jan 2019 11:26:45 +0100
Subject: [PATCH] removes unused/commented code

---
 conf/defaults.ini               |  1 -
 pkg/middleware/auth_proxy.go    |  2 +-
 pkg/middleware/middleware.go    | 23 -----------------------
 pkg/middleware/recovery_test.go |  3 +--
 pkg/middleware/session.go       | 13 -------------
 pkg/setting/setting.go          |  2 --
 6 files changed, 2 insertions(+), 42 deletions(-)
 delete mode 100644 pkg/middleware/session.go

diff --git a/conf/defaults.ini b/conf/defaults.ini
index e17373a9a14..f8e5c3cf838 100644
--- a/conf/defaults.ini
+++ b/conf/defaults.ini
@@ -143,7 +143,6 @@ provider = file
 
 provider_config = sessions
 
-
 # Session cookie name
 cookie_name = grafana_sess
 
diff --git a/pkg/middleware/auth_proxy.go b/pkg/middleware/auth_proxy.go
index 7b517a6f5f8..c5be1f32a09 100644
--- a/pkg/middleware/auth_proxy.go
+++ b/pkg/middleware/auth_proxy.go
@@ -68,7 +68,7 @@ func initContextWithAuthProxy(ctx *m.ReqContext, orgID int64) bool {
 		query.UserId = getRequestUserId(ctx)
 		// if we're using ldap, pass authproxy login name to ldap user sync
 	} else if setting.LdapEnabled {
-		ctx.Session.Delete(session.SESS_KEY_LASTLDAPSYNC) //makes sure we always sync with ldap if session if we only have last sync info in session but not user.
+		ctx.Session.Delete(session.SESS_KEY_LASTLDAPSYNC)
 
 		syncQuery := &m.LoginUserQuery{
 			ReqContext: ctx,
diff --git a/pkg/middleware/middleware.go b/pkg/middleware/middleware.go
index 04d014c6fa8..3722ac3058f 100644
--- a/pkg/middleware/middleware.go
+++ b/pkg/middleware/middleware.go
@@ -88,29 +88,6 @@ func initContextWithAnonymousUser(ctx *m.ReqContext) bool {
 	return true
 }
 
-// func initContextWithUserSessionCookie(ctx *m.ReqContext, orgId int64) bool {
-// 	// initialize session
-// 	if err := ctx.Session.Start(ctx.Context); err != nil {
-// 		ctx.Logger.Error("Failed to start session", "error", err)
-// 		return false
-// 	}
-
-// 	var userId int64
-// 	if userId = getRequestUserId(ctx); userId == 0 {
-// 		return false
-// 	}
-
-// 	query := m.GetSignedInUserQuery{UserId: userId, OrgId: orgId}
-// 	if err := bus.Dispatch(&query); err != nil {
-// 		ctx.Logger.Error("Failed to get user with id", "userId", userId, "error", err)
-// 		return false
-// 	}
-
-// 	ctx.SignedInUser = query.Result
-// 	ctx.IsSignedIn = true
-// 	return true
-// }
-
 func initContextWithApiKey(ctx *m.ReqContext) bool {
 	var keyString string
 	if keyString = getApiKey(ctx); keyString == "" {
diff --git a/pkg/middleware/recovery_test.go b/pkg/middleware/recovery_test.go
index d4a99360e07..e041d42e56b 100644
--- a/pkg/middleware/recovery_test.go
+++ b/pkg/middleware/recovery_test.go
@@ -9,7 +9,7 @@ import (
 	"github.com/grafana/grafana/pkg/services/session"
 	"github.com/grafana/grafana/pkg/setting"
 	. "github.com/smartystreets/goconvey/convey"
-	"gopkg.in/macaron.v1"
+	macaron "gopkg.in/macaron.v1"
 )
 
 func TestRecoveryMiddleware(t *testing.T) {
@@ -67,7 +67,6 @@ func recoveryScenario(desc string, url string, fn scenarioFunc) {
 		sc.m.Use(GetContextHandler(sc.userAuthTokenService))
 		// mock out gc goroutine
 		session.StartSessionGC = func() {}
-		//sc.m.Use(Sessioner(&ms.Options{}, 0))
 		sc.m.Use(OrgRedirect())
 		sc.m.Use(AddDefaultResponseHeaders())
 
diff --git a/pkg/middleware/session.go b/pkg/middleware/session.go
deleted file mode 100644
index 54bcfffdba2..00000000000
--- a/pkg/middleware/session.go
+++ /dev/null
@@ -1,13 +0,0 @@
-package middleware
-
-// func Sessioner(options *ms.Options, sessionConnMaxLifetime int64) macaron.Handler {
-// 	session.Init(options, sessionConnMaxLifetime)
-
-// 	return func(ctx *m.ReqContext) {
-// 		ctx.Next()
-
-// 		if err := ctx.Session.Release(); err != nil {
-// 			panic("session(release): " + err.Error())
-// 		}
-// 	}
-// }
diff --git a/pkg/setting/setting.go b/pkg/setting/setting.go
index 5db10a89263..79c2a780d1e 100644
--- a/pkg/setting/setting.go
+++ b/pkg/setting/setting.go
@@ -223,7 +223,6 @@ type Cfg struct {
 	EnterpriseLicensePath            string
 
 	LoginCookieName                   string
-	LoginCookieUsername               string
 	LoginCookieSecure                 bool
 	LoginCookieMaxDays                int
 	LoginCookieRotation               time.Duration
@@ -556,7 +555,6 @@ func (cfg *Cfg) Load(args *CommandLineArgs) error {
 	cfg.LoginCookieName = login.Key("cookie_name").MustString("grafana_session")
 	cfg.LoginCookieMaxDays = login.Key("login_remember_days").MustInt(7)
 	cfg.LoginCookieSecure = login.Key("cookie_secure").MustBool(false)
-	cfg.LoginCookieUsername = login.Key("cookie_username").MustString("grafana_username")
 	cfg.LoginDeleteExpiredTokensAfterDays = login.Key("delete_expired_token_after_days").MustInt(30)
 	cfg.LoginCookieRotation = login.Key("rotate_cookie_every").MustDuration(time.Minute * 30)