npm - @fernir2/saas-kit - Versions diffs - 0.0.174 → 0.0.177 - Mend

@fernir2/saas-kit 0.0.174 → 0.0.177

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (2384) hide show

package/packages/level2/server/users/edit-other-users.cjs.js CHANGED Viewed

@@ -23,7 +23,7 @@ var userDb$1 = require('../../fd-app-toolbox/server/users/user-db.cjs.js');
 var dateTimes = require('../../../fd-toolbox/dates/date-times.cjs.js');
 var enums = require('../../../fd-toolbox/enums/enums.cjs.js');
-var __defProp=Object['defineProperty'],__name=(_0xccc9b1,_0x3993ae)=>__defProp(_0xccc9b1,'name',{'value':_0x3993ae,'configurable':!![]});async function createUserWithSettings(_0x1a0d22){await checkUserPermission(enums.crudActions['create']);const _0x579e52={'email':_0x1a0d22['email'],'password':_0x1a0d22['password'],'userName':_0x1a0d22['userName'],'firstName':_0x1a0d22['firstName']??'','lastName':_0x1a0d22['lastName']??'','userId':uuids.getNewUuid(),'homeWorkspaceId':workspaceConstants.workspaceConstants['defaultWorkspaceId'],'currentWorkspaceId':workspaceConstants.workspaceConstants['defaultWorkspaceId']};await userCreationService.createUser(_0x579e52,uuids.getNewUuid());const _0x44948a=await userDb.getUserByEmail(_0x579e52['email']);if(!_0x44948a)throw errors.createError(metaErrorMessagesConstants.metaErrorMessages['userNotFound']);const _0x52ef42=[resourceNames.resourceNames['user']];await userRole.addUserToRoles(_0x52ef42,_0x44948a['id']);const _0x77fa15={'id':uuids.getNewUuid(),'userId':_0x44948a['id'],'firstName':_0x1a0d22['firstName'],'lastName':_0x1a0d22['lastName'],'createdDate':dateTime.getNow(),'createdByUserId':await currentUserIdProvider.getUserId(),'modifiedDate':dateTime.getNow(),'modifiedByUserId':await currentUserIdProvider.getUserId()};userSettingDb.createUserSetting(_0x77fa15);const _0x31ba33={'userId':_0x44948a['id'],'userName':_0x1a0d22['userName'],'roles':_0x52ef42,'firstName':_0x1a0d22['firstName'],'lastName':_0x1a0d22['lastName']};await messages.publishMessage(_0x31ba33);}__name(createUserWithSettings,'createUserWithSettings');async function editUser(_0x57f0b8){await checkUserPermission(enums.crudActions['update']);if(!_0x57f0b8['id'])throw errors.createError(metaErrorMessagesConstants.metaErrorMessages['noUserIdProvided']);const _0x4ead80=await userDb$1.getUserById(_0x57f0b8['id']);_0x4ead80['email']=_0x57f0b8['email'],_0x4ead80['firstName']=_0x57f0b8['firstName'],_0x4ead80['lastName']=_0x57f0b8['lastName'],_0x4ead80['lastLoginDate']=_0x57f0b8['lastLoginDate']?dateTimes.parseUtcStringToDate(_0x57f0b8['lastLoginDate']):void(-0x807+-0x51*-0x1c+-0xd5),await updateUserSettingIfNeeded(_0x57f0b8,_0x4ead80);_0x4ead80['isDisabled']!==_0x57f0b8['isDisabled']&&(_0x4ead80['isDisabled']=_0x57f0b8['isDisabled'],await userManager.updateUser(_0x4ead80));let _0x4b1255={'isSuccess':!![],'userFriendlyMessage':''};if(_0x57f0b8['password']){const _0x559f96=userManager.generatePasswordResetToken(_0x4ead80),_0x5140ef=await userManager.resetPassword(_0x559f96,_0x4ead80,_0x57f0b8['password']);handleIdentityResult(_0x4b1255,_0x5140ef);}if(_0x4b1255['isSuccess']){const _0x2f04c4=await userManager.updateUser(_0x4ead80);handleIdentityResult(_0x4b1255,_0x2f04c4);}return _0x4b1255;}__name(editUser,'editUser');async function checkUserPermission(_0x264009){if(!permissionChecker.hasPermission(resourceNames.resourceNames['user'],_0x264009,await currentUserIdProvider.getUserId()))throw errors.createError(metaErrorMessagesConstants.metaErrorMessages['noPermissionForCrudAction']['replace']('{0}',crudActionsConstants.crudActionNames['delete'])['replace']('{1}',resourceNames.resourceNames['user']));}__name(checkUserPermission,'checkUserPermission');async function updateUserSettingIfNeeded(_0x1ae6b8,_0x362d0d){const _0x55aa8b=await userSettingDb.getUserSettingByUserId(_0x362d0d['id']);_0x1ae6b8['firstName']&&_0x55aa8b['firstName']!==_0x1ae6b8['firstName']&&(_0x55aa8b['firstName']=_0x1ae6b8['firstName']);_0x1ae6b8['lastName']&&_0x55aa8b['lastName']!==_0x1ae6b8['lastName']&&(_0x55aa8b['lastName']=_0x1ae6b8['lastName']);if(_0x1ae6b8['firstName']||_0x1ae6b8['lastName']){const _0x290d37={'resource':_0x55aa8b,'userId':toolboxUsers.toolboxUserConstants['workerBotId'],'resourceName':resourceNames.resourceNames['userSetting'],'isCalledFromOutside':!![]};await cruds.crudUpdate(_0x290d37);}}__name(updateUserSettingIfNeeded,'updateUserSettingIfNeeded');function handleIdentityResult(_0x14ad71,_0x32f6d9){_0x14ad71['isSuccess']=_0x32f6d9['isSuccess'],_0x14ad71['userFriendlyMessage']=_0x32f6d9['isSuccess']?operationStatusMessages.operationStatusMessages['success']:_0x32f6d9['userFriendlyMessage'];}__name(handleIdentityResult,'handleIdentityResult');
+var __defProp=Object['defineProperty'],__name=(_0x286c87,_0x27b96a)=>__defProp(_0x286c87,'name',{'value':_0x27b96a,'configurable':!![]});async function createUserWithSettings(_0x20fb00){await checkUserPermission(enums.crudActions['create']);const _0x13f884={'email':_0x20fb00['email'],'password':_0x20fb00['password'],'userName':_0x20fb00['userName'],'firstName':_0x20fb00['firstName']??'','lastName':_0x20fb00['lastName']??'','userId':uuids.getNewUuid(),'homeWorkspaceId':workspaceConstants.workspaceConstants['defaultWorkspaceId'],'currentWorkspaceId':workspaceConstants.workspaceConstants['defaultWorkspaceId']};await userCreationService.createUser(_0x13f884,uuids.getNewUuid());const _0x258c84=await userDb.getUserByEmail(_0x13f884['email']);if(!_0x258c84)throw errors.createError(metaErrorMessagesConstants.metaErrorMessages['userNotFound']);const _0x2e2707=[resourceNames.resourceNames['user']];await userRole.addUserToRoles(_0x2e2707,_0x258c84['id']);const _0x3a739b={'id':uuids.getNewUuid(),'userId':_0x258c84['id'],'firstName':_0x20fb00['firstName'],'lastName':_0x20fb00['lastName'],'createdDate':dateTime.getNow(),'createdByUserId':await currentUserIdProvider.getUserId(),'modifiedDate':dateTime.getNow(),'modifiedByUserId':await currentUserIdProvider.getUserId()};userSettingDb.createUserSetting(_0x3a739b);const _0x510c4d={'userId':_0x258c84['id'],'userName':_0x20fb00['userName'],'roles':_0x2e2707,'firstName':_0x20fb00['firstName'],'lastName':_0x20fb00['lastName']};await messages.publishMessage(_0x510c4d);}__name(createUserWithSettings,'createUserWithSettings');async function editUser(_0x451847){await checkUserPermission(enums.crudActions['update']);if(!_0x451847['id'])throw errors.createError(metaErrorMessagesConstants.metaErrorMessages['noUserIdProvided']);const _0x5d6ec7=await userDb$1.getUserById(_0x451847['id']);_0x5d6ec7['email']=_0x451847['email'],_0x5d6ec7['firstName']=_0x451847['firstName'],_0x5d6ec7['lastName']=_0x451847['lastName'],_0x5d6ec7['lastLoginDate']=_0x451847['lastLoginDate']?dateTimes.parseUtcStringToDate(_0x451847['lastLoginDate']):void(0x1*0x1497+0x1*0x187d+-0x2d14),await updateUserSettingIfNeeded(_0x451847,_0x5d6ec7);_0x5d6ec7['isDisabled']!==_0x451847['isDisabled']&&(_0x5d6ec7['isDisabled']=_0x451847['isDisabled'],await userManager.updateUser(_0x5d6ec7));let _0x34f359={'isSuccess':!![],'userFriendlyMessage':''};if(_0x451847['password']){const _0x5f0837=userManager.generatePasswordResetToken(_0x5d6ec7),_0x166354=await userManager.resetPassword(_0x5f0837,_0x5d6ec7,_0x451847['password']);handleIdentityResult(_0x34f359,_0x166354);}if(_0x34f359['isSuccess']){const _0x404f57=await userManager.updateUser(_0x5d6ec7);handleIdentityResult(_0x34f359,_0x404f57);}return _0x34f359;}__name(editUser,'editUser');async function checkUserPermission(_0x5cee66){if(!permissionChecker.hasPermission(resourceNames.resourceNames['user'],_0x5cee66,await currentUserIdProvider.getUserId()))throw errors.createError(metaErrorMessagesConstants.metaErrorMessages['noPermissionForCrudAction']['replace']('{0}',crudActionsConstants.crudActionNames['delete'])['replace']('{1}',resourceNames.resourceNames['user']));}__name(checkUserPermission,'checkUserPermission');async function updateUserSettingIfNeeded(_0x456a45,_0x11f514){const _0x3c901b=await userSettingDb.getUserSettingByUserId(_0x11f514['id']);_0x456a45['firstName']&&_0x3c901b['firstName']!==_0x456a45['firstName']&&(_0x3c901b['firstName']=_0x456a45['firstName']);_0x456a45['lastName']&&_0x3c901b['lastName']!==_0x456a45['lastName']&&(_0x3c901b['lastName']=_0x456a45['lastName']);if(_0x456a45['firstName']||_0x456a45['lastName']){const _0x3c7c78={'resource':_0x3c901b,'userId':toolboxUsers.toolboxUserConstants['workerBotId'],'resourceName':resourceNames.resourceNames['userSetting'],'isCalledFromOutside':!![]};await cruds.crudUpdate(_0x3c7c78);}}__name(updateUserSettingIfNeeded,'updateUserSettingIfNeeded');function handleIdentityResult(_0x33338e,_0x2c0bed){_0x33338e['isSuccess']=_0x2c0bed['isSuccess'],_0x33338e['userFriendlyMessage']=_0x2c0bed['isSuccess']?operationStatusMessages.operationStatusMessages['success']:_0x2c0bed['userFriendlyMessage'];}__name(handleIdentityResult,'handleIdentityResult');
 exports.checkUserPermission = checkUserPermission;
 exports.createUserWithSettings = createUserWithSettings;

package/packages/level2/server/users/edit-other-users.js CHANGED Viewed

@@ -21,6 +21,6 @@ import { getUserById } from '../../fd-app-toolbox/server/users/user-db.js';
 import { parseUtcStringToDate } from '../../../fd-toolbox/dates/date-times.js';
 import { crudActions } from '../../../fd-toolbox/enums/enums.js';
