replace Id with ID
This commit is contained in:
@@ -36,7 +36,7 @@ func NewNKodeAPI(repo repository.CustomerUserRepository, queue *email.Queue) NKo
|
||||
}
|
||||
}
|
||||
|
||||
func (n *NKodeAPI) CreateNewCustomer(nkodePolicy entities.NKodePolicy) (*entities.CustomerId, error) {
|
||||
func (n *NKodeAPI) CreateNewCustomer(nkodePolicy entities.NKodePolicy) (*entities.CustomerID, error) {
|
||||
newCustomer, err := entities.NewCustomer(nkodePolicy)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
@@ -46,22 +46,22 @@ func (n *NKodeAPI) CreateNewCustomer(nkodePolicy entities.NKodePolicy) (*entitie
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return &newCustomer.Id, nil
|
||||
return &newCustomer.ID, nil
|
||||
}
|
||||
|
||||
func (n *NKodeAPI) CreateCustomerWithID(id entities.CustomerId, nkodePolicy entities.NKodePolicy) error {
|
||||
func (n *NKodeAPI) CreateCustomerWithID(id entities.CustomerID, nkodePolicy entities.NKodePolicy) error {
|
||||
newCustomer, err := entities.NewCustomer(nkodePolicy)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
newCustomer.Id = id
|
||||
newCustomer.ID = id
|
||||
if err = n.repo.CreateCustomer(*newCustomer); err != nil {
|
||||
return err
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func (n *NKodeAPI) GenerateSignupResetInterface(userEmail entities.UserEmail, customerId entities.CustomerId, kp entities.KeypadDimension, reset bool) (*entities.SignupResetInterface, error) {
|
||||
func (n *NKodeAPI) GenerateSignupResetInterface(userEmail entities.UserEmail, customerId entities.CustomerID, kp entities.KeypadDimension, reset bool) (*entities.SignupResetInterface, error) {
|
||||
user, err := n.repo.GetUser(userEmail, customerId)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
@@ -78,23 +78,23 @@ func (n *NKodeAPI) GenerateSignupResetInterface(userEmail entities.UserEmail, cu
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if err := n.signupSessionCache.Add(signupSession.Id.String(), *signupSession, sessionExpiration); err != nil {
|
||||
if err := n.signupSessionCache.Add(signupSession.ID.String(), *signupSession, sessionExpiration); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
svgInterface, err := n.repo.GetSvgStringInterface(signupSession.LoginUserInterface.SvgId)
|
||||
svgInterface, err := n.repo.GetSvgStringInterface(signupSession.LoginUserInterface.SvgID)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
resp := entities.SignupResetInterface{
|
||||
UserIdxInterface: signupSession.SetIdxInterface,
|
||||
SvgInterface: svgInterface,
|
||||
SessionId: uuid.UUID(signupSession.Id).String(),
|
||||
SessionID: uuid.UUID(signupSession.ID).String(),
|
||||
Colors: signupSession.Colors,
|
||||
}
|
||||
return &resp, nil
|
||||
}
|
||||
|
||||
func (n *NKodeAPI) SetNKode(customerId entities.CustomerId, sessionId entities.SessionId, keySelection entities.KeySelection) (entities.IdxInterface, error) {
|
||||
func (n *NKodeAPI) SetNKode(customerId entities.CustomerID, sessionId entities.SessionID, keySelection entities.KeySelection) (entities.IdxInterface, error) {
|
||||
_, err := n.repo.GetCustomer(customerId)
|
||||
|
||||
if err != nil {
|
||||
@@ -118,7 +118,7 @@ func (n *NKodeAPI) SetNKode(customerId entities.CustomerId, sessionId entities.S
|
||||
return confirmInterface, nil
|
||||
}
|
||||
|
||||
func (n *NKodeAPI) ConfirmNKode(customerId entities.CustomerId, sessionId entities.SessionId, keySelection entities.KeySelection) error {
|
||||
func (n *NKodeAPI) ConfirmNKode(customerId entities.CustomerID, sessionId entities.SessionID, keySelection entities.KeySelection) error {
|
||||
session, exists := n.signupSessionCache.Get(sessionId.String())
|
||||
if !exists {
|
||||
log.Printf("session id does not exist %s", sessionId)
|
||||
@@ -149,11 +149,11 @@ func (n *NKodeAPI) ConfirmNKode(customerId entities.CustomerId, sessionId entiti
|
||||
} else {
|
||||
err = n.repo.WriteNewUser(*user)
|
||||
}
|
||||
n.signupSessionCache.Delete(userSession.Id.String())
|
||||
n.signupSessionCache.Delete(userSession.ID.String())
|
||||
return err
|
||||
}
|
||||
|
||||
func (n *NKodeAPI) GetLoginInterface(userEmail entities.UserEmail, customerId entities.CustomerId) (*entities.LoginInterface, error) {
|
||||
func (n *NKodeAPI) GetLoginInterface(userEmail entities.UserEmail, customerId entities.CustomerID) (*entities.LoginInterface, error) {
|
||||
user, err := n.repo.GetUser(userEmail, customerId)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
@@ -162,7 +162,7 @@ func (n *NKodeAPI) GetLoginInterface(userEmail entities.UserEmail, customerId en
|
||||
log.Printf("user %s for customer %s dne", userEmail, customerId)
|
||||
return nil, config.ErrUserForCustomerDNE
|
||||
}
|
||||
svgInterface, err := n.repo.GetSvgStringInterface(user.Interface.SvgId)
|
||||
svgInterface, err := n.repo.GetSvgStringInterface(user.Interface.SvgID)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
@@ -176,7 +176,7 @@ func (n *NKodeAPI) GetLoginInterface(userEmail entities.UserEmail, customerId en
|
||||
return &resp, nil
|
||||
}
|
||||
|
||||
func (n *NKodeAPI) Login(customerId entities.CustomerId, userEmail entities.UserEmail, keySelection entities.KeySelection) (*security.AuthenticationTokens, error) {
|
||||
func (n *NKodeAPI) Login(customerId entities.CustomerID, userEmail entities.UserEmail, keySelection entities.KeySelection) (*security.AuthenticationTokens, error) {
|
||||
customer, err := n.repo.GetCustomer(customerId)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
@@ -205,19 +205,19 @@ func (n *NKodeAPI) Login(customerId entities.CustomerId, userEmail entities.User
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if err = n.repo.UpdateUserRefreshToken(user.Id, jwtToken.RefreshToken); err != nil {
|
||||
if err = n.repo.UpdateUserRefreshToken(user.ID, jwtToken.RefreshToken); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if err = user.Interface.LoginShuffle(); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if err = n.repo.UpdateUserInterface(user.Id, user.Interface); err != nil {
|
||||
if err = n.repo.UpdateUserInterface(user.ID, user.Interface); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return &jwtToken, nil
|
||||
}
|
||||
|
||||
func (n *NKodeAPI) RenewAttributes(customerId entities.CustomerId) error {
|
||||
func (n *NKodeAPI) RenewAttributes(customerId entities.CustomerID) error {
|
||||
return n.repo.Renew(customerId)
|
||||
}
|
||||
|
||||
@@ -225,7 +225,7 @@ func (n *NKodeAPI) RandomSvgInterface() ([]string, error) {
|
||||
return n.repo.RandomSvgInterface(entities.KeypadMax)
|
||||
}
|
||||
|
||||
func (n *NKodeAPI) RefreshToken(userEmail entities.UserEmail, customerId entities.CustomerId, refreshToken string) (string, error) {
|
||||
func (n *NKodeAPI) RefreshToken(userEmail entities.UserEmail, customerId entities.CustomerID, refreshToken string) (string, error) {
|
||||
user, err := n.repo.GetUser(userEmail, customerId)
|
||||
if err != nil {
|
||||
return "", err
|
||||
@@ -248,7 +248,7 @@ func (n *NKodeAPI) RefreshToken(userEmail entities.UserEmail, customerId entitie
|
||||
return security.EncodeAndSignClaims(newAccessClaims)
|
||||
}
|
||||
|
||||
func (n *NKodeAPI) ForgotNKode(userEmail entities.UserEmail, customerId entities.CustomerId) error {
|
||||
func (n *NKodeAPI) ForgotNKode(userEmail entities.UserEmail, customerId entities.CustomerID) error {
|
||||
user, err := n.repo.GetUser(userEmail, customerId)
|
||||
if err != nil {
|
||||
return fmt.Errorf("error getting user in rest nkode %v", err)
|
||||
@@ -278,7 +278,7 @@ func (n *NKodeAPI) ForgotNKode(userEmail entities.UserEmail, customerId entities
|
||||
return nil
|
||||
}
|
||||
|
||||
func (n *NKodeAPI) Signout(userEmail entities.UserEmail, customerId entities.CustomerId) error {
|
||||
func (n *NKodeAPI) Signout(userEmail entities.UserEmail, customerId entities.CustomerID) error {
|
||||
user, err := n.repo.GetUser(userEmail, customerId)
|
||||
if err != nil {
|
||||
return err
|
||||
@@ -287,7 +287,7 @@ func (n *NKodeAPI) Signout(userEmail entities.UserEmail, customerId entities.Cus
|
||||
log.Printf("user %s for customer %s dne", userEmail, customerId)
|
||||
return config.ErrUserForCustomerDNE
|
||||
}
|
||||
if err = n.repo.UpdateUserRefreshToken(user.Id, ""); err != nil {
|
||||
if err = n.repo.UpdateUserRefreshToken(user.ID, ""); err != nil {
|
||||
return err
|
||||
}
|
||||
return nil
|
||||
|
||||
Reference in New Issue
Block a user