diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml index c5e919d..fd1f743 100644 --- a/docker-compose.dev.yml +++ b/docker-compose.dev.yml @@ -12,6 +12,10 @@ services: - redis - rabbitmq - statsd + environment: + ACCOUNTS_API_ID: "" + ACCOUNTS_API_SECRET: "" + STATSD_ADDR: "" redis: extends: diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml index 3c86b31..9d8bc79 100644 --- a/docker-compose.prod.yml +++ b/docker-compose.prod.yml @@ -8,6 +8,10 @@ services: - redis - rabbitmq restart: always + environment: + ACCOUNTS_API_ID: "" + ACCOUNTS_API_SECRET: "" + STATSD_ADDR: "" redis: extends: diff --git a/lib/worker/supports.go b/lib/worker/supports.go index e370521..4d1f58a 100644 --- a/lib/worker/supports.go +++ b/lib/worker/supports.go @@ -5,6 +5,8 @@ import ( "elyby/minecraft-skinsystem/lib/external/accounts" ) +var AccountsTokenConfig *accounts.TokenRequest + var token *accounts.Token const repeatsLimit = 3 @@ -40,13 +42,7 @@ func _getByField(field string, value string) (accounts.AccountInfoResponse, erro func getToken() (*accounts.Token, error) { if token == nil { - tempToken, err := accounts.GetToken(accounts.TokenRequest{ - Id: "skinsystem", - Secret: "qugFIaCjec3LMA", - Scopes: []string{ - "internal_account_info", - }, - }) + tempToken, err := accounts.GetToken(*AccountsTokenConfig) if err != nil { return &accounts.Token{}, err } diff --git a/minecraft-skinsystem.go b/minecraft-skinsystem.go index b8eefb6..c684279 100644 --- a/minecraft-skinsystem.go +++ b/minecraft-skinsystem.go @@ -19,6 +19,7 @@ import ( "elyby/minecraft-skinsystem/lib/routes" "elyby/minecraft-skinsystem/lib/services" "elyby/minecraft-skinsystem/lib/worker" + "elyby/minecraft-skinsystem/lib/external/accounts" ) const redisPoolSize int = 10 @@ -28,6 +29,20 @@ func main() { runtime.GOMAXPROCS(runtime.NumCPU()) + accountsApiId := os.Getenv("ACCOUNTS_API_ID") + accountsApiSecret := os.Getenv("ACCOUNTS_API_SECRET") + if accountsApiId == "" || accountsApiSecret == "" { + log.Fatal("ACCOUNTS_API params must be provided") + } + + worker.AccountsTokenConfig = &accounts.TokenRequest{ + Id: accountsApiId, + Secret: accountsApiSecret, + Scopes: []string{ + "internal_account_info", + }, + } + log.Println("Connecting to redis") var redisString = os.Getenv("REDIS_ADDR") @@ -62,6 +77,7 @@ func main() { // statsd var statsdString = os.Getenv("STATSD_ADDR") + statsdString = "" if (statsdString != "") { log.Println("Connecting to statsd") hostname, _ := os.Hostname()