last_used can be nil

This commit is contained in:
Pascal Fischer 2023-03-29 17:46:09 +02:00
parent 0ca3d27a80
commit 3bab745142
4 changed files with 8 additions and 4 deletions

View File

@ -316,7 +316,6 @@ components:
- expiration_date
- created_by
- created_at
- last_used
PersonalAccessTokenGenerated:
type: object
properties:

View File

@ -394,7 +394,7 @@ type PersonalAccessToken struct {
Id string `json:"id"`
// LastUsed Date the token was last used
LastUsed time.Time `json:"last_used"`
LastUsed *time.Time `json:"last_used,omitempty"`
// Name Name of the token
Name string `json:"name"`

View File

@ -3,6 +3,7 @@ package http
import (
"encoding/json"
"net/http"
"time"
"github.com/gorilla/mux"
@ -187,13 +188,17 @@ func (h *PATHandler) DeleteToken(w http.ResponseWriter, r *http.Request) {
}
func toPATResponse(pat *server.PersonalAccessToken) *api.PersonalAccessToken {
var lastUsed *time.Time
if !pat.LastUsed.IsZero() {
lastUsed = &pat.LastUsed
}
return &api.PersonalAccessToken{
CreatedAt: pat.CreatedAt,
CreatedBy: pat.CreatedBy,
Name: pat.Name,
ExpirationDate: pat.ExpirationDate,
Id: pat.ID,
LastUsed: pat.LastUsed,
LastUsed: lastUsed,
}
}

View File

@ -57,7 +57,7 @@ func CreateNewPAT(name string, expirationInDays int, createdBy string) (*Persona
ExpirationDate: currentTime.AddDate(0, 0, expirationInDays),
CreatedBy: createdBy,
CreatedAt: currentTime,
LastUsed: currentTime,
LastUsed: time.Time{},
},
PlainToken: plainToken,
}, nil