implement reset nkode
This commit is contained in:
@@ -34,12 +34,12 @@ func (n *NKodeAPI) CreateNewCustomer(nkodePolicy NKodePolicy, id *CustomerId) (*
|
||||
return &newCustomer.Id, nil
|
||||
}
|
||||
|
||||
func (n *NKodeAPI) GenerateSignupInterface(userEmail Email, customerId CustomerId, kp KeypadDimension) (*GenerateSignupInterfaceResp, error) {
|
||||
func (n *NKodeAPI) GenerateSignupResetInterface(userEmail Email, customerId CustomerId, kp KeypadDimension, reset bool) (*GenerateSignupResetInterfaceResp, error) {
|
||||
svgIdxInterface, err := n.Db.RandomSvgIdxInterface(kp)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
signupSession, err := NewSignupSession(userEmail, kp, customerId, svgIdxInterface)
|
||||
signupSession, err := NewSignupResetSession(userEmail, kp, customerId, svgIdxInterface, reset)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
@@ -48,7 +48,7 @@ func (n *NKodeAPI) GenerateSignupInterface(userEmail Email, customerId CustomerI
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
resp := GenerateSignupInterfaceResp{
|
||||
resp := GenerateSignupResetInterfaceResp{
|
||||
UserIdxInterface: signupSession.SetIdxInterface,
|
||||
SvgInterface: svgInterface,
|
||||
SessionId: uuid.UUID(signupSession.Id).String(),
|
||||
@@ -95,7 +95,11 @@ func (n *NKodeAPI) ConfirmNKode(customerId CustomerId, sessionId SessionId, keyS
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
err = n.Db.WriteNewUser(*user)
|
||||
if session.Reset {
|
||||
err = n.Db.UpdateUserNKode(*user)
|
||||
} else {
|
||||
err = n.Db.WriteNewUser(*user)
|
||||
}
|
||||
delete(n.SignupSessions, session.Id)
|
||||
return err
|
||||
}
|
||||
@@ -105,6 +109,9 @@ func (n *NKodeAPI) GetLoginInterface(userEmail Email, customerId CustomerId) (*G
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if user == nil {
|
||||
return nil, errors.New(fmt.Sprintf("user %s for customer %s dne", userEmail, customerId))
|
||||
}
|
||||
err = user.Interface.PartialInterfaceShuffle()
|
||||
if err != nil {
|
||||
return nil, err
|
||||
@@ -126,14 +133,17 @@ func (n *NKodeAPI) GetLoginInterface(userEmail Email, customerId CustomerId) (*G
|
||||
return &resp, nil
|
||||
}
|
||||
|
||||
func (n *NKodeAPI) Login(customerId CustomerId, userEmail Email, keySelection KeySelection) (*JwtTokens, error) {
|
||||
func (n *NKodeAPI) Login(customerId CustomerId, userEmail Email, keySelection KeySelection) (*AuthenticationTokens, error) {
|
||||
customer, err := n.Db.GetCustomer(customerId)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
user, err := n.Db.GetUser(userEmail, customerId)
|
||||
if err != nil {
|
||||
return nil, errors.New(fmt.Sprintf("user dne %s", userEmail))
|
||||
return nil, err
|
||||
}
|
||||
if user == nil {
|
||||
return nil, errors.New(fmt.Sprintf("user %s for customer %s dne", userEmail, customerId))
|
||||
}
|
||||
passcode, err := ValidKeyEntry(*user, *customer, keySelection)
|
||||
if err != nil {
|
||||
@@ -146,7 +156,7 @@ func (n *NKodeAPI) Login(customerId CustomerId, userEmail Email, keySelection Ke
|
||||
return nil, err
|
||||
}
|
||||
}
|
||||
jwtToken, err := NewJwtTokens(string(user.Email))
|
||||
jwtToken, err := NewAuthenticationTokens(string(user.Email), customerId)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
@@ -174,6 +184,9 @@ func (n *NKodeAPI) RefreshToken(userEmail Email, customerId CustomerId, refreshT
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
if user == nil {
|
||||
return "", errors.New(fmt.Sprintf("user %s for customer %s dne", userEmail, customerId))
|
||||
}
|
||||
if user.RefreshToken != refreshToken {
|
||||
return "", errors.New("refresh token is invalid")
|
||||
}
|
||||
@@ -184,6 +197,17 @@ func (n *NKodeAPI) RefreshToken(userEmail Email, customerId CustomerId, refreshT
|
||||
if err = ClaimExpired(*refreshClaims); err != nil {
|
||||
return "", err
|
||||
}
|
||||
newAccessClaims := NewAccessClaim(string(userEmail))
|
||||
newAccessClaims := NewAccessClaim(string(userEmail), customerId)
|
||||
return EncodeAndSignClaims(newAccessClaims)
|
||||
}
|
||||
|
||||
func (n *NKodeAPI) ResetNKode(userEmail Email, customerId CustomerId) error {
|
||||
user, err := n.Db.GetUser(userEmail, customerId)
|
||||
if err != nil {
|
||||
return fmt.Errorf("error getting user in rest nkode %v", err)
|
||||
}
|
||||
if user == nil {
|
||||
return nil
|
||||
}
|
||||
return ResetUserEmail(userEmail, customerId)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user