Adapted recommendation from Maintainer for PR #1888

Signed-off-by: Maik Brauer <maik.brauer@vodafone.com>
This commit is contained in:
Maik Brauer
2021-01-05 17:10:57 +01:00
parent eb9ef3b0ec
commit 4d246bc9dc
2 changed files with 4 additions and 6 deletions

View File

@@ -52,7 +52,7 @@ type Config struct {
Groups []string `json:"groups"`
GroupNameFormat GroupNameFormat `json:"groupNameFormat"`
UseGroupsAsWhitelist bool `json:"useGroupsAsWhitelist"`
UpnToLowercase bool `json:"upnToLowercase"`
emailToLowercase bool `json:"emailToLowercase"`
}
// Open returns a strategy for logging in through Microsoft.
@@ -69,7 +69,7 @@ func (c *Config) Open(id string, logger log.Logger) (connector.Connector, error)
groupNameFormat: c.GroupNameFormat,
useGroupsAsWhitelist: c.UseGroupsAsWhitelist,
logger: logger,
upnToLowercase: c.UpnToLowercase,
emailToLowercase: c.EmailToLowercase,
}
// By default allow logins from both personal and business/school
// accounts.
@@ -112,7 +112,7 @@ type microsoftConnector struct {
groups []string
useGroupsAsWhitelist bool
logger log.Logger
upnToLowercase bool
emailToLowercase bool
}
func (c *microsoftConnector) isOrgTenant() bool {
@@ -175,7 +175,7 @@ func (c *microsoftConnector) HandleCallback(s connector.Scopes, r *http.Request)
return identity, fmt.Errorf("microsoft: get user: %v", err)
}
if c.upnToLowercase {
if c.emailToLowercase {
user.Email = strings.ToLower(user.Email)
}