Rename accounts-enabling config variable

api/accounts_test.go

@@ -27,7 +27,7 @@ const testSetupWait = 200 * time.Millisecond
 
 func TestMain(m *testing.M) {
 	// call flag.Parse() here if TestMain uses flags
-	config.Override("IsAccountV1Enabled", 1)
+	config.Override("AccountsEnabled", 1)
 	defer config.RestoreOverridden()
 
 	dbConfig := config.GetDatabase()

api/handlers.go

@@ -6,11 +6,11 @@ import (
 	"io/ioutil"
 	"net/http"
 
-	"github.com/lbryio/lbrytv/config"
-	"github.com/lbryio/lbrytv/internal/monitor"
 	"github.com/lbryio/lbrytv/app/player"
 	"github.com/lbryio/lbrytv/app/proxy"
 	"github.com/lbryio/lbrytv/app/users"
+	"github.com/lbryio/lbrytv/config"
+	"github.com/lbryio/lbrytv/internal/monitor"
 
 	"github.com/gorilla/mux"
 	log "github.com/sirupsen/logrus"
@@ -50,7 +50,7 @@ func Proxy(w http.ResponseWriter, req *http.Request) {
 		return
 	}
 
-	if config.IsAccountV1Enabled() {
+	if config.AccountsEnabled() {
 		accountID, err = users.GetAccountIDFromRequest(req)
 		if err != nil {
 			response, _ := json.Marshal(proxy.NewErrorResponse(err.Error(), proxy.ErrProxyAuthFailed))

config/config.go

@@ -59,7 +59,8 @@ func (c *ConfigWrapper) Init() {
 	c.Viper.SetDefault("Host", "http://localhost:8080")
 	c.Viper.SetDefault("BaseContentURL", "http://localhost:8080/content/")
 
-	c.Viper.SetDefault("IsAccountV1Enabled", true)
+	c.Viper.SetDefault("AccountsEnabled", false)
+	c.Viper.BindEnv("AccountsEnabled")
 
 	c.Viper.SetConfigName("lbrytv") // name of config file (without extension)
 
@@ -117,10 +118,9 @@ func RestoreOverridden() {
 
 // Concrete v variables go here
 
-// IsAccountV1Enabled enables or disables Account Subsystem V1 (database + plain auth_token)
-func IsAccountV1Enabled() bool {
-
-	return Config.Viper.GetBool("IsAccountV1Enabled")
+// AccountsEnabled enables or disables accounts subsystem
+func AccountsEnabled() bool {
+	return Config.Viper.GetBool("AccountsEnabled")
 }
 
 // GetAddress determines address to bind http API server to

deployments/docker-dev/docker-compose.yml

@@ -34,7 +34,7 @@ services:
       target: /static
     environment:
       LW_LBRYNET: http://lbrynet:5279/
-      LW_IsAccountV1Enabled: 1
+      LW_ACCOUNTSENABLED: 1
     depends_on:
       - lbrynet
       - postgres

deployments/docker-production/docker-compose.yml

@@ -38,6 +38,7 @@ services:
       target: /static
     environment:
       LW_LBRYNET: http://lbrynet:5279/
+      LW_ACCOUNTSENABLED: 0
     depends_on:
       - lbrynet
       - postgres

deployments/docker/app/config/lbrytv.yml

@@ -8,4 +8,4 @@ Database:
   DBName: lbrytv
   Options: sslmode=disable
 
-IsAccountV1Enabled: 0
+AccountsEnabled: 0

lbrytv.yml

@@ -10,4 +10,4 @@ Database:
   DBName: lbrytv
   Options: sslmode=disable
 
-IsAccountV1Enabled: 1
+AccountsEnabled: 0