Add feature flag for checking hosted domain (#23)

topfreegames · May 12, 2020 · d2f0e1c · d2f0e1c
1 parent 07ca099
commit d2f0e1c
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 9 deletions.
diff --git a/api/app.go b/api/app.go
@@ -110,10 +110,11 @@ func (a *App) configureJaeger() error {
 func (a *App) configureGoogleOAuth2Provider() {
 	repo := repositories.New(a.storage)
 	google := oauth2.NewGoogle(oauth2.GoogleConfig{
-		ClientID:      a.config.GetString("oauth2.google.clientId"),
-		ClientSecret:  a.config.GetString("oauth2.google.clientSecret"),
-		RedirectURL:   a.config.GetString("oauth2.google.redirectUrl"),
-		HostedDomains: a.config.GetStringSlice("oauth2.google.hostedDomains"),
+		ClientID:          a.config.GetString("oauth2.google.clientId"),
+		ClientSecret:      a.config.GetString("oauth2.google.clientSecret"),
+		RedirectURL:       a.config.GetString("oauth2.google.redirectUrl"),
+		CheckHostedDomain: a.config.GetBool("oauth2.google.checkHostedDomain"),
+		HostedDomains:     a.config.GetStringSlice("oauth2.google.hostedDomains"),
 	}, repo)
 	a.oauth2Provider = google
 }

diff --git a/config/local.yaml b/config/local.yaml
@@ -8,6 +8,7 @@ oauth2:
     clientId: dummy
     clientSecret: dummy
     redirectUrl: dummy
+    checkHostedDomain: true
     hostedDomains:
       - domain1
       - domain2

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -11,3 +11,5 @@ services:
       - "postgres"
       - "-c"
       - "max_connections=9999"
+    environment:
+      - POSTGRES_HOST_AUTH_METHOD=trust
diff --git a/oauth2/google.go b/oauth2/google.go
@@ -22,10 +22,11 @@ const userEndpoint = "https://www.googleapis.com/oauth2/v2/userinfo"
 // GoogleConfig are the basic required informations to use Google
 // as oauth2 provider
 type GoogleConfig struct {
-	ClientID      string
-	ClientSecret  string
-	RedirectURL   string
-	HostedDomains []string
+	ClientID          string
+	ClientSecret      string
+	RedirectURL       string
+	CheckHostedDomain bool
+	HostedDomains     []string
 }
 
 var googleConfig GoogleConfig
@@ -196,7 +197,7 @@ func (g *Google) getUserInfo(accessToken string) (*userInfo, error) {
 }
 
 func (g *Google) checkHostedDomain(hd string) bool {
-	if g.config.HostedDomains == nil || len(g.config.HostedDomains) == 0 {
+	if !g.config.CheckHostedDomain || g.config.HostedDomains == nil || len(g.config.HostedDomains) == 0 {
 		return true
 	}
 	for _, allowed := range g.config.HostedDomains {