tsk-15: Added User Id to Login

.gitea/workflows/tag_release.yaml

@@ -25,7 +25,7 @@ jobs:
         run: |
           echo "Creating version"
 
-          VERSION="0.0.12"
+          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/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_Scheduled = "SCHEDULED"
+	Message_Event_Response_Status_Instant   = "Instant"
+	Message_Event_Response_Status_Scheduled = "Scheduled"
 )

tx0/token/token.go

@@ -11,13 +11,9 @@ type Claims struct {
 	jwt.RegisteredClaims
 }
 
-type LoginResult struct {
-	UserId      uuid.UUID `json:"user_id"`
-	AccessToken string    `json:"access_token"`
-	TokenType   string    `json:"token_type"`
-	ExpiresIn   int64     `json:"expires_in"`
+type Login struct {
+	UserId uuid.UUID `json:"user_id"`
+	AccessToken string `json:"access_token"`
+	TokenType   string `json:"token_type"`
+	ExpiresIn   int64  `json:"expires_in"`
 }
-
-// Alias for LoginResult
-// Will be deprecated at some point
-type Login = LoginResult