tsk-15: Added User Id to Login

Closes #14

Reviewed-on: phoenix/textsender-models#20
Co-authored-by: phoenix <kundeng00@pm.me>
Co-committed-by: phoenix <kundeng00@pm.me>

tx0/config/twilio_config.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 )
 
-type TwiloConfig struct {
+type TwilioConfig struct {
 	AccountSID string `json:"auth_sid"`
 	ServiceSID string `json:"service_sid"`
 	URI        string `json:"uri"`
@@ -12,10 +12,11 @@ type TwiloConfig struct {
 	Number     string `json:"phone_number"`
 }
 
-func (config *TwiloConfig) PrintConfig() {
+func (config *TwilioConfig) PrintConfig() {
-	fmt.Printf("Account SID: %s\n", config.AccountSID)
+	fmt.Println("Twilio config")
-	fmt.Printf("Service SID: %s\n", config.ServiceSID)
+	fmt.Println("Account SID:", config.AccountSID)
+	fmt.Println("Service SID:", config.ServiceSID)
 	fmt.Println("URI:", config.URI)
-	fmt.Printf("Auth Token: %s\n", config.AuthToken)
+	fmt.Println("Auth Token:", config.AuthToken)
-	fmt.Printf("Number: %s\n", config.Number)
+	fmt.Println("Number:", config.Number)
 }

tx0/token/token.go

@@ -12,6 +12,7 @@ type Claims struct {
 }
 
 type Login struct {
+	UserId uuid.UUID `json:"user_id"`
 	AccessToken string `json:"access_token"`
 	TokenType   string `json:"token_type"`
 	ExpiresIn   int64  `json:"expires_in"`

tx0/user/service_user.go

@@ -7,8 +7,8 @@ import (
 )
 
 type ServiceUser struct {
-	Id         uuid.UUID  `json:"id"`
+	Id         uuid.UUID `json:"id"`
-	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,omitempty"`
+	Created    time.Time `json:"date_created"`
 }

tx0/user/user.go

@@ -1,12 +1,18 @@
 package user
 
 import (
+	"time"
+
 	"github.com/google/uuid"
 )
 
 type User struct {
-	Id          uuid.UUID `json:"id"`
+	Id          uuid.UUID  `json:"id"`
-	PhoneNumber string    `json:"phone_number"`
+	PhoneNumber string     `json:"phone_number"`
-	Username    string    `json:"username"`
+	Username    string     `json:"username"`
-	Password    string    `json:"password"`
+	Password    string     `json:"password"`
+	Firstname   *string    `json:"first_name,omitempty"`
+	Lastname    *string    `json:"last_name,omitempty"`
+	Created     time.Time  `json:"date_created"`
+	LastLogin   *time.Time `json:"last_login,omitempty"`
 }