Home Explore Help
Sign In
golang
/
netmaker
mirror of https://github.com/gravitl/netmaker
2
0
Fork 0
Files Issues 0 Wiki
Browse Source

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

Release v1.0.0
Abhishek K 2 months ago
parent
33480f514f 070eed8a23
commit
6741bac338
4 changed files with 17 additions and 2 deletions
Unified View Show Diff Stats
  1. 1 1
      pro/auth/error.go
  2. 13 0
      pro/auth/sync.go
  3. 2 1
      pro/idp/google/google.go
  4. 1 0
      pro/idp/idp.go

+ 1 - 1
pro/auth/error.go
View File 

@@ -93,7 +93,7 @@ var htmlBaseTemplate = `<!DOCTYPE html>
 
 </html>`
 
 </html>`
 
 
 
 var oauthNotConfigured = fmt.Sprintf(htmlBaseTemplate, `<h2>Your Netmaker server does not have OAuth configured.</h2>
 
 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>`)
 
 var oauthStateInvalid = fmt.Sprintf(htmlBaseTemplate, `<h2>Invalid OAuth Session. Please re-try again.</h2>`)

+ 13 - 0
pro/auth/sync.go
View File 

@@ -122,6 +122,12 @@ func syncUsers(idpUsers []idp.User) error {
 
 	filters := logic.GetServerSettings().UserFilters
 
 	filters := logic.GetServerSettings().UserFilters
 
 
 
 	for _, user := range idpUsers {
 
 	for _, user := range idpUsers {
 
+		if user.AccountArchived {
 
+			// delete the user if it has been archived.
 
+			_ = logic.DeleteUser(user.Username)
 
+			continue
 
+		}
 
+
 
 		var found bool
 
 		var found bool
 
 		for _, filter := range filters {
 
 		for _, filter := range filters {
 
 			if strings.HasPrefix(user.Username, filter) {
 
 			if strings.HasPrefix(user.Username, filter) {
 
@@ -150,6 +156,13 @@ func syncUsers(idpUsers []idp.User) error {
 
 			if err != nil {
 
 			if err != nil {
 
 				return err
 
 				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 {
 
 		} else if dbUser.AuthType == models.OAuth {
 
 			if dbUser.AccountDisabled != user.AccountDisabled ||
 
 			if dbUser.AccountDisabled != user.AccountDisabled ||
 
 				dbUser.DisplayName != user.DisplayName ||
 
 				dbUser.DisplayName != user.DisplayName ||

+ 2 - 1
pro/idp/google/google.go
View File 

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

+ 1 - 0
pro/idp/idp.go
View File 

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