feat: add changes from portal

Author: fiftin

api/auth_verify.go

@@ -10,6 +10,7 @@ import (
 	"github.com/semaphoreui/semaphore/db"
 	"github.com/semaphoreui/semaphore/util"
 	"github.com/semaphoreui/semaphore/util/mailer"
+	log "github.com/sirupsen/logrus"
 )
 
 //go:embed templates/*.tmpl
@@ -80,6 +81,13 @@ func sendEmailVerificationCode(code string, email string) error {
 		return err
 	}
 
+	content := body.String()
+
+	log.WithFields(log.Fields{
+		"email":   email,
+		"context": "send_email_verification_code",
+	}).Info("send email otp code")
+
 	err = mailer.Send(
 		util.Config.EmailSecure,
 		util.Config.EmailTls,
@@ -89,10 +97,19 @@ func sendEmailVerificationCode(code string, email string) error {
 		util.Config.EmailPassword,
 		util.Config.EmailSender,
 		email,
-		"Email Verification Code",
-		body.String(),
+		"Email verification code",
+		content,
 	)
 
+	if err != nil {
+
+		log.WithError(err).WithFields(log.Fields{
+			"email":   email,
+			"context": "send_email_verification_code",
+		}).Error("failed to send email verification code")
+
+	}
+
 	return err
 }
 

api/login.go

@@ -158,9 +158,11 @@ func createSession(w http.ResponseWriter, r *http.Request, user db.User, oidc bo
 	switch {
 	case user.Totp != nil && util.Config.Auth.Totp.Enabled:
 		verificationMethod = db.SessionVerificationTotp
+
 	case util.Config.Auth.Email.Enabled && (!util.Config.Auth.Email.DisableForOidc || !oidc):
-		code := random.Number(6)
-		_, err = helpers.Store(r).AddEmailOtpVerification(user.ID, code)
+
+		err = newEmailOtp(user.ID, user.Email, helpers.Store(r))
+
 		if err != nil {
 			log.WithError(err).WithFields(log.Fields{
 				"user_id": user.ID,

api/login_email.go

@@ -0,0 +1,92 @@
+package api
+
+import (
+	"errors"
+	"github.com/semaphoreui/semaphore/api/helpers"
+	"github.com/semaphoreui/semaphore/db"
+	"github.com/semaphoreui/semaphore/pkg/random"
+	log "github.com/sirupsen/logrus"
+	"net/http"
+)
+
+func newEmailOtp(userID int, userEmail string, store db.Store) error {
+	code := random.Number(6)
+	_, err := store.AddEmailOtpVerification(userID, code)
+
+	if err != nil {
+		return err
+	}
+	err = sendEmailVerificationCode(code, userEmail)
+	return err
+}
+
+func resendEmailOtp(w http.ResponseWriter, r *http.Request) {
+
+	session, ok := getSession(r)
+
+	if !ok {
+		w.WriteHeader(http.StatusUnauthorized)
+		return
+	}
+
+	user, err := helpers.Store(r).GetUser(session.UserID)
+
+	if err != nil {
+		helpers.WriteErrorStatus(w, "User not found", http.StatusUnauthorized)
+		return
+	}
+
+	err = newEmailOtp(session.UserID, user.Email, helpers.Store(r))
+	if err != nil {
+		log.WithError(err).WithFields(log.Fields{
+			"user_id": session.UserID,
+			"context": "resend_email_otp",
+		}).Error("Failed to add email otp verification")
+		helpers.WriteErrorStatus(w, "Failed to create email OTP verification", http.StatusInternalServerError)
+		return
+	}
+}
+
+func loginEmail(w http.ResponseWriter, r *http.Request) {
+
+	var email struct {
+		Email string `json:"email" binding:"required"`
+	}
+	if !helpers.Bind(w, r, &email) {
+		return
+	}
+
+	store := helpers.Store(r)
+
+	user, err := store.GetUserByLoginOrEmail("", email.Email)
+
+	if err != nil {
+		if errors.Is(err, db.ErrNotFound) {
+			user, err = store.CreateUserWithoutPassword(db.User{
+				Email:    email.Email,
+				External: true,
+				Alert:    true,
+				Pro:      true,
+				Name:     getRandomProfileName(),
+				Username: getRandomUsername(),
+			})
+		} else {
+			var validationError *db.ValidationError
+			switch {
+			case errors.As(err, &validationError):
+				// TODO: Return more informative error code.
+			}
+
+			log.WithError(err).WithFields(log.Fields{
+				"email":   email.Email,
+				"context": "loginEmail",
+			}).Error("Failed to get or create user by email")
+			w.WriteHeader(http.StatusInternalServerError)
+			return
+		}
+	}
+
+	createSession(w, r, user, false)
+
+	w.WriteHeader(http.StatusNoContent)
+}

api/router.go

@@ -143,7 +143,8 @@ func Route(
 	publicAPIRouter.Use(StoreMiddleware, JSONMiddleware)
 
 	publicAPIRouter.HandleFunc("/auth/login", login).Methods("GET", "POST")
-	publicAPIRouter.HandleFunc("/auth/verify/email", startEmailVerification).Methods("POST")
+	publicAPIRouter.HandleFunc("/auth/login/email", loginEmail).Methods("GET", "POST")
+	publicAPIRouter.HandleFunc("/auth/login/email/resend", resendEmailOtp).Methods("GET", "POST")
 	publicAPIRouter.HandleFunc("/auth/verify", verifySession).Methods("POST")
 	publicAPIRouter.HandleFunc("/auth/recovery", recoverySession).Methods("POST")