@@ -412,14 +412,14 @@ class BaseUserRepository extends BaseRepository {
412412 * @param {boolean } [isRegistryObject=true] - If false, returns a legacy user object.
413413 * @returns {Promise<object> } The updated user object.
414414 */
415- async updateUser ( username , orgShortname , incomingParameters , options = { } , isRegistryObject = true , requestingUserUUID = null ) {
415+ async updateUser ( username , orgShortname , incomingParameters , options = { } , isRegistryObject = true , requestingUserUUID = null ) {
416416 const { deepRemoveEmpty } = require ( '../utils/utils' )
417417 const baseOrgRepository = new BaseOrgRepository ( )
418418 const legacyUserRepo = new UserRepository ( )
419419 const { createAuditLogEntry } = require ( './baseOrgRepositoryHelpers' )
420420 const registryOrg = await baseOrgRepository . getOrgObject ( orgShortname , false , options )
421421 const originalRegistryOrg = registryOrg . toObject ( )
422-
422+
423423 const legacyUser = await legacyUserRepo . findOneByUserNameAndOrgUUID ( username , registryOrg . UUID , null , options )
424424 const registryUser = await this . findOneByUsernameAndOrgShortname ( username , orgShortname , options , true )
425425
@@ -455,7 +455,7 @@ async updateUser (username, orgShortname, incomingParameters, options = {}, isRe
455455
456456 const rolesToAdd = _ . flattenDeep ( _ . compact ( _ . get ( incomingParameters , 'active_roles.add' ) ) )
457457 const rolesToRemove = _ . flattenDeep ( _ . compact ( _ . get ( incomingParameters , 'active_roles.remove' ) ) )
458-
458+
459459 if ( rolesToRemove . includes ( 'ADMIN' ) && userUUID ) {
460460 if ( Array . isArray ( registryOrg . admins ) ) {
461461 registryOrg . admins . pull ( userUUID )
@@ -472,7 +472,7 @@ async updateUser (username, orgShortname, incomingParameters, options = {}, isRe
472472 // Handle roles calculation fallback
473473 const initialRoles = legacyUser ?. authority ?. active_roles ?? [ ]
474474 const finalRoles = [ ...new Set ( [ ...initialRoles , ...rolesToAdd ] ) ] . filter ( role => ! rolesToRemove . includes ( role ) )
475-
475+
476476 if ( registryUser ) {
477477 registryUser . role = finalRoles [ 0 ] ?? ''
478478 }
@@ -487,7 +487,7 @@ async updateUser (username, orgShortname, incomingParameters, options = {}, isRe
487487 if ( registryOrg . admins && registryOrg . admins . includes ( userUUID ) ) {
488488 registryOrg . admins . pull ( userUUID )
489489 }
490-
490+
491491 const newOrg = await baseOrgRepository . getOrgObject ( incomingParameters . org_short_name )
492492 const originalNewOrg = newOrg . toObject ( )
493493 if ( ! Array . isArray ( newOrg . users ) ) {
@@ -515,7 +515,7 @@ async updateUser (username, orgShortname, incomingParameters, options = {}, isRe
515515 if ( registryUser ) {
516516 delete registryUser . role
517517 }
518-
518+
519519 await registryOrg . save ( options )
520520 if ( requestingUserUUID ) {
521521 await createAuditLogEntry ( registryOrg , originalRegistryOrg , requestingUserUUID , options )
@@ -554,20 +554,20 @@ async updateUser (username, orgShortname, incomingParameters, options = {}, isRe
554554 * @param {boolean } [isRegistryObject=true] - If false, accepts/returns legacy format.
555555 * @returns {Promise<object> } The updated user object.
556556 */
557- async updateUserFull ( identifier , incomingUser , options = { } , isRegistryObject = true , requestingUserUUID = null ) {
557+ async updateUserFull ( identifier , incomingUser , options = { } , isRegistryObject = true , requestingUserUUID = null ) {
558558 const legacyUserRepo = new UserRepository ( )
559559
560560 const registryUser = await this . findUserByUUID ( identifier , options )
561561 const legacyUser = await legacyUserRepo . findOneByUUID ( identifier )
562-
562+
563563 // Fail only if completely missing everywhere
564564 if ( ! registryUser && ! legacyUser ) {
565565 throw new Error ( 'User not found in any repository' )
566566 }
567567
568568 const { ...incomingUserBody } = incomingUser
569- let legacyObjectRaw = isRegistryObject ? this . convertRegistryToLegacy ( incomingUserBody ) : incomingUserBody
570- let registryObjectRaw = isRegistryObject ? incomingUserBody : this . convertLegacyToRegistry ( incomingUserBody )
569+ const legacyObjectRaw = isRegistryObject ? this . convertRegistryToLegacy ( incomingUserBody ) : incomingUserBody
570+ const registryObjectRaw = isRegistryObject ? incomingUserBody : this . convertLegacyToRegistry ( incomingUserBody )
571571
572572 const protectedFieldsRegistry = [ '_id' , 'UUID' , '__v' , 'secret' , 'created' , 'last_updated' ]
573573 const protectedFieldsLegacy = [ '_id' , 'UUID' , '__v' , 'secret' , 'time' , 'org_UUID' ]
@@ -593,7 +593,7 @@ async updateUserFull (identifier, incomingUser, options = {}, isRegistryObject =
593593 if ( incomingUser . org_short_name ) {
594594 const baseOrgRepository = new BaseOrgRepository ( )
595595 const { createAuditLogEntry } = require ( './baseOrgRepositoryHelpers' )
596-
596+
597597 // Grab current org UUID using whichever document is real
598598 const currentOrgUUID = legacyUser ? legacyUser . org_UUID : registryUser ?. org_UUID // Fallback if schema supports it
599599 const currentOrg = currentOrgUUID ? await baseOrgRepository . findOneByUUID ( currentOrgUUID ) : null
@@ -638,7 +638,6 @@ async updateUserFull (identifier, incomingUser, options = {}, isRegistryObject =
638638 // Conditionally save records
639639 if ( updatedLegacyUser ) await updatedLegacyUser . save ( options )
640640 if ( updatedRegistryUser ) await updatedRegistryUser . save ( options )
641-
642641 } catch ( error ) {
643642 throw new Error ( 'Failed to update user: ' + error . message )
644643 }
@@ -666,7 +665,7 @@ async updateUserFull (identifier, incomingUser, options = {}, isRegistryObject =
666665 * @param {boolean } [isRegistryObject=true] - Unused parameter.
667666 * @returns {Promise<string> } The new random secret key.
668667 */
669- async resetSecret ( username , orgShortName , options = { } , isRegistryObject = true ) {
668+ async resetSecret ( username , orgShortName , options = { } , isRegistryObject = true ) {
670669 const legacyUserRepo = new UserRepository ( )
671670 const baseOrgRepository = new BaseOrgRepository ( )
672671
0 commit comments