Merge pull request #4859 from Cookiezaurs/master-user-merging

Cookiezaurs · web-flow · commit a0907e44adf9 · 2024-01-23T11:47:56.000+02:00
Save last merged uid and did in users document
diff --git a/api/parts/mgmt/app_users.js b/api/parts/mgmt/app_users.js
@@ -569,6 +569,8 @@ usersApi.mergeUserProperties = function(newAppUserP, oldAppUser) {
             newAppUserP[i] = oldAppUser[i];
         }
     }
+    newAppUserP.merged_uid = oldAppUser.uid;
+    newAppUserP.merged_did = oldAppUser.did;
     newAppUserP.merges = (newAppUserP.merges || 0) + 1;
 };
 

Original file line number	Diff line number	Diff line change
`@@ -569,6 +569,8 @@ usersApi.mergeUserProperties = function(newAppUserP, oldAppUser) {`
`569`	`569`	`newAppUserP[i] = oldAppUser[i];`
`570`	`570`	`}`
`571`	`571`	`}`
	`572`	`+ newAppUserP.merged_uid = oldAppUser.uid;`
	`573`	`+ newAppUserP.merged_did = oldAppUser.did;`
`572`	`574`	`newAppUserP.merges = (newAppUserP.merges \|\| 0) + 1;`
`573`	`575`	`};`
`574`	`576`