-var __defProp=Object['defineProperty'],__name=(_0xccc9b1,_0x3993ae)=>__defProp(_0xccc9b1,'name',{'value':_0x3993ae,'configurable':!![]});async function createUserWithSettings(_0x1a0d22){await checkUserPermission(crudActions['create']);const _0x579e52={'email':_0x1a0d22['email'],'password':_0x1a0d22['password'],'userName':_0x1a0d22['userName'],'firstName':_0x1a0d22['firstName']??'','lastName':_0x1a0d22['lastName']??'','userId':getNewUuid(),'homeWorkspaceId':workspaceConstants['defaultWorkspaceId'],'currentWorkspaceId':workspaceConstants['defaultWorkspaceId']};await createUser(_0x579e52,getNewUuid());const _0x44948a=await getUserByEmail(_0x579e52['email']);if(!_0x44948a)throw createError(metaErrorMessages['userNotFound']);const _0x52ef42=[resourceNames['user']];await addUserToRoles(_0x52ef42,_0x44948a['id']);const _0x77fa15={'id':getNewUuid(),'userId':_0x44948a['id'],'firstName':_0x1a0d22['firstName'],'lastName':_0x1a0d22['lastName'],'createdDate':getNow(),'createdByUserId':await getUserId(),'modifiedDate':getNow(),'modifiedByUserId':await getUserId()};createUserSetting(_0x77fa15);const _0x31ba33={'userId':_0x44948a['id'],'userName':_0x1a0d22['userName'],'roles':_0x52ef42,'firstName':_0x1a0d22['firstName'],'lastName':_0x1a0d22['lastName']};await publishMessage(_0x31ba33);}__name(createUserWithSettings,'createUserWithSettings');async function editUser(_0x57f0b8){await checkUserPermission(crudActions['update']);if(!_0x57f0b8['id'])throw createError(metaErrorMessages['noUserIdProvided']);const _0x4ead80=await getUserById(_0x57f0b8['id']);_0x4ead80['email']=_0x57f0b8['email'],_0x4ead80['firstName']=_0x57f0b8['firstName'],_0x4ead80['lastName']=_0x57f0b8['lastName'],_0x4ead80['lastLoginDate']=_0x57f0b8['lastLoginDate']?parseUtcStringToDate(_0x57f0b8['lastLoginDate']):void(-0x807+-0x51*-0x1c+-0xd5),await updateUserSettingIfNeeded(_0x57f0b8,_0x4ead80);_0x4ead80['isDisabled']!==_0x57f0b8['isDisabled']&&(_0x4ead80['isDisabled']=_0x57f0b8['isDisabled'],await updateUser(_0x4ead80));let _0x4b1255={'isSuccess':!![],'userFriendlyMessage':''};if(_0x57f0b8['password']){const _0x559f96=generatePasswordResetToken(_0x4ead80),_0x5140ef=await resetPassword(_0x559f96,_0x4ead80,_0x57f0b8['password']);handleIdentityResult(_0x4b1255,_0x5140ef);}if(_0x4b1255['isSuccess']){const _0x2f04c4=await updateUser(_0x4ead80);handleIdentityResult(_0x4b1255,_0x2f04c4);}return _0x4b1255;}__name(editUser,'editUser');async function checkUserPermission(_0x264009){if(!hasPermission(resourceNames['user'],_0x264009,await getUserId()))throw createError(metaErrorMessages['noPermissionForCrudAction']['replace']('{0}',crudActionNames['delete'])['replace']('{1}',resourceNames['user']));}__name(checkUserPermission,'checkUserPermission');async function updateUserSettingIfNeeded(_0x1ae6b8,_0x362d0d){const _0x55aa8b=await getUserSettingByUserId(_0x362d0d['id']);_0x1ae6b8['firstName']&&_0x55aa8b['firstName']!==_0x1ae6b8['firstName']&&(_0x55aa8b['firstName']=_0x1ae6b8['firstName']);_0x1ae6b8['lastName']&&_0x55aa8b['lastName']!==_0x1ae6b8['lastName']&&(_0x55aa8b['lastName']=_0x1ae6b8['lastName']);if(_0x1ae6b8['firstName']||_0x1ae6b8['lastName']){const _0x290d37={'resource':_0x55aa8b,'userId':toolboxUserConstants['workerBotId'],'resourceName':resourceNames['userSetting'],'isCalledFromOutside':!![]};await crudUpdate(_0x290d37);}}__name(updateUserSettingIfNeeded,'updateUserSettingIfNeeded');function handleIdentityResult(_0x14ad71,_0x32f6d9){_0x14ad71['isSuccess']=_0x32f6d9['isSuccess'],_0x14ad71['userFriendlyMessage']=_0x32f6d9['isSuccess']?operationStatusMessages['success']:_0x32f6d9['userFriendlyMessage'];}__name(handleIdentityResult,'handleIdentityResult');
+var __defProp=Object['defineProperty'],__name=(_0x286c87,_0x27b96a)=>__defProp(_0x286c87,'name',{'value':_0x27b96a,'configurable':!![]});async function createUserWithSettings(_0x20fb00){await checkUserPermission(crudActions['create']);const _0x13f884={'email':_0x20fb00['email'],'password':_0x20fb00['password'],'userName':_0x20fb00['userName'],'firstName':_0x20fb00['firstName']??'','lastName':_0x20fb00['lastName']??'','userId':getNewUuid(),'homeWorkspaceId':workspaceConstants['defaultWorkspaceId'],'currentWorkspaceId':workspaceConstants['defaultWorkspaceId']};await createUser(_0x13f884,getNewUuid());const _0x258c84=await getUserByEmail(_0x13f884['email']);if(!_0x258c84)throw createError(metaErrorMessages['userNotFound']);const _0x2e2707=[resourceNames['user']];await addUserToRoles(_0x2e2707,_0x258c84['id']);const _0x3a739b={'id':getNewUuid(),'userId':_0x258c84['id'],'firstName':_0x20fb00['firstName'],'lastName':_0x20fb00['lastName'],'createdDate':getNow(),'createdByUserId':await getUserId(),'modifiedDate':getNow(),'modifiedByUserId':await getUserId()};createUserSetting(_0x3a739b);const _0x510c4d={'userId':_0x258c84['id'],'userName':_0x20fb00['userName'],'roles':_0x2e2707,'firstName':_0x20fb00['firstName'],'lastName':_0x20fb00['lastName']};await publishMessage(_0x510c4d);}__name(createUserWithSettings,'createUserWithSettings');async function editUser(_0x451847){await checkUserPermission(crudActions['update']);if(!_0x451847['id'])throw createError(metaErrorMessages['noUserIdProvided']);const _0x5d6ec7=await getUserById(_0x451847['id']);_0x5d6ec7['email']=_0x451847['email'],_0x5d6ec7['firstName']=_0x451847['firstName'],_0x5d6ec7['lastName']=_0x451847['lastName'],_0x5d6ec7['lastLoginDate']=_0x451847['lastLoginDate']?parseUtcStringToDate(_0x451847['lastLoginDate']):void(0x1*0x1497+0x1*0x187d+-0x2d14),await updateUserSettingIfNeeded(_0x451847,_0x5d6ec7);_0x5d6ec7['isDisabled']!==_0x451847['isDisabled']&&(_0x5d6ec7['isDisabled']=_0x451847['isDisabled'],await updateUser(_0x5d6ec7));let _0x34f359={'isSuccess':!![],'userFriendlyMessage':''};if(_0x451847['password']){const _0x5f0837=generatePasswordResetToken(_0x5d6ec7),_0x166354=await resetPassword(_0x5f0837,_0x5d6ec7,_0x451847['password']);handleIdentityResult(_0x34f359,_0x166354);}if(_0x34f359['isSuccess']){const _0x404f57=await updateUser(_0x5d6ec7);handleIdentityResult(_0x34f359,_0x404f57);}return _0x34f359;}__name(editUser,'editUser');async function checkUserPermission(_0x5cee66){if(!hasPermission(resourceNames['user'],_0x5cee66,await getUserId()))throw createError(metaErrorMessages['noPermissionForCrudAction']['replace']('{0}',crudActionNames['delete'])['replace']('{1}',resourceNames['user']));}__name(checkUserPermission,'checkUserPermission');async function updateUserSettingIfNeeded(_0x456a45,_0x11f514){const _0x3c901b=await getUserSettingByUserId(_0x11f514['id']);_0x456a45['firstName']&&_0x3c901b['firstName']!==_0x456a45['firstName']&&(_0x3c901b['firstName']=_0x456a45['firstName']);_0x456a45['lastName']&&_0x3c901b['lastName']!==_0x456a45['lastName']&&(_0x3c901b['lastName']=_0x456a45['lastName']);if(_0x456a45['firstName']||_0x456a45['lastName']){const _0x3c7c78={'resource':_0x3c901b,'userId':toolboxUserConstants['workerBotId'],'resourceName':resourceNames['userSetting'],'isCalledFromOutside':!![]};await crudUpdate(_0x3c7c78);}}__name(updateUserSettingIfNeeded,'updateUserSettingIfNeeded');function handleIdentityResult(_0x33338e,_0x2c0bed){_0x33338e['isSuccess']=_0x2c0bed['isSuccess'],_0x33338e['userFriendlyMessage']=_0x2c0bed['isSuccess']?operationStatusMessages['success']:_0x2c0bed['userFriendlyMessage'];}__name(handleIdentityResult,'handleIdentityResult');
 export { checkUserPermission, createUserWithSettings, editUser };

package/packages/level2/server/users/tokens.cjs.js CHANGED Viewed

@@ -1,10 +1,10 @@
 'use strict';
 'use strict';
-var _0x564dfc = require('jsonwebtoken');
+var _0x472bf5 = require('jsonwebtoken');
 var configs = require('../../../fd-toolbox/server/configs/configs.cjs.js');
-var __defProp=Object['defineProperty'],__name=(_0x4c7430,_0x5a5d18)=>__defProp(_0x4c7430,'name',{'value':_0x5a5d18,'configurable':!![]});const jwtKey=configs.getConfig()['JwtKey']??'';function isUserPayload(_0x113399){return _0x113399!==null&&typeof _0x113399==='object'&&Object['keys'](_0x113399)['every'](_0x435570=>_0x435570 in _0x113399);}__name(isUserPayload,'isUserPayload');function createToken(_0x5a6227){const _0x28b33f=mapUserToUserPayload(_0x5a6227);return _0x564dfc['sign'](_0x28b33f,jwtKey,{'algorithm':'HS256','expiresIn':'14d'});}__name(createToken,'createToken');function decodeToken(_0x27be78){try{const _0x117f4a=_0x564dfc['verify'](_0x27be78,jwtKey,{'algorithms':['HS256']});if(isUserPayload(_0x117f4a))return _0x117f4a;else throw new Error();}catch{return null;}}__name(decodeToken,'decodeToken');function mapUserToUserPayload(_0x3bfca7){return {'userId':_0x3bfca7['id'],'email':_0x3bfca7['email']};}__name(mapUserToUserPayload,'mapUserToUserPayload');
+var __defProp=Object['defineProperty'],__name=(_0x3aa4a9,_0x56f020)=>__defProp(_0x3aa4a9,'name',{'value':_0x56f020,'configurable':!![]});const jwtKey=configs.getConfig()['JwtKey']??'';function isUserPayload(_0x565a49){return _0x565a49!==null&&typeof _0x565a49==='object'&&Object['keys'](_0x565a49)['every'](_0x106980=>_0x106980 in _0x565a49);}__name(isUserPayload,'isUserPayload');function createToken(_0x53c825){const _0x54b34c=mapUserToUserPayload(_0x53c825);return _0x472bf5['sign'](_0x54b34c,jwtKey,{'algorithm':'HS256','expiresIn':'14d'});}__name(createToken,'createToken');function decodeToken(_0x217f53){try{const _0x3cb297=_0x472bf5['verify'](_0x217f53,jwtKey,{'algorithms':['HS256']});if(isUserPayload(_0x3cb297))return _0x3cb297;else throw new Error();}catch{return null;}}__name(decodeToken,'decodeToken');function mapUserToUserPayload(_0x1ea5a4){return {'userId':_0x1ea5a4['id'],'email':_0x1ea5a4['email']};}__name(mapUserToUserPayload,'mapUserToUserPayload');
 exports.createToken = createToken;
 exports.decodeToken = decodeToken;

package/packages/level2/server/users/tokens.js CHANGED Viewed

@@ -1,7 +1,7 @@
 'use strict';
-import _0x564dfc from 'jsonwebtoken';
+import _0x472bf5 from 'jsonwebtoken';
 import { getConfig } from '../../../fd-toolbox/server/configs/configs.js';
-var __defProp=Object['defineProperty'],__name=(_0x4c7430,_0x5a5d18)=>__defProp(_0x4c7430,'name',{'value':_0x5a5d18,'configurable':!![]});const jwtKey=getConfig()['JwtKey']??'';function isUserPayload(_0x113399){return _0x113399!==null&&typeof _0x113399==='object'&&Object['keys'](_0x113399)['every'](_0x435570=>_0x435570 in _0x113399);}__name(isUserPayload,'isUserPayload');function createToken(_0x5a6227){const _0x28b33f=mapUserToUserPayload(_0x5a6227);return _0x564dfc['sign'](_0x28b33f,jwtKey,{'algorithm':'HS256','expiresIn':'14d'});}__name(createToken,'createToken');function decodeToken(_0x27be78){try{const _0x117f4a=_0x564dfc['verify'](_0x27be78,jwtKey,{'algorithms':['HS256']});if(isUserPayload(_0x117f4a))return _0x117f4a;else throw new Error();}catch{return null;}}__name(decodeToken,'decodeToken');function mapUserToUserPayload(_0x3bfca7){return {'userId':_0x3bfca7['id'],'email':_0x3bfca7['email']};}__name(mapUserToUserPayload,'mapUserToUserPayload');
+var __defProp=Object['defineProperty'],__name=(_0x3aa4a9,_0x56f020)=>__defProp(_0x3aa4a9,'name',{'value':_0x56f020,'configurable':!![]});const jwtKey=getConfig()['JwtKey']??'';function isUserPayload(_0x565a49){return _0x565a49!==null&&typeof _0x565a49==='object'&&Object['keys'](_0x565a49)['every'](_0x106980=>_0x106980 in _0x565a49);}__name(isUserPayload,'isUserPayload');function createToken(_0x53c825){const _0x54b34c=mapUserToUserPayload(_0x53c825);return _0x472bf5['sign'](_0x54b34c,jwtKey,{'algorithm':'HS256','expiresIn':'14d'});}__name(createToken,'createToken');function decodeToken(_0x217f53){try{const _0x3cb297=_0x472bf5['verify'](_0x217f53,jwtKey,{'algorithms':['HS256']});if(isUserPayload(_0x3cb297))return _0x3cb297;else throw new Error();}catch{return null;}}__name(decodeToken,'decodeToken');function mapUserToUserPayload(_0x1ea5a4){return {'userId':_0x1ea5a4['id'],'email':_0x1ea5a4['email']};}__name(mapUserToUserPayload,'mapUserToUserPayload');
 export { createToken, decodeToken };

package/packages/level2/server/users/user-creation-service.cjs.js CHANGED Viewed

@@ -13,6 +13,6 @@ var argon2 = require('@node-rs/argon2');
 var permissionChecker = require('../../meta/server/permission/permission-checker.cjs.js');
 var enums = require('../../../fd-toolbox/enums/enums.cjs.js');
-var __defProp=Object['defineProperty'],__name=(_0x33998b,_0x364382)=>__defProp(_0x33998b,'name',{'value':_0x364382,'configurable':!![]});async function createUser(_0x4b7da9,_0x2d7a2b,_0x4d2342=!![]){const _0xebd6fd=await currentUserIdProvider.getUserId(),_0x70331e=_0xebd6fd===toolboxUsers.toolboxUserConstants['workerBotId']||await permissionChecker.hasPermission(resourceNames.resourceNames['user'],enums.crudActions['create'],_0xebd6fd);if(!_0x70331e)throw errors.createError(toolboxErrorMessagesConstants.toolboxErrorMessages['noPermissionToCreateUser']);const _0x5afd26={'id':_0x2d7a2b??uuids.getNewUuid(),'userId':_0x2d7a2b??_0xebd6fd,'firstName':_0x4b7da9['firstName']??'','lastName':_0x4b7da9['lastName']??'','email':_0x4b7da9['email'],'passwordHash':await argon2.hash(_0x4b7da9['password']),'isDisabled':![],'securityStamp':crypto.randomBytes(0x14a5+0xd6b+-0x21f0)['toString']('hex'),'homeWorkspaceId':_0x4b7da9['homeWorkspaceId'],'currentWorkspaceId':_0x4b7da9['currentWorkspaceId']},_0x518c27=await userDb.createUserResource(_0x5afd26),_0x4d4736=!!_0x518c27['id'],_0x50d9c2={'isSuccess':_0x4d4736,'userFriendlyMessage':''};if(!_0x4d4736){_0x50d9c2['userFriendlyMessage']=toolboxErrorMessagesConstants.toolboxErrorMessages['failedToCreateUser'];if(_0x4d2342)throw errors.createError(toolboxErrorMessagesConstants.toolboxErrorMessages['userCreationFailedWithReason']['replace']('{0}',_0x50d9c2['userFriendlyMessage']));}return _0x50d9c2;}__name(createUser,'createUser');
+var __defProp=Object['defineProperty'],__name=(_0xa4c85e,_0x258698)=>__defProp(_0xa4c85e,'name',{'value':_0x258698,'configurable':!![]});async function createUser(_0xeda29d,_0x58be0a,_0x3cd57c=!![]){const _0x16fca5=await currentUserIdProvider.getUserId(),_0x329c7f=_0x16fca5===toolboxUsers.toolboxUserConstants['workerBotId']||await permissionChecker.hasPermission(resourceNames.resourceNames['user'],enums.crudActions['create'],_0x16fca5);if(!_0x329c7f)throw errors.createError(toolboxErrorMessagesConstants.toolboxErrorMessages['noPermissionToCreateUser']);const _0xdc8361={'id':_0x58be0a??uuids.getNewUuid(),'userId':_0x58be0a??_0x16fca5,'firstName':_0xeda29d['firstName']??'','lastName':_0xeda29d['lastName']??'','email':_0xeda29d['email'],'passwordHash':await argon2.hash(_0xeda29d['password']),'isDisabled':![],'securityStamp':crypto.randomBytes(-0x28d+0x743+-0x496)['toString']('hex'),'homeWorkspaceId':_0xeda29d['homeWorkspaceId'],'currentWorkspaceId':_0xeda29d['currentWorkspaceId']},_0x74805=await userDb.createUserResource(_0xdc8361),_0x349455=!!_0x74805['id'],_0x21701c={'isSuccess':_0x349455,'userFriendlyMessage':''};if(!_0x349455){_0x21701c['userFriendlyMessage']=toolboxErrorMessagesConstants.toolboxErrorMessages['failedToCreateUser'];if(_0x3cd57c)throw errors.createError(toolboxErrorMessagesConstants.toolboxErrorMessages['userCreationFailedWithReason']['replace']('{0}',_0x21701c['userFriendlyMessage']));}return _0x21701c;}__name(createUser,'createUser');
 exports.createUser = createUser;

