Przeglądaj źródła

change to invite code param

abhishek9686 1 rok temu
rodzic
commit
076fd6302e
2 zmienionych plików z 21 dodań i 15 usunięć
  1. 3 3
      controllers/user.go
  2. 18 12
      email/email.go

+ 3 - 3
controllers/user.go

@@ -1083,7 +1083,7 @@ func deleteAllPendingUsers(w http.ResponseWriter, r *http.Request) {
 //		200: ReturnSuccessResponse
 func userInviteSignUp(w http.ResponseWriter, r *http.Request) {
 	email, _ := url.QueryUnescape(r.URL.Query().Get("email"))
-	code, _ := url.QueryUnescape(r.URL.Query().Get("code"))
+	code, _ := url.QueryUnescape(r.URL.Query().Get("invite_code"))
 	in, err := logic.GetUserInvite(email)
 	if err != nil {
 		logger.Log(0, "failed to fetch users: ", err.Error())
@@ -1151,7 +1151,7 @@ func userInviteSignUp(w http.ResponseWriter, r *http.Request) {
 //		200: ReturnSuccessResponse
 func userInviteVerify(w http.ResponseWriter, r *http.Request) {
 	email, _ := url.QueryUnescape(r.URL.Query().Get("email"))
-	code, _ := url.QueryUnescape(r.URL.Query().Get("code"))
+	code, _ := url.QueryUnescape(r.URL.Query().Get("invite_code"))
 	err := logic.ValidateAndApproveUserInvite(email, code)
 	if err != nil {
 		logger.Log(0, "failed to fetch users: ", err.Error())
@@ -1209,7 +1209,7 @@ func inviteUsers(w http.ResponseWriter, r *http.Request) {
 			Groups:     inviteReq.Groups,
 			InviteCode: logic.RandomString(8),
 		}
-		u, err := url.Parse(fmt.Sprintf("%s/invite?email=%s&code=%s",
+		u, err := url.Parse(fmt.Sprintf("%s/invite?email=%s&invite_code=%s",
 			servercfg.GetFrontendURL(), url.QueryEscape(invite.Email), url.QueryEscape(invite.InviteCode)))
 		if err != nil {
 			slog.Error("failed to parse to invite url", "error", err)

+ 18 - 12
email/email.go

@@ -8,11 +8,28 @@ import (
 
 type EmailSenderType string
 
+var client EmailSender
+
 const (
 	Smtp   EmailSenderType = "smtp"
 	Resend EmailSenderType = "resend"
 )
 
+func init() {
+	switch EmailSenderType(servercfg.EmailSenderType()) {
+	case Smtp:
+		client = &SmtpSender{
+			SmtpHost:    servercfg.GetSmtpHost(),
+			SmtpPort:    servercfg.GetSmtpPort(),
+			SenderEmail: servercfg.GetSenderEmail(),
+			SenderPass:  servercfg.GetEmaiSenderAuth(),
+		}
+	case Resend:
+		client = NewResendEmailSenderFromConfig()
+	}
+	client = GetClient()
+}
+
 // EmailSender - an interface for sending emails based on notifications and mail templates
 type EmailSender interface {
 	// SendEmail - sends an email based on a context, notification and mail template
@@ -32,16 +49,5 @@ type Notification struct {
 }
 
 func GetClient() (e EmailSender) {
-	switch EmailSenderType(servercfg.EmailSenderType()) {
-	case Smtp:
-		e = &SmtpSender{
-			SmtpHost:    servercfg.GetSmtpHost(),
-			SmtpPort:    servercfg.GetSmtpPort(),
-			SenderEmail: servercfg.GetSenderEmail(),
-			SenderPass:  servercfg.GetEmaiSenderAuth(),
-		}
-	case Resend:
-		e = NewResendEmailSenderFromConfig()
-	}
-	return
+	return client
 }