From 208dc11d2540ecbe3c9855e239413a0373eb5f47 Mon Sep 17 00:00:00 2001
From: Bingchang Chen <19990626.love@163.com>
Date: Mon, 11 Jul 2022 12:36:20 +0800
Subject: [PATCH] fix: set SessionOn always true (#877)

* fix: set SessionOn always true

* Update adapter.go

Co-authored-by: Gucheng <85475922+nomeguy@users.noreply.github.com>
---
 conf/app.conf     | 1 -
 conf/conf_test.go | 4 ----
 main.go           | 1 +
 object/adapter.go | 5 +++--
 4 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/conf/app.conf b/conf/app.conf
index 2f9c8f5e..6a353705 100644
--- a/conf/app.conf
+++ b/conf/app.conf
@@ -1,7 +1,6 @@
 appname = casdoor
 httpport = 8000
 runmode = dev
-SessionOn = true
 copyrequestbody = true
 driverName = mysql
 dataSourceName = root:123456@tcp(localhost:3306)/
diff --git a/conf/conf_test.go b/conf/conf_test.go
index 604399dc..24ccdabe 100644
--- a/conf/conf_test.go
+++ b/conf/conf_test.go
@@ -79,13 +79,9 @@ func TestGetConfBool(t *testing.T) {
 		input       string
 		expected    interface{}
 	}{
-		{"Should be return false", "SessionOn", false},
 		{"Should be return false", "copyrequestbody", true},
 	}
 
-	//do some set up job
-	os.Setenv("SessionOn", "false")
-
 	err := beego.LoadAppConfig("ini", "app.conf")
 	assert.Nil(t, err)
 	for _, scenery := range scenarios {
diff --git a/main.go b/main.go
index 43028198..5a6dd032 100644
--- a/main.go
+++ b/main.go
@@ -56,6 +56,7 @@ func main() {
 	beego.InsertFilter("*", beego.BeforeRouter, routers.AuthzFilter)
 	beego.InsertFilter("*", beego.BeforeRouter, routers.RecordMessage)
 
+	beego.BConfig.WebConfig.Session.SessionOn = true
 	beego.BConfig.WebConfig.Session.SessionName = "casdoor_session_id"
 	if conf.GetConfigString("redisEndpoint") == "" {
 		beego.BConfig.WebConfig.Session.SessionProvider = "file"
diff --git a/object/adapter.go b/object/adapter.go
index 7b670618..0394ba54 100644
--- a/object/adapter.go
+++ b/object/adapter.go
@@ -22,7 +22,7 @@ import (
 	"github.com/casdoor/casdoor/conf"
 	"github.com/casdoor/casdoor/util"
 	//_ "github.com/denisenkom/go-mssqldb" // db = mssql
-	_ "github.com/go-sql-driver/mysql" // db = mysql
+	_ "github.com/go-sql-driver/mysql"     // db = mysql
 	//_ "github.com/lib/pq"                // db = postgres
 	"xorm.io/core"
 	"xorm.io/xorm"
@@ -36,11 +36,12 @@ func InitConfig() {
 		panic(err)
 	}
 
+	beego.BConfig.WebConfig.Session.SessionOn = true
+
 	InitAdapter(true)
 }
 
 func InitAdapter(createDatabase bool) {
-
 	adapter = NewAdapter(conf.GetConfigString("driverName"), conf.GetBeegoConfDataSourceName(), conf.GetConfigString("dbName"))
 	if createDatabase {
 		adapter.CreateDatabase()