tsk-20: Obtain refresh token (#24)
Closes #20 Reviewed-on: phoenix/textsender-auth#24 Co-authored-by: phoenix <kundeng00@pm.me> Co-committed-by: phoenix <kundeng00@pm.me>
This commit is contained in:
@@ -5,3 +5,4 @@ const Register = "/api/v1/register"
|
||||
const Login = "/api/v1/login"
|
||||
const CreateServiceUser = "/api/v1/service/register"
|
||||
const LoginServiceUser = "/api/v1/service/login"
|
||||
const TokenRefresh = "/api/v1/token/refresh"
|
||||
|
||||
@@ -0,0 +1,100 @@
|
||||
package handler
|
||||
|
||||
import (
|
||||
"net/http"
|
||||
|
||||
"git.kundeng.us/phoenix/textsender-models/pkg/token"
|
||||
|
||||
"git.kundeng.us/phoenix/textsender-auth/internal/config"
|
||||
"git.kundeng.us/phoenix/textsender-auth/internal/model"
|
||||
"git.kundeng.us/phoenix/textsender-auth/internal/store"
|
||||
"git.kundeng.us/phoenix/textsender-auth/internal/utility"
|
||||
)
|
||||
|
||||
type RefreshHandler struct {
|
||||
UserStore model.UserStore
|
||||
ServiceStore store.ServiceStore
|
||||
}
|
||||
|
||||
func NewRefreshHandler(userStore model.UserStore, serviceStore store.ServiceStore) *RefreshHandler {
|
||||
return &RefreshHandler{UserStore: userStore, ServiceStore: serviceStore}
|
||||
}
|
||||
|
||||
type RefreshRequest struct {
|
||||
AccessToken string `json:"access_token"`
|
||||
}
|
||||
|
||||
type RefreshResponse struct {
|
||||
Message string `json:"message"`
|
||||
Data []*token.Login `json:"data"`
|
||||
}
|
||||
|
||||
// Refresh godoc
|
||||
// @Summary Obtain a refresh token
|
||||
// @Description Refresh token endpoint (requires JWT)
|
||||
// @Tags refresh
|
||||
// @Accept json
|
||||
// @Produce json
|
||||
// @Security BearerAuth
|
||||
// @Param request body RefreshRequest true "Data to refresh token"
|
||||
// @Success 200 {object} RefreshResponse
|
||||
// @Failure 400 {object} RefreshResponse
|
||||
// @Failure 500 {object} RefreshResponse
|
||||
// @Router /token/refresh [post]
|
||||
func (rh *RefreshHandler) Refresh(w http.ResponseWriter, r *http.Request) {
|
||||
var req RefreshRequest
|
||||
if err := ExtractFromRequest(r, &req); err != nil {
|
||||
http.Error(w, "Invalid JSON: "+err.Error(), http.StatusBadRequest)
|
||||
}
|
||||
defer r.Body.Close()
|
||||
|
||||
var statusCode int
|
||||
var resp RefreshResponse
|
||||
|
||||
secretKey := config.GetSecretKey()
|
||||
tokGen := utility.TokenGenerator{}
|
||||
tokGen.SetSecretKey(secretKey)
|
||||
tokGen.SetHourOffset(12)
|
||||
if verified, err := tokGen.VerifyToken(req.AccessToken); err != nil {
|
||||
statusCode = http.StatusInternalServerError
|
||||
resp.Message = err.Error()
|
||||
} else {
|
||||
if verified {
|
||||
if id, err := tokGen.ExtractIdFromToken(req.AccessToken); err != nil {
|
||||
statusCode = http.StatusInternalServerError
|
||||
resp.Message = err.Error()
|
||||
} else {
|
||||
ctx := r.Context()
|
||||
if usr, err := rh.UserStore.GetUserByID(ctx, id); err != nil || usr == nil {
|
||||
if serviceUsr, err := rh.ServiceStore.GetWithId(ctx, id); err != nil || serviceUsr == nil {
|
||||
statusCode = http.StatusInternalServerError
|
||||
resp.Message = err.Error()
|
||||
} else {
|
||||
if myToken, err := tokGen.GenerateToken(serviceUsr); err != nil {
|
||||
statusCode = http.StatusInternalServerError
|
||||
resp.Message = err.Error()
|
||||
} else {
|
||||
statusCode = http.StatusOK
|
||||
resp.Data = append(resp.Data, myToken)
|
||||
resp.Message = "Successful"
|
||||
}
|
||||
}
|
||||
} else {
|
||||
if myToken, err := tokGen.GenerateToken(usr); err != nil {
|
||||
statusCode = http.StatusInternalServerError
|
||||
resp.Message = err.Error()
|
||||
} else {
|
||||
statusCode = http.StatusOK
|
||||
resp.Data = append(resp.Data, myToken)
|
||||
resp.Message = "Successful"
|
||||
}
|
||||
}
|
||||
}
|
||||
} else {
|
||||
statusCode = http.StatusBadRequest
|
||||
resp.Message = "Unverified"
|
||||
}
|
||||
}
|
||||
|
||||
RespondWithJson(w, statusCode, &resp)
|
||||
}
|
||||
@@ -0,0 +1,65 @@
|
||||
package handler
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"net/http"
|
||||
"net/http/httptest"
|
||||
"strings"
|
||||
"testing"
|
||||
|
||||
"git.kundeng.us/phoenix/textsender-models/pkg/user"
|
||||
"github.com/stretchr/testify/assert"
|
||||
|
||||
"git.kundeng.us/phoenix/textsender-auth/internal/handler/endpoint"
|
||||
"git.kundeng.us/phoenix/textsender-auth/internal/store/mock"
|
||||
"git.kundeng.us/phoenix/textsender-auth/internal/utility"
|
||||
)
|
||||
|
||||
func TestRefreshTokenWithMock(t *testing.T) {
|
||||
var serviceUser user.ServiceUser
|
||||
var hashedPassword string
|
||||
var err error
|
||||
unhashed := "9328nr29nudx3292m320!"
|
||||
hashing := utility.HashMash{Password: unhashed}
|
||||
if hashedPassword, err = hashing.HashPassword(); err != nil {
|
||||
assert.NoError(t, err, "Error hashing password: %v", err)
|
||||
} else {
|
||||
serviceUser.Passphrase = hashedPassword
|
||||
}
|
||||
serviceUser.Username = "swoon"
|
||||
ctx := t.Context()
|
||||
mockStore := mock.NewMockServiceUserStore()
|
||||
userStore := mock.NewMockUserStore()
|
||||
|
||||
if err := mockStore.Create(ctx, &serviceUser); err != nil {
|
||||
assert.NoError(t, err, "Error creating service user: %v", err)
|
||||
}
|
||||
|
||||
handler := NewServiceHandler(mockStore)
|
||||
testService := ServiceLoginRequest{Username: serviceUser.Username, Passphrase: unhashed}
|
||||
jsonValue, err := json.Marshal(testService)
|
||||
assert.NoError(t, err, "Error marshaling request")
|
||||
|
||||
req, _ := http.NewRequest("POST", endpoint.LoginServiceUser, strings.NewReader(string(jsonValue)))
|
||||
rr := httptest.NewRecorder()
|
||||
|
||||
handler.Login(rr, req)
|
||||
assert.Equal(t, http.StatusOK, rr.Code)
|
||||
|
||||
var response ServiceLoginResponse
|
||||
err = json.Unmarshal(rr.Body.Bytes(), &response)
|
||||
assert.NoError(t, err)
|
||||
|
||||
accessToken := response.Data[0].AccessToken
|
||||
|
||||
testReq := RefreshRequest{AccessToken: accessToken}
|
||||
jsonValue, err = json.Marshal(testReq)
|
||||
assert.NoError(t, err, "Error marshaling request")
|
||||
|
||||
newHandler := NewRefreshHandler(userStore, mockStore)
|
||||
req, _ = http.NewRequest("POST", endpoint.TokenRefresh, strings.NewReader(string(jsonValue)))
|
||||
rr = httptest.NewRecorder()
|
||||
|
||||
newHandler.Refresh(rr, req)
|
||||
assert.Equal(t, http.StatusOK, rr.Code)
|
||||
}
|
||||
Reference in New Issue
Block a user