sendnrw/netbird
2
0
Fork 0
mirror of https://github.com/netbirdio/netbird.git synced 2026-04-18 00:06:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor to use name instead of description

Browse Source
This commit is contained in:
Pascal Fischer
2023-03-27 16:28:49 +02:00
parent 9e74f30d2f
commit c65a934107
5 changed files with 18 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
management/server/http/api/openapi.yml
View File

@@ -292,12 +292,9 @@ components:
id:
description: ID of a token
type: string
description:
description: Description of the token
name:
description: Name of the token
type: string
# hashed_token:
# description: Hashed representation of the token
# type: string
expiration_date:
description: Date the token expires
type: string
@@ -315,8 +312,7 @@ components:
format: date-time
required:
- id
- description
# - hashed_token
- name
- expiration_date
- created_by
- created_at
@@ -324,14 +320,14 @@ components:
PersonalAccessTokenRequest:
type: object
properties:
description:
description: Description of the token
name:
description: Name of the token
type: string
expires_in:
description: Expiration in days
type: integer
required:
- description
- name
- expires_in
GroupMinimum:
type: object

12
management/server/http/api/types.gen.go
View File

@@ -387,9 +387,6 @@ type PersonalAccessToken struct {
// CreatedBy User ID of the user who created the token
CreatedBy string `json:"created_by"`
// Description Description of the token
Description string `json:"description"`
// ExpirationDate Date the token expires
ExpirationDate time.Time `json:"expiration_date"`
@@ -398,15 +395,18 @@ type PersonalAccessToken struct {
// LastUsed Date the token was last used
LastUsed time.Time `json:"last_used"`
// Name Name of the token
Name string `json:"name"`
}
// PersonalAccessTokenRequest defines model for PersonalAccessTokenRequest.
type PersonalAccessTokenRequest struct {
// Description Description of the token
Description string `json:"description"`
// ExpiresIn Expiration in days
ExpiresIn int `json:"expires_in"`
// Name Name of the token
Name string `json:"name"`
}
// Policy defines model for Policy.

24
management/server/http/pat_handler.go
View File

@@ -30,11 +30,6 @@ func NewPATsHandler(accountManager server.AccountManager, authCfg AuthCfg) *PATH
}
func (h *PATHandler) GetAllTokens(w http.ResponseWriter, r *http.Request) {
if r.Method != http.MethodGet {
util.WriteErrorResponse("wrong HTTP method", http.StatusMethodNotAllowed, w)
return
}
claims := h.claimsExtractor.FromRequestContext(r)
account, user, err := h.accountManager.GetAccountFromToken(claims)
if err != nil {
@@ -62,11 +57,6 @@ func (h *PATHandler) GetAllTokens(w http.ResponseWriter, r *http.Request) {
}
func (h *PATHandler) GetToken(w http.ResponseWriter, r *http.Request) {
if r.Method != http.MethodGet {
util.WriteErrorResponse("wrong HTTP method", http.StatusMethodNotAllowed, w)
return
}
claims := h.claimsExtractor.FromRequestContext(r)
account, user, err := h.accountManager.GetAccountFromToken(claims)
if err != nil {
@@ -96,11 +86,6 @@ func (h *PATHandler) GetToken(w http.ResponseWriter, r *http.Request) {
}
func (h *PATHandler) CreateToken(w http.ResponseWriter, r *http.Request) {
if r.Method != http.MethodPut {
util.WriteErrorResponse("wrong HTTP method", http.StatusMethodNotAllowed, w)
return
}
claims := h.claimsExtractor.FromRequestContext(r)
account, user, err := h.accountManager.GetAccountFromToken(claims)
if err != nil {
@@ -126,7 +111,7 @@ func (h *PATHandler) CreateToken(w http.ResponseWriter, r *http.Request) {
return
}
pat, plainToken, err := server.CreateNewPAT(req.Description, req.ExpiresIn, user.Id)
pat, plainToken, err := server.CreateNewPAT(req.Name, req.ExpiresIn, user.Id)
err = h.accountManager.AddPATToUser(account.Id, userID, pat)
if err != nil {
util.WriteError(err, w)
@@ -137,11 +122,6 @@ func (h *PATHandler) CreateToken(w http.ResponseWriter, r *http.Request) {
}
func (h *PATHandler) DeleteToken(w http.ResponseWriter, r *http.Request) {
if r.Method != http.MethodDelete {
util.WriteErrorResponse("wrong HTTP method", http.StatusMethodNotAllowed, w)
return
}
claims := h.claimsExtractor.FromRequestContext(r)
account, user, err := h.accountManager.GetAccountFromToken(claims)
if err != nil {
@@ -179,7 +159,7 @@ func toPATResponse(pat *server.PersonalAccessToken) *api.PersonalAccessToken {
return &api.PersonalAccessToken{
CreatedAt: pat.CreatedAt,
CreatedBy: pat.CreatedBy,
Description: pat.Description,
Name: pat.Name,
ExpirationDate: pat.ExpirationDate,
Id: pat.ID,
LastUsed: pat.LastUsed,