From b953eb1bd56db6d59c0f568b8dbdbd334b35d6de Mon Sep 17 00:00:00 2001
From: Keepers <ryanfkeepers@gmail.com>
Date: Thu, 6 Apr 2023 17:53:45 -0600
Subject: [PATCH] force userPN on exchange, onedrive backup (#3052)

#### Does this PR need a docs update or release note?

- [x] :no_entry: No

#### Type of change

- [x] :bug: Bugfix

#### Issue(s)

* #2825

#### Test Plan

- [x] :muscle: Manual
---
 src/cli/backup/exchange_e2e_test.go   | 4 ++--
 src/cli/backup/onedrive_e2e_test.go   | 4 ++--
 src/cli/backup/sharepoint_e2e_test.go | 4 ++--
 src/cli/restore/exchange_e2e_test.go  | 4 ++--
 src/pkg/repository/repository.go      | 6 ++++++
 5 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/cli/backup/exchange_e2e_test.go b/src/cli/backup/exchange_e2e_test.go
index 96fa0ce35..212706c9e 100644
--- a/src/cli/backup/exchange_e2e_test.go
+++ b/src/cli/backup/exchange_e2e_test.go
@@ -303,8 +303,8 @@ func (suite *PreparedBackupExchangeE2ESuite) SetupSuite() {
 
 	var (
 		users    = []string{suite.m365UserID}
-		idToName = map[string]string{suite.m365UserID: "todo-name-" + suite.m365UserID}
-		nameToID = map[string]string{"todo-name-" + suite.m365UserID: suite.m365UserID}
+		idToName = map[string]string{suite.m365UserID: suite.m365UserID}
+		nameToID = map[string]string{suite.m365UserID: suite.m365UserID}
 		ins      = common.IDsNames{
 			IDToName: idToName,
 			NameToID: nameToID,
diff --git a/src/cli/backup/onedrive_e2e_test.go b/src/cli/backup/onedrive_e2e_test.go
index 19555e91a..9512b2695 100644
--- a/src/cli/backup/onedrive_e2e_test.go
+++ b/src/cli/backup/onedrive_e2e_test.go
@@ -209,8 +209,8 @@ func (suite *BackupDeleteOneDriveE2ESuite) SetupSuite() {
 	var (
 		m365UserID = tester.M365UserID(t)
 		users      = []string{m365UserID}
-		idToName   = map[string]string{m365UserID: "todo-name-" + m365UserID}
-		nameToID   = map[string]string{"todo-name-" + m365UserID: m365UserID}
+		idToName   = map[string]string{m365UserID: m365UserID}
+		nameToID   = map[string]string{m365UserID: m365UserID}
 		ins        = common.IDsNames{
 			IDToName: idToName,
 			NameToID: nameToID,
diff --git a/src/cli/backup/sharepoint_e2e_test.go b/src/cli/backup/sharepoint_e2e_test.go
index 42116760d..76caa6ef3 100644
--- a/src/cli/backup/sharepoint_e2e_test.go
+++ b/src/cli/backup/sharepoint_e2e_test.go
@@ -161,8 +161,8 @@ func (suite *BackupDeleteSharePointE2ESuite) SetupSuite() {
 	var (
 		m365SiteID = tester.M365SiteID(t)
 		sites      = []string{m365SiteID}
-		idToName   = map[string]string{m365SiteID: "todo-name-" + m365SiteID}
-		nameToID   = map[string]string{"todo-name-" + m365SiteID: m365SiteID}
+		idToName   = map[string]string{m365SiteID: m365SiteID}
+		nameToID   = map[string]string{m365SiteID: m365SiteID}
 		ins        = common.IDsNames{
 			IDToName: idToName,
 			NameToID: nameToID,
diff --git a/src/cli/restore/exchange_e2e_test.go b/src/cli/restore/exchange_e2e_test.go
index 23fb7dc9d..089e09380 100644
--- a/src/cli/restore/exchange_e2e_test.go
+++ b/src/cli/restore/exchange_e2e_test.go
@@ -77,8 +77,8 @@ func (suite *RestoreExchangeE2ESuite) SetupSuite() {
 
 	var (
 		users    = []string{suite.m365UserID}
-		idToName = map[string]string{suite.m365UserID: "todo-name-" + suite.m365UserID}
-		nameToID = map[string]string{"todo-name-" + suite.m365UserID: suite.m365UserID}
+		idToName = map[string]string{suite.m365UserID: suite.m365UserID}
+		nameToID = map[string]string{suite.m365UserID: suite.m365UserID}
 		ins      = common.IDsNames{
 			IDToName: idToName,
 			NameToID: nameToID,
diff --git a/src/pkg/repository/repository.go b/src/pkg/repository/repository.go
index 80686368d..a2bb2443f 100644
--- a/src/pkg/repository/repository.go
+++ b/src/pkg/repository/repository.go
@@ -27,6 +27,7 @@ import (
 	"github.com/alcionai/corso/src/pkg/control"
 	"github.com/alcionai/corso/src/pkg/fault"
 	"github.com/alcionai/corso/src/pkg/logger"
+	"github.com/alcionai/corso/src/pkg/path"
 	"github.com/alcionai/corso/src/pkg/selectors"
 	"github.com/alcionai/corso/src/pkg/storage"
 	"github.com/alcionai/corso/src/pkg/store"
@@ -318,6 +319,11 @@ func (r repository) NewBackupWithLookup(
 		return operations.BackupOperation{}, errors.Wrap(err, "resolving resource owner details")
 	}
 
+	// Exchange and OneDrive need to maintain the user PN as the ID until we're ready to migrate
+	if sel.PathService() != path.SharePointService {
+		ownerID = ownerName
+	}
+
 	// TODO: retrieve display name from gc
 	sel = sel.SetDiscreteOwnerIDName(ownerID, ownerName)