Compare commits
5
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
44848fdffd | ||
|
|
e894925996 | ||
|
|
08f5938b79 | ||
|
|
9be6fa9b34 | ||
|
|
12bf453925 |
@@ -25,7 +25,7 @@ jobs:
|
|||||||
run: |
|
run: |
|
||||||
echo "Creating version"
|
echo "Creating version"
|
||||||
|
|
||||||
VERSION="0.0.12"
|
VERSION="0.1.1"
|
||||||
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)
|
||||||
|
|||||||
@@ -7,7 +7,6 @@ import (
|
|||||||
type TwilioConfig struct {
|
type TwilioConfig struct {
|
||||||
AccountSID string `json:"auth_sid"`
|
AccountSID string `json:"auth_sid"`
|
||||||
ServiceSID string `json:"service_sid"`
|
ServiceSID string `json:"service_sid"`
|
||||||
URI string `json:"uri"`
|
|
||||||
AuthToken string `json:"auth_token"`
|
AuthToken string `json:"auth_token"`
|
||||||
Number string `json:"phone_number"`
|
Number string `json:"phone_number"`
|
||||||
}
|
}
|
||||||
@@ -16,7 +15,6 @@ func (config *TwilioConfig) PrintConfig() {
|
|||||||
fmt.Println("Twilio config")
|
fmt.Println("Twilio config")
|
||||||
fmt.Println("Account SID:", config.AccountSID)
|
fmt.Println("Account SID:", config.AccountSID)
|
||||||
fmt.Println("Service SID:", config.ServiceSID)
|
fmt.Println("Service SID:", config.ServiceSID)
|
||||||
fmt.Println("URI:", config.URI)
|
|
||||||
fmt.Println("Auth Token:", config.AuthToken)
|
fmt.Println("Auth Token:", config.AuthToken)
|
||||||
fmt.Println("Number:", config.Number)
|
fmt.Println("Number:", config.Number)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
type Message struct {
|
type Message struct {
|
||||||
Id uuid.UUID `json:"id"`
|
Id *uuid.UUID `json:"id,omitempty"`
|
||||||
Content string `json:"content,omitempty"`
|
Content string `json:"content"`
|
||||||
UserId uuid.UUID `json:"user_id"`
|
UserId *uuid.UUID `json:"user_id,omitempty"`
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -16,6 +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"`
|
||||||
}
|
}
|
||||||
|
|
||||||
// Alias for LoginResult
|
// Alias for LoginResult
|
||||||
|
|||||||
@@ -7,8 +7,9 @@ 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:"date_created"`
|
Created time.Time `json:"created"`
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -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:"date_created"`
|
Created time.Time `json:"created"`
|
||||||
LastLogin *time.Time `json:"last_login,omitempty"`
|
LastLogin *time.Time `json:"last_login,omitempty"`
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user