modified anon merge logic

nextguyover · nextguyover · commit 8a7f50934dba · 2024-12-28T21:42:37.000+11:00
diff --git a/Confab/Services/UserService.cs b/Confab/Services/UserService.cs
@@ -376,7 +376,7 @@ private async Task MergeAnonAccount(UserSchema authenticatedUser, UserSchema ano
             }
 
             // if authenticatedUser previously did not have comments, change authenticatedUser's publicId to anonUser's publicId
-            if (authUserInitialCommentCount != 0)
+            if (authUserInitialCommentCount != 0 && authenticatedUser.Role != UserRole.Admin)  // don't change publicId for admin
             {
                 authenticatedUser.PublicId = anonUser.PublicId;
             }

Original file line number	Diff line number	Diff line change
`@@ -376,7 +376,7 @@ private async Task MergeAnonAccount(UserSchema authenticatedUser, UserSchema ano`
`376`	`376`	`}`
`377`	`377`
`378`	`378`	`// if authenticatedUser previously did not have comments, change authenticatedUser's publicId to anonUser's publicId`
`379`		`- if (authUserInitialCommentCount != 0)`
	`379`	`+ if (authUserInitialCommentCount != 0 && authenticatedUser.Role != UserRole.Admin) // don't change publicId for admin`
`380`	`380`	`{`
`381`	`381`	`authenticatedUser.PublicId = anonUser.PublicId;`
`382`	`382`	`}`