fix: centralize const used in multiple packages

mainawycliffe · Dec 10, 2019 · de08a79 · de08a79
1 parent ea15e91
commit de08a79
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 6 deletions.
diff --git a/cmd/root.go b/cmd/root.go
@@ -2,6 +2,7 @@ package cmd
 
 import (
 	"fmt"
+	"github.com/mainawycliffe/kamanda/configs"
 	homedir "github.com/mitchellh/go-homedir"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
@@ -65,8 +66,8 @@ func initConfig() {
 		}
 		viper.SetConfigFile(configPath)
 	}
-	viper.Set("GOOGLE_OAUTH_CLIENT_ID", GOOGLE_OAUTH_CLIENT_ID)
-	viper.Set("GOOGLE_OAUTH_CLIENT_SECRET", GOOGLE_OAUTH_CLIENT_SECRET)
+	viper.Set(configs.GoogleOAuthClientIDConfigKey, GOOGLE_OAUTH_CLIENT_ID)
+	viper.Set(configs.GoogleOAuthClientSecretConfigKey, GOOGLE_OAUTH_CLIENT_SECRET)
 	viper.AutomaticEnv()
 	// @todo: improve error handling here, i.e fail if error is due to missing
 	// config file

diff --git a/configs/consts.go b/configs/consts.go
@@ -1,6 +1,9 @@
 package configs
 
+// these are viper configs keynames
 const (
 	FirebaseLoggedInUserEmailViperConfigKey = "FirebaseUserAccountEmail"
 	FirebaseRefreshTokenViperConfigKey      = "FirebaseRefreshToken"
+	GoogleOAuthClientIDConfigKey            = "GOOGLE_OAUTH_CLIENT_ID"
+	GoogleOAuthClientSecretConfigKey        = "GOOGLE_OAUTH_CLIENT_SECRET"
 )
diff --git a/firebase/token.go b/firebase/token.go
@@ -35,8 +35,8 @@ func (r RefreshToken) validate() error {
 // constructToken create a json refresh token byte for use by a firebase client
 func constructToken() ([]byte, error) {
 	refreshToken := RefreshToken{
-		ClientID:     viper.GetString("GOOGLE_OAUTH_CLIENT_ID"),
-		ClientSecret: viper.GetString("GOOGLE_OAUTH_CLIENT_SECRET"),
+		ClientID:     viper.GetString(configs.GoogleOAuthClientIDConfigKey),
+		ClientSecret: viper.GetString(configs.GoogleOAuthClientSecretConfigKey),
 		RefreshToken: viper.GetString(configs.FirebaseRefreshTokenViperConfigKey),
 		Type:         "authorized_user",
 	}

diff --git a/oauth/oauth.go b/oauth/oauth.go
@@ -114,8 +114,8 @@ func getGoogleOAuthConfig(port string) *oauth2.Config {
 	}
 	return &oauth2.Config{
 		RedirectURL:  redirectURL,
-		ClientID:     viper.GetString("GOOGLE_OAUTH_CLIENT_ID"),
-		ClientSecret: viper.GetString("GOOGLE_OAUTH_CLIENT_SECRET"),
+		ClientID:     viper.GetString(configs.GoogleOAuthClientIDConfigKey),
+		ClientSecret: viper.GetString(configs.GoogleOAuthClientSecretConfigKey),
 		Scopes:       googleOAuthScopes(),
 		Endpoint:     google.Endpoint,
 	}