mirror of
https://github.com/steveiliop56/tinyauth.git
synced 2025-10-28 20:55:42 +00:00
fix: use email in oauth whitelist check
This commit is contained in:
Binary file not shown.
@@ -12,6 +12,7 @@ export default defineConfig({
|
|||||||
changeOrigin: true,
|
changeOrigin: true,
|
||||||
rewrite: (path) => path.replace(/^\/api/, ""),
|
rewrite: (path) => path.replace(/^\/api/, ""),
|
||||||
},
|
},
|
||||||
}
|
},
|
||||||
|
allowedHosts: true,
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -110,8 +110,8 @@ func (hooks *Hooks) UseUserContext(c *gin.Context) types.UserContext {
|
|||||||
log.Debug().Msg("Provider exists")
|
log.Debug().Msg("Provider exists")
|
||||||
|
|
||||||
// Check if the oauth email is whitelisted
|
// Check if the oauth email is whitelisted
|
||||||
if !hooks.Auth.EmailWhitelisted(cookie.Username) {
|
if !hooks.Auth.EmailWhitelisted(cookie.Email) {
|
||||||
log.Error().Str("email", cookie.Username).Msg("Email is not whitelisted")
|
log.Error().Str("email", cookie.Email).Msg("Email is not whitelisted")
|
||||||
|
|
||||||
// It isn't so we delete the cookie and return an empty context
|
// It isn't so we delete the cookie and return an empty context
|
||||||
hooks.Auth.DeleteSessionCookie(c)
|
hooks.Auth.DeleteSessionCookie(c)
|
||||||
|
|||||||
@@ -103,6 +103,7 @@ func GetGithubUser(client *http.Client) (constants.Claims, error) {
|
|||||||
for _, email := range emails {
|
for _, email := range emails {
|
||||||
if email.Primary {
|
if email.Primary {
|
||||||
// Set the email then exit
|
// Set the email then exit
|
||||||
|
log.Debug().Str("email", email.Email).Msg("Found primary email")
|
||||||
user.Email = email.Email
|
user.Email = email.Email
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
@@ -115,6 +116,7 @@ func GetGithubUser(client *http.Client) (constants.Claims, error) {
|
|||||||
|
|
||||||
// Set the email if it is not set picking the first one
|
// Set the email if it is not set picking the first one
|
||||||
if user.Email == "" {
|
if user.Email == "" {
|
||||||
|
log.Warn().Str("email", emails[0].Email).Msg("No primary email found, using first email")
|
||||||
user.Email = emails[0].Email
|
user.Email = emails[0].Email
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user