From edf120a12c6290aaae93f77b97e3824b45c972b1 Mon Sep 17 00:00:00 2001
From: VeronikaSolovei9 <kalypsonika@gmail.com>
Date: Sun, 24 Sep 2023 16:44:13 -0700
Subject: [PATCH] Code clean up

---
 exchange/utils.go   | 31 ++++++++-----------------------
 privacy/scrubber.go | 18 ++++++++++++++++++
 2 files changed, 26 insertions(+), 23 deletions(-)

diff --git a/exchange/utils.go b/exchange/utils.go
index ceca0846a3a..d170280e849 100644
--- a/exchange/utils.go
+++ b/exchange/utils.go
@@ -6,6 +6,7 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"github.com/prebid/prebid-server/ortb"
 	"math/rand"
 
 	"github.com/buger/jsonparser"
@@ -184,23 +185,17 @@ func (rs *requestSplitter) cleanOpenRTBRequests(ctx context.Context,
 		passIDActivityAllowed := auctionReq.Activities.Allow(privacy.ActivityTransmitUserFPD, scopedName, privacy.NewRequestFromBidRequest(*req))
 		if !passIDActivityAllowed {
 			//UFPD
-			privacy.ScrubDeviceIDs(reqWrapper)
-			privacy.ScrubUserIDs(reqWrapper)
-			privacy.ScrubUserExt(reqWrapper, "data")
+			privacy.ScrubUserFPD(reqWrapper)
 		} else {
 			// run existing policies (GDPR, CCPA, COPPA, LMT)
 			// potentially block passing IDs based on GDPR
 			if gdprEnforced {
 				if gdprErr == nil {
 					if !auctionPermissions.PassID {
-						privacy.ScrubDeviceIDs(reqWrapper)
-						privacy.ScrubUserDemographics(reqWrapper)
-						privacy.ScrubUserExt(reqWrapper, "eids")
+						privacy.ScrubGdprID(reqWrapper)
 					}
 				} else {
-					privacy.ScrubDeviceIDs(reqWrapper)
-					privacy.ScrubUserDemographics(reqWrapper)
-					privacy.ScrubUserExt(reqWrapper, "eids")
+					privacy.ScrubGdprID(reqWrapper)
 				}
 			}
 			// potentially block passing IDs based on CCPA
@@ -211,20 +206,17 @@ func (rs *requestSplitter) cleanOpenRTBRequests(ctx context.Context,
 
 		passGeoActivityAllowed := auctionReq.Activities.Allow(privacy.ActivityTransmitPreciseGeo, scopedName, privacy.NewRequestFromBidRequest(*req))
 		if !passGeoActivityAllowed {
-			privacy.ScrubGEO(reqWrapper)
-			privacy.ScrubDeviceIP(reqWrapper, ipConf)
+			privacy.ScrubGeoAndDeviceIP(reqWrapper, ipConf)
 		} else {
 			// run existing policies (GDPR, CCPA, COPPA, LMT)
 			// potentially block passing geo based on GDPR
 			if gdprEnforced {
 				if gdprErr == nil {
 					if !auctionPermissions.PassGeo {
-						privacy.ScrubDeviceIP(reqWrapper, ipConf)
-						privacy.ScrubGEO(reqWrapper)
+						privacy.ScrubGeoAndDeviceIP(reqWrapper, ipConf)
 					}
 				} else {
-					privacy.ScrubDeviceIP(reqWrapper, ipConf)
-					privacy.ScrubGEO(reqWrapper)
+					privacy.ScrubGeoAndDeviceIP(reqWrapper, ipConf)
 				}
 			}
 			// potentially block passing geo based on CCPA
@@ -267,15 +259,8 @@ func cloneBidderReq(req *openrtb2.BidRequest) *openrtb_ext.RequestWrapper {
 	newReq = ptrutil.Clone(req)
 
 	if req.User != nil {
-		var userCopy *openrtb2.User
-		userCopy = ptrutil.Clone(req.User)
+		userCopy := ortb.CloneUser(req.User)
 		newReq.User = userCopy
-
-		if req.User.Geo != nil {
-			var userGeoCopy *openrtb2.Geo
-			userGeoCopy = ptrutil.Clone(req.User.Geo)
-			newReq.User.Geo = userGeoCopy
-		}
 	}
 
 	if req.Device != nil {
diff --git a/privacy/scrubber.go b/privacy/scrubber.go
index f49ba6aba81..5469429162c 100644
--- a/privacy/scrubber.go
+++ b/privacy/scrubber.go
@@ -128,6 +128,24 @@ func ScrubDeviceIDsIPsUserDemoExt(reqWrapper *openrtb_ext.RequestWrapper, ipConf
 	}
 }
 
+func ScrubUserFPD(reqWrapper *openrtb_ext.RequestWrapper) {
+	ScrubDeviceIDs(reqWrapper)
+	ScrubUserIDs(reqWrapper)
+	ScrubUserExt(reqWrapper, "data")
+	reqWrapper.User.EIDs = nil
+}
+
+func ScrubGdprID(reqWrapper *openrtb_ext.RequestWrapper) {
+	ScrubDeviceIDs(reqWrapper)
+	ScrubUserDemographics(reqWrapper)
+	ScrubUserExt(reqWrapper, "eids")
+}
+
+func ScrubGeoAndDeviceIP(reqWrapper *openrtb_ext.RequestWrapper, ipConf IPConf) {
+	ScrubDeviceIP(reqWrapper, ipConf)
+	ScrubGEO(reqWrapper)
+}
+
 func scrubIP(ip string, ones, bits int) string {
 	if ip == "" {
 		return ""