mirror of
https://github.com/get-drexa/drive.git
synced 2026-02-02 13:21:17 +00:00
feat: suppor tokenDelivery field for account reg
This commit is contained in:
@@ -32,10 +32,10 @@ func authCookies(c *fiber.Ctx) map[string]string {
|
||||
return m
|
||||
}
|
||||
|
||||
// setAuthCookies sets HTTP-only auth cookies with security settings derived from the request.
|
||||
// SetAuthCookies sets HTTP-only auth cookies with security settings derived from the request.
|
||||
// Secure flag is based on actual protocol (works automatically with proxies/tunnels),
|
||||
// unless explicitly set in cfg.Secure.
|
||||
func setAuthCookies(c *fiber.Ctx, accessToken, refreshToken string, cfg CookieConfig) {
|
||||
func SetAuthCookies(c *fiber.Ctx, accessToken, refreshToken string, cfg CookieConfig) {
|
||||
secure := c.Protocol() == "https"
|
||||
|
||||
accessTokenCookie := &fiber.Cookie{
|
||||
|
||||
@@ -11,8 +11,8 @@ import (
|
||||
)
|
||||
|
||||
const (
|
||||
tokenDeliveryCookie = "cookie"
|
||||
tokenDeliveryBody = "body"
|
||||
TokenDeliveryCookie = "cookie"
|
||||
TokenDeliveryBody = "body"
|
||||
)
|
||||
|
||||
const (
|
||||
@@ -113,13 +113,13 @@ func (h *HTTPHandler) Login(c *fiber.Ctx) error {
|
||||
default:
|
||||
return c.Status(fiber.StatusBadRequest).JSON(fiber.Map{"error": "invalid token delivery method"})
|
||||
|
||||
case tokenDeliveryCookie:
|
||||
setAuthCookies(c, result.AccessToken, result.RefreshToken, h.cookieConfig)
|
||||
case TokenDeliveryCookie:
|
||||
SetAuthCookies(c, result.AccessToken, result.RefreshToken, h.cookieConfig)
|
||||
return c.JSON(loginResponse{
|
||||
User: *result.User,
|
||||
})
|
||||
|
||||
case tokenDeliveryBody:
|
||||
case TokenDeliveryBody:
|
||||
return c.JSON(loginResponse{
|
||||
User: *result.User,
|
||||
AccessToken: result.AccessToken,
|
||||
|
||||
@@ -58,7 +58,7 @@ func NewAuthMiddleware(s *Service, db *bun.DB, cookieConfig CookieConfig) fiber.
|
||||
return c.SendStatus(fiber.StatusUnauthorized)
|
||||
}
|
||||
|
||||
setAuthCookies(c, newTokens.AccessToken, newTokens.RefreshToken, cookieConfig)
|
||||
SetAuthCookies(c, newTokens.AccessToken, newTokens.RefreshToken, cookieConfig)
|
||||
at = newTokens.AccessToken
|
||||
rt = newTokens.RefreshToken
|
||||
}
|
||||
@@ -90,7 +90,7 @@ func NewAuthMiddleware(s *Service, db *bun.DB, cookieConfig CookieConfig) fiber.
|
||||
newTokens, err := s.RefreshAccessToken(c.Context(), tx, rt)
|
||||
if err == nil {
|
||||
if commitErr := tx.Commit(); commitErr == nil {
|
||||
setAuthCookies(c, newTokens.AccessToken, newTokens.RefreshToken, cookieConfig)
|
||||
SetAuthCookies(c, newTokens.AccessToken, newTokens.RefreshToken, cookieConfig)
|
||||
}
|
||||
} else {
|
||||
_ = tx.Rollback()
|
||||
|
||||
Reference in New Issue
Block a user