v2: fixed oauth errors, oauth clients native control added

This commit is contained in:
Ivan Rezchikov
2026-09-15 16:21:53 +03:00
parent 83e1849d73
commit 8b0a3d143b
51 changed files with 1392 additions and 3216 deletions
@@ -1,72 +0,0 @@
package handlers
import (
"net/http"
"github.com/dusiburg/kotosoft-id/internal/models"
"github.com/dusiburg/kotosoft-id/internal/services"
"github.com/gin-gonic/gin"
"github.com/google/uuid"
)
type CitizenshipHandler struct {
s *services.CitizenshipService
}
func NewCitizenshipHandler(s *services.CitizenshipService) *CitizenshipHandler {
return &CitizenshipHandler{s: s}
}
func (h *CitizenshipHandler) GetCitizenshipApplicationByUserId(c *gin.Context) {
userID := mustUserID(c)
application, err := h.s.GetCitizenshipApplicationByUserId(c.Request.Context(), userID)
if err != nil {
c.Error(err)
return
}
c.JSON(http.StatusOK, application)
}
func (h *CitizenshipHandler) CreateCitizenshipApplication(c *gin.Context) {
userID := mustUserID(c)
var input models.CreateCitizenshipApplicationInput
if err := c.ShouldBindJSON(&input); err != nil {
c.Error(models.ErrBadRequest)
return
}
application, err := h.s.CreateCitizenshipApplication(c.Request.Context(), userID, input.RegionID)
if err != nil {
c.Error(err)
return
}
c.JSON(http.StatusCreated, application)
}
func (h *CitizenshipHandler) ReviewCitizenshipApplication(c *gin.Context) {
reviewerID := mustUserID(c)
applicationID, err := uuid.Parse(c.Param("id"))
if err != nil {
c.Error(models.ErrBadRequest)
return
}
var input models.ReviewCitizenshipApplicationInput
if err := c.ShouldBindJSON(&input); err != nil {
c.Error(models.ErrBadRequest)
return
}
application, err := h.s.ReviewCitizenshipApplication(c.Request.Context(), applicationID, reviewerID, input)
if err != nil {
c.Error(err)
return
}
c.JSON(http.StatusOK, application)
}
@@ -0,0 +1,104 @@
package handlers
import (
"net/http"
"github.com/dusiburg/kotosoft-id/internal/models"
"github.com/dusiburg/kotosoft-id/internal/services"
"github.com/gin-gonic/gin"
"github.com/google/uuid"
)
type ClientHandler struct {
svc *services.Service
}
func NewClientHandler(svc *services.Service) *ClientHandler {
return &ClientHandler{svc: svc}
}
func (h *ClientHandler) Create(c *gin.Context) {
var input models.ClientCreateInput
if err := c.ShouldBindJSON(&input); err != nil {
c.Error(models.ErrBadRequest)
return
}
client, rawSecret, err := h.svc.CreateClient(c.Request.Context(), input)
if err != nil {
c.Error(err)
return
}
c.JSON(http.StatusCreated, gin.H{
"id": client.ID,
"client_id": client.ClientID,
"client_secret": rawSecret,
"name": client.Name,
"redirect_uris": client.RedirectURIs,
"grant_types": client.GrantTypes,
"scopes": client.Scopes,
"trusted": client.Trusted,
"is_active": client.IsActive,
"created_at": client.CreatedAt,
})
}
func (h *ClientHandler) List(c *gin.Context) {
clients, err := h.svc.ListClients(c.Request.Context())
if err != nil {
c.Error(err)
return
}
c.JSON(http.StatusOK, clients)
}
func (h *ClientHandler) Get(c *gin.Context) {
id, err := uuid.Parse(c.Param("id"))
if err != nil {
c.Error(models.ErrBadRequest)
return
}
client, err := h.svc.GetClient(c.Request.Context(), id)
if err != nil {
c.Error(err)
return
}
c.JSON(http.StatusOK, client)
}
func (h *ClientHandler) Update(c *gin.Context) {
id, err := uuid.Parse(c.Param("id"))
if err != nil {
c.Error(models.ErrBadRequest)
return
}
var input models.ClientUpdateInput
if err := c.ShouldBindJSON(&input); err != nil {
c.Error(models.ErrBadRequest)
return
}
client, err := h.svc.UpdateClient(c.Request.Context(), id, input)
if err != nil {
c.Error(err)
return
}
c.JSON(http.StatusOK, client)
}
func (h *ClientHandler) Deactivate(c *gin.Context) {
id, err := uuid.Parse(c.Param("id"))
if err != nil {
c.Error(models.ErrBadRequest)
return
}
if err := h.svc.DeactivateClient(c.Request.Context(), id); err != nil {
c.Error(err)
return
}
c.Status(http.StatusNoContent)
}
@@ -1,280 +0,0 @@
package handlers
import (
"net/http"
"github.com/dusiburg/kotosoft-id/internal/models"
"github.com/gin-gonic/gin"
"github.com/google/uuid"
"github.com/dusiburg/kotosoft-id/internal/services"
)
type PositionsHandler struct {
svc *services.Service
}
func NewPositionsHandler(svc *services.Service) *PositionsHandler {
return &PositionsHandler{svc: svc}
}
func localeFromRequest(c *gin.Context) string {
if l := c.GetHeader("X-Locale"); l != "" {
return l
}
if l := c.GetHeader("Accept-Language"); l != "" {
return l
}
return "en"
}
func userIDFromContext(c *gin.Context) (uuid.UUID, bool) {
v, ok := c.Get("user_id")
if !ok {
return uuid.Nil, false
}
id, ok := v.(uuid.UUID)
return id, ok
}
func (h *PositionsHandler) GetMyPositions(c *gin.Context) {
userID, ok := userIDFromContext(c)
if !ok {
c.Error(models.ErrUnauthorized)
return
}
positions, err := h.svc.GetUserPositions(c.Request.Context(), userID, localeFromRequest(c))
if err != nil {
c.Error(models.ErrInternal)
return
}
c.JSON(http.StatusOK, positions)
}
func (h *PositionsHandler) ListPositions(c *gin.Context) {
positions, err := h.svc.GetAllPositions(c.Request.Context(), localeFromRequest(c))
if err != nil {
c.Error(models.ErrInternal)
return
}
c.JSON(http.StatusOK, positions)
}
type upsertPositionRequest struct {
Code string `json:"code" binding:"required"`
Name string `json:"name" binding:"required"`
Description *string `json:"description"`
}
func (h *PositionsHandler) UpsertPosition(c *gin.Context) {
var req upsertPositionRequest
if err := c.ShouldBindJSON(&req); err != nil {
c.Error(models.ErrBadRequest)
return
}
if err := h.svc.UpsertPositionForLocale(c.Request.Context(), req.Code, localeFromRequest(c), req.Name, req.Description); err != nil {
c.Error(models.ErrInternal)
return
}
c.Status(http.StatusNoContent)
}
func (h *PositionsHandler) UpdatePosition(c *gin.Context) {
var req struct {
Name string `json:"name" binding:"required"`
Description *string `json:"description"`
}
if err := c.ShouldBindJSON(&req); err != nil {
c.Error(models.ErrBadRequest)
return
}
if err := h.svc.UpsertPositionForLocale(c.Request.Context(), c.Param("code"), localeFromRequest(c), req.Name, req.Description); err != nil {
c.Error(models.ErrInternal)
return
}
c.Status(http.StatusNoContent)
}
func (h *PositionsHandler) DeletePosition(c *gin.Context) {
if err := h.svc.DeletePosition(c.Request.Context(), c.Param("code")); err != nil {
c.Error(err)
return
}
c.Status(http.StatusNoContent)
}
type permissionCodeRequest struct {
PermissionCode string `json:"permission_code" binding:"required"`
}
func (h *PositionsHandler) AddPermissionToPosition(c *gin.Context) {
var req permissionCodeRequest
if err := c.ShouldBindJSON(&req); err != nil {
c.Error(models.ErrBadRequest)
return
}
if err := h.svc.AddPermissionToPosition(c.Request.Context(), c.Param("code"), req.PermissionCode); err != nil {
c.Error(err)
return
}
c.Status(http.StatusNoContent)
}
func (h *PositionsHandler) RemovePermissionFromPosition(c *gin.Context) {
if err := h.svc.RemovePermissionFromPosition(c.Request.Context(), c.Param("code"), c.Param("permissionCode")); err != nil {
c.Error(err)
return
}
c.Status(http.StatusNoContent)
}
func (h *PositionsHandler) ListPermissions(c *gin.Context) {
perms, err := h.svc.GetAllPermissionsForLocale(c.Request.Context(), localeFromRequest(c))
if err != nil {
c.Error(models.ErrInternal)
return
}
c.JSON(http.StatusOK, perms)
}
func (h *PositionsHandler) ListUsersWithPositions(c *gin.Context) {
users, err := h.svc.GetUsersWithPositions(c.Request.Context(), localeFromRequest(c))
if err != nil {
c.Error(models.ErrInternal)
return
}
c.JSON(http.StatusOK, users)
}
func (h *PositionsHandler) AssignPosition(c *gin.Context) {
adminID, ok := userIDFromContext(c)
if !ok {
c.Error(models.ErrUnauthorized)
return
}
targetUserID, err := uuid.Parse(c.Param("userId"))
if err != nil {
c.Error(models.ErrBadRequest)
return
}
var input models.AssignPositionInput
if err := c.ShouldBindJSON(&input); err != nil {
c.Error(models.ErrBadRequest)
return
}
if err := h.svc.AssignPosition(c.Request.Context(), adminID, targetUserID, input); err != nil {
c.Error(err)
return
}
c.Status(http.StatusNoContent)
}
func (h *PositionsHandler) RevokePosition(c *gin.Context) {
targetUserID, err := uuid.Parse(c.Param("userId"))
if err != nil {
c.Error(models.ErrBadRequest)
return
}
if err := h.svc.RevokePosition(c.Request.Context(), targetUserID, c.Param("code")); err != nil {
c.Error(err)
return
}
c.Status(http.StatusNoContent)
}
func (h *PositionsHandler) CreatePermission(c *gin.Context) {
var req struct {
Code string `json:"code" binding:"required"`
Description *string `json:"description"`
}
if err := c.ShouldBindJSON(&req); err != nil {
c.Error(models.ErrBadRequest)
return
}
if err := h.svc.CreatePermission(c.Request.Context(), req.Code, localeFromRequest(c), req.Description); err != nil {
c.Error(err)
return
}
c.Status(http.StatusNoContent)
}
func (h *PositionsHandler) UpdatePermission(c *gin.Context) {
var req struct {
Description *string `json:"description"`
}
if err := c.ShouldBindJSON(&req); err != nil {
c.Error(models.ErrBadRequest)
return
}
if err := h.svc.UpdatePermission(c.Request.Context(), c.Param("code"), localeFromRequest(c), req.Description); err != nil {
c.Error(err)
return
}
c.Status(http.StatusNoContent)
}
func (h *PositionsHandler) DeletePermission(c *gin.Context) {
if err := h.svc.DeletePermission(c.Request.Context(), c.Param("code")); err != nil {
c.Error(err)
return
}
c.Status(http.StatusNoContent)
}
func (h *PositionsHandler) Introspect(c *gin.Context) {
var req struct {
Token string `json:"token" form:"token" binding:"required"`
}
if err := c.ShouldBind(&req); err != nil {
c.JSON(http.StatusBadRequest, gin.H{"error": "missing token"})
return
}
id, secret, ok := c.Request.BasicAuth()
if !ok {
c.Header("WWW-Authenticate", `Basic realm="oauth"`)
c.JSON(http.StatusUnauthorized, gin.H{"error": "invalid_client"})
return
}
if _, err := h.svc.AuthenticateClient(c.Request.Context(), services.ClientAuth{
ClientID: id,
ClientSecret: secret,
}); err != nil {
c.Header("WWW-Authenticate", `Basic realm="oauth"`)
c.JSON(http.StatusUnauthorized, gin.H{"error": "invalid_client"})
return
}
resp, err := h.svc.IntrospectToken(c.Request.Context(), req.Token)
if err != nil {
c.JSON(http.StatusInternalServerError, gin.H{"error": "server_error"})
return
}
c.JSON(http.StatusOK, resp)
}