dkelly/go-nkode
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

implement Email as username

Browse Source
This commit is contained in:
Donovan
2024-09-24 16:56:14 -05:00
parent a7235941e7
commit 1b133edd78
11 changed files with 89 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
core/nkode_api.go
View File

@@ -34,12 +34,12 @@ func (n *NKodeAPI) CreateNewCustomer(nkodePolicy NKodePolicy, id *CustomerId) (*
return &newCustomer.Id, nil
}
func (n *NKodeAPI) GenerateSignupInterface(username Username, customerId CustomerId, kp KeypadDimension) (*GenerateSignupInterfaceResp, error) {
func (n *NKodeAPI) GenerateSignupInterface(userEmail Email, customerId CustomerId, kp KeypadDimension) (*GenerateSignupInterfaceResp, error) {
svgIdxInterface, err := n.Db.RandomSvgIdxInterface(kp)
if err != nil {
return nil, err
}
signupSession, err := NewSignupSession(username, kp, customerId, svgIdxInterface)
signupSession, err := NewSignupSession(userEmail, kp, customerId, svgIdxInterface)
if err != nil {
return nil, err
}
@@ -91,7 +91,7 @@ func (n *NKodeAPI) ConfirmNKode(customerId CustomerId, sessionId SessionId, keyS
if err != nil {
return err
}
user, err := NewUser(*customer, session.Username, passcode, session.LoginUserInterface, session.Kp)
user, err := NewUser(*customer, string(session.UserEmail), passcode, session.LoginUserInterface, session.Kp)
if err != nil {
return err
}
@@ -100,8 +100,8 @@ func (n *NKodeAPI) ConfirmNKode(customerId CustomerId, sessionId SessionId, keyS
return err
}
func (n *NKodeAPI) GetLoginInterface(username Username, customerId CustomerId) (*GetLoginInterfaceResp, error) {
user, err := n.Db.GetUser(username, customerId)
func (n *NKodeAPI) GetLoginInterface(userEmail Email, customerId CustomerId) (*GetLoginInterfaceResp, error) {
user, err := n.Db.GetUser(userEmail, customerId)
if err != nil {
return nil, err
}
@@ -126,14 +126,14 @@ func (n *NKodeAPI) GetLoginInterface(username Username, customerId CustomerId) (
return &resp, nil
}
func (n *NKodeAPI) Login(customerId CustomerId, username Username, keySelection KeySelection) (*JwtTokens, error) {
func (n *NKodeAPI) Login(customerId CustomerId, userEmail Email, keySelection KeySelection) (*JwtTokens, error) {
customer, err := n.Db.GetCustomer(customerId)
if err != nil {
return nil, err
}
user, err := n.Db.GetUser(username, customerId)
user, err := n.Db.GetUser(userEmail, customerId)
if err != nil {
return nil, errors.New(fmt.Sprintf("user dne %s", username))
return nil, errors.New(fmt.Sprintf("user dne %s", userEmail))
}
passcode, err := ValidKeyEntry(*user, *customer, keySelection)
if err != nil {
@@ -146,7 +146,7 @@ func (n *NKodeAPI) Login(customerId CustomerId, username Username, keySelection
return nil, err
}
}
jwtToken, err := NewJwtTokens(string(user.Username))
jwtToken, err := NewJwtTokens(string(user.Email))
if err != nil {
return nil, err
}
@@ -169,8 +169,8 @@ func (n *NKodeAPI) GetSvgStringInterface(svgId SvgIdInterface) ([]string, error)
return n.Db.GetSvgStringInterface(svgId)
}
func (n *NKodeAPI) RefreshToken(username Username, customerId CustomerId, refreshToken string) (string, error) {
user, err := n.Db.GetUser(username, customerId)
func (n *NKodeAPI) RefreshToken(userEmail Email, customerId CustomerId, refreshToken string) (string, error) {
user, err := n.Db.GetUser(userEmail, customerId)
if err != nil {
return "", err
}
@@ -184,6 +184,6 @@ func (n *NKodeAPI) RefreshToken(username Username, customerId CustomerId, refres
if err = ClaimExpired(*refreshClaims); err != nil {
return "", err
}
newAccessClaims := NewAccessClaim(string(username))
newAccessClaims := NewAccessClaim(string(userEmail))
return EncodeAndSignClaims(newAccessClaims)
}