fix microsoft active directory config

lakhansamani · lakhansamani · commit a042c202a0b0 · 2023-08-03T13:29:07.000+05:30
diff --git a/server/oauth/oauth.go b/server/oauth/oauth.go
@@ -171,8 +171,8 @@ func InitOAuth() error {
 		microsoftClientSecret = ""
 	}
 	microsoftActiveDirTenantID, err := memorystore.Provider.GetStringStoreEnvVariable(constants.EnvKeyMicrosoftActiveDirectoryTenantID)
-	if err != nil || microsoftActiveDirTenantID == "" {
-		microsoftActiveDirTenantID = "common"
+	if err != nil {
+		microsoftActiveDirTenantID = ""
 	}
 	if microsoftClientID != "" && microsoftClientSecret != "" && microsoftActiveDirTenantID != "" {
 		p, err := oidc.NewProvider(ctx, fmt.Sprintf("https://login.microsoftonline.com/%s/v2.0", microsoftActiveDirTenantID))

Original file line number	Diff line number	Diff line change
`@@ -171,8 +171,8 @@ func InitOAuth() error {`
`171`	`171`	`microsoftClientSecret = ""`
`172`	`172`	`}`
`173`	`173`	`microsoftActiveDirTenantID, err := memorystore.Provider.GetStringStoreEnvVariable(constants.EnvKeyMicrosoftActiveDirectoryTenantID)`
`174`		`- if err != nil \|\| microsoftActiveDirTenantID == "" {`
`175`		`- microsoftActiveDirTenantID = "common"`
	`174`	`+ if err != nil {`
	`175`	`+ microsoftActiveDirTenantID = ""`
`176`	`176`	`}`
`177`	`177`	`if microsoftClientID != "" && microsoftClientSecret != "" && microsoftActiveDirTenantID != "" {`
`178`	`178`	`p, err := oidc.NewProvider(ctx, fmt.Sprintf("https://login.microsoftonline.com/%s/v2.0", microsoftActiveDirTenantID))`