package/packages/level2/server/users/user-creation-service.js CHANGED Viewed

@@ -11,6 +11,6 @@ import { hash } from '@node-rs/argon2';
 import { hasPermission } from '../../meta/server/permission/permission-checker.js';
 import { crudActions } from '../../../fd-toolbox/enums/enums.js';
-var __defProp=Object['defineProperty'],__name=(_0x33998b,_0x364382)=>__defProp(_0x33998b,'name',{'value':_0x364382,'configurable':!![]});async function createUser(_0x4b7da9,_0x2d7a2b,_0x4d2342=!![]){const _0xebd6fd=await getUserId(),_0x70331e=_0xebd6fd===toolboxUserConstants['workerBotId']||await hasPermission(resourceNames['user'],crudActions['create'],_0xebd6fd);if(!_0x70331e)throw createError(toolboxErrorMessages['noPermissionToCreateUser']);const _0x5afd26={'id':_0x2d7a2b??getNewUuid(),'userId':_0x2d7a2b??_0xebd6fd,'firstName':_0x4b7da9['firstName']??'','lastName':_0x4b7da9['lastName']??'','email':_0x4b7da9['email'],'passwordHash':await hash(_0x4b7da9['password']),'isDisabled':![],'securityStamp':randomBytes(0x14a5+0xd6b+-0x21f0)['toString']('hex'),'homeWorkspaceId':_0x4b7da9['homeWorkspaceId'],'currentWorkspaceId':_0x4b7da9['currentWorkspaceId']},_0x518c27=await createUserResource(_0x5afd26),_0x4d4736=!!_0x518c27['id'],_0x50d9c2={'isSuccess':_0x4d4736,'userFriendlyMessage':''};if(!_0x4d4736){_0x50d9c2['userFriendlyMessage']=toolboxErrorMessages['failedToCreateUser'];if(_0x4d2342)throw createError(toolboxErrorMessages['userCreationFailedWithReason']['replace']('{0}',_0x50d9c2['userFriendlyMessage']));}return _0x50d9c2;}__name(createUser,'createUser');
+var __defProp=Object['defineProperty'],__name=(_0xa4c85e,_0x258698)=>__defProp(_0xa4c85e,'name',{'value':_0x258698,'configurable':!![]});async function createUser(_0xeda29d,_0x58be0a,_0x3cd57c=!![]){const _0x16fca5=await getUserId(),_0x329c7f=_0x16fca5===toolboxUserConstants['workerBotId']||await hasPermission(resourceNames['user'],crudActions['create'],_0x16fca5);if(!_0x329c7f)throw createError(toolboxErrorMessages['noPermissionToCreateUser']);const _0xdc8361={'id':_0x58be0a??getNewUuid(),'userId':_0x58be0a??_0x16fca5,'firstName':_0xeda29d['firstName']??'','lastName':_0xeda29d['lastName']??'','email':_0xeda29d['email'],'passwordHash':await hash(_0xeda29d['password']),'isDisabled':![],'securityStamp':randomBytes(-0x28d+0x743+-0x496)['toString']('hex'),'homeWorkspaceId':_0xeda29d['homeWorkspaceId'],'currentWorkspaceId':_0xeda29d['currentWorkspaceId']},_0x74805=await createUserResource(_0xdc8361),_0x349455=!!_0x74805['id'],_0x21701c={'isSuccess':_0x349455,'userFriendlyMessage':''};if(!_0x349455){_0x21701c['userFriendlyMessage']=toolboxErrorMessages['failedToCreateUser'];if(_0x3cd57c)throw createError(toolboxErrorMessages['userCreationFailedWithReason']['replace']('{0}',_0x21701c['userFriendlyMessage']));}return _0x21701c;}__name(createUser,'createUser');
 export { createUser };

package/packages/level2/server/users/user-db.cjs.js CHANGED Viewed

@@ -1,21 +1,22 @@
 'use strict';
 'use strict';
-var dbConnection = require('../../meta/server/db/db-connection.cjs.js');
+var dbConnection = require('../../db/db-connection.cjs.js');
 var drizzleOrm = require('drizzle-orm');
-var db$1 = require('../../meta/server/db/db.cjs.js');
+var db = require('../../meta/server/db/db.cjs.js');
 var resourceNames = require('../../../fd-toolbox/resources/resource-names.cjs.js');
 var uuids = require('../../../fd-toolbox/uuids.cjs.js');
 var schema = require('../../../../generated/schema.cjs.js');
 var auths = require('./auths.cjs.js');
 var workspaceConstants = require('../../../fd-toolbox/server/constants/workspace-constants.cjs.js');
 var drizzle = require('../../meta/server/web/drizzle.cjs.js');
+var drizzleQueries = require('../../db/drizzle-queries.cjs.js');
 var oauthServiceDb = require('../auth/oauth-service-db.cjs.js');
 var singleFuncs = require('../../../fd-toolbox/server/collections/single-funcs.cjs.js');
 var userDb = require('../../fd-app-toolbox/server/users/user-db.cjs.js');
 var crudResources = require('../../meta/server/resources/crud-resources.cjs.js');
-var __defProp=Object['defineProperty'],__name=(_0x204698,_0x105140)=>__defProp(_0x204698,'name',{'value':_0x105140,'configurable':!![]});const db=dbConnection.getDb();async function getUserByEmail(_0x50fdaf){const _0x3e262b=await db$1.getResourcesByField(resourceNames.resourceNames['user'],schema.userSchema['email'],_0x50fdaf);return singleFuncs.singleOrDefault(_0x3e262b);}__name(getUserByEmail,'getUserByEmail');async function getUserByEmailAndPassword(_0x50d164,_0x372a7c){const _0x366cec=await getUserByEmail(_0x50d164);if(_0x366cec){const _0x2c8561=await auths.checkValidPassword(_0x372a7c,_0x366cec['passwordHash']??'');if(_0x2c8561)return _0x366cec;}return null;}__name(getUserByEmailAndPassword,'getUserByEmailAndPassword');async function getUserByOAuth(_0x5f40a5,_0x18a101){const _0x20a017=await oauthServiceDb.getOAuthProviderByAuthKey(_0x18a101,_0x5f40a5);if(!_0x20a017)return null;const _0x4e71f=await userDb.getUserById(_0x20a017['userId']);return _0x4e71f;}__name(getUserByOAuth,'getUserByOAuth');async function createUserResource(_0x15cc69){return crudResources.createResource(_0x15cc69,resourceNames.resourceNames['user']);}__name(createUserResource,'createUserResource');async function addRoleToUser(_0x2af341,_0x3681cd){return db['insert'](schema.userRoleSchema)['values']({'id':uuids.getNewUuid(),'userId':_0x2af341,'roleId':_0x3681cd})['onConflictDoNothing']()['returning']();}__name(addRoleToUser,'addRoleToUser');async function getUserHomeWorkspaceId(_0x4a6021){const _0x340a50=await userDb.getUserById(_0x4a6021);if(!_0x340a50['homeWorkspaceId'])return workspaceConstants.workspaceConstants['defaultWorkspaceId'];return _0x340a50['homeWorkspaceId'];}__name(getUserHomeWorkspaceId,'getUserHomeWorkspaceId');async function getUserDtosOrSingle(_0x259cd9){const _0x5bcadd=[drizzleOrm.eq(schema.userSchema['isDisabled'],![])];if(_0x259cd9)_0x5bcadd['push'](drizzleOrm.eq(schema.userSchema['id'],_0x259cd9));const {query:_0x13ff5c}=await drizzle.getQuery(schema.userSchema);drizzle.applyFilterToQuery(_0x13ff5c,drizzleOrm.and(..._0x5bcadd));const _0x49a31c=(await _0x13ff5c)['map'](_0x47e261=>({'id':_0x47e261['id'],'email':_0x47e261['email']??void(-0x1d5e+0x2353*-0x1+0x40b1*0x1)}));return _0x49a31c;}__name(getUserDtosOrSingle,'getUserDtosOrSingle');
+var __defProp=Object['defineProperty'],__name=(_0x376104,_0x212f63)=>__defProp(_0x376104,'name',{'value':_0x212f63,'configurable':!![]});async function getUserByEmail(_0x106009){const _0x4ece85=await db.getResourcesByField(resourceNames.resourceNames['user'],schema.userSchema['email'],_0x106009);return singleFuncs.singleOrDefault(_0x4ece85);}__name(getUserByEmail,'getUserByEmail');async function getUserByEmailAndPassword(_0x3c8302,_0x35f475){const _0x33895f=await getUserByEmail(_0x3c8302);if(_0x33895f){const _0x4c245a=await auths.checkValidPassword(_0x35f475,_0x33895f['passwordHash']??'');if(_0x4c245a)return _0x33895f;}return null;}__name(getUserByEmailAndPassword,'getUserByEmailAndPassword');async function getUserByOAuth(_0x296dc4,_0x4e15d8){const _0x4c0c12=await oauthServiceDb.getOAuthProviderByAuthKey(_0x4e15d8,_0x296dc4);if(!_0x4c0c12)return null;const _0x1bca23=await userDb.getUserById(_0x4c0c12['userId']);return _0x1bca23;}__name(getUserByOAuth,'getUserByOAuth');async function createUserResource(_0x5baa62){return crudResources.createResource(_0x5baa62,resourceNames.resourceNames['user']);}__name(createUserResource,'createUserResource');async function addRoleToUser(_0x101b68,_0x1cb9c3){return dbConnection.dbInsert(schema.userRoleSchema)['values']({'id':uuids.getNewUuid(),'userId':_0x101b68,'roleId':_0x1cb9c3})['onConflictDoNothing']()['returning']();}__name(addRoleToUser,'addRoleToUser');async function getUserHomeWorkspaceId(_0xdd605b){const _0x23d426=await userDb.getUserById(_0xdd605b);if(!_0x23d426['homeWorkspaceId'])return workspaceConstants.workspaceConstants['defaultWorkspaceId'];return _0x23d426['homeWorkspaceId'];}__name(getUserHomeWorkspaceId,'getUserHomeWorkspaceId');async function getUserDtosOrSingle(_0x70959e){const _0x3c7112=[drizzleOrm.eq(schema.userSchema['isDisabled'],![])];if(_0x70959e)_0x3c7112['push'](drizzleOrm.eq(schema.userSchema['id'],_0x70959e));const {query:_0x5a1d34}=await drizzle.getQuery(schema.userSchema);drizzleQueries.applyFilterToQuery(_0x5a1d34,drizzleOrm.and(..._0x3c7112));const _0x2bd422=(await drizzleQueries.runQuery(_0x5a1d34))['map'](_0x5d1c83=>({'id':_0x5d1c83['id'],'email':_0x5d1c83['email']??void(-0x2474+0x21a*-0x8+0x3544)}));return _0x2bd422;}__name(getUserDtosOrSingle,'getUserDtosOrSingle');
 exports.addRoleToUser = addRoleToUser;
 exports.createUserResource = createUserResource;

package/packages/level2/server/users/user-db.d.ts CHANGED Viewed

