gravitl/netmaker
1
1
Fork 0
mirror of https://github.com/gravitl/netmaker.git synced 2025-09-12 16:14:37 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #3535 from gravitl/release-v1.0.0

Browse source 
Release v1.0.0
This commit is contained in:
Abhishek K 2025-07-02 15:53:33 +05:30 • committed by GitHub
commit 6741bac338
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pro/auth/error.go
View file

@ -93,7 +93,7 @@ var htmlBaseTemplate = `<!DOCTYPE html>
</html>`
var oauthNotConfigured = fmt.Sprintf(htmlBaseTemplate, `<h2>Your Netmaker server does not have OAuth configured.</h2>
<p>Please visit the docs <a href="https://docs.netmaker.io/docs/server-installation/integrating-oauth" target="_blank" rel="noopener">here</a> to learn how to.</p>`)
<p>Please visit the docs <a href="https://docs.netmaker.io/docs/server-installation/identity-provider-integration-guide" target="_blank" rel="noopener">here</a> to learn how to.</p>`)
var oauthStateInvalid = fmt.Sprintf(htmlBaseTemplate, `<h2>Invalid OAuth Session. Please re-try again.</h2>`)

13
pro/auth/sync.go
View file

@ -122,6 +122,12 @@ func syncUsers(idpUsers []idp.User) error {
filters := logic.GetServerSettings().UserFilters
for _, user := range idpUsers {
if user.AccountArchived {
// delete the user if it has been archived.
_ = logic.DeleteUser(user.Username)
continue
}
var found bool
for _, filter := range filters {
if strings.HasPrefix(user.Username, filter) {
@ -150,6 +156,13 @@ func syncUsers(idpUsers []idp.User) error {
if err != nil {
return err
}
// It's possible that a user can attempt to log in to Netmaker
// after the IDP is configured but before the users are synced.
// Since the user doesn't exist, a pending user will be
// created. Now, since the user is created, the pending user
// can be deleted.
_ = logic.DeletePendingUser(user.Username)
} else if dbUser.AuthType == models.OAuth {
if dbUser.AccountDisabled != user.AccountDisabled ||
dbUser.DisplayName != user.DisplayName ||

3
pro/idp/google/google.go
View file

@ -63,7 +63,7 @@ func (g *Client) GetUsers() ([]idp.User, error) {
var retval []idp.User
err := g.service.Users.List().
Customer("my_customer").
Fields("users(id,primaryEmail,name,suspended)", "nextPageToken").
Fields("users(id,primaryEmail,name,suspended,archived)", "nextPageToken").
Pages(context.TODO(), func(users *admindir.Users) error {
for _, user := range users.Users {
retval = append(retval, idp.User{
@ -71,6 +71,7 @@ func (g *Client) GetUsers() ([]idp.User, error) {
Username: user.PrimaryEmail,
DisplayName: user.Name.FullName,
AccountDisabled: user.Suspended,
AccountArchived: user.Archived,
})
}

1
pro/idp/idp.go
View file

@ -10,6 +10,7 @@ type User struct {
Username string
DisplayName string
AccountDisabled bool
AccountArchived bool
}
type Group struct {