From 12b414793521a5dfe5f83c8316ff802ac6e5f89a Mon Sep 17 00:00:00 2001
From: ShiKhu <alex.kaminsky.11@gmail.com>
Date: Sun, 23 Jan 2022 18:57:06 +0100
Subject: [PATCH] feat (backend): insert userID on SessionStart

---
 backend/pkg/db/postgres/messages_common.go | 7 +++++--
 backend/pkg/messages/messages.go           | 4 +++-
 backend/pkg/messages/read_message.go       | 1 +
 backend/services/http/handlers_web.go      | 2 ++
 4 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/backend/pkg/db/postgres/messages_common.go b/backend/pkg/db/postgres/messages_common.go
index a6f624651..df539e05c 100644
--- a/backend/pkg/db/postgres/messages_common.go
+++ b/backend/pkg/db/postgres/messages_common.go
@@ -47,7 +47,8 @@ func (conn *Conn) InsertSessionStart(sessionID uint64, s *types.Session) error {
 			rev_id, 
 			tracker_version, issue_score,
 			platform,
-			user_agent, user_browser, user_browser_version, user_device_memory_size, user_device_heap_size
+			user_agent, user_browser, user_browser_version, user_device_memory_size, user_device_heap_size,
+			user_id
 		) VALUES (
 			$1, $2, $3,
 			$4, $5, $6, $7, 
@@ -55,7 +56,8 @@ func (conn *Conn) InsertSessionStart(sessionID uint64, s *types.Session) error {
 			NULLIF($10, ''), 
 			$11, $12,
 			$13,
-			NULLIF($14, ''), NULLIF($15, ''), NULLIF($16, ''), NULLIF($17, 0), NULLIF($18, 0::bigint)
+			NULLIF($14, ''), NULLIF($15, ''), NULLIF($16, ''), NULLIF($17, 0), NULLIF($18, 0::bigint),
+			NULLIF($19, '')
 		)`,
 		sessionID, s.ProjectID, s.Timestamp, 
 		s.UserUUID, s.UserDevice, s.UserDeviceType, s.UserCountry,
@@ -64,6 +66,7 @@ func (conn *Conn) InsertSessionStart(sessionID uint64, s *types.Session) error {
 		s.TrackerVersion, s.Timestamp/1000,
 		s.Platform,
 		s.UserAgent, s.UserBrowser, s.UserBrowserVersion, s.UserDeviceMemorySize, s.UserDeviceHeapSize,
+		s.UserID,
 	); err != nil {
 		return err;
 	}
diff --git a/backend/pkg/messages/messages.go b/backend/pkg/messages/messages.go
index 3d8bae7f6..cdff71e1d 100644
--- a/backend/pkg/messages/messages.go
+++ b/backend/pkg/messages/messages.go
@@ -63,9 +63,10 @@ UserDeviceType string
 UserDeviceMemorySize uint64
 UserDeviceHeapSize uint64
 UserCountry string
+UserID string
 }
 func (msg *SessionStart) Encode() []byte{
-  buf := make([]byte, 151 + len(msg.TrackerVersion)+ len(msg.RevID)+ len(msg.UserUUID)+ len(msg.UserAgent)+ len(msg.UserOS)+ len(msg.UserOSVersion)+ len(msg.UserBrowser)+ len(msg.UserBrowserVersion)+ len(msg.UserDevice)+ len(msg.UserDeviceType)+ len(msg.UserCountry))
+  buf := make([]byte, 161 + len(msg.TrackerVersion)+ len(msg.RevID)+ len(msg.UserUUID)+ len(msg.UserAgent)+ len(msg.UserOS)+ len(msg.UserOSVersion)+ len(msg.UserBrowser)+ len(msg.UserBrowserVersion)+ len(msg.UserDevice)+ len(msg.UserDeviceType)+ len(msg.UserCountry)+ len(msg.UserID))
   buf[0] = 1
   p := 1
   p = WriteUint(msg.Timestamp, buf, p)
@@ -83,6 +84,7 @@ p = WriteString(msg.UserDeviceType, buf, p)
 p = WriteUint(msg.UserDeviceMemorySize, buf, p)
 p = WriteUint(msg.UserDeviceHeapSize, buf, p)
 p = WriteString(msg.UserCountry, buf, p)
+p = WriteString(msg.UserID, buf, p)
   return buf[:p]
 }
 
diff --git a/backend/pkg/messages/read_message.go b/backend/pkg/messages/read_message.go
index d0148bbc6..c226df728 100644
--- a/backend/pkg/messages/read_message.go
+++ b/backend/pkg/messages/read_message.go
@@ -42,6 +42,7 @@ if msg.UserDeviceType, err = ReadString(reader); err != nil { return nil, err }
 if msg.UserDeviceMemorySize, err = ReadUint(reader); err != nil { return nil, err }
 if msg.UserDeviceHeapSize, err = ReadUint(reader); err != nil { return nil, err }
 if msg.UserCountry, err = ReadString(reader); err != nil { return nil, err }
+if msg.UserID, err = ReadString(reader); err != nil { return nil, err }
       return msg, nil
   
     case 2:
diff --git a/backend/services/http/handlers_web.go b/backend/services/http/handlers_web.go
index 5e144f1cc..09d2511d8 100644
--- a/backend/services/http/handlers_web.go
+++ b/backend/services/http/handlers_web.go
@@ -27,6 +27,7 @@ func startSessionHandlerWeb(w http.ResponseWriter, r *http.Request) {
 		JsHeapSizeLimit uint64  `json:"jsHeapSizeLimit"`
 		ProjectKey      *string `json:"projectKey"`
 		Reset           bool    `json:"reset"`
+		UserID          string  `json:"userID"`
 	}
 	type response struct {
 		Timestamp int64  			`json:"timestamp"`
@@ -101,6 +102,7 @@ func startSessionHandlerWeb(w http.ResponseWriter, r *http.Request) {
 			UserCountry:          country,
 			UserDeviceMemorySize: req.DeviceMemory,
 			UserDeviceHeapSize:   req.JsHeapSizeLimit,
+			UserID:								req.UserID,
 		}))
 	}