tsk-15: Added User Id to Login

.gitea/workflows/tag_release.yaml

@@ -25,7 +25,7 @@ jobs:
         run: |
           echo "Creating version"
 
-          VERSION="0.1.1"
+          VERSION="0.0.11"
           PROJECT_COMMIT_HASH=$(git rev-parse HEAD | cut -c 1-10)
           BRANCH_REF="${{ gitea.ref }}"
           BRANCH_NAME=$(echo "$BRANCH_REF" | cut -d '/' -f 3)

tx0/config/twilio_config.go

@@ -7,6 +7,7 @@ import (
 type TwilioConfig struct {
 	AccountSID string `json:"auth_sid"`
 	ServiceSID string `json:"service_sid"`
+	URI        string `json:"uri"`
 	AuthToken  string `json:"auth_token"`
 	Number     string `json:"phone_number"`
 }
@@ -15,6 +16,7 @@ func (config *TwilioConfig) PrintConfig() {
 	fmt.Println("Twilio config")
 	fmt.Println("Account SID:", config.AccountSID)
 	fmt.Println("Service SID:", config.ServiceSID)
+	fmt.Println("URI:", config.URI)
 	fmt.Println("Auth Token:", config.AuthToken)
 	fmt.Println("Number:", config.Number)
 }

tx0/message/message.go

@@ -5,7 +5,7 @@ import (
 )
 
 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"`
 }

tx0/message/message_event_response.go

@@ -15,11 +15,11 @@ type MessageEventResponse struct {
 	UserId                  uuid.UUID   `json:"user_id,omitempty"`
 	ContactId               *uuid.UUID  `json:"contact_id,omitempty"`
 	MessageId               *uuid.UUID  `json:"message_id,omitempty"`
-	Status                  string      `json:"status"`
+	Status                  *string     `json:"status"`
 	Sent                    time.Time   `json:"sent"`
 }
 
 const (
-	Message_Event_Response_Status_Instant   = "INSTANT"
+	Message_Event_Response_Status_Instant   = "Instant"
-	Message_Event_Response_Status_Scheduled = "SCHEDULED"
+	Message_Event_Response_Status_Scheduled = "Scheduled"
 )

tx0/token/token.go

@@ -11,14 +11,9 @@ type Claims struct {
 	jwt.RegisteredClaims
 }
 
-type LoginResult struct {
+type Login struct {
-	UserId      uuid.UUID `json:"user_id"`
+	UserId uuid.UUID `json:"user_id"`
-	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
-// Will be deprecated at some point
-type Login = LoginResult

tx0/user/service_user.go

@@ -7,9 +7,8 @@ import (
 )
 
 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"`
 	Passphrase string    `json:"passphrase,omitempty"`
-	Created    time.Time `json:"created"`
+	Created    time.Time `json:"date_created"`
 }

tx0/user/user.go

@@ -13,6 +13,6 @@ type User struct {
 	Password    string     `json:"password"`
 	Firstname   *string    `json:"first_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"`
 }