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

refactor nkode-core

Browse Source
This commit is contained in:
Donovan
2025-01-21 01:19:27 -06:00
parent 3ed12cee68
commit c5e95239b5
46 changed files with 318 additions and 434 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
internal/api/handler.go
View File

@@ -5,16 +5,17 @@ import (
"errors"
"github.com/google/uuid"
"go-nkode/config"
"go-nkode/internal/entities"
"go-nkode/internal/models"
"go-nkode/internal/security"
"go-nkode/pkg/nkode-core/api"
"go-nkode/pkg/nkode-core/entities"
"go-nkode/pkg/nkode-core/security"
"log"
"net/http"
"strings"
)
type NKodeHandler struct {
Api NKodeAPI
Api api.NKodeAPI
}
const (
@@ -122,12 +123,12 @@ func (h *NKodeHandler) GenerateSignupResetInterfaceHandler(w http.ResponseWriter
badRequest(w, malformedCustomerId)
return
}
userEmail, err := models.ParseEmail(signupResetPost.UserEmail)
userEmail, err := entities.ParseEmail(signupResetPost.UserEmail)
if err != nil {
badRequest(w, malformedUserEmail)
return
}
resp, err := h.Api.GenerateSignupResetInterface(userEmail, models.CustomerId(customerId), kp, signupResetPost.Reset)
resp, err := h.Api.GenerateSignupResetInterface(userEmail, entities.CustomerId(customerId), kp, signupResetPost.Reset)
if err != nil {
handleError(w, err)
return
@@ -156,7 +157,7 @@ func (h *NKodeHandler) SetNKodeHandler(w http.ResponseWriter, r *http.Request) {
badRequest(w, malformedSessionId)
return
}
confirmInterface, err := h.Api.SetNKode(models.CustomerId(customerId), models.SessionId(sessionId), setNKodePost.KeySelection)
confirmInterface, err := h.Api.SetNKode(entities.CustomerId(customerId), entities.SessionId(sessionId), setNKodePost.KeySelection)
if err != nil {
handleError(w, err)
return
@@ -186,7 +187,7 @@ func (h *NKodeHandler) ConfirmNKodeHandler(w http.ResponseWriter, r *http.Reques
badRequest(w, malformedSessionId)
return
}
if err = h.Api.ConfirmNKode(models.CustomerId(customerId), models.SessionId(sessionId), confirmNKodePost.KeySelection); err != nil {
if err = h.Api.ConfirmNKode(entities.CustomerId(customerId), entities.SessionId(sessionId), confirmNKodePost.KeySelection); err != nil {
handleError(w, err)
return
}
@@ -208,11 +209,11 @@ func (h *NKodeHandler) GetLoginInterfaceHandler(w http.ResponseWriter, r *http.R
badRequest(w, malformedCustomerId)
return
}
userEmail, err := models.ParseEmail(loginInterfacePost.UserEmail)
userEmail, err := entities.ParseEmail(loginInterfacePost.UserEmail)
if err != nil {
badRequest(w, malformedUserEmail)
}
loginInterface, err := h.Api.GetLoginInterface(userEmail, models.CustomerId(customerId))
loginInterface, err := h.Api.GetLoginInterface(userEmail, entities.CustomerId(customerId))
if err != nil {
handleError(w, err)
return
@@ -236,12 +237,12 @@ func (h *NKodeHandler) LoginHandler(w http.ResponseWriter, r *http.Request) {
badRequest(w, malformedCustomerId)
return
}
userEmail, err := models.ParseEmail(loginPost.UserEmail)
userEmail, err := entities.ParseEmail(loginPost.UserEmail)
if err != nil {
badRequest(w, malformedUserEmail)
return
}
jwtTokens, err := h.Api.Login(models.CustomerId(customerId), userEmail, loginPost.KeySelection)
jwtTokens, err := h.Api.Login(entities.CustomerId(customerId), userEmail, loginPost.KeySelection)
if err != nil {
handleError(w, err)
return
@@ -265,7 +266,7 @@ func (h *NKodeHandler) RenewAttributesHandler(w http.ResponseWriter, r *http.Req
badRequest(w, malformedCustomerId)
return
}
if err = h.Api.RenewAttributes(models.CustomerId(customerId)); err != nil {
if err = h.Api.RenewAttributes(entities.CustomerId(customerId)); err != nil {
handleError(w, err)
return
}
@@ -286,7 +287,7 @@ func (h *NKodeHandler) RandomSvgInterfaceHandler(w http.ResponseWriter, r *http.
respBody := models.RandomSvgInterfaceResp{
Svgs: svgs,
Colors: models.SetColors,
Colors: entities.SetColors,
}
marshalAndWriteBytes(w, respBody)
@@ -308,13 +309,13 @@ func (h *NKodeHandler) RefreshTokenHandler(w http.ResponseWriter, r *http.Reques
badRequest(w, malformedCustomerId)
return
}
userEmail, err := models.ParseEmail(refreshClaims.Subject)
userEmail, err := entities.ParseEmail(refreshClaims.Subject)
if err != nil {
badRequest(w, malformedUserEmail)
log.Println(err)
return
}
accessToken, err := h.Api.RefreshToken(userEmail, models.CustomerId(customerId), refreshToken)
accessToken, err := h.Api.RefreshToken(userEmail, entities.CustomerId(customerId), refreshToken)
if err != nil {
handleError(w, err)
@@ -340,13 +341,13 @@ func (h *NKodeHandler) ResetNKode(w http.ResponseWriter, r *http.Request) {
return
}
userEmail, err := models.ParseEmail(resetNKodePost.UserEmail)
userEmail, err := entities.ParseEmail(resetNKodePost.UserEmail)
if err != nil {
badRequest(w, malformedUserEmail)
return
}
if err = h.Api.ResetNKode(userEmail, models.CustomerId(customerId)); err != nil {
if err = h.Api.ResetNKode(userEmail, entities.CustomerId(customerId)); err != nil {
internalServerError(w)
log.Println(err)
return