extern/netbird
1
0
Fork 0
mirror of https://github.com/netbirdio/netbird.git synced 2025-02-23 05:31:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update account attributes only when there is a domain (#1701)

Browse Source 
add log for when a domain is not present
This commit is contained in:
Maycon Santos 2024-03-14 14:17:22 +01:00 committed by GitHub
parent 4a1aee1ae0
commit 042141db06
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
management/server/account.go
View File

@ -1361,16 +1361,21 @@ func (am *DefaultAccountManager) removeUserFromCache(accountID, userID string) e
func (am *DefaultAccountManager) updateAccountDomainAttributes(account *Account, claims jwtclaims.AuthorizationClaims, func (am *DefaultAccountManager) updateAccountDomainAttributes(account *Account, claims jwtclaims.AuthorizationClaims,
primaryDomain bool, primaryDomain bool,
) error { ) error {
account.IsDomainPrimaryAccount = primaryDomain
lowerDomain := strings.ToLower(claims.Domain) if claims.Domain != "" {
userObj := account.Users[claims.UserId] account.IsDomainPrimaryAccount = primaryDomain
if account.Domain != lowerDomain && userObj.Role == UserRoleAdmin {
account.Domain = lowerDomain lowerDomain := strings.ToLower(claims.Domain)
} userObj := account.Users[claims.UserId]
// prevent updating category for different domain until admin logs in if account.Domain != lowerDomain && userObj.Role == UserRoleAdmin {
if account.Domain == lowerDomain { account.Domain = lowerDomain
account.DomainCategory = claims.DomainCategory }
// prevent updating category for different domain until admin logs in
if account.Domain == lowerDomain {
account.DomainCategory = claims.DomainCategory
}
} else {
log.Errorf("claims don't contain a valid domain, skipping domain attributes update. Received claims: %v", claims)
} }
err := am.Store.SaveAccount(account) err := am.Store.SaveAccount(account)