Compare commits

..
Author SHA1 Message Date
phoenix 7cc10fd264 tsk-24: Added IssuedAt to token.LoginResult 2025-12-30 18:43:25 -05:00
5 changed files with 8 additions and 9 deletions
+1 -1
View File
@@ -25,7 +25,7 @@ jobs:
run: | run: |
echo "Creating version" echo "Creating version"
VERSION="0.1.1" VERSION="0.0.13"
PROJECT_COMMIT_HASH=$(git rev-parse HEAD | cut -c 1-10) PROJECT_COMMIT_HASH=$(git rev-parse HEAD | cut -c 1-10)
BRANCH_REF="${{ gitea.ref }}" BRANCH_REF="${{ gitea.ref }}"
BRANCH_NAME=$(echo "$BRANCH_REF" | cut -d '/' -f 3) BRANCH_NAME=$(echo "$BRANCH_REF" | cut -d '/' -f 3)
+3 -3
View File
@@ -5,7 +5,7 @@ import (
) )
type Message struct { type Message struct {
Id *uuid.UUID `json:"id,omitempty"` Id uuid.UUID `json:"id"`
Content string `json:"content"` Content string `json:"content,omitempty"`
UserId *uuid.UUID `json:"user_id,omitempty"` UserId uuid.UUID `json:"user_id"`
} }
+1 -1
View File
@@ -16,7 +16,7 @@ type LoginResult struct {
AccessToken string `json:"access_token"` AccessToken string `json:"access_token"`
TokenType string `json:"token_type"` TokenType string `json:"token_type"`
ExpiresIn int64 `json:"expires_in"` ExpiresIn int64 `json:"expires_in"`
IssuedAt int64 `json:"issued_at"` IssuedAt int64 `json:"issued_at"`
} }
// Alias for LoginResult // Alias for LoginResult
+2 -3
View File
@@ -7,9 +7,8 @@ import (
) )
type ServiceUser struct { type ServiceUser struct {
Id uuid.UUID `json:"id"` Id uuid.UUID `json:"id"`
// TODO: Remove the omitempty tags at a later point
Username string `json:"username,omitempty"` Username string `json:"username,omitempty"`
Passphrase string `json:"passphrase,omitempty"` Passphrase string `json:"passphrase,omitempty"`
Created time.Time `json:"created"` Created time.Time `json:"date_created"`
} }
+1 -1
View File
@@ -13,6 +13,6 @@ type User struct {
Password string `json:"password"` Password string `json:"password"`
Firstname *string `json:"first_name,omitempty"` Firstname *string `json:"first_name,omitempty"`
Lastname *string `json:"last_name,omitempty"` Lastname *string `json:"last_name,omitempty"`
Created time.Time `json:"created"` Created time.Time `json:"date_created"`
LastLogin *time.Time `json:"last_login,omitempty"` LastLogin *time.Time `json:"last_login,omitempty"`
} }