totole/services
1
0
Fork 0
mirror of https://github.com/kevin-DL/services.git synced 2026-01-16 13:04:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

clean up password reset code (#375)

Browse Source
This commit is contained in:
Dominic Wong
2022-02-16 09:22:39 +00:00
committed by GitHub
parent b27e03baa1
commit f1967eaa4b
5 changed files with 232 additions and 227 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
otp/handler/otp.go
View File

@@ -30,7 +30,7 @@ func (e *Otp) Generate(ctx context.Context, req *pb.GenerateRequest, rsp *pb.Gen
}
// check if a key exists for the user
okey := new(otpKey)
var okey otpKey
if req.Expiry <= 0 {
req.Expiry = 60
@@ -40,7 +40,7 @@ func (e *Otp) Generate(ctx context.Context, req *pb.GenerateRequest, rsp *pb.Gen
req.Size = 6
}
if _, err := cache.Context(ctx).Get("otp:"+req.Id, &okey); err != nil || okey == nil {
if _, err := cache.Context(ctx).Get("otp:"+req.Id, &okey); err != nil {
// generate a key
key, err := totp.Generate(totp.GenerateOpts{
Issuer: "Micro",
@@ -53,12 +53,12 @@ func (e *Otp) Generate(ctx context.Context, req *pb.GenerateRequest, rsp *pb.Gen
return errors.InternalServerError("otp.generate", "failed to generate code")
}
okey = &otpKey{
okey = otpKey{
Secret: key.Secret(),
Expiry: uint(req.Expiry),
}
if err := cache.Context(ctx).Set("otp:"+req.Id, okey, time.Now().Add(time.Second*time.Duration(req.Expiry))); err != nil {
if err := cache.Context(ctx).Set("otp:"+req.Id, okey, time.Time{}); err != nil {
logger.Error("Failed to store secret: %v", err)
return errors.InternalServerError("otp.generate", "failed to generate code")
}
@@ -78,11 +78,11 @@ func (e *Otp) Generate(ctx context.Context, req *pb.GenerateRequest, rsp *pb.Gen
return errors.InternalServerError("otp.generate", "failed to generate code: %v", err)
}
// we have to replaced the cached value if the expiry is different
// we have to replace the cached value if the expiry is different
if v := uint(req.Expiry); v != okey.Expiry {
okey.Expiry = v
if err := cache.Context(ctx).Set("otp:"+req.Id, okey, time.Now().Add(time.Minute*5)); err != nil {
if err := cache.Context(ctx).Set("otp:"+req.Id, okey, time.Time{}); err != nil {
logger.Error("Failed to store secret: %v", err)
return errors.InternalServerError("otp.generate", "failed to generate code")
}
@@ -133,7 +133,7 @@ func (e *Otp) DeleteData(ctx context.Context, request *adminpb.DeleteDataRequest
return err
}
if len(request.TenantId) < 10 { // deliberate length check so we don't delete all the things
if len(request.TenantId) < 10 { // deliberate length check, so we don't delete all the things
return errors.BadRequest(method, "Missing tenant ID")
}