Przeglądaj źródła

delete invite after user singup

abhishek9686 1 rok temu
rodzic
commit
a797875c9b
5 zmienionych plików z 5 dodań i 1 usunięć
  1. 1 1
      email/invite.go
  2. 1 0
      pro/auth/azure-ad.go
  3. 1 0
      pro/auth/github.go
  4. 1 0
      pro/auth/google.go
  5. 1 0
      pro/auth/oidc.go

+ 1 - 1
email/invite.go

@@ -12,7 +12,7 @@ type UserInvitedMail struct {
 
 // GetSubject - gets the subject of the email
 func (UserInvitedMail) GetSubject(info Notification) string {
-	return "Netmaker SaaS: Invitation Pending Acceptance"
+	return "Netmaker: Pending Invitation"
 }
 
 // GetBody - gets the body of the email

+ 1 - 0
pro/auth/azure-ad.go

@@ -114,6 +114,7 @@ func handleAzureCallback(w http.ResponseWriter, r *http.Request) {
 					handleSomethingWentWrong(w)
 					return
 				}
+				logic.DeleteUserInvite(user.UserName)
 				logic.DeletePendingUser(content.UserPrincipalName)
 			} else {
 				err = logic.InsertPendingUser(&models.User{

+ 1 - 0
pro/auth/github.go

@@ -114,6 +114,7 @@ func handleGithubCallback(w http.ResponseWriter, r *http.Request) {
 					handleSomethingWentWrong(w)
 					return
 				}
+				logic.DeleteUserInvite(user.UserName)
 				logic.DeletePendingUser(content.Login)
 			} else {
 				err = logic.InsertPendingUser(&models.User{

+ 1 - 0
pro/auth/google.go

@@ -115,6 +115,7 @@ func handleGoogleCallback(w http.ResponseWriter, r *http.Request) {
 					handleSomethingWentWrong(w)
 					return
 				}
+				logic.DeleteUserInvite(user.UserName)
 				logic.DeletePendingUser(content.Email)
 			} else {
 				err = logic.InsertPendingUser(&models.User{

+ 1 - 0
pro/auth/oidc.go

@@ -126,6 +126,7 @@ func handleOIDCCallback(w http.ResponseWriter, r *http.Request) {
 					handleSomethingWentWrong(w)
 					return
 				}
+				logic.DeleteUserInvite(user.UserName)
 				logic.DeletePendingUser(content.Email)
 			} else {
 				err = logic.InsertPendingUser(&models.User{