@@ -4,13 +4,6 @@ export declare function getUserByEmailAndPassword(email: string, password: strin
 export declare function getUserByOAuth(oauthKey: string, oauthProvider: string): Promise<User>;
 export declare function createUserResource(userToCreate: User): Promise<User>;
 /** @internal */
-export declare function addRoleToUser(userId: string, roleId: string): Promise<{
-    id: string;
-    userId: string;
-    roleId: string;
-}[]>;
+export declare function addRoleToUser(userId: string, roleId: string): Promise<any>;
 export declare function getUserHomeWorkspaceId(userId: string): Promise<string>;
-export declare function getUserDtosOrSingle(userId?: string): Promise<{
-    id: string;
-    email: string;
-}[]>;
+export declare function getUserDtosOrSingle(userId?: string): Promise<any>;

package/packages/level2/server/users/user-db.js CHANGED Viewed

@@ -1,5 +1,5 @@
 'use strict';
-import { getDb } from '../../meta/server/db/db-connection.js';
+import { dbInsert } from '../../db/db-connection.js';
 import { eq, and } from 'drizzle-orm';
 import { getResourcesByField } from '../../meta/server/db/db.js';
 import { resourceNames } from '../../../fd-toolbox/resources/resource-names.js';
@@ -7,12 +7,13 @@ import { getNewUuid } from '../../../fd-toolbox/uuids.js';
 import { userSchema, userRoleSchema } from '../../../../generated/schema.js';
 import { checkValidPassword } from './auths.js';
 import { workspaceConstants } from '../../../fd-toolbox/server/constants/workspace-constants.js';
-import { getQuery, applyFilterToQuery } from '../../meta/server/web/drizzle.js';
+import { getQuery } from '../../meta/server/web/drizzle.js';
+import { applyFilterToQuery, runQuery } from '../../db/drizzle-queries.js';
 import { getOAuthProviderByAuthKey } from '../auth/oauth-service-db.js';
 import { singleOrDefault } from '../../../fd-toolbox/server/collections/single-funcs.js';
 import { getUserById } from '../../fd-app-toolbox/server/users/user-db.js';
 import { createResource } from '../../meta/server/resources/crud-resources.js';
-var __defProp=Object['defineProperty'],__name=(_0x204698,_0x105140)=>__defProp(_0x204698,'name',{'value':_0x105140,'configurable':!![]});const db=getDb();async function getUserByEmail(_0x50fdaf){const _0x3e262b=await getResourcesByField(resourceNames['user'],userSchema['email'],_0x50fdaf);return singleOrDefault(_0x3e262b);}__name(getUserByEmail,'getUserByEmail');async function getUserByEmailAndPassword(_0x50d164,_0x372a7c){const _0x366cec=await getUserByEmail(_0x50d164);if(_0x366cec){const _0x2c8561=await checkValidPassword(_0x372a7c,_0x366cec['passwordHash']??'');if(_0x2c8561)return _0x366cec;}return null;}__name(getUserByEmailAndPassword,'getUserByEmailAndPassword');async function getUserByOAuth(_0x5f40a5,_0x18a101){const _0x20a017=await getOAuthProviderByAuthKey(_0x18a101,_0x5f40a5);if(!_0x20a017)return null;const _0x4e71f=await getUserById(_0x20a017['userId']);return _0x4e71f;}__name(getUserByOAuth,'getUserByOAuth');async function createUserResource(_0x15cc69){return createResource(_0x15cc69,resourceNames['user']);}__name(createUserResource,'createUserResource');async function addRoleToUser(_0x2af341,_0x3681cd){return db['insert'](userRoleSchema)['values']({'id':getNewUuid(),'userId':_0x2af341,'roleId':_0x3681cd})['onConflictDoNothing']()['returning']();}__name(addRoleToUser,'addRoleToUser');async function getUserHomeWorkspaceId(_0x4a6021){const _0x340a50=await getUserById(_0x4a6021);if(!_0x340a50['homeWorkspaceId'])return workspaceConstants['defaultWorkspaceId'];return _0x340a50['homeWorkspaceId'];}__name(getUserHomeWorkspaceId,'getUserHomeWorkspaceId');async function getUserDtosOrSingle(_0x259cd9){const _0x5bcadd=[eq(userSchema['isDisabled'],![])];if(_0x259cd9)_0x5bcadd['push'](eq(userSchema['id'],_0x259cd9));const {query:_0x13ff5c}=await getQuery(userSchema);applyFilterToQuery(_0x13ff5c,and(..._0x5bcadd));const _0x49a31c=(await _0x13ff5c)['map'](_0x47e261=>({'id':_0x47e261['id'],'email':_0x47e261['email']??void(-0x1d5e+0x2353*-0x1+0x40b1*0x1)}));return _0x49a31c;}__name(getUserDtosOrSingle,'getUserDtosOrSingle');
+var __defProp=Object['defineProperty'],__name=(_0x376104,_0x212f63)=>__defProp(_0x376104,'name',{'value':_0x212f63,'configurable':!![]});async function getUserByEmail(_0x106009){const _0x4ece85=await getResourcesByField(resourceNames['user'],userSchema['email'],_0x106009);return singleOrDefault(_0x4ece85);}__name(getUserByEmail,'getUserByEmail');async function getUserByEmailAndPassword(_0x3c8302,_0x35f475){const _0x33895f=await getUserByEmail(_0x3c8302);if(_0x33895f){const _0x4c245a=await checkValidPassword(_0x35f475,_0x33895f['passwordHash']??'');if(_0x4c245a)return _0x33895f;}return null;}__name(getUserByEmailAndPassword,'getUserByEmailAndPassword');async function getUserByOAuth(_0x296dc4,_0x4e15d8){const _0x4c0c12=await getOAuthProviderByAuthKey(_0x4e15d8,_0x296dc4);if(!_0x4c0c12)return null;const _0x1bca23=await getUserById(_0x4c0c12['userId']);return _0x1bca23;}__name(getUserByOAuth,'getUserByOAuth');async function createUserResource(_0x5baa62){return createResource(_0x5baa62,resourceNames['user']);}__name(createUserResource,'createUserResource');async function addRoleToUser(_0x101b68,_0x1cb9c3){return dbInsert(userRoleSchema)['values']({'id':getNewUuid(),'userId':_0x101b68,'roleId':_0x1cb9c3})['onConflictDoNothing']()['returning']();}__name(addRoleToUser,'addRoleToUser');async function getUserHomeWorkspaceId(_0xdd605b){const _0x23d426=await getUserById(_0xdd605b);if(!_0x23d426['homeWorkspaceId'])return workspaceConstants['defaultWorkspaceId'];return _0x23d426['homeWorkspaceId'];}__name(getUserHomeWorkspaceId,'getUserHomeWorkspaceId');async function getUserDtosOrSingle(_0x70959e){const _0x3c7112=[eq(userSchema['isDisabled'],![])];if(_0x70959e)_0x3c7112['push'](eq(userSchema['id'],_0x70959e));const {query:_0x5a1d34}=await getQuery(userSchema);applyFilterToQuery(_0x5a1d34,and(..._0x3c7112));const _0x2bd422=(await runQuery(_0x5a1d34))['map'](_0x5d1c83=>({'id':_0x5d1c83['id'],'email':_0x5d1c83['email']??void(-0x2474+0x21a*-0x8+0x3544)}));return _0x2bd422;}__name(getUserDtosOrSingle,'getUserDtosOrSingle');
 export { addRoleToUser, createUserResource, getUserByEmail, getUserByEmailAndPassword, getUserByOAuth, getUserDtosOrSingle, getUserHomeWorkspaceId };

package/packages/level2/server/users/user-deletions.cjs.js CHANGED Viewed

@@ -9,6 +9,6 @@ var editOtherUsers = require('./edit-other-users.cjs.js');
 var userManager = require('./user-manager.cjs.js');
 var enums = require('../../../fd-toolbox/enums/enums.cjs.js');
-var __defProp=Object['defineProperty'],__name=(_0x2f312a,_0x11a720)=>__defProp(_0x2f312a,'name',{'value':_0x11a720,'configurable':!![]});async function deleteUser(_0x249bd5){editOtherUsers.checkUserPermission(enums.crudActions['delete']);const _0x33b8d2=await itemDb.getItemsByUserId(_0x249bd5);for(const _0x2e14f5 of _0x33b8d2){const _0x3373ba={'resourceName':resourceNames.resourceNames['item'],'resourceId':_0x2e14f5['id'],'userId':toolboxUsers.toolboxUserConstants['workerBotId'],'ignoreDbUpdateConcurrencyException':![]};await cruds.crudDelete(_0x3373ba);}await userManager.userManagerDeleteUser(_0x249bd5);}__name(deleteUser,'deleteUser');
+var __defProp=Object['defineProperty'],__name=(_0x38f8f4,_0x50c489)=>__defProp(_0x38f8f4,'name',{'value':_0x50c489,'configurable':!![]});async function deleteUser(_0x1d187f){editOtherUsers.checkUserPermission(enums.crudActions['delete']);const _0x551855=await itemDb.getItemsByUserId(_0x1d187f);for(const _0x344cb3 of _0x551855){const _0x525f57={'resourceName':resourceNames.resourceNames['item'],'resourceId':_0x344cb3['id'],'userId':toolboxUsers.toolboxUserConstants['workerBotId'],'ignoreDbUpdateConcurrencyException':![]};await cruds.crudDelete(_0x525f57);}await userManager.userManagerDeleteUser(_0x1d187f);}__name(deleteUser,'deleteUser');
 exports.deleteUser = deleteUser;

package/packages/level2/server/users/user-deletions.js CHANGED Viewed

@@ -7,6 +7,6 @@ import { checkUserPermission } from './edit-other-users.js';
 import { userManagerDeleteUser } from './user-manager.js';
 import { crudActions } from '../../../fd-toolbox/enums/enums.js';
-var __defProp=Object['defineProperty'],__name=(_0x2f312a,_0x11a720)=>__defProp(_0x2f312a,'name',{'value':_0x11a720,'configurable':!![]});async function deleteUser(_0x249bd5){checkUserPermission(crudActions['delete']);const _0x33b8d2=await getItemsByUserId(_0x249bd5);for(const _0x2e14f5 of _0x33b8d2){const _0x3373ba={'resourceName':resourceNames['item'],'resourceId':_0x2e14f5['id'],'userId':toolboxUserConstants['workerBotId'],'ignoreDbUpdateConcurrencyException':![]};await crudDelete(_0x3373ba);}await userManagerDeleteUser(_0x249bd5);}__name(deleteUser,'deleteUser');
+var __defProp=Object['defineProperty'],__name=(_0x38f8f4,_0x50c489)=>__defProp(_0x38f8f4,'name',{'value':_0x50c489,'configurable':!![]});async function deleteUser(_0x1d187f){checkUserPermission(crudActions['delete']);const _0x551855=await getItemsByUserId(_0x1d187f);for(const _0x344cb3 of _0x551855){const _0x525f57={'resourceName':resourceNames['item'],'resourceId':_0x344cb3['id'],'userId':toolboxUserConstants['workerBotId'],'ignoreDbUpdateConcurrencyException':![]};await crudDelete(_0x525f57);}await userManagerDeleteUser(_0x1d187f);}__name(deleteUser,'deleteUser');
 export { deleteUser };

package/packages/level2/server/users/user-feature-db.cjs.js CHANGED Viewed

@@ -3,6 +3,7 @@
 var db = require('../../meta/server/db/db.cjs.js');
 var drizzle = require('../../meta/server/web/drizzle.cjs.js');
+var drizzleQueries = require('../../db/drizzle-queries.cjs.js');
 var schema = require('../../../../generated/schema.cjs.js');
 var drizzleOrm = require('drizzle-orm');
 var resourceNames = require('../../../fd-toolbox/resources/resource-names.cjs.js');
@@ -13,8 +14,9 @@ var metaErrorMessagesConstants = require('../../meta/constants/meta-error-messag
 var userFeaturePredicates = require('./user-feature-predicates.cjs.js');
 var featureEnums = require('../../meta/core/resources/enums/feature-enums.cjs.js');
 var crudResources = require('../../meta/server/resources/crud-resources.cjs.js');
+var dbConnection = require('../../db/db-connection.cjs.js');
-var __defProp=Object['defineProperty'],__name=(_0xf20e51,_0x4ab5a0)=>__defProp(_0xf20e51,'name',{'value':_0x4ab5a0,'configurable':!![]});async function getOneUserFeatureEnabledByUserId(_0x2c4f6f,_0x74918f){const {query:_0x561342}=await drizzle.getQuery(schema.userFeatureSchema);_0x561342['leftJoin'](schema.featureSchema,drizzleOrm.eq(schema.featureSchema['id'],schema.userFeatureSchema['featureId'])),drizzle.applyFilterToQuery(_0x561342,userFeaturePredicates.getUserFeatureByFeatureCode(_0x2c4f6f,_0x74918f)),drizzle.applyFilterToQuery(_0x561342,drizzleOrm.eq(schema.userFeatureSchema['userId'],_0x74918f));const _0xb5a7c9=await _0x561342;return _0xb5a7c9[-0x1*-0xf6a+0x2072+-0x2*0x17ee]?_0xb5a7c9[-0x1*0x337+0x1cb0+-0x1*0x1979]:null;}__name(getOneUserFeatureEnabledByUserId,'getOneUserFeatureEnabledByUserId');async function getUserFeatures(){return db.getResourcesByName(resourceNames.resourceNames['userFeature']);}__name(getUserFeatures,'getUserFeatures');async function getUserFeaturesByUserId(_0x120a47){const {query:_0x5ec8ee}=await drizzle.getQuery(schema.userFeatureSchema);drizzle.applyFilterToQuery(_0x5ec8ee,drizzleOrm.eq(schema.userFeatureSchema['userId'],_0x120a47));const _0x2a0bfe=await _0x5ec8ee;return _0x2a0bfe;}__name(getUserFeaturesByUserId,'getUserFeaturesByUserId');async function tryGetOneByCode(_0x4a5d5f,_0x26531d){const {query:_0xd82b1f}=await drizzle.getQuery(schema.userFeatureSchema,drizzleOrm.getTableColumns(schema.userFeatureSchema));_0xd82b1f['leftJoin'](schema.featureSchema,drizzleOrm.eq(schema.featureSchema['id'],schema.userFeatureSchema['featureId'])),drizzle.applyFilterToQuery(_0xd82b1f,drizzleOrm.and(drizzleOrm.eq(schema.userFeatureSchema['userId'],_0x4a5d5f),drizzleOrm.eq(schema.featureSchema['code'],_0x26531d)));const _0x1fd869=await _0xd82b1f;return _0x1fd869[-0xa49*-0x3+-0x159*-0x3+-0x22e6]?_0x1fd869[-0x1*-0x23e3+-0x49f+0x29b*-0xc]:null;}__name(tryGetOneByCode,'tryGetOneByCode');async function createUserFeatures(_0x5c5c3b,_0x31937b,_0x50e219){const _0x45e369=new Map([]),_0x42acd9=Array['from'](_0x31937b['keys']());for(const _0x164d0c of _0x42acd9){!_0x45e369['has'](_0x164d0c)&&_0x45e369['set'](_0x164d0c,![]);}for(const [_0x380a65,_0x5e7af5]of _0x45e369){const _0xd59e2c=_0x5e7af5?featureEnums.userFeatureStates['enabled']:featureEnums.userFeatureStates['disabled'];await createUserFeature(_0x5c5c3b['userId'],_0x380a65,_0x31937b,_0x50e219,_0xd59e2c);}}__name(createUserFeatures,'createUserFeatures');async function getUserFeatureToUserIdMap(){const _0x2477c7=new Map(),_0x36c124=await drizzle.executeQuery(schema.userFeatureSchema);for(const _0x1b6a81 of _0x36c124){const _0xb15226=_0x1b6a81['userId'];!_0x2477c7['has'](_0xb15226)&&_0x2477c7['set'](_0xb15226,[]),_0x2477c7['get'](_0xb15226)['push'](_0x1b6a81);}return _0x2477c7;}__name(getUserFeatureToUserIdMap,'getUserFeatureToUserIdMap');async function createUserFeature(_0x5e1493,_0x190e0b,_0x5ddd9b,_0x460525,_0x18ce1a){if(!_0x5ddd9b['has'](_0x190e0b))throw errors.createError(metaErrorMessagesConstants.metaErrorMessages['featureCodeMissing']['replace']('{0}',_0x190e0b));const _0x334feb=_0x5ddd9b['get'](_0x190e0b),_0x281b55=_0x460525['find'](_0x1695ee=>_0x1695ee['featureId']===_0x334feb['id']&&_0x1695ee['userId']===_0x5e1493);if(!_0x281b55){const _0x22b548={...baseResourceProperties.createBaseResourceProperties(),'featureId':_0x334feb['id'],'state':_0x18ce1a,'userId':_0x5e1493,'workspaceId':workspaceConstants.workspaceConstants['defaultWorkspaceId']};await crudResources.createResource(_0x22b548,resourceNames.resourceNames['userFeature']);}}__name(createUserFeature,'createUserFeature');
+var __defProp=Object['defineProperty'],__name=(_0x388de4,_0x49afff)=>__defProp(_0x388de4,'name',{'value':_0x49afff,'configurable':!![]});async function getOneUserFeatureEnabledByUserId(_0x13496b,_0x5c5db3){const {query:_0x1fdd84}=await drizzle.getQuery(schema.userFeatureSchema);dbConnection.dbLeftJoin(_0x1fdd84,schema.featureSchema,drizzleOrm.eq(schema.featureSchema['id'],schema.userFeatureSchema['featureId'])),drizzleQueries.applyFilterToQuery(_0x1fdd84,userFeaturePredicates.getUserFeatureByFeatureCode(_0x13496b,_0x5c5db3)),drizzleQueries.applyFilterToQuery(_0x1fdd84,drizzleOrm.eq(schema.userFeatureSchema['userId'],_0x5c5db3));const _0x3e7043=await drizzleQueries.runQuery(_0x1fdd84);return _0x3e7043[-0x261+-0x1b3+0x414]?_0x3e7043[0x3*0xb3d+-0x2088+-0x12f]:null;}__name(getOneUserFeatureEnabledByUserId,'getOneUserFeatureEnabledByUserId');async function getUserFeatures(){return db.getResourcesByName(resourceNames.resourceNames['userFeature']);}__name(getUserFeatures,'getUserFeatures');async function getUserFeaturesByUserId(_0x1f4256){const {query:_0x2c140d}=await drizzle.getQuery(schema.userFeatureSchema);drizzleQueries.applyFilterToQuery(_0x2c140d,drizzleOrm.eq(schema.userFeatureSchema['userId'],_0x1f4256));const _0x19248e=await drizzleQueries.runQuery(_0x2c140d);return _0x19248e;}__name(getUserFeaturesByUserId,'getUserFeaturesByUserId');async function tryGetOneByCode(_0x5b53a2,_0x210d1e){const {query:_0x8b5aa7}=await drizzle.getQuery(schema.userFeatureSchema,drizzleOrm.getTableColumns(schema.userFeatureSchema));dbConnection.dbLeftJoin(_0x8b5aa7,schema.featureSchema,drizzleOrm.eq(schema.featureSchema['id'],schema.userFeatureSchema['featureId'])),drizzleQueries.applyFilterToQuery(_0x8b5aa7,drizzleOrm.and(drizzleOrm.eq(schema.userFeatureSchema['userId'],_0x5b53a2),drizzleOrm.eq(schema.featureSchema['code'],_0x210d1e)));const _0x314cd3=await drizzleQueries.runQuery(_0x8b5aa7);return _0x314cd3[0x201+0x6*-0x4ff+0x7*0x3ff]?_0x314cd3[0x20d9+-0x2209+-0x98*-0x2]:null;}__name(tryGetOneByCode,'tryGetOneByCode');async function createUserFeatures(_0x93f8f9,_0x3500ec,_0x232426){const _0x4567df=new Map([]),_0x540452=Array['from'](_0x3500ec['keys']());for(const _0x29f19c of _0x540452){!_0x4567df['has'](_0x29f19c)&&_0x4567df['set'](_0x29f19c,![]);}for(const [_0x10e43a,_0x38a90e]of _0x4567df){const _0x3f8b39=_0x38a90e?featureEnums.userFeatureStates['enabled']:featureEnums.userFeatureStates['disabled'];await createUserFeature(_0x93f8f9['userId'],_0x10e43a,_0x3500ec,_0x232426,_0x3f8b39);}}__name(createUserFeatures,'createUserFeatures');async function getUserFeatureToUserIdMap(){const _0x6439=new Map(),_0x429777=await drizzle.executeQuery(schema.userFeatureSchema);for(const _0x5507b5 of _0x429777){const _0x577a68=_0x5507b5['userId'];!_0x6439['has'](_0x577a68)&&_0x6439['set'](_0x577a68,[]),_0x6439['get'](_0x577a68)['push'](_0x5507b5);}return _0x6439;}__name(getUserFeatureToUserIdMap,'getUserFeatureToUserIdMap');async function createUserFeature(_0x45cecf,_0x5af69b,_0x357db3,_0x535c33,_0x49554b){if(!_0x357db3['has'](_0x5af69b))throw errors.createError(metaErrorMessagesConstants.metaErrorMessages['featureCodeMissing']['replace']('{0}',_0x5af69b));const _0x3bd59d=_0x357db3['get'](_0x5af69b),_0x2f8227=_0x535c33['find'](_0x5bd683=>_0x5bd683['featureId']===_0x3bd59d['id']&&_0x5bd683['userId']===_0x45cecf);if(!_0x2f8227){const _0x2a7a1f={...baseResourceProperties.createBaseResourceProperties(),'featureId':_0x3bd59d['id'],'state':_0x49554b,'userId':_0x45cecf,'workspaceId':workspaceConstants.workspaceConstants['defaultWorkspaceId']};await crudResources.createResource(_0x2a7a1f,resourceNames.resourceNames['userFeature']);}}__name(createUserFeature,'createUserFeature');
 exports.createUserFeatures = createUserFeatures;
 exports.getOneUserFeatureEnabledByUserId = getOneUserFeatureEnabledByUserId;

package/packages/level2/server/users/user-feature-db.d.ts CHANGED Viewed

@@ -1,9 +1,9 @@
 import { Feature } from "../../meta/core/resources/features/feature.resource";
 import { UserFeature } from "../../meta/core/resources/users/user-feature.resource";
 import { UserSeedModel } from "./user-seed-model";
-export declare function getOneUserFeatureEnabledByUserId(featureCode: string, userId: string): Promise<UserFeature>;
-export declare function getUserFeatures(): Promise<UserFeature[]>;
-export declare function getUserFeaturesByUserId(userId: string): Promise<UserFeature[]>;
-export declare function tryGetOneByCode(userId: string, featureCode: string): Promise<UserFeature>;
+export declare function getOneUserFeatureEnabledByUserId(featureCode: string, userId: string): Promise<any>;
+export declare function getUserFeatures(): Promise<any>;
+export declare function getUserFeaturesByUserId(userId: string): Promise<any>;
+export declare function tryGetOneByCode(userId: string, featureCode: string): Promise<any>;
 export declare function createUserFeatures(userSeedModel: UserSeedModel, featureByFeatureCode: Map<string, Feature>, userFeatures: UserFeature[]): Promise<void>;
 export declare function getUserFeatureToUserIdMap(): Promise<Map<string, UserFeature[]>>;

package/packages/level2/server/users/user-feature-db.js CHANGED Viewed

@@ -1,6 +1,7 @@
 'use strict';
 import { getResourcesByName } from '../../meta/server/db/db.js';
-import { getQuery, applyFilterToQuery, executeQuery } from '../../meta/server/web/drizzle.js';
+import { getQuery, executeQuery } from '../../meta/server/web/drizzle.js';
+import { applyFilterToQuery, runQuery } from '../../db/drizzle-queries.js';
 import { userFeatureSchema, featureSchema } from '../../../../generated/schema.js';
 import { eq, getTableColumns, and } from 'drizzle-orm';
 import { resourceNames } from '../../../fd-toolbox/resources/resource-names.js';
@@ -11,7 +12,8 @@ import { metaErrorMessages } from '../../meta/constants/meta-error-messages-cons
 import { getUserFeatureByFeatureCode } from './user-feature-predicates.js';
 import { userFeatureStates } from '../../meta/core/resources/enums/feature-enums.js';
 import { createResource } from '../../meta/server/resources/crud-resources.js';
+import { dbLeftJoin } from '../../db/db-connection.js';
-var __defProp=Object['defineProperty'],__name=(_0xf20e51,_0x4ab5a0)=>__defProp(_0xf20e51,'name',{'value':_0x4ab5a0,'configurable':!![]});async function getOneUserFeatureEnabledByUserId(_0x2c4f6f,_0x74918f){const {query:_0x561342}=await getQuery(userFeatureSchema);_0x561342['leftJoin'](featureSchema,eq(featureSchema['id'],userFeatureSchema['featureId'])),applyFilterToQuery(_0x561342,getUserFeatureByFeatureCode(_0x2c4f6f,_0x74918f)),applyFilterToQuery(_0x561342,eq(userFeatureSchema['userId'],_0x74918f));const _0xb5a7c9=await _0x561342;return _0xb5a7c9[-0x1*-0xf6a+0x2072+-0x2*0x17ee]?_0xb5a7c9[-0x1*0x337+0x1cb0+-0x1*0x1979]:null;}__name(getOneUserFeatureEnabledByUserId,'getOneUserFeatureEnabledByUserId');async function getUserFeatures(){return getResourcesByName(resourceNames['userFeature']);}__name(getUserFeatures,'getUserFeatures');async function getUserFeaturesByUserId(_0x120a47){const {query:_0x5ec8ee}=await getQuery(userFeatureSchema);applyFilterToQuery(_0x5ec8ee,eq(userFeatureSchema['userId'],_0x120a47));const _0x2a0bfe=await _0x5ec8ee;return _0x2a0bfe;}__name(getUserFeaturesByUserId,'getUserFeaturesByUserId');async function tryGetOneByCode(_0x4a5d5f,_0x26531d){const {query:_0xd82b1f}=await getQuery(userFeatureSchema,getTableColumns(userFeatureSchema));_0xd82b1f['leftJoin'](featureSchema,eq(featureSchema['id'],userFeatureSchema['featureId'])),applyFilterToQuery(_0xd82b1f,and(eq(userFeatureSchema['userId'],_0x4a5d5f),eq(featureSchema['code'],_0x26531d)));const _0x1fd869=await _0xd82b1f;return _0x1fd869[-0xa49*-0x3+-0x159*-0x3+-0x22e6]?_0x1fd869[-0x1*-0x23e3+-0x49f+0x29b*-0xc]:null;}__name(tryGetOneByCode,'tryGetOneByCode');async function createUserFeatures(_0x5c5c3b,_0x31937b,_0x50e219){const _0x45e369=new Map([]),_0x42acd9=Array['from'](_0x31937b['keys']());for(const _0x164d0c of _0x42acd9){!_0x45e369['has'](_0x164d0c)&&_0x45e369['set'](_0x164d0c,![]);}for(const [_0x380a65,_0x5e7af5]of _0x45e369){const _0xd59e2c=_0x5e7af5?userFeatureStates['enabled']:userFeatureStates['disabled'];await createUserFeature(_0x5c5c3b['userId'],_0x380a65,_0x31937b,_0x50e219,_0xd59e2c);}}__name(createUserFeatures,'createUserFeatures');async function getUserFeatureToUserIdMap(){const _0x2477c7=new Map(),_0x36c124=await executeQuery(userFeatureSchema);for(const _0x1b6a81 of _0x36c124){const _0xb15226=_0x1b6a81['userId'];!_0x2477c7['has'](_0xb15226)&&_0x2477c7['set'](_0xb15226,[]),_0x2477c7['get'](_0xb15226)['push'](_0x1b6a81);}return _0x2477c7;}__name(getUserFeatureToUserIdMap,'getUserFeatureToUserIdMap');async function createUserFeature(_0x5e1493,_0x190e0b,_0x5ddd9b,_0x460525,_0x18ce1a){if(!_0x5ddd9b['has'](_0x190e0b))throw createError(metaErrorMessages['featureCodeMissing']['replace']('{0}',_0x190e0b));const _0x334feb=_0x5ddd9b['get'](_0x190e0b),_0x281b55=_0x460525['find'](_0x1695ee=>_0x1695ee['featureId']===_0x334feb['id']&&_0x1695ee['userId']===_0x5e1493);if(!_0x281b55){const _0x22b548={...createBaseResourceProperties(),'featureId':_0x334feb['id'],'state':_0x18ce1a,'userId':_0x5e1493,'workspaceId':workspaceConstants['defaultWorkspaceId']};await createResource(_0x22b548,resourceNames['userFeature']);}}__name(createUserFeature,'createUserFeature');
+var __defProp=Object['defineProperty'],__name=(_0x388de4,_0x49afff)=>__defProp(_0x388de4,'name',{'value':_0x49afff,'configurable':!![]});async function getOneUserFeatureEnabledByUserId(_0x13496b,_0x5c5db3){const {query:_0x1fdd84}=await getQuery(userFeatureSchema);dbLeftJoin(_0x1fdd84,featureSchema,eq(featureSchema['id'],userFeatureSchema['featureId'])),applyFilterToQuery(_0x1fdd84,getUserFeatureByFeatureCode(_0x13496b,_0x5c5db3)),applyFilterToQuery(_0x1fdd84,eq(userFeatureSchema['userId'],_0x5c5db3));const _0x3e7043=await runQuery(_0x1fdd84);return _0x3e7043[-0x261+-0x1b3+0x414]?_0x3e7043[0x3*0xb3d+-0x2088+-0x12f]:null;}__name(getOneUserFeatureEnabledByUserId,'getOneUserFeatureEnabledByUserId');async function getUserFeatures(){return getResourcesByName(resourceNames['userFeature']);}__name(getUserFeatures,'getUserFeatures');async function getUserFeaturesByUserId(_0x1f4256){const {query:_0x2c140d}=await getQuery(userFeatureSchema);applyFilterToQuery(_0x2c140d,eq(userFeatureSchema['userId'],_0x1f4256));const _0x19248e=await runQuery(_0x2c140d);return _0x19248e;}__name(getUserFeaturesByUserId,'getUserFeaturesByUserId');async function tryGetOneByCode(_0x5b53a2,_0x210d1e){const {query:_0x8b5aa7}=await getQuery(userFeatureSchema,getTableColumns(userFeatureSchema));dbLeftJoin(_0x8b5aa7,featureSchema,eq(featureSchema['id'],userFeatureSchema['featureId'])),applyFilterToQuery(_0x8b5aa7,and(eq(userFeatureSchema['userId'],_0x5b53a2),eq(featureSchema['code'],_0x210d1e)));const _0x314cd3=await runQuery(_0x8b5aa7);return _0x314cd3[0x201+0x6*-0x4ff+0x7*0x3ff]?_0x314cd3[0x20d9+-0x2209+-0x98*-0x2]:null;}__name(tryGetOneByCode,'tryGetOneByCode');async function createUserFeatures(_0x93f8f9,_0x3500ec,_0x232426){const _0x4567df=new Map([]),_0x540452=Array['from'](_0x3500ec['keys']());for(const _0x29f19c of _0x540452){!_0x4567df['has'](_0x29f19c)&&_0x4567df['set'](_0x29f19c,![]);}for(const [_0x10e43a,_0x38a90e]of _0x4567df){const _0x3f8b39=_0x38a90e?userFeatureStates['enabled']:userFeatureStates['disabled'];await createUserFeature(_0x93f8f9['userId'],_0x10e43a,_0x3500ec,_0x232426,_0x3f8b39);}}__name(createUserFeatures,'createUserFeatures');async function getUserFeatureToUserIdMap(){const _0x6439=new Map(),_0x429777=await executeQuery(userFeatureSchema);for(const _0x5507b5 of _0x429777){const _0x577a68=_0x5507b5['userId'];!_0x6439['has'](_0x577a68)&&_0x6439['set'](_0x577a68,[]),_0x6439['get'](_0x577a68)['push'](_0x5507b5);}return _0x6439;}__name(getUserFeatureToUserIdMap,'getUserFeatureToUserIdMap');async function createUserFeature(_0x45cecf,_0x5af69b,_0x357db3,_0x535c33,_0x49554b){if(!_0x357db3['has'](_0x5af69b))throw createError(metaErrorMessages['featureCodeMissing']['replace']('{0}',_0x5af69b));const _0x3bd59d=_0x357db3['get'](_0x5af69b),_0x2f8227=_0x535c33['find'](_0x5bd683=>_0x5bd683['featureId']===_0x3bd59d['id']&&_0x5bd683['userId']===_0x45cecf);if(!_0x2f8227){const _0x2a7a1f={...createBaseResourceProperties(),'featureId':_0x3bd59d['id'],'state':_0x49554b,'userId':_0x45cecf,'workspaceId':workspaceConstants['defaultWorkspaceId']};await createResource(_0x2a7a1f,resourceNames['userFeature']);}}__name(createUserFeature,'createUserFeature');
 export { createUserFeatures, getOneUserFeatureEnabledByUserId, getUserFeatureToUserIdMap, getUserFeatures, getUserFeaturesByUserId, tryGetOneByCode };

package/packages/level2/server/users/user-feature-predicates.cjs.js CHANGED Viewed

@@ -5,7 +5,7 @@ var drizzleOrm = require('drizzle-orm');
 var schema = require('../../../../generated/schema.cjs.js');
 var featureEnums = require('../../meta/core/resources/enums/feature-enums.cjs.js');
-var __defProp=Object['defineProperty'],__name=(_0x541191,_0x20810d)=>__defProp(_0x541191,'name',{'value':_0x20810d,'configurable':!![]});function getUserFeatureByFeatureCode(_0x350eb7,_0x59a231){return drizzleOrm.and(_0x59a231?drizzleOrm.eq(schema.userFeatureSchema['userId'],_0x59a231):void(-0x7*-0x44b+0x1ff1+-0x3dfe),drizzleOrm.eq(schema.featureSchema['code'],_0x350eb7),drizzleOrm.eq(schema.featureSchema['state'],featureEnums.featureStates['enabled']),drizzleOrm.eq(schema.userFeatureSchema['state'],featureEnums.userFeatureStates['enabled']));}__name(getUserFeatureByFeatureCode,'getUserFeatureByFeatureCode');function getUserFeaturesByFeatureCodes(_0x5e2cc9,_0x297623){return drizzleOrm.and(_0x297623?drizzleOrm.eq(schema.userFeatureSchema['userId'],_0x297623):void(-0x2*0xe62+0x191f*-0x1+0x35e3),drizzleOrm.inArray(schema.featureSchema['code'],_0x5e2cc9),drizzleOrm.eq(schema.featureSchema['state'],featureEnums.featureStates['enabled']),drizzleOrm.eq(schema.userFeatureSchema['state'],featureEnums.userFeatureStates['enabled']));}__name(getUserFeaturesByFeatureCodes,'getUserFeaturesByFeatureCodes');
+var __defProp=Object['defineProperty'],__name=(_0x493761,_0xb6f250)=>__defProp(_0x493761,'name',{'value':_0xb6f250,'configurable':!![]});function getUserFeatureByFeatureCode(_0x3be163,_0x48ff5c){return drizzleOrm.and(_0x48ff5c?drizzleOrm.eq(schema.userFeatureSchema['userId'],_0x48ff5c):void(-0x2462+0x1e*0x95+-0x7*-0x2b4),drizzleOrm.eq(schema.featureSchema['code'],_0x3be163),drizzleOrm.eq(schema.featureSchema['state'],featureEnums.featureStates['enabled']),drizzleOrm.eq(schema.userFeatureSchema['state'],featureEnums.userFeatureStates['enabled']));}__name(getUserFeatureByFeatureCode,'getUserFeatureByFeatureCode');function getUserFeaturesByFeatureCodes(_0x29f8f7,_0x50feb1){return drizzleOrm.and(_0x50feb1?drizzleOrm.eq(schema.userFeatureSchema['userId'],_0x50feb1):void(-0xc62+0x21*0x8b+0x1*-0x589),drizzleOrm.inArray(schema.featureSchema['code'],_0x29f8f7),drizzleOrm.eq(schema.featureSchema['state'],featureEnums.featureStates['enabled']),drizzleOrm.eq(schema.userFeatureSchema['state'],featureEnums.userFeatureStates['enabled']));}__name(getUserFeaturesByFeatureCodes,'getUserFeaturesByFeatureCodes');
 exports.getUserFeatureByFeatureCode = getUserFeatureByFeatureCode;
 exports.getUserFeaturesByFeatureCodes = getUserFeaturesByFeatureCodes;

package/packages/level2/server/users/user-feature-predicates.js CHANGED Viewed

@@ -3,6 +3,6 @@ import { and, eq, inArray } from 'drizzle-orm';
 import { userFeatureSchema, featureSchema } from '../../../../generated/schema.js';
 import { featureStates, userFeatureStates } from '../../meta/core/resources/enums/feature-enums.js';
-var __defProp=Object['defineProperty'],__name=(_0x541191,_0x20810d)=>__defProp(_0x541191,'name',{'value':_0x20810d,'configurable':!![]});function getUserFeatureByFeatureCode(_0x350eb7,_0x59a231){return and(_0x59a231?eq(userFeatureSchema['userId'],_0x59a231):void(-0x7*-0x44b+0x1ff1+-0x3dfe),eq(featureSchema['code'],_0x350eb7),eq(featureSchema['state'],featureStates['enabled']),eq(userFeatureSchema['state'],userFeatureStates['enabled']));}__name(getUserFeatureByFeatureCode,'getUserFeatureByFeatureCode');function getUserFeaturesByFeatureCodes(_0x5e2cc9,_0x297623){return and(_0x297623?eq(userFeatureSchema['userId'],_0x297623):void(-0x2*0xe62+0x191f*-0x1+0x35e3),inArray(featureSchema['code'],_0x5e2cc9),eq(featureSchema['state'],featureStates['enabled']),eq(userFeatureSchema['state'],userFeatureStates['enabled']));}__name(getUserFeaturesByFeatureCodes,'getUserFeaturesByFeatureCodes');
+var __defProp=Object['defineProperty'],__name=(_0x493761,_0xb6f250)=>__defProp(_0x493761,'name',{'value':_0xb6f250,'configurable':!![]});function getUserFeatureByFeatureCode(_0x3be163,_0x48ff5c){return and(_0x48ff5c?eq(userFeatureSchema['userId'],_0x48ff5c):void(-0x2462+0x1e*0x95+-0x7*-0x2b4),eq(featureSchema['code'],_0x3be163),eq(featureSchema['state'],featureStates['enabled']),eq(userFeatureSchema['state'],userFeatureStates['enabled']));}__name(getUserFeatureByFeatureCode,'getUserFeatureByFeatureCode');function getUserFeaturesByFeatureCodes(_0x29f8f7,_0x50feb1){return and(_0x50feb1?eq(userFeatureSchema['userId'],_0x50feb1):void(-0xc62+0x21*0x8b+0x1*-0x589),inArray(featureSchema['code'],_0x29f8f7),eq(featureSchema['state'],featureStates['enabled']),eq(userFeatureSchema['state'],userFeatureStates['enabled']));}__name(getUserFeaturesByFeatureCodes,'getUserFeaturesByFeatureCodes');
 export { getUserFeatureByFeatureCode, getUserFeaturesByFeatureCodes };

package/packages/level2/server/users/user-manager.cjs.js CHANGED Viewed

@@ -1,15 +1,16 @@
 'use strict';
 'use strict';
-var dbConnection = require('../../meta/server/db/db-connection.cjs.js');
+var dbConnection = require('../../db/db-connection.cjs.js');
+var drizzleQueries = require('../../db/drizzle-queries.cjs.js');
 var schema = require('../../../../generated/schema.cjs.js');
 var drizzleOrm = require('drizzle-orm');
 var roleDb = require('../auth/role-db.cjs.js');
 var singleFuncs = require('../../../fd-toolbox/server/collections/single-funcs.cjs.js');
 var userTokenPurposes = require('../../common/users/user-token-purposes.cjs.js');
 var argon2 = require('@node-rs/argon2');
-var db$1 = require('../../meta/server/db/db.cjs.js');
-var _0x564dfc = require('jsonwebtoken');
+var db = require('../../meta/server/db/db.cjs.js');
+var _0x472bf5 = require('jsonwebtoken');
 var resourceNames = require('../../../fd-toolbox/resources/resource-names.cjs.js');
 var errors$1 = require('../../../fd-toolbox/server/web/errors.cjs.js');
 var errors = require('../../../fd-toolbox/errors/errors.cjs.js');
@@ -17,7 +18,7 @@ var metaErrorMessagesConstants = require('../../meta/constants/meta-error-messag
 var userDb = require('./user-db.cjs.js');
 var userManagerMessages = require('./user-manager-messages.cjs.js');
-var __defProp=Object['defineProperty'],__name=(_0x445d5e,_0x433bf3)=>__defProp(_0x445d5e,'name',{'value':_0x433bf3,'configurable':!![]});const db=dbConnection.getDb();async function getUserRolesForPermission(_0x5c2e8d){const _0x4fd9ea=await getRolesAsync(_0x5c2e8d);if(_0x4fd9ea&&_0x4fd9ea['length']>0xbdc+0x1*0xda6+-0x1982*0x1)return _0x4fd9ea;else throw errors.createError(metaErrorMessagesConstants.metaErrorMessages['noRolesForUser']['replace']('{0}',_0x5c2e8d));}__name(getUserRolesForPermission,'getUserRolesForPermission');async function getUserDto(_0x1eebae){return singleFuncs.singleOrDefault(await userDb.getUserDtosOrSingle(_0x1eebae));}__name(getUserDto,'getUserDto');async function getUserDtos(){return userDb.getUserDtosOrSingle();}__name(getUserDtos,'getUserDtos');async function userManagerDeleteUser(_0x300c22){let _0x2b8e6c;try{_0x2b8e6c=await db['delete'](schema.userSchema)['where'](drizzleOrm.eq(schema.userSchema['id'],_0x300c22))['returning']();}catch(_0x2a0768){if(_0x2a0768&&typeof _0x2a0768==='object'&&'detail'in _0x2a0768)throw errors$1.apiConflictError(_0x2a0768['detail']?_0x2a0768['detail']['toString']():'');}return _0x2b8e6c;}__name(userManagerDeleteUser,'userManagerDeleteUser');async function getRolesAsync(_0x545e80){const _0x2412a0=await db['select']({'name':schema.roleSchema['name']})['from'](schema.userRoleSchema)['innerJoin'](schema.roleSchema,drizzleOrm.eq(schema.userRoleSchema['roleId'],schema.roleSchema['id']))['where'](drizzleOrm.eq(schema.userRoleSchema['userId'],_0x545e80));return _0x2412a0['map'](_0x2e07ce=>_0x2e07ce['name']);}__name(getRolesAsync,'getRolesAsync');async function addToRole(_0x2e090e,_0x19e980){const _0x4278b3=await roleDb.getRoleByName(_0x19e980);return userDb.addRoleToUser(_0x2e090e,_0x4278b3['id']);}__name(addToRole,'addToRole');function generateUserToken(_0xd98118,_0x5d965d=''){const _0x231570={'id':_0xd98118['id'],'purpose':_0x5d965d};return _0x564dfc['sign'](_0x231570,_0xd98118['securityStamp'],{'algorithm':'HS256','expiresIn':'1d'});}__name(generateUserToken,'generateUserToken');function validateUserToken(_0x46370d,_0x5d3eff,_0xcf8a8c=''){try{const _0xcf98fb=_0x564dfc['verify'](_0x46370d,_0x5d3eff['securityStamp'],{'algorithms':['HS256']});if(typeof _0xcf98fb!=='object')return ![];const {id:_0x200a93,purpose:_0xbe5488}=_0xcf98fb;return _0x200a93===_0x5d3eff['id']&&_0xbe5488===_0xcf8a8c;}catch{return ![];}}__name(validateUserToken,'validateUserToken');function generatePasswordResetToken(_0x565e44){return generateUserToken(_0x565e44,userTokenPurposes.userTokenPurposeConstants['resetPassword']);}__name(generatePasswordResetToken,'generatePasswordResetToken');async function resetPassword(_0x46066d,_0x4f0c8f,_0x18f4a8){if(!validateUserToken(_0x46066d,_0x4f0c8f,userTokenPurposes.userTokenPurposeConstants['resetPassword']))return {'isSuccess':![],'userFriendlyMessage':userManagerMessages.userManagerMessages['invalidToken']};_0x4f0c8f['passwordHash']=await argon2.hash(_0x18f4a8,{'memoryCost':0x4c00,'timeCost':0x2,'outputLen':0x20,'parallelism':0x1});try{return await db$1.updateResource(_0x4f0c8f,resourceNames.resourceNames['user']),{'isSuccess':!![],'userFriendlyMessage':userManagerMessages.userManagerMessages['passwordChanged']};}catch(_0x34da01){return {'isSuccess':![],'userFriendlyMessage':_0x34da01 instanceof Error?_0x34da01['message']:metaErrorMessagesConstants.metaErrorMessages['resetPasswordError']};}}__name(resetPassword,'resetPassword');async function updateUser(_0x1bc379){const _0x43f937=await db['update'](schema.userSchema)['set'](_0x1bc379)['where'](drizzleOrm.and(drizzleOrm.eq(schema.userSchema['id'],_0x1bc379['id']),drizzleOrm.eq(schema.userSchema['passwordHash'],schema.userSchema['passwordHash'])))['returning']();return {'isSuccess':!!_0x43f937,'userFriendlyMessage':userManagerMessages.userManagerMessages['userUpdated']};}__name(updateUser,'updateUser');
+var __defProp=Object['defineProperty'],__name=(_0x541bcc,_0x5d34e0)=>__defProp(_0x541bcc,'name',{'value':_0x5d34e0,'configurable':!![]});async function getUserRolesForPermission(_0x132684){const _0xfdcaab=await getRolesAsync(_0x132684);if(_0xfdcaab&&_0xfdcaab['length']>-0x1*-0x1e8f+0x5a2+0x73d*-0x5)return _0xfdcaab;else throw errors.createError(metaErrorMessagesConstants.metaErrorMessages['noRolesForUser']['replace']('{0}',_0x132684));}__name(getUserRolesForPermission,'getUserRolesForPermission');async function getUserDto(_0x34169e){return singleFuncs.singleOrDefault(await userDb.getUserDtosOrSingle(_0x34169e));}__name(getUserDto,'getUserDto');async function getUserDtos(){return userDb.getUserDtosOrSingle();}__name(getUserDtos,'getUserDtos');async function userManagerDeleteUser(_0x307d4f){let _0x4e866d;try{_0x4e866d=await dbConnection.dbDelete(schema.userSchema)['where'](drizzleOrm.eq(schema.userSchema['id'],_0x307d4f))['returning']();}catch(_0x201eea){if(_0x201eea&&typeof _0x201eea==='object'&&'detail'in _0x201eea)throw errors$1.apiConflictError(_0x201eea['detail']?String(_0x201eea['detail']):'');}return _0x4e866d;}__name(userManagerDeleteUser,'userManagerDeleteUser');async function getRolesAsync(_0x52a631){const _0x1115ed=dbConnection.createDynamicSelect(schema.userRoleSchema,{'name':schema.roleSchema['name']});dbConnection.dbInnerJoin(_0x1115ed,schema.roleSchema,drizzleOrm.eq(schema.userRoleSchema['roleId'],schema.roleSchema['id'])),dbConnection.dbWhere(_0x1115ed,drizzleOrm.eq(schema.userRoleSchema['userId'],_0x52a631));const _0x2966bc=await drizzleQueries.runQuery(_0x1115ed);return _0x2966bc['map'](_0x35b2b5=>_0x35b2b5['name']);}__name(getRolesAsync,'getRolesAsync');async function addToRole(_0x11e22a,_0x32e271){const _0x52d0f2=await roleDb.getRoleByName(_0x32e271);return userDb.addRoleToUser(_0x11e22a,_0x52d0f2['id']);}__name(addToRole,'addToRole');function generateUserToken(_0x302088,_0x92e5e6=''){const _0x409f73={'id':_0x302088['id'],'purpose':_0x92e5e6};return _0x472bf5['sign'](_0x409f73,_0x302088['securityStamp'],{'algorithm':'HS256','expiresIn':'1d'});}__name(generateUserToken,'generateUserToken');function validateUserToken(_0x54f8f0,_0x508ec1,_0x124450=''){try{const _0x3bdc6b=_0x472bf5['verify'](_0x54f8f0,_0x508ec1['securityStamp'],{'algorithms':['HS256']});if(typeof _0x3bdc6b!=='object')return ![];const {id:_0x5c1cfc,purpose:_0x1985dc}=_0x3bdc6b;return _0x5c1cfc===_0x508ec1['id']&&_0x1985dc===_0x124450;}catch{return ![];}}__name(validateUserToken,'validateUserToken');function generatePasswordResetToken(_0x5e8a5d){return generateUserToken(_0x5e8a5d,userTokenPurposes.userTokenPurposeConstants['resetPassword']);}__name(generatePasswordResetToken,'generatePasswordResetToken');async function resetPassword(_0x59c541,_0x2343bf,_0x2162b8){if(!validateUserToken(_0x59c541,_0x2343bf,userTokenPurposes.userTokenPurposeConstants['resetPassword']))return {'isSuccess':![],'userFriendlyMessage':userManagerMessages.userManagerMessages['invalidToken']};_0x2343bf['passwordHash']=await argon2.hash(_0x2162b8,{'memoryCost':0x4c00,'timeCost':0x2,'outputLen':0x20,'parallelism':0x1});try{return await db.updateResource(_0x2343bf,resourceNames.resourceNames['user']),{'isSuccess':!![],'userFriendlyMessage':userManagerMessages.userManagerMessages['passwordChanged']};}catch(_0x4f59aa){return {'isSuccess':![],'userFriendlyMessage':_0x4f59aa instanceof Error?_0x4f59aa['message']:metaErrorMessagesConstants.metaErrorMessages['resetPasswordError']};}}__name(resetPassword,'resetPassword');async function updateUser(_0x1c8636){const _0x592704=await dbConnection.dbUpdate(schema.userSchema)['set'](_0x1c8636)['where'](drizzleOrm.and(drizzleOrm.eq(schema.userSchema['id'],_0x1c8636['id']),drizzleOrm.eq(schema.userSchema['passwordHash'],schema.userSchema['passwordHash'])))['returning']();return {'isSuccess':!!_0x592704,'userFriendlyMessage':userManagerMessages.userManagerMessages['userUpdated']};}__name(updateUser,'updateUser');
 exports.addToRole = addToRole;
 exports.generatePasswordResetToken = generatePasswordResetToken;

package/packages/level2/server/users/user-manager.d.ts CHANGED Viewed

@@ -1,20 +1,10 @@
 import { User } from "../../meta/core/resources/users/user.resource";
-export declare function getUserRolesForPermission(userId: string): Promise<string[]>;
-export declare function getUserDto(userId: string): Promise<{
-    id: string;
-    email: string;
-}>;
-export declare function getUserDtos(): Promise<{
-    id: string;
-    email: string;
-}[]>;
+export declare function getUserRolesForPermission(userId: string): Promise<any>;
+export declare function getUserDto(userId: string): Promise<unknown>;
+export declare function getUserDtos(): Promise<any>;
 export declare function userManagerDeleteUser(userId: string): Promise<any>;
-export declare function getRolesAsync(userId: string): Promise<string[]>;
-export declare function addToRole(userId: string, roleName: string): Promise<{
-    id: string;
-    userId: string;
-    roleId: string;
-}[]>;
+export declare function getRolesAsync(userId: string): Promise<any>;
+export declare function addToRole(userId: string, roleName: string): Promise<any>;
 export declare function generatePasswordResetToken(userModel: User): string;
 export declare function resetPassword(token: string, userModel: User, newPassword: string): Promise<{
     isSuccess: true;

package/packages/level2/server/users/user-manager.js CHANGED Viewed

@@ -1,13 +1,14 @@
 'use strict';
-import { getDb } from '../../meta/server/db/db-connection.js';
-import { userSchema, roleSchema, userRoleSchema } from '../../../../generated/schema.js';
+import { dbDelete, createDynamicSelect, dbInnerJoin, dbWhere, dbUpdate } from '../../db/db-connection.js';
+import { runQuery } from '../../db/drizzle-queries.js';
+import { userSchema, userRoleSchema, roleSchema } from '../../../../generated/schema.js';
 import { eq, and } from 'drizzle-orm';
 import { getRoleByName } from '../auth/role-db.js';
 import { singleOrDefault } from '../../../fd-toolbox/server/collections/single-funcs.js';
 import { userTokenPurposeConstants } from '../../common/users/user-token-purposes.js';
 import { hash } from '@node-rs/argon2';
 import { updateResource } from '../../meta/server/db/db.js';
-import _0x564dfc from 'jsonwebtoken';
+import _0x472bf5 from 'jsonwebtoken';
 import { resourceNames } from '../../../fd-toolbox/resources/resource-names.js';
 import { apiConflictError } from '../../../fd-toolbox/server/web/errors.js';
 import { createError } from '../../../fd-toolbox/errors/errors.js';
@@ -15,6 +16,6 @@ import { metaErrorMessages } from '../../meta/constants/meta-error-messages-cons
 import { getUserDtosOrSingle, addRoleToUser } from './user-db.js';
 import { userManagerMessages } from './user-manager-messages.js';
-var __defProp=Object['defineProperty'],__name=(_0x445d5e,_0x433bf3)=>__defProp(_0x445d5e,'name',{'value':_0x433bf3,'configurable':!![]});const db=getDb();async function getUserRolesForPermission(_0x5c2e8d){const _0x4fd9ea=await getRolesAsync(_0x5c2e8d);if(_0x4fd9ea&&_0x4fd9ea['length']>0xbdc+0x1*0xda6+-0x1982*0x1)return _0x4fd9ea;else throw createError(metaErrorMessages['noRolesForUser']['replace']('{0}',_0x5c2e8d));}__name(getUserRolesForPermission,'getUserRolesForPermission');async function getUserDto(_0x1eebae){return singleOrDefault(await getUserDtosOrSingle(_0x1eebae));}__name(getUserDto,'getUserDto');async function getUserDtos(){return getUserDtosOrSingle();}__name(getUserDtos,'getUserDtos');async function userManagerDeleteUser(_0x300c22){let _0x2b8e6c;try{_0x2b8e6c=await db['delete'](userSchema)['where'](eq(userSchema['id'],_0x300c22))['returning']();}catch(_0x2a0768){if(_0x2a0768&&typeof _0x2a0768==='object'&&'detail'in _0x2a0768)throw apiConflictError(_0x2a0768['detail']?_0x2a0768['detail']['toString']():'');}return _0x2b8e6c;}__name(userManagerDeleteUser,'userManagerDeleteUser');async function getRolesAsync(_0x545e80){const _0x2412a0=await db['select']({'name':roleSchema['name']})['from'](userRoleSchema)['innerJoin'](roleSchema,eq(userRoleSchema['roleId'],roleSchema['id']))['where'](eq(userRoleSchema['userId'],_0x545e80));return _0x2412a0['map'](_0x2e07ce=>_0x2e07ce['name']);}__name(getRolesAsync,'getRolesAsync');async function addToRole(_0x2e090e,_0x19e980){const _0x4278b3=await getRoleByName(_0x19e980);return addRoleToUser(_0x2e090e,_0x4278b3['id']);}__name(addToRole,'addToRole');function generateUserToken(_0xd98118,_0x5d965d=''){const _0x231570={'id':_0xd98118['id'],'purpose':_0x5d965d};return _0x564dfc['sign'](_0x231570,_0xd98118['securityStamp'],{'algorithm':'HS256','expiresIn':'1d'});}__name(generateUserToken,'generateUserToken');function validateUserToken(_0x46370d,_0x5d3eff,_0xcf8a8c=''){try{const _0xcf98fb=_0x564dfc['verify'](_0x46370d,_0x5d3eff['securityStamp'],{'algorithms':['HS256']});if(typeof _0xcf98fb!=='object')return ![];const {id:_0x200a93,purpose:_0xbe5488}=_0xcf98fb;return _0x200a93===_0x5d3eff['id']&&_0xbe5488===_0xcf8a8c;}catch{return ![];}}__name(validateUserToken,'validateUserToken');function generatePasswordResetToken(_0x565e44){return generateUserToken(_0x565e44,userTokenPurposeConstants['resetPassword']);}__name(generatePasswordResetToken,'generatePasswordResetToken');async function resetPassword(_0x46066d,_0x4f0c8f,_0x18f4a8){if(!validateUserToken(_0x46066d,_0x4f0c8f,userTokenPurposeConstants['resetPassword']))return {'isSuccess':![],'userFriendlyMessage':userManagerMessages['invalidToken']};_0x4f0c8f['passwordHash']=await hash(_0x18f4a8,{'memoryCost':0x4c00,'timeCost':0x2,'outputLen':0x20,'parallelism':0x1});try{return await updateResource(_0x4f0c8f,resourceNames['user']),{'isSuccess':!![],'userFriendlyMessage':userManagerMessages['passwordChanged']};}catch(_0x34da01){return {'isSuccess':![],'userFriendlyMessage':_0x34da01 instanceof Error?_0x34da01['message']:metaErrorMessages['resetPasswordError']};}}__name(resetPassword,'resetPassword');async function updateUser(_0x1bc379){const _0x43f937=await db['update'](userSchema)['set'](_0x1bc379)['where'](and(eq(userSchema['id'],_0x1bc379['id']),eq(userSchema['passwordHash'],userSchema['passwordHash'])))['returning']();return {'isSuccess':!!_0x43f937,'userFriendlyMessage':userManagerMessages['userUpdated']};}__name(updateUser,'updateUser');
+var __defProp=Object['defineProperty'],__name=(_0x541bcc,_0x5d34e0)=>__defProp(_0x541bcc,'name',{'value':_0x5d34e0,'configurable':!![]});async function getUserRolesForPermission(_0x132684){const _0xfdcaab=await getRolesAsync(_0x132684);if(_0xfdcaab&&_0xfdcaab['length']>-0x1*-0x1e8f+0x5a2+0x73d*-0x5)return _0xfdcaab;else throw createError(metaErrorMessages['noRolesForUser']['replace']('{0}',_0x132684));}__name(getUserRolesForPermission,'getUserRolesForPermission');async function getUserDto(_0x34169e){return singleOrDefault(await getUserDtosOrSingle(_0x34169e));}__name(getUserDto,'getUserDto');async function getUserDtos(){return getUserDtosOrSingle();}__name(getUserDtos,'getUserDtos');async function userManagerDeleteUser(_0x307d4f){let _0x4e866d;try{_0x4e866d=await dbDelete(userSchema)['where'](eq(userSchema['id'],_0x307d4f))['returning']();}catch(_0x201eea){if(_0x201eea&&typeof _0x201eea==='object'&&'detail'in _0x201eea)throw apiConflictError(_0x201eea['detail']?String(_0x201eea['detail']):'');}return _0x4e866d;}__name(userManagerDeleteUser,'userManagerDeleteUser');async function getRolesAsync(_0x52a631){const _0x1115ed=createDynamicSelect(userRoleSchema,{'name':roleSchema['name']});dbInnerJoin(_0x1115ed,roleSchema,eq(userRoleSchema['roleId'],roleSchema['id'])),dbWhere(_0x1115ed,eq(userRoleSchema['userId'],_0x52a631));const _0x2966bc=await runQuery(_0x1115ed);return _0x2966bc['map'](_0x35b2b5=>_0x35b2b5['name']);}__name(getRolesAsync,'getRolesAsync');async function addToRole(_0x11e22a,_0x32e271){const _0x52d0f2=await getRoleByName(_0x32e271);return addRoleToUser(_0x11e22a,_0x52d0f2['id']);}__name(addToRole,'addToRole');function generateUserToken(_0x302088,_0x92e5e6=''){const _0x409f73={'id':_0x302088['id'],'purpose':_0x92e5e6};return _0x472bf5['sign'](_0x409f73,_0x302088['securityStamp'],{'algorithm':'HS256','expiresIn':'1d'});}__name(generateUserToken,'generateUserToken');function validateUserToken(_0x54f8f0,_0x508ec1,_0x124450=''){try{const _0x3bdc6b=_0x472bf5['verify'](_0x54f8f0,_0x508ec1['securityStamp'],{'algorithms':['HS256']});if(typeof _0x3bdc6b!=='object')return ![];const {id:_0x5c1cfc,purpose:_0x1985dc}=_0x3bdc6b;return _0x5c1cfc===_0x508ec1['id']&&_0x1985dc===_0x124450;}catch{return ![];}}__name(validateUserToken,'validateUserToken');function generatePasswordResetToken(_0x5e8a5d){return generateUserToken(_0x5e8a5d,userTokenPurposeConstants['resetPassword']);}__name(generatePasswordResetToken,'generatePasswordResetToken');async function resetPassword(_0x59c541,_0x2343bf,_0x2162b8){if(!validateUserToken(_0x59c541,_0x2343bf,userTokenPurposeConstants['resetPassword']))return {'isSuccess':![],'userFriendlyMessage':userManagerMessages['invalidToken']};_0x2343bf['passwordHash']=await hash(_0x2162b8,{'memoryCost':0x4c00,'timeCost':0x2,'outputLen':0x20,'parallelism':0x1});try{return await updateResource(_0x2343bf,resourceNames['user']),{'isSuccess':!![],'userFriendlyMessage':userManagerMessages['passwordChanged']};}catch(_0x4f59aa){return {'isSuccess':![],'userFriendlyMessage':_0x4f59aa instanceof Error?_0x4f59aa['message']:metaErrorMessages['resetPasswordError']};}}__name(resetPassword,'resetPassword');async function updateUser(_0x1c8636){const _0x592704=await dbUpdate(userSchema)['set'](_0x1c8636)['where'](and(eq(userSchema['id'],_0x1c8636['id']),eq(userSchema['passwordHash'],userSchema['passwordHash'])))['returning']();return {'isSuccess':!!_0x592704,'userFriendlyMessage':userManagerMessages['userUpdated']};}__name(updateUser,'updateUser');
 export { addToRole, generatePasswordResetToken, getRolesAsync, getUserDto, getUserDtos, getUserRolesForPermission, resetPassword, updateUser, userManagerDeleteUser };

package/packages/level2/server/users/user-master-data.cjs.js CHANGED Viewed

@@ -18,7 +18,7 @@ var extensions = require('../../../fd-toolbox/constants/extensions.cjs.js');
 var db = require('../../meta/server/db/db.cjs.js');
 var crudResources = require('../../meta/server/resources/crud-resources.cjs.js');
-var __defProp=Object['defineProperty'],__name=(_0x336b32,_0x2a7e54)=>__defProp(_0x336b32,'name',{'value':_0x2a7e54,'configurable':!![]});async function seedUsers(){const _0x370c55=userMother.getUserSeedModels();for(const _0x39144d of Object['keys'](_0x370c55)){const _0x2fe317=_0x370c55[_0x39144d],_0x995d8d=await createUser(_0x2fe317);for(const _0x440196 of _0x2fe317['roles']){await createUserRole(_0x995d8d,_0x440196);}const _0xb28e9d=await createUserSetting(_0x2fe317,_0x39144d);await userSettingDb.createUserSetting(_0xb28e9d);}}__name(seedUsers,'seedUsers');async function seedWorkerBotDirectlyInDb(){const _0x332c3b=userMother.createWorkerBot(),_0x531431=await createUserDirectlyInDb(_0x332c3b);for(const _0x6be11c of _0x332c3b['roles']){await createUserRoleDirectlyInDb(_0x531431,_0x6be11c);}const _0x4e126c=await createUserSetting(_0x332c3b,_0x332c3b['userId']);await userSettingDb.createUserSettingDirectlyInDb(_0x4e126c);}__name(seedWorkerBotDirectlyInDb,'seedWorkerBotDirectlyInDb');async function seedOtherUsersInfo(_0x2c193f){const _0x3590f0=userMother.getUserSeedModels(),_0x2af1bf=await userFeatureDb.getUserFeatureToUserIdMap();for(const _0x4b959f of Object['keys'](_0x3590f0)){const _0x153f01=_0x3590f0[_0x4b959f];let _0x43d6f1=_0x2af1bf['get'](_0x153f01['userId']);_0x43d6f1??=[],await seedOtherUserInfo(_0x153f01,_0x2c193f,_0x43d6f1,_0x4b959f);}}__name(seedOtherUsersInfo,'seedOtherUsersInfo');async function seedOtherUserInfo(_0x44177b,_0x3b1fe8,_0xaae3f5,_0x3454b0){await createTask('dev',_0x44177b),await createTask('help',_0x44177b);const _0x11359d=await userSettingDb.tryGetUserSettingByUserId(_0x44177b['userId']);if(!_0x11359d){const _0x572719=await createUserSetting(_0x44177b,_0x3454b0);await userSettingDb.createUserSetting(_0x572719);}await userFeatureDb.createUserFeatures(_0x44177b,_0x3b1fe8,_0xaae3f5);}__name(seedOtherUserInfo,'seedOtherUserInfo');async function createTask(_0xb8b8cb,_0x1b01f7){const _0x2f6fef=_0x1b01f7['firstName']+'.'+_0x1b01f7['lastName']+'\x20'+_0xb8b8cb,_0xf940dd=await itemDb.tryGetItemByItemName(_0x1b01f7['userId'],_0x2f6fef);if(_0xf940dd)return;const _0x9ee2e0={...baseResourceProperties.createBaseResourceProperties(),'content':_0xb8b8cb,'name':_0x2f6fef,'userId':_0x1b01f7['userId']};await itemDb.createItem(_0x9ee2e0);}__name(createTask,'createTask');async function createUserSetting(_0x4ab50a,_0x4c629a){const _0x5f0857={...baseResourceProperties.createBaseResourceProperties(uuids.getNewUuid()),'userId':_0x4ab50a['userId'],'firstName':_0x4ab50a['firstName'],'lastName':_0x4ab50a['lastName'],'imageUrl':'/'+publicFiles.publicImages['user']+'/'+_0x4c629a+'.'+extensions.extensions['webp']};return _0x5f0857;}__name(createUserSetting,'createUserSetting');async function mapUserSeedModelToUser(_0x3ff263){const _0x5ec6a6={'id':_0x3ff263['userId'],'firstName':_0x3ff263['firstName'],'lastName':_0x3ff263['lastName'],'userId':_0x3ff263['userId'],'email':_0x3ff263['email'],'passwordHash':await argon2.hash(authsConstants.auths['defaultPwd']),'isDisabled':![],'securityStamp':node_crypto.randomBytes(-0x2d2+0x1b06+0x86*-0x2e)['toString']('hex'),'imageUrl':_0x3ff263['imageUrl'],'homeWorkspaceId':_0x3ff263['homeWorkspaceId'],'currentWorkspaceId':_0x3ff263['currentWorkspaceId']};return _0x5ec6a6;}__name(mapUserSeedModelToUser,'mapUserSeedModelToUser');async function createUser(_0x54e3c3){const _0x4084ce=await mapUserSeedModelToUser(_0x54e3c3);return userDb.createUserResource(_0x4084ce);}__name(createUser,'createUser');async function createUserDirectlyInDb(_0x51f1d8){const _0x10f67b=await mapUserSeedModelToUser(_0x51f1d8);return db.createResourceDirectlyInDb(_0x10f67b,resourceNames.resourceNames['user']);}__name(createUserDirectlyInDb,'createUserDirectlyInDb');async function userToUserRole(_0x702917,_0x12031f){if(!await roleDb.isRoleExists(_0x12031f)||!_0x702917)return void(0x2*0x7d+-0x14f*0x16+-0x10*-0x1bd);const _0x2d1a3a=await roleDb.getRoleByName(_0x12031f),_0x51af0d={'id':uuids.getNewUuid(),'userId':_0x702917['id'],'roleId':_0x2d1a3a['id'],'user':_0x702917,'role':_0x2d1a3a};return _0x51af0d;}__name(userToUserRole,'userToUserRole');async function createUserRole(_0xb96d59,_0x2dec79){const _0x1f6eb1=await userToUserRole(_0xb96d59,_0x2dec79);if(!_0x1f6eb1)return;await crudResources.createResource(_0x1f6eb1,resourceNames.resourceNames['userRole']);}__name(createUserRole,'createUserRole');async function createUserRoleDirectlyInDb(_0x3e0dde,_0x10b10d){const _0x45f510=await userToUserRole(_0x3e0dde,_0x10b10d);if(!_0x45f510)return;await db.createResourceDirectlyInDb(_0x45f510,resourceNames.resourceNames['userRole']);}__name(createUserRoleDirectlyInDb,'createUserRoleDirectlyInDb');
+var __defProp=Object['defineProperty'],__name=(_0x37fed7,_0x9ac26)=>__defProp(_0x37fed7,'name',{'value':_0x9ac26,'configurable':!![]});async function seedUsers(){const _0x529656=userMother.getUserSeedModels();for(const _0x5a7525 of Object['keys'](_0x529656)){const _0x24af8f=_0x529656[_0x5a7525],_0xd2888c=await createUser(_0x24af8f);for(const _0x162586 of _0x24af8f['roles']){await createUserRole(_0xd2888c,_0x162586);}const _0x50a2e1=await createUserSetting(_0x24af8f,_0x5a7525);await userSettingDb.createUserSetting(_0x50a2e1);}}__name(seedUsers,'seedUsers');async function seedWorkerBotDirectlyInDb(){const _0x3ea42e=userMother.createWorkerBot(),_0xa3cc7d=await createUserDirectlyInDb(_0x3ea42e);for(const _0x371dcf of _0x3ea42e['roles']){await createUserRoleDirectlyInDb(_0xa3cc7d,_0x371dcf);}const _0x1ff27e=await createUserSetting(_0x3ea42e,_0x3ea42e['userId']);await userSettingDb.createUserSettingDirectlyInDb(_0x1ff27e);}__name(seedWorkerBotDirectlyInDb,'seedWorkerBotDirectlyInDb');async function seedOtherUsersInfo(_0x5bc1cf){const _0x489acb=userMother.getUserSeedModels(),_0x462fa8=await userFeatureDb.getUserFeatureToUserIdMap();for(const _0x30b5ca of Object['keys'](_0x489acb)){const _0x50f2a9=_0x489acb[_0x30b5ca];let _0x4f0322=_0x462fa8['get'](_0x50f2a9['userId']);_0x4f0322??=[],await seedOtherUserInfo(_0x50f2a9,_0x5bc1cf,_0x4f0322,_0x30b5ca);}}__name(seedOtherUsersInfo,'seedOtherUsersInfo');async function seedOtherUserInfo(_0x1fc90b,_0x2a3ff3,_0x4e9f45,_0x2d7a9c){await createTask('dev',_0x1fc90b),await createTask('help',_0x1fc90b);const _0x318b7d=await userSettingDb.tryGetUserSettingByUserId(_0x1fc90b['userId']);if(!_0x318b7d){const _0x3f1cdc=await createUserSetting(_0x1fc90b,_0x2d7a9c);await userSettingDb.createUserSetting(_0x3f1cdc);}await userFeatureDb.createUserFeatures(_0x1fc90b,_0x2a3ff3,_0x4e9f45);}__name(seedOtherUserInfo,'seedOtherUserInfo');async function createTask(_0x7ee0d,_0x155a91){const _0x40cb81=_0x155a91['firstName']+'.'+_0x155a91['lastName']+'\x20'+_0x7ee0d,_0x2d3358=await itemDb.tryGetItemByItemName(_0x155a91['userId'],_0x40cb81);if(_0x2d3358)return;const _0x1a0959={...baseResourceProperties.createBaseResourceProperties(),'content':_0x7ee0d,'name':_0x40cb81,'userId':_0x155a91['userId']};await itemDb.createItem(_0x1a0959);}__name(createTask,'createTask');async function createUserSetting(_0x3442e2,_0x3a8c61){const _0x2ae46e={...baseResourceProperties.createBaseResourceProperties(uuids.getNewUuid()),'userId':_0x3442e2['userId'],'firstName':_0x3442e2['firstName'],'lastName':_0x3442e2['lastName'],'imageUrl':'/'+publicFiles.publicImages['user']+'/'+_0x3a8c61+'.'+extensions.extensions['webp']};return _0x2ae46e;}__name(createUserSetting,'createUserSetting');async function mapUserSeedModelToUser(_0x451964){const _0x4434f8={'id':_0x451964['userId'],'firstName':_0x451964['firstName'],'lastName':_0x451964['lastName'],'userId':_0x451964['userId'],'email':_0x451964['email'],'passwordHash':await argon2.hash(authsConstants.auths['defaultPwd']),'isDisabled':![],'securityStamp':node_crypto.randomBytes(-0xb*0x1ab+0x17ac+-0x533)['toString']('hex'),'imageUrl':_0x451964['imageUrl'],'homeWorkspaceId':_0x451964['homeWorkspaceId'],'currentWorkspaceId':_0x451964['currentWorkspaceId']};return _0x4434f8;}__name(mapUserSeedModelToUser,'mapUserSeedModelToUser');async function createUser(_0x1e3013){const _0xaac5b4=await mapUserSeedModelToUser(_0x1e3013);return userDb.createUserResource(_0xaac5b4);}__name(createUser,'createUser');async function createUserDirectlyInDb(_0x36e23c){const _0x401443=await mapUserSeedModelToUser(_0x36e23c);return db.createResourceDirectlyInDb(_0x401443,resourceNames.resourceNames['user']);}__name(createUserDirectlyInDb,'createUserDirectlyInDb');async function userToUserRole(_0x1fff95,_0x4bcab0){if(!await roleDb.isRoleExists(_0x4bcab0)||!_0x1fff95)return void(-0xd79+-0x1886+-0x47*-0x89);const _0x3a9f41=await roleDb.getRoleByName(_0x4bcab0),_0x380606={'id':uuids.getNewUuid(),'userId':_0x1fff95['id'],'roleId':_0x3a9f41['id'],'user':_0x1fff95,'role':_0x3a9f41};return _0x380606;}__name(userToUserRole,'userToUserRole');async function createUserRole(_0x533600,_0x3d4233){const _0x24d5c7=await userToUserRole(_0x533600,_0x3d4233);if(!_0x24d5c7)return;await crudResources.createResource(_0x24d5c7,resourceNames.resourceNames['userRole']);}__name(createUserRole,'createUserRole');async function createUserRoleDirectlyInDb(_0x6b3a6d,_0x3d885d){const _0x38b829=await userToUserRole(_0x6b3a6d,_0x3d885d);if(!_0x38b829)return;await db.createResourceDirectlyInDb(_0x38b829,resourceNames.resourceNames['userRole']);}__name(createUserRoleDirectlyInDb,'createUserRoleDirectlyInDb');
 exports.seedOtherUserInfo = seedOtherUserInfo;
 exports.seedOtherUsersInfo = seedOtherUsersInfo;