totole/services
1
0
Fork 0
mirror of https://github.com/kevin-DL/services.git synced 2026-01-12 03:05:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix the verification emails (#366)

Browse Source 
* fix the verification emails

* fix typo

* switch to token only
This commit is contained in:
Asim Aslam
2022-02-09 21:51:47 +00:00
committed by GitHub
parent 1ea9b6f373
commit f232eab84e
5 changed files with 229 additions and 223 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
user/handler/handler.go
View File

@@ -253,43 +253,18 @@ func (s *User) ReadSession(ctx context.Context, req *pb.ReadSessionRequest, rsp
}
func (s *User) VerifyEmail(ctx context.Context, req *pb.VerifyEmailRequest, rsp *pb.VerifyEmailResponse) error {
if len(req.Email) == 0 {
return errors.BadRequest("user.verifyemail", "missing email")
}
if len(req.Token) == 0 {
return errors.BadRequest("user.verifytoken", "missing token")
}
// check the token exists
email, err := s.domain.ReadToken(ctx, req.Email, req.Token)
tenant, email, err := s.domain.ReadToken(ctx, req.Token)
if err != nil {
return err
}
// validate the code, e.g its an OTP token and hasn't expired
resp, err := s.Otp.Validate(ctx, &otp.ValidateRequest{
Id: req.Email,
Code: req.Token,
})
if err != nil {
return err
}
// check if the code is actually valid
if !resp.Success {
return errors.BadRequest("user.resetpassword", "invalid code")
}
// mark user as verified
user, err := s.domain.SearchByEmail(ctx, email)
if err != nil {
return err
}
user.Verified = true
// update the user
return s.domain.Update(ctx, user)
return s.domain.MarkVerified(ctx, tenant, email)
}
func (s *User) SendVerificationEmail(ctx context.Context, req *pb.SendVerificationEmailRequest, rsp *pb.SendVerificationEmailResponse) error {
@@ -303,18 +278,11 @@ func (s *User) SendVerificationEmail(ctx context.Context, req *pb.SendVerificati
return err
}
// generate a new OTP code
resp, err := s.Otp.Generate(ctx, &otp.GenerateRequest{
Expiry: 900,
Id: req.Email,
})
if err != nil {
return err
}
// generate random token
token := random(256)
// generate/save a token for verification
token, err := s.domain.CreateToken(ctx, req.Email, resp.Code)
err = s.domain.CreateToken(ctx, req.Email, token)
if err != nil {
return err
}