npm - @fernir2/saas-kit - Versions diffs - 0.0.207 → 0.0.209 - Mend

@fernir2/saas-kit 0.0.207 → 0.0.209

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 (2774) hide show

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

@@ -3,6 +3,6 @@ import { createError } from '../../../fd-toolbox/errors/errors.js';
 import { metaErrorMessages } from '../../meta/constants/meta-error-messages-constants.js';
 import { isUserInRole } from './user-role.js';
-var __defProp=Object['defineProperty'],__name=(_0x169ebe,_0x23c55a)=>__defProp(_0x169ebe,'name',{'value':_0x23c55a,'configurable':!![]});async function checkOnlyAdminAllowedToEdit(_0x2a9232,_0x4a3543){const _0x250fc9=await isUserInRole(_0x4a3543);if(_0x250fc9){const _0x2fef3e=await isUserInRole(_0x2a9232);!_0x2fef3e&&createError(metaErrorMessages['onlyAdminsAreAllowedToEditAdmins']);}}__name(checkOnlyAdminAllowedToEdit,'checkOnlyAdminAllowedToEdit');
+var __defProp=Object['defineProperty'],__name=(_0x27f03d,_0x1d7f07)=>__defProp(_0x27f03d,'name',{'value':_0x1d7f07,'configurable':!![]});async function checkOnlyAdminAllowedToEdit(_0x4aae93,_0x40727d){const _0x25f734=await isUserInRole(_0x40727d);if(_0x25f734){const _0x346e20=await isUserInRole(_0x4aae93);!_0x346e20&&createError(metaErrorMessages['onlyAdminsAreAllowedToEditAdmins']);}}__name(checkOnlyAdminAllowedToEdit,'checkOnlyAdminAllowedToEdit');
 export { checkOnlyAdminAllowedToEdit };

package/packages/level2/server/users/auth.d.ts CHANGED Viewed

@@ -1,11 +1,11 @@
 import { UserInviteValidationResult } from "../../../fd-toolbox/types/validations/user-invite-validation-result";
 import { OAuthProvider } from "../../common/resources/oauth-service.resource";
-import { Func } from "../../../fd-toolbox/functions/getter-setter-functions";
+import { Func } from "../../../fd-toolbox/functions/internal-getter-setter-functions";
 import { OAuthTokenData } from "./oauth-token-data";
-export declare function registerUser<TUser, TOAuthProvider>(email: string, password?: string, userInviteValidationResult?: UserInviteValidationResult, workspaceUserInviteId?: string, firstName?: string, lastName?: string, oauthKey?: string, oauthProvider?: string, extendedUserFields?: Partial<TUser>, extendedOAuthProviderFields?: Partial<TOAuthProvider>): Promise<import("../../../../lib/package/undocumented").User>;
-export declare function createSessionForUser(userId: string): Promise<import("../../../../lib/package/undocumented").Cookie>;
+export declare function registerUser<TUser, TOAuthProvider>(email: string, password?: string, userInviteValidationResult?: UserInviteValidationResult, workspaceUserInviteId?: string, firstName?: string, lastName?: string, oauthKey?: string, oauthProvider?: string, extendedUserFields?: Partial<TUser>, extendedOAuthProviderFields?: Partial<TOAuthProvider>): Promise<import("../../../../generated/npm-package").User>;
+export declare function createSessionForUser(userId: string): Promise<import("../../../../generated/npm-package/undocumented").Cookie>;
 export declare function checkValidPassword(password: string, passwordHash: string): Promise<boolean>;
 export declare function refreshAccessTokenIfNeeded(refreshTokenCallback: Func<OAuthProvider, Promise<OAuthTokenData>>, oauthProvider: string, refreshIfNotExpired?: boolean): Promise<void>;
 export declare function initializeAccessToken(initAccessToken: Func<OAuthProvider, Promise<OAuthTokenData>>, oauthProvider: string): Promise<void>;
 /** @internal */
-export declare function registerTestUserWithCustomWorkspaceId<TUser, TOAuthProvider>(email: string, password?: string, workspaceId?: string, firstName?: string, lastName?: string, oauthKey?: string, oauthProvider?: string, extendedUserFields?: Partial<TUser>, extendedOAuthProviderFields?: Partial<TOAuthProvider>): Promise<import("../../../../lib/package/undocumented").User>;
+export declare function registerTestUserWithCustomWorkspaceId<TUser, TOAuthProvider>(email: string, password?: string, workspaceId?: string, firstName?: string, lastName?: string, oauthKey?: string, oauthProvider?: string, extendedUserFields?: Partial<TUser>, extendedOAuthProviderFields?: Partial<TOAuthProvider>): Promise<import("../../../../generated/npm-package").User>;

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

@@ -5,7 +5,7 @@ import { randomBytes } from 'crypto';
 import { workspaceConstants } from '../../../fd-toolbox/server/constants/workspace-constants.js';
 import { publicImages } from '../../../fd-toolbox/constants/public-files.js';
 import { emptyUuid } from '../../../fd-toolbox/constants/constants.js';
-import { fileExtensionsWithoutDot } from '../../../base-repo/app-constants/system-constants.js';
+import { fileExtensionsWithoutDot, stringEncodingNames } from '../../../base-repo/app-constants/internal-system-constants.js';
 import { createUserResource } from './user-db.js';
 import { getUserById } from '../../fd-app-toolbox/server/users/user-db.js';
 import { crudCreate } from '../../meta/server/basic-crud/cruds.js';
@@ -18,7 +18,8 @@ import { createBaseResourceProperties } from '../utils/base-resource-properties.
 import { workspaceStatuses, workspaceCategories } from '../../common/dev/dev-enums.js';
 import { createSession, createSessionCookie } from '../../meta/server/auth/fd-sessions.js';
 import { deleteUserWorkspaceInvite } from '../workspace/workspace-invite/workspace-user-invites.js';
+import { first } from '../../../fd-toolbox/server/collections/single-funcs.js';
-var __defProp=Object['defineProperty'],__name=(_0x50ef9b,_0x2508d1)=>__defProp(_0x50ef9b,'name',{'value':_0x2508d1,'configurable':!![]});async function registerUser(_0x28291e,_0x3a6ad8,_0x25453a,_0x523f94,_0x15d8be,_0x45e48d,_0x2d3c8a,_0x39ab66,_0x35a71f,_0x2dce90){let _0x3a953b=await getWorkspaceFromInviteOrCreateWorkspace(_0x28291e,_0x25453a);const _0x3691be=_0x3a6ad8?await hashPassword(_0x3a6ad8):void(-0x875+-0x1be*0x13+-0x1*-0x298f),_0x22568e=getNewUuid(),_0x2ee3b2=await createUserResource({'id':_0x22568e,'userId':_0x22568e,'passwordHash':_0x3691be,'isDisabled':![],'email':_0x28291e,'securityStamp':randomBytes(0x1969+-0x70e+-0x123b)['toString']('hex'),'imageUrl':'/'+publicImages['user']+'/'+emptyUuid+'.'+fileExtensionsWithoutDot['webp'],'firstName':_0x15d8be,'lastName':_0x45e48d,'homeWorkspaceId':_0x3a953b,'currentWorkspaceId':_0x3a953b,..._0x35a71f??{}});if(!_0x2ee3b2)return void(-0x22f*0x5+0x19fa+0x1*-0xf0f);await createSettingForUser(_0x22568e,_0x15d8be,_0x45e48d);if(_0x2d3c8a&&_0x39ab66){const _0x44af0d={'id':getNewUuid(),'userId':_0x22568e,'authKey':_0x2d3c8a,'authType':_0x39ab66,..._0x2dce90?_0x35a71f:{}},_0x4feb26={...await getCrudUpdateConfig(_0x44af0d,resourceNames['oAuthProvider']),'throwOnNonSuccess':!![]};await crudCreate(_0x4feb26);}return _0x523f94&&await deleteUserWorkspaceInvite(_0x523f94),_0x2ee3b2;}__name(registerUser,'registerUser');async function createSessionForUser(_0x2930cf){let _0x2e7be6=await getUserById(_0x2930cf);const _0x31a6ce=await createSession(_0x2930cf,{'homeWorkspaceId':_0x2e7be6['homeWorkspaceId']??workspaceConstants['defaultWorkspaceId'],'currentWorkspaceId':_0x2e7be6['currentWorkspaceId']??workspaceConstants['defaultWorkspaceId']});return createSessionCookie(_0x31a6ce['id']);}__name(createSessionForUser,'createSessionForUser');async function checkValidPassword(_0x58f96a,_0x38db67){if(_0x38db67)return verify(_0x38db67,_0x58f96a,{'memoryCost':0x4c00,'timeCost':0x2,'outputLen':0x20,'parallelism':0x1});return ![];}__name(checkValidPassword,'checkValidPassword');async function refreshAccessTokenIfNeeded(_0x577921,_0x50cfdf,_0x3d8936){const _0x4e1fee=await getOAuthProviderByCurrentUser(_0x50cfdf);if(!_0x4e1fee?.['accessApiTokenExpiresAt'])return void(0x4*-0x831+0x22e1+-0x21d*0x1);if(_0x3d8936||isBeforeNow(_0x4e1fee['accessApiTokenExpiresAt'])){const _0x3f3c05=await _0x577921(_0x4e1fee);return updateOAuthProviderToken(_0x4e1fee,_0x3f3c05);}return void(0x1*0x17e9+-0x1aa0+0x2b7);}__name(refreshAccessTokenIfNeeded,'refreshAccessTokenIfNeeded');async function initializeAccessToken(_0x5a1d49,_0xa0d1b7){const _0x4ae5f5=await getOAuthProviderByCurrentUser(_0xa0d1b7);if(!_0x4ae5f5)return void(-0x25db+0x4e7*-0x6+0x4345);const _0x2a78e2=await _0x5a1d49(_0x4ae5f5);return updateOAuthProviderToken(_0x4ae5f5,_0x2a78e2);}__name(initializeAccessToken,'initializeAccessToken');async function registerTestUserWithCustomWorkspaceId(_0x164031,_0x37b570,_0x44b818,_0x390270,_0x4a4444,_0x873ae8,_0x46fdce,_0x20e5fa,_0x48da2e){const _0x140f26=_0x37b570?await hashPassword(_0x37b570):void(0x1*0x18d1+0x17bb+0x1*-0x308c),_0x1e20e2=getNewUuid(),_0x3cc856=await createUserResource({'id':_0x1e20e2,'userId':_0x1e20e2,'passwordHash':_0x140f26,'isDisabled':![],'email':_0x164031,'securityStamp':randomBytes(0x91*0x3+-0x1387+0x11f4)['toString']('hex'),'imageUrl':'/'+publicImages['user']+'/'+emptyUuid+'.'+fileExtensionsWithoutDot['webp'],'firstName':_0x390270,'lastName':_0x4a4444,'homeWorkspaceId':workspaceConstants['defaultWorkspaceId'],'currentWorkspaceId':_0x44b818??workspaceConstants['defaultWorkspaceId'],..._0x20e5fa??{}});if(!_0x3cc856)return void(-0x23b*0x11+0xd5f+0x188c);await createSettingForUser(_0x1e20e2,_0x390270,_0x4a4444);if(_0x873ae8&&_0x46fdce){const _0x2c830d={'id':getNewUuid(),'userId':_0x1e20e2,'authKey':_0x873ae8,'authType':_0x46fdce,..._0x48da2e?_0x20e5fa:{}},_0x4935ca={...await getCrudUpdateConfig(_0x2c830d,resourceNames['oAuthProvider']),'throwOnNonSuccess':!![]};await crudCreate(_0x4935ca);}return _0x3cc856;}__name(registerTestUserWithCustomWorkspaceId,'registerTestUserWithCustomWorkspaceId');async function getWorkspaceFromInviteOrCreateWorkspace(_0x2b7671,_0x31078f){let _0x172cae;if(_0x31078f?.['workspaceId'])_0x172cae=_0x31078f['workspaceId'];else {const _0x27c40b=await createWorkspaceAndWorkspaceSetting(_0x2b7671);_0x172cae=_0x27c40b['id'];}return _0x172cae;}__name(getWorkspaceFromInviteOrCreateWorkspace,'getWorkspaceFromInviteOrCreateWorkspace');async function createWorkspaceAndWorkspaceSetting(_0x4460f6){const _0x2a2ee4={'id':getNewUuid(),'name':_0x4460f6['split']('@')[0x1*-0x1d3+0xcaf*0x1+-0xadc]},{result:_0x1020e3}=await crudCreate(await getCrudUpdateConfig(_0x2a2ee4,resourceNames['workspace'])),_0x454749={...createBaseResourceProperties(),'name':_0x1020e3['name'],'workspaceId':_0x1020e3['id'],'workspaceCategory':workspaceCategories['internal'],'status':workspaceStatuses['active'],'workspace':_0x1020e3};return await crudCreate(await getCrudUpdateConfig(_0x454749,resourceNames['workspaceSetting'])),_0x1020e3;}__name(createWorkspaceAndWorkspaceSetting,'createWorkspaceAndWorkspaceSetting');async function hashPassword(_0x24c0b8){return hash(_0x24c0b8,{'memoryCost':0x4c00,'timeCost':0x2,'outputLen':0x20,'parallelism':0x1});}__name(hashPassword,'hashPassword');async function createSettingForUser(_0x1a8f01,_0x1832ec,_0x3c203c){const _0x4fd776={'id':getNewUuid(),'userId':_0x1a8f01,'firstName':_0x1832ec,'lastName':_0x3c203c,'createdDate':getNow(),'createdByUserId':_0x1a8f01,'modifiedDate':getNow(),'modifiedByUserId':_0x1a8f01};return createUserSetting(_0x4fd776);}__name(createSettingForUser,'createSettingForUser');
+var __defProp=Object['defineProperty'],__name=(_0x37a016,_0x393681)=>__defProp(_0x37a016,'name',{'value':_0x393681,'configurable':!![]});async function registerUser(_0x4bcbbb,_0x2f4183,_0x2855b7,_0x67f1b8,_0x307854,_0x14104c,_0x3013ef,_0x4a0a35,_0x447b09,_0x1cf041){let _0x403667=await getWorkspaceFromInviteOrCreateWorkspace(_0x4bcbbb,_0x2855b7);const _0x46b988=_0x2f4183?await hashPassword(_0x2f4183):void(-0x593*-0x1+0x1*-0x1fbb+0x1*0x1a28),_0x2f9995=getNewUuid(),_0x16bf41=await createUserResource({'id':_0x2f9995,'userId':_0x2f9995,'passwordHash':_0x46b988,'isDisabled':![],'email':_0x4bcbbb,'securityStamp':randomBytes(0x51e+-0xc83*-0x1+-0x1181)['toString'](stringEncodingNames['hexEncoding']),'imageUrl':'/'+publicImages['user']+'/'+emptyUuid+'.'+fileExtensionsWithoutDot['webp'],'firstName':_0x307854,'lastName':_0x14104c,'homeWorkspaceId':_0x403667,'currentWorkspaceId':_0x403667,..._0x447b09??{}});if(!_0x16bf41)return void(-0x13c6+0x309*-0xc+-0x1*-0x3832);await createSettingForUser(_0x2f9995,_0x307854,_0x14104c);if(_0x3013ef&&_0x4a0a35){const _0xd54ca3={'id':getNewUuid(),'userId':_0x2f9995,'authKey':_0x3013ef,'authType':_0x4a0a35,..._0x1cf041?_0x447b09:{}},_0x1dfc79={...await getCrudUpdateConfig(_0xd54ca3,resourceNames['oAuthProvider']),'throwOnNonSuccess':!![]};await crudCreate(_0x1dfc79);}return _0x67f1b8&&await deleteUserWorkspaceInvite(_0x67f1b8),_0x16bf41;}__name(registerUser,'registerUser');async function createSessionForUser(_0x5d4fa5){let _0xd97b38=await getUserById(_0x5d4fa5);const _0x2c283e=await createSession(_0x5d4fa5,{'homeWorkspaceId':_0xd97b38['homeWorkspaceId']??workspaceConstants['defaultWorkspaceId'],'currentWorkspaceId':_0xd97b38['currentWorkspaceId']??workspaceConstants['defaultWorkspaceId']});return createSessionCookie(_0x2c283e['id']);}__name(createSessionForUser,'createSessionForUser');async function checkValidPassword(_0x471648,_0x170489){if(_0x170489)return verify(_0x170489,_0x471648,{'memoryCost':0x4c00,'timeCost':0x2,'outputLen':0x20,'parallelism':0x1});return ![];}__name(checkValidPassword,'checkValidPassword');async function refreshAccessTokenIfNeeded(_0x2c6e9b,_0x326901,_0x213f17){const _0x35980c=await getOAuthProviderByCurrentUser(_0x326901);if(!_0x35980c?.['accessApiTokenExpiresAt'])return void(-0xf*-0x26f+0x2051+-0x17*0x2fe);if(_0x213f17||isBeforeNow(_0x35980c['accessApiTokenExpiresAt'])){const _0x2cd67f=await _0x2c6e9b(_0x35980c);return updateOAuthProviderToken(_0x35980c,_0x2cd67f);}return void(-0x7*0x6d+-0xd4*0x2+0x4a3);}__name(refreshAccessTokenIfNeeded,'refreshAccessTokenIfNeeded');async function initializeAccessToken(_0x2cfbe4,_0x300eb3){const _0x474192=await getOAuthProviderByCurrentUser(_0x300eb3);if(!_0x474192)return void(-0x1a*-0xeb+-0x1a5*0x13+0x761);const _0x39cfa3=await _0x2cfbe4(_0x474192);return updateOAuthProviderToken(_0x474192,_0x39cfa3);}__name(initializeAccessToken,'initializeAccessToken');async function registerTestUserWithCustomWorkspaceId(_0x699868,_0x1266c0,_0x5abb4c,_0x2eb8cf,_0x32a660,_0x35c4d6,_0x2fc08a,_0x58371d,_0x19446c){const _0x3e2b7c=_0x1266c0?await hashPassword(_0x1266c0):void(0x2243+0x1605+-0x3848),_0x49e5b0=getNewUuid(),_0xb567ca=await createUserResource({'id':_0x49e5b0,'userId':_0x49e5b0,'passwordHash':_0x3e2b7c,'isDisabled':![],'email':_0x699868,'securityStamp':randomBytes(-0x192d+0x5e*0x59+-0x761*0x1)['toString'](stringEncodingNames['hexEncoding']),'imageUrl':'/'+publicImages['user']+'/'+emptyUuid+'.'+fileExtensionsWithoutDot['webp'],'firstName':_0x2eb8cf,'lastName':_0x32a660,'homeWorkspaceId':workspaceConstants['defaultWorkspaceId'],'currentWorkspaceId':_0x5abb4c??workspaceConstants['defaultWorkspaceId'],..._0x58371d??{}});if(!_0xb567ca)return void(-0x28e+-0x1*-0x6b0+-0x422);await createSettingForUser(_0x49e5b0,_0x2eb8cf,_0x32a660);if(_0x35c4d6&&_0x2fc08a){const _0x4a8446={'id':getNewUuid(),'userId':_0x49e5b0,'authKey':_0x35c4d6,'authType':_0x2fc08a,..._0x19446c?_0x58371d:{}},_0x41d2fe={...await getCrudUpdateConfig(_0x4a8446,resourceNames['oAuthProvider']),'throwOnNonSuccess':!![]};await crudCreate(_0x41d2fe);}return _0xb567ca;}__name(registerTestUserWithCustomWorkspaceId,'registerTestUserWithCustomWorkspaceId');async function getWorkspaceFromInviteOrCreateWorkspace(_0x5b6c0b,_0x2ac2d2){let _0x4fcb88;if(_0x2ac2d2?.['workspaceId'])_0x4fcb88=_0x2ac2d2['workspaceId'];else {const _0x17c91a=await createWorkspaceAndWorkspaceSetting(_0x5b6c0b);_0x4fcb88=_0x17c91a['id'];}return _0x4fcb88;}__name(getWorkspaceFromInviteOrCreateWorkspace,'getWorkspaceFromInviteOrCreateWorkspace');async function createWorkspaceAndWorkspaceSetting(_0x12f06d){const _0x583164={'id':getNewUuid(),'name':first(_0x12f06d['split']('@'))},{result:_0x25bc3f}=await crudCreate(await getCrudUpdateConfig(_0x583164,resourceNames['workspace'])),_0x35f3ce={...createBaseResourceProperties(),'name':_0x25bc3f['name'],'workspaceId':_0x25bc3f['id'],'workspaceCategory':workspaceCategories['internal'],'status':workspaceStatuses['active'],'workspace':_0x25bc3f};return await crudCreate(await getCrudUpdateConfig(_0x35f3ce,resourceNames['workspaceSetting'])),_0x25bc3f;}__name(createWorkspaceAndWorkspaceSetting,'createWorkspaceAndWorkspaceSetting');async function hashPassword(_0x35165f){return hash(_0x35165f,{'memoryCost':0x4c00,'timeCost':0x2,'outputLen':0x20,'parallelism':0x1});}__name(hashPassword,'hashPassword');async function createSettingForUser(_0x429788,_0x5b7991,_0x46af11){const _0x2a6260={'id':getNewUuid(),'userId':_0x429788,'firstName':_0x5b7991,'lastName':_0x46af11,'createdDate':getNow(),'createdByUserId':_0x429788,'modifiedDate':getNow(),'modifiedByUserId':_0x429788};return createUserSetting(_0x2a6260);}__name(createSettingForUser,'createSettingForUser');
 export { checkValidPassword, createSessionForUser, initializeAccessToken, refreshAccessTokenIfNeeded, registerTestUserWithCustomWorkspaceId, registerUser };

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-time.js';
 import { crudActions } from '../../../fd-toolbox/enums/enums.js';
-var __defProp=Object['defineProperty'],__name=(_0x5e90ca,_0x549355)=>__defProp(_0x5e90ca,'name',{'value':_0x549355,'configurable':!![]});async function createUserWithSettings(_0x22965b){await checkUserPermission(crudActions['create']);const _0x51a433={'email':_0x22965b['email'],'password':_0x22965b['password'],'userName':_0x22965b['userName'],'firstName':_0x22965b['firstName']??'','lastName':_0x22965b['lastName']??'','userId':getNewUuid(),'homeWorkspaceId':workspaceConstants['defaultWorkspaceId'],'currentWorkspaceId':workspaceConstants['defaultWorkspaceId']};await createUser(_0x51a433,getNewUuid());const _0x5728f2=await getUserByEmail(_0x51a433['email']);if(!_0x5728f2)throw createError(metaErrorMessages['userNotFound']);const _0xd9dd1e=[resourceNames['user']];await addUserToRoles(_0xd9dd1e,_0x5728f2['id']);const _0x3b0af6={'id':getNewUuid(),'userId':_0x5728f2['id'],'firstName':_0x22965b['firstName'],'lastName':_0x22965b['lastName'],'createdDate':getNow(),'createdByUserId':await getUserId(),'modifiedDate':getNow(),'modifiedByUserId':await getUserId()};createUserSetting(_0x3b0af6);const _0x2f1bed={'userId':_0x5728f2['id'],'userName':_0x22965b['userName'],'roles':_0xd9dd1e,'firstName':_0x22965b['firstName'],'lastName':_0x22965b['lastName']};await publishMessage(_0x2f1bed);}__name(createUserWithSettings,'createUserWithSettings');async function editUser(_0x31284c){await checkUserPermission(crudActions['update']);if(!_0x31284c['id'])throw createError(metaErrorMessages['noUserIdProvided']);const _0x510380=await getUserById(_0x31284c['id']);_0x510380['email']=_0x31284c['email'],_0x510380['firstName']=_0x31284c['firstName'],_0x510380['lastName']=_0x31284c['lastName'],_0x510380['lastLoginDate']=_0x31284c['lastLoginDate']?parseUtcStringToDate(_0x31284c['lastLoginDate']):void(0x2140+0xfa2+-0x30e2),await updateUserSettingIfNeeded(_0x31284c,_0x510380);_0x510380['isDisabled']!==_0x31284c['isDisabled']&&(_0x510380['isDisabled']=_0x31284c['isDisabled'],await updateUser(_0x510380));let _0x49355d={'isSuccess':!![],'userFriendlyMessage':''};if(_0x31284c['password']){const _0x4c933f=generatePasswordResetToken(_0x510380),_0x25971f=await resetPassword(_0x4c933f,_0x510380,_0x31284c['password']);handleIdentityResult(_0x49355d,_0x25971f);}if(_0x49355d['isSuccess']){const _0x284c9f=await updateUser(_0x510380);handleIdentityResult(_0x49355d,_0x284c9f);}return _0x49355d;}__name(editUser,'editUser');async function checkUserPermission(_0x17b239){if(!hasPermission(resourceNames['user'],_0x17b239,await getUserId()))throw createError(metaErrorMessages['noPermissionForCrudAction']['replace']('{0}',crudActionNames['delete'])['replace']('{1}',resourceNames['user']));}__name(checkUserPermission,'checkUserPermission');async function updateUserSettingIfNeeded(_0x3768a2,_0x270c01){const _0x5291a1=await getUserSettingByUserId(_0x270c01['id']);_0x3768a2['firstName']&&_0x5291a1['firstName']!==_0x3768a2['firstName']&&(_0x5291a1['firstName']=_0x3768a2['firstName']);_0x3768a2['lastName']&&_0x5291a1['lastName']!==_0x3768a2['lastName']&&(_0x5291a1['lastName']=_0x3768a2['lastName']);if(_0x3768a2['firstName']||_0x3768a2['lastName']){const _0x468d9b={'resource':_0x5291a1,'userId':toolboxUserConstants['workerBotId'],'resourceName':resourceNames['userSetting'],'isCalledFromOutside':!![]};await crudUpdate(_0x468d9b);}}__name(updateUserSettingIfNeeded,'updateUserSettingIfNeeded');function handleIdentityResult(_0x2bcf77,_0x10e194){_0x2bcf77['isSuccess']=_0x10e194['isSuccess'],_0x2bcf77['userFriendlyMessage']=_0x10e194['isSuccess']?operationStatusMessages['success']:_0x10e194['userFriendlyMessage'];}__name(handleIdentityResult,'handleIdentityResult');
+var __defProp=Object['defineProperty'],__name=(_0x687033,_0xab5624)=>__defProp(_0x687033,'name',{'value':_0xab5624,'configurable':!![]});async function createUserWithSettings(_0x40acc5){await checkUserPermission(crudActions['create']);const _0x11ae39={'email':_0x40acc5['email'],'password':_0x40acc5['password'],'userName':_0x40acc5['userName'],'firstName':_0x40acc5['firstName']??'','lastName':_0x40acc5['lastName']??'','userId':getNewUuid(),'homeWorkspaceId':workspaceConstants['defaultWorkspaceId'],'currentWorkspaceId':workspaceConstants['defaultWorkspaceId']};await createUser(_0x11ae39,getNewUuid());const _0x3a3e1c=await getUserByEmail(_0x11ae39['email']);if(!_0x3a3e1c)throw createError(metaErrorMessages['userNotFound']);const _0x4fea08=[resourceNames['user']];await addUserToRoles(_0x4fea08,_0x3a3e1c['id']);const _0x2c8576={'id':getNewUuid(),'userId':_0x3a3e1c['id'],'firstName':_0x40acc5['firstName'],'lastName':_0x40acc5['lastName'],'createdDate':getNow(),'createdByUserId':await getUserId(),'modifiedDate':getNow(),'modifiedByUserId':await getUserId()};createUserSetting(_0x2c8576);const _0x41acbe={'userId':_0x3a3e1c['id'],'userName':_0x40acc5['userName'],'roles':_0x4fea08,'firstName':_0x40acc5['firstName'],'lastName':_0x40acc5['lastName']};await publishMessage(_0x41acbe);}__name(createUserWithSettings,'createUserWithSettings');async function editUser(_0x35c896){await checkUserPermission(crudActions['update']);if(!_0x35c896['id'])throw createError(metaErrorMessages['noUserIdProvided']);const _0x376927=await getUserById(_0x35c896['id']);_0x376927['email']=_0x35c896['email'],_0x376927['firstName']=_0x35c896['firstName'],_0x376927['lastName']=_0x35c896['lastName'],_0x376927['lastLoginDate']=_0x35c896['lastLoginDate']?parseUtcStringToDate(_0x35c896['lastLoginDate']):void(0x4*-0x300+0x1045+0x1*-0x445),await updateUserSettingIfNeeded(_0x35c896,_0x376927);_0x376927['isDisabled']!==_0x35c896['isDisabled']&&(_0x376927['isDisabled']=_0x35c896['isDisabled'],await updateUser(_0x376927));let _0x4a32d1={'isSuccess':!![],'userFriendlyMessage':''};if(_0x35c896['password']){const _0x3183a3=generatePasswordResetToken(_0x376927),_0x254729=await resetPassword(_0x3183a3,_0x376927,_0x35c896['password']);handleIdentityResult(_0x4a32d1,_0x254729);}if(_0x4a32d1['isSuccess']){const _0x210173=await updateUser(_0x376927);handleIdentityResult(_0x4a32d1,_0x210173);}return _0x4a32d1;}__name(editUser,'editUser');async function checkUserPermission(_0x5c0039){if(!hasPermission(resourceNames['user'],_0x5c0039,await getUserId()))throw createError(metaErrorMessages['noPermissionForCrudAction']['replace']('{0}',crudActionNames['delete'])['replace']('{1}',resourceNames['user']));}__name(checkUserPermission,'checkUserPermission');async function updateUserSettingIfNeeded(_0x39f50c,_0x4903b7){const _0x3da881=await getUserSettingByUserId(_0x4903b7['id']);_0x39f50c['firstName']&&_0x3da881['firstName']!==_0x39f50c['firstName']&&(_0x3da881['firstName']=_0x39f50c['firstName']);_0x39f50c['lastName']&&_0x3da881['lastName']!==_0x39f50c['lastName']&&(_0x3da881['lastName']=_0x39f50c['lastName']);if(_0x39f50c['firstName']||_0x39f50c['lastName']){const _0x218c5c={'resource':_0x3da881,'userId':toolboxUserConstants['workerBotId'],'resourceName':resourceNames['userSetting'],'isCalledFromOutside':!![]};await crudUpdate(_0x218c5c);}}__name(updateUserSettingIfNeeded,'updateUserSettingIfNeeded');function handleIdentityResult(_0x234393,_0x5d01c2){_0x234393['isSuccess']=_0x5d01c2['isSuccess'],_0x234393['userFriendlyMessage']=_0x5d01c2['isSuccess']?operationStatusMessages['success']:_0x5d01c2['userFriendlyMessage'];}__name(handleIdentityResult,'handleIdentityResult');
 export { checkUserPermission, createUserWithSettings, editUser };

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

@@ -1,10 +1,12 @@
 'use strict';
-import _0x4be08b from 'jsonwebtoken';
+import _0x58b317 from 'jsonwebtoken';
 import { getConfig } from '../../../fd-toolbox/server/configs/configs.js';
 import { isNullOrUndefined } from '../../../fd-toolbox/functions/value-checking-functions.js';
 import { createError } from '../../../fd-toolbox/errors/errors.js';
 import { metaErrorMessages } from '../../meta/constants/meta-error-messages-constants.js';
+import { fdConfigKeys } from '../../../fd-toolbox/server/constants/configs/fd-config-keys.js';
+import { userTokenConstants } from './user-token-constants.js';
-var __defProp=Object['defineProperty'],__name=(_0x2712ef,_0x5201f9)=>__defProp(_0x2712ef,'name',{'value':_0x5201f9,'configurable':!![]});const jwtKey=getConfig()['JwtKey']??'';function createToken(_0x31bf35){const _0x72ab0e=mapUserToUserPayload(_0x31bf35);return _0x4be08b['sign'](_0x72ab0e,jwtKey,{'algorithm':'HS256','expiresIn':'14d'});}__name(createToken,'createToken');function decodeToken(_0x346b0c){try{const _0x3eb5e6=_0x4be08b['verify'](_0x346b0c,jwtKey,{'algorithms':['HS256']});if(isUserPayload(_0x3eb5e6))return _0x3eb5e6;else throw createError(metaErrorMessages['invalidToken']);}catch{return void(-0x2ef*-0x7+0x2620+-0x3aa9);}}__name(decodeToken,'decodeToken');function mapUserToUserPayload(_0x591db1){return {'userId':_0x591db1['id'],'email':_0x591db1['email']};}__name(mapUserToUserPayload,'mapUserToUserPayload');function isUserPayload(_0x26eeb8){return !isNullOrUndefined(_0x26eeb8)&&typeof _0x26eeb8==='object'&&Object['keys'](_0x26eeb8)['every'](_0x12a9a8=>_0x12a9a8 in _0x26eeb8);}__name(isUserPayload,'isUserPayload');
+var __defProp=Object['defineProperty'],__name=(_0x27ba18,_0x5c23d2)=>__defProp(_0x27ba18,'name',{'value':_0x5c23d2,'configurable':!![]});const jwtKey=getConfig()[fdConfigKeys['jwtKey']]??'';function createToken(_0x173f35){const _0x1bc5dc=mapUserToUserPayload(_0x173f35);return _0x58b317['sign'](_0x1bc5dc,jwtKey,{'algorithm':userTokenConstants['signingAlgorithm'],'expiresIn':'14d'});}__name(createToken,'createToken');function decodeToken(_0x62a2a8){try{const _0x1e66c3=_0x58b317['verify'](_0x62a2a8,jwtKey,{'algorithms':[userTokenConstants['signingAlgorithm']]});if(isUserPayload(_0x1e66c3))return _0x1e66c3;else throw createError(metaErrorMessages['invalidToken']);}catch{return void(0x9*-0x327+0x4*-0x46a+0x1*0x2e07);}}__name(decodeToken,'decodeToken');function mapUserToUserPayload(_0x190780){return {'userId':_0x190780['id'],'email':_0x190780['email']};}__name(mapUserToUserPayload,'mapUserToUserPayload');function isUserPayload(_0x2d6c00){return !isNullOrUndefined(_0x2d6c00)&&typeof _0x2d6c00==='object'&&Object['keys'](_0x2d6c00)['every'](_0x5c9217=>_0x5c9217 in _0x2d6c00);}__name(isUserPayload,'isUserPayload');
 export { createToken, decodeToken };

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

@@ -10,7 +10,8 @@ import { randomBytes } from 'crypto';
 import { hash } from '@node-rs/argon2';
 import { hasPermission } from '../../meta/server/permission/permission-checker.js';
 import { crudActions } from '../../../fd-toolbox/enums/enums.js';
+import { stringEncodingNames } from '../../../base-repo/app-constants/internal-system-constants.js';
-var __defProp=Object['defineProperty'],__name=(_0x40df61,_0x35ea75)=>__defProp(_0x40df61,'name',{'value':_0x35ea75,'configurable':!![]});async function createUser(_0x4586a7,_0x2d872b,_0x12ebbd=!![]){const _0x507aad=await getUserId(),_0x1eddb5=_0x507aad===toolboxUserConstants['workerBotId']||await hasPermission(resourceNames['user'],crudActions['create'],_0x507aad);if(!_0x1eddb5)throw createError(toolboxErrorMessages['noPermissionToCreateUser']);const _0x18913b={'id':_0x2d872b??getNewUuid(),'userId':_0x2d872b??_0x507aad,'firstName':_0x4586a7['firstName']??'','lastName':_0x4586a7['lastName']??'','email':_0x4586a7['email'],'passwordHash':await hash(_0x4586a7['password']),'isDisabled':![],'securityStamp':randomBytes(-0xea6+0x1cd8+0xe12*-0x1)['toString']('hex'),'homeWorkspaceId':_0x4586a7['homeWorkspaceId'],'currentWorkspaceId':_0x4586a7['currentWorkspaceId']},_0xdb7e7c=await createUserResource(_0x18913b),_0x2b1b63=!!_0xdb7e7c['id'],_0x582182={'isSuccess':_0x2b1b63,'userFriendlyMessage':''};if(!_0x2b1b63){_0x582182['userFriendlyMessage']=toolboxErrorMessages['failedToCreateUser'];if(_0x12ebbd)throw createError(toolboxErrorMessages['userCreationFailedWithReason']['replace']('{0}',_0x582182['userFriendlyMessage']));}return _0x582182;}__name(createUser,'createUser');
+var __defProp=Object['defineProperty'],__name=(_0x1b1f58,_0x38dea9)=>__defProp(_0x1b1f58,'name',{'value':_0x38dea9,'configurable':!![]});async function createUser(_0x3ae1db,_0x300641,_0x42da6e=!![]){const _0x236ba3=await getUserId(),_0x48c8b0=_0x236ba3===toolboxUserConstants['workerBotId']||await hasPermission(resourceNames['user'],crudActions['create'],_0x236ba3);if(!_0x48c8b0)throw createError(toolboxErrorMessages['noPermissionToCreateUser']);const _0x2273ee={'id':_0x300641??getNewUuid(),'userId':_0x300641??_0x236ba3,'firstName':_0x3ae1db['firstName']??'','lastName':_0x3ae1db['lastName']??'','email':_0x3ae1db['email'],'passwordHash':await hash(_0x3ae1db['password']),'isDisabled':![],'securityStamp':randomBytes(0x93*0x43+-0x17e4+-0xe75)['toString'](stringEncodingNames['hexEncoding']),'homeWorkspaceId':_0x3ae1db['homeWorkspaceId'],'currentWorkspaceId':_0x3ae1db['currentWorkspaceId']},_0x551d62=await createUserResource(_0x2273ee),_0x4452fb=!!_0x551d62['id'],_0x4c2532={'isSuccess':_0x4452fb,'userFriendlyMessage':''};if(!_0x4452fb){_0x4c2532['userFriendlyMessage']=toolboxErrorMessages['failedToCreateUser'];if(_0x42da6e)throw createError(toolboxErrorMessages['userCreationFailedWithReason']['replace']('{0}',_0x4c2532['userFriendlyMessage']));}return _0x4c2532;}__name(createUser,'createUser');
 export { createUser };

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

@@ -4,16 +4,18 @@ import { eq, and } from 'drizzle-orm';
 import { getResourcesByField } from '../../meta/server/db/db.js';
 import { resourceNames } from '../../../fd-toolbox/resources/resource-names.js';
 import { getNewUuid } from '../../../fd-toolbox/uuids.js';
-import { userSchema, userRoleSchema } from '../../../../generated/schema.js';
+import { getDbSchema } from '../../db/db-schema.js';
 import { checkValidPassword } from './auth.js';
 import { workspaceConstants } from '../../../fd-toolbox/server/constants/workspace-constants.js';
 import { getQuery } from '../../meta/server/web/drizzle.js';
-import { applyFilterToQuery, runQuery } from '../../db/drizzle-queries.js';
+import { getTableColumn, 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 { singleOrUndefined } 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';
+import { schemaNames, columnNames } from '../../db/constants/schema-names.js';
+import { removePermissionsFromCoreCache } from '../../meta/server/permission/permissions.js';
-var __defProp=Object['defineProperty'],__name=(_0xfd563a,_0x3b0f06)=>__defProp(_0xfd563a,'name',{'value':_0x3b0f06,'configurable':!![]});async function getUserByEmail(_0x4c5bee){const _0x1b6a4d=await getResourcesByField(resourceNames['user'],userSchema['email'],_0x4c5bee);return singleOrDefault(_0x1b6a4d);}__name(getUserByEmail,'getUserByEmail');async function getUserByEmailAndPassword(_0xf69e82,_0x16cf4b){const _0x12c26c=await getUserByEmail(_0xf69e82);if(_0x12c26c){const _0x2d3e8b=await checkValidPassword(_0x16cf4b,_0x12c26c['passwordHash']??'');if(_0x2d3e8b)return _0x12c26c;}return void(-0x58*-0x3c+-0x1d58+0x8b8);}__name(getUserByEmailAndPassword,'getUserByEmailAndPassword');async function getUserByOAuth(_0x34cfc1,_0x24cc08){const _0x4f109a=await getOAuthProviderByAuthKey(_0x24cc08,_0x34cfc1);if(!_0x4f109a)return void(-0xd4*-0x2+0x1a09+-0x11*0x1a1);const _0x421e50=await getUserById(_0x4f109a['userId']);return _0x421e50;}__name(getUserByOAuth,'getUserByOAuth');async function createUserResource(_0x58adcc){return createResource(_0x58adcc,resourceNames['user']);}__name(createUserResource,'createUserResource');async function addRoleToUser(_0x187878,_0x1d3f47){return dbInsert(userRoleSchema)['values']({'id':getNewUuid(),'userId':_0x187878,'roleId':_0x1d3f47})['onConflictDoNothing']()['returning']();}__name(addRoleToUser,'addRoleToUser');async function getUserHomeWorkspaceId(_0x1a592a){const _0x278b68=await getUserById(_0x1a592a);if(!_0x278b68['homeWorkspaceId'])return workspaceConstants['defaultWorkspaceId'];return _0x278b68['homeWorkspaceId'];}__name(getUserHomeWorkspaceId,'getUserHomeWorkspaceId');async function getUserDtosOrSingle(_0x2457ba){const _0x2a13c3=[eq(userSchema['isDisabled'],![])];if(_0x2457ba)_0x2a13c3['push'](eq(userSchema['id'],_0x2457ba));const {query:_0x4c1e72}=await getQuery(userSchema);applyFilterToQuery(_0x4c1e72,and(..._0x2a13c3));const _0x1f43c5=await runQuery(_0x4c1e72),_0x507e7c=_0x1f43c5['map'](_0x16b629=>({'id':_0x16b629['id'],'email':_0x16b629['email']??void(-0x19bf+0x171*-0x2+-0x3*-0x98b)}));return _0x507e7c;}__name(getUserDtosOrSingle,'getUserDtosOrSingle');
+var __defProp=Object['defineProperty'],__name=(_0x42112b,_0x2ee79b)=>__defProp(_0x42112b,'name',{'value':_0x2ee79b,'configurable':!![]});async function getUserByEmail(_0x19763f){const _0x408431=getDbSchema(),_0xdf2138=_0x408431[schemaNames['userSchema']],_0x3ed46d=await getResourcesByField(resourceNames['user'],getTableColumn(_0xdf2138,columnNames['email']),_0x19763f);return singleOrUndefined(_0x3ed46d);}__name(getUserByEmail,'getUserByEmail');async function getUserByEmailAndPassword(_0x2cca59,_0xb60948){const _0x23b02f=await getUserByEmail(_0x2cca59);if(_0x23b02f){const _0x2c8dd8=await checkValidPassword(_0xb60948,_0x23b02f['passwordHash']??'');if(_0x2c8dd8)return _0x23b02f;}return void(0x2*-0xf38+0x5*-0x6a3+0x3f9f);}__name(getUserByEmailAndPassword,'getUserByEmailAndPassword');async function getUserByOAuth(_0x5e25e7,_0x4cbcba){const _0x3357a7=await getOAuthProviderByAuthKey(_0x4cbcba,_0x5e25e7);if(!_0x3357a7)return void(0x62b*-0x4+0x5*0x5d1+-0x469);const _0x1e9f40=await getUserById(_0x3357a7['userId']);return _0x1e9f40;}__name(getUserByOAuth,'getUserByOAuth');async function createUserResource(_0x10495a){return createResource(_0x10495a,resourceNames['user']);}__name(createUserResource,'createUserResource');async function addRoleToUser(_0x5a6903,_0x2fdd6f){const _0x4f68ff=getDbSchema(),_0x4c1e81=_0x4f68ff[schemaNames['userRoleSchema']],_0x388f3f=await dbInsert(_0x4c1e81)['values']({'id':getNewUuid(),'userId':_0x5a6903,'roleId':_0x2fdd6f})['onConflictDoNothing']()['returning']();return await removePermissionsFromCoreCache(),_0x388f3f;}__name(addRoleToUser,'addRoleToUser');async function getUserHomeWorkspaceId(_0x54bf6f){const _0x2547ef=await getUserById(_0x54bf6f);if(!_0x2547ef['homeWorkspaceId'])return workspaceConstants['defaultWorkspaceId'];return _0x2547ef['homeWorkspaceId'];}__name(getUserHomeWorkspaceId,'getUserHomeWorkspaceId');async function getUserDtosOrSingle(_0x5e599e){const _0x5e8403=getDbSchema(),_0x44e605=_0x5e8403[schemaNames['userSchema']],_0x3b91cd=[eq(getTableColumn(_0x44e605,columnNames['isDisabled']),![])];if(_0x5e599e)_0x3b91cd['push'](eq(getTableColumn(_0x44e605,columnNames['id']),_0x5e599e));const {query:_0x4f0629}=await getQuery(_0x44e605);applyFilterToQuery(_0x4f0629,and(..._0x3b91cd));const _0x12bb95=await runQuery(_0x4f0629),_0x55eeb9=_0x12bb95['map'](_0xbb51d0=>({'id':_0xbb51d0['id'],'email':_0xbb51d0['email']??void(-0x3*0x147+-0x1*0xf6d+-0x9a1*-0x2)}));return _0x55eeb9;}__name(getUserDtosOrSingle,'getUserDtosOrSingle');
 export { addRoleToUser, createUserResource, getUserByEmail, getUserByEmailAndPassword, getUserByOAuth, getUserDtosOrSingle, getUserHomeWorkspaceId };

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=(_0x427139,_0x36dd0c)=>__defProp(_0x427139,'name',{'value':_0x36dd0c,'configurable':!![]});async function deleteUser(_0x422086){checkUserPermission(crudActions['delete']);const _0x493827=await getItemsByUserId(_0x422086);for(const _0x427ec5 of _0x493827){const _0x333079={'resourceName':resourceNames['item'],'resourceId':_0x427ec5['id'],'userId':toolboxUserConstants['workerBotId'],'ignoreDbUpdateConcurrencyException':![]};await crudDelete(_0x333079);}await userManagerDeleteUser(_0x422086);}__name(deleteUser,'deleteUser');
+var __defProp=Object['defineProperty'],__name=(_0x1f6106,_0x45accb)=>__defProp(_0x1f6106,'name',{'value':_0x45accb,'configurable':!![]});async function deleteUser(_0x28124b){checkUserPermission(crudActions['delete']);const _0x36b9a6=await getItemsByUserId(_0x28124b);for(const _0x320b75 of _0x36b9a6){const _0x543714={'resourceName':resourceNames['item'],'resourceId':_0x320b75['id'],'userId':toolboxUserConstants['workerBotId'],'ignoreDbUpdateConcurrencyException':![]};await crudDelete(_0x543714);}await userManagerDeleteUser(_0x28124b);}__name(deleteUser,'deleteUser');
 export { deleteUser };

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

@@ -1,9 +1,8 @@
 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<any>;
+export declare function getOneUserFeatureEnabledByUserId(featureCode: string, userId: string): Promise<unknown>;
 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 tryGetOneByCode(userId: string, featureCode: string): Promise<unknown>;
+export declare function createUserFeatures(userId: string, 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,8 +1,7 @@
 'use strict';
 import { getResourcesByName } from '../../meta/server/db/db.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 { getTableColumn, applyFilterToQuery, runQuery } from '../../db/drizzle-queries.js';
 import { eq, getTableColumns, and } from 'drizzle-orm';
 import { resourceNames } from '../../../fd-toolbox/resources/resource-names.js';
 import { createBaseResourceProperties } from '../utils/base-resource-properties.js';
@@ -13,7 +12,10 @@ 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';
+import { getDbSchema } from '../../db/db-schema.js';
+import { schemaNames, columnNames } from '../../db/constants/schema-names.js';
+import { singleOrUndefined } from '../../../fd-toolbox/server/collections/single-funcs.js';
-var __defProp=Object['defineProperty'],__name=(_0x39de30,_0x4a5bd2)=>__defProp(_0x39de30,'name',{'value':_0x4a5bd2,'configurable':!![]});async function getOneUserFeatureEnabledByUserId(_0xe41579,_0x5e1ea3){const {query:_0x3e1485}=await getQuery(userFeatureSchema);dbLeftJoin(_0x3e1485,featureSchema,eq(featureSchema['id'],userFeatureSchema['featureId'])),applyFilterToQuery(_0x3e1485,getUserFeatureByFeatureCode(_0xe41579,_0x5e1ea3)),applyFilterToQuery(_0x3e1485,eq(userFeatureSchema['userId'],_0x5e1ea3));const _0x5b95c3=await runQuery(_0x3e1485);return _0x5b95c3[-0x1359*-0x2+-0x31*-0x73+-0x3cb5]?_0x5b95c3[0x1*0x1ae7+-0xfa7*-0x1+-0x2a8e]:void(-0xbe2+-0x950+0x1*0x1532);}__name(getOneUserFeatureEnabledByUserId,'getOneUserFeatureEnabledByUserId');async function getUserFeatures(){return getResourcesByName(resourceNames['userFeature']);}__name(getUserFeatures,'getUserFeatures');async function getUserFeaturesByUserId(_0x8bbd4b){const {query:_0x45dfb3}=await getQuery(userFeatureSchema);applyFilterToQuery(_0x45dfb3,eq(userFeatureSchema['userId'],_0x8bbd4b));const _0x59dafa=await runQuery(_0x45dfb3);return _0x59dafa;}__name(getUserFeaturesByUserId,'getUserFeaturesByUserId');async function tryGetOneByCode(_0x38882b,_0x85e6bc){const {query:_0x27d047}=await getQuery(userFeatureSchema,getTableColumns(userFeatureSchema));dbLeftJoin(_0x27d047,featureSchema,eq(featureSchema['id'],userFeatureSchema['featureId'])),applyFilterToQuery(_0x27d047,and(eq(userFeatureSchema['userId'],_0x38882b),eq(featureSchema['code'],_0x85e6bc)));const _0x9145f5=await runQuery(_0x27d047);return _0x9145f5[-0x1286+0xdf*-0x22+0x34*0xed]?_0x9145f5[-0xe5*-0x3+0x13fe+0x3*-0x78f]:void(-0x2*-0x1069+0x5*0x282+-0x2d5c);}__name(tryGetOneByCode,'tryGetOneByCode');async function createUserFeatures(_0xd2755f,_0x59c19f,_0xc6bfb1){const _0x5d25e6=new Map([]),_0x222c0b=Array['from'](_0x59c19f['keys']());for(const _0x19a4a8 of _0x222c0b){!_0x5d25e6['has'](_0x19a4a8)&&_0x5d25e6['set'](_0x19a4a8,![]);}for(const [_0x15aca6,_0x1e889e]of _0x5d25e6){const _0x44d074=_0x1e889e?userFeatureStates['enabled']:userFeatureStates['disabled'];await createUserFeature(_0xd2755f['userId'],_0x15aca6,_0x59c19f,_0xc6bfb1,_0x44d074);}}__name(createUserFeatures,'createUserFeatures');async function getUserFeatureToUserIdMap(){const _0x210c20=new Map(),_0x32b117=await executeQuery(userFeatureSchema);for(const _0x39947b of _0x32b117){const _0x459d02=_0x39947b['userId'];!_0x210c20['has'](_0x459d02)&&_0x210c20['set'](_0x459d02,[]),_0x210c20['get'](_0x459d02)['push'](_0x39947b);}return _0x210c20;}__name(getUserFeatureToUserIdMap,'getUserFeatureToUserIdMap');async function createUserFeature(_0x1cbfdd,_0x6ebde8,_0x29da5f,_0x3fa38a,_0x2783b5){if(!_0x29da5f['has'](_0x6ebde8))throw createError(metaErrorMessages['featureCodeMissing']['replace']('{0}',_0x6ebde8));const _0x1baec2=_0x29da5f['get'](_0x6ebde8),_0x16bec9=_0x3fa38a['find'](_0x10133d=>_0x10133d['featureId']===_0x1baec2['id']&&_0x10133d['userId']===_0x1cbfdd);if(!_0x16bec9){const _0x9797da={...createBaseResourceProperties(),'featureId':_0x1baec2['id'],'state':_0x2783b5,'userId':_0x1cbfdd,'workspaceId':workspaceConstants['defaultWorkspaceId']};await createResource(_0x9797da,resourceNames['userFeature']);}}__name(createUserFeature,'createUserFeature');
+var __defProp=Object['defineProperty'],__name=(_0x2e7afd,_0x31d394)=>__defProp(_0x2e7afd,'name',{'value':_0x31d394,'configurable':!![]});async function getOneUserFeatureEnabledByUserId(_0x12cc93,_0x29c3cf){const _0x50aba6=getDbSchema(),_0x544443=_0x50aba6[schemaNames['featureSchema']],_0x1b5965=_0x50aba6[schemaNames['userFeatureSchema']],{query:_0x54b0d2}=await getQuery(_0x1b5965);dbLeftJoin(_0x54b0d2,_0x544443,eq(getTableColumn(_0x544443,columnNames['id']),getTableColumn(_0x1b5965,columnNames['featureId']))),applyFilterToQuery(_0x54b0d2,getUserFeatureByFeatureCode(_0x12cc93,_0x29c3cf)),applyFilterToQuery(_0x54b0d2,eq(getTableColumn(_0x1b5965,columnNames['userId']),_0x29c3cf));const _0x18547f=await runQuery(_0x54b0d2);return singleOrUndefined(_0x18547f);}__name(getOneUserFeatureEnabledByUserId,'getOneUserFeatureEnabledByUserId');async function getUserFeatures(){return getResourcesByName(resourceNames['userFeature']);}__name(getUserFeatures,'getUserFeatures');async function getUserFeaturesByUserId(_0x334915){const _0xbb5387=getDbSchema(),_0x4047f7=_0xbb5387[schemaNames['userFeatureSchema']],{query:_0x2a3e61}=await getQuery(_0x4047f7);applyFilterToQuery(_0x2a3e61,eq(getTableColumn(_0x4047f7,columnNames['userId']),_0x334915));const _0x5324ec=await runQuery(_0x2a3e61);return _0x5324ec;}__name(getUserFeaturesByUserId,'getUserFeaturesByUserId');async function tryGetOneByCode(_0x296137,_0x16405d){const _0x4cb0e3=getDbSchema(),_0x35bb0e=_0x4cb0e3[schemaNames['featureSchema']],_0x504e41=_0x4cb0e3[schemaNames['userFeatureSchema']],{query:_0x483428}=await getQuery(_0x504e41,getTableColumns(_0x504e41));dbLeftJoin(_0x483428,_0x35bb0e,eq(getTableColumn(_0x35bb0e,columnNames['id']),getTableColumn(_0x504e41,columnNames['featureId']))),applyFilterToQuery(_0x483428,and(eq(getTableColumn(_0x504e41,columnNames['userId']),_0x296137),eq(getTableColumn(_0x35bb0e,columnNames['code']),_0x16405d)));const _0x37de51=await runQuery(_0x483428);return singleOrUndefined(_0x37de51);}__name(tryGetOneByCode,'tryGetOneByCode');async function createUserFeatures(_0x8325db,_0x2d108d,_0x473d38){const _0x5f3368=new Map([]),_0x54cf1d=Array['from'](_0x2d108d['keys']());for(const _0x177c59 of _0x54cf1d){!_0x5f3368['has'](_0x177c59)&&_0x5f3368['set'](_0x177c59,![]);}for(const [_0x1d76c3,_0x2d4026]of _0x5f3368){const _0x2622b1=_0x2d4026?userFeatureStates['enabled']:userFeatureStates['disabled'];await createUserFeature(_0x8325db,_0x1d76c3,_0x2d108d,_0x473d38,_0x2622b1);}}__name(createUserFeatures,'createUserFeatures');async function getUserFeatureToUserIdMap(){const _0x28d881=getDbSchema(),_0xb58953=_0x28d881[schemaNames['userFeatureSchema']],_0x2af2ea=new Map(),_0x44ac46=await executeQuery(_0xb58953);for(const _0x5ee56c of _0x44ac46){const _0x487406=_0x5ee56c['userId'];!_0x2af2ea['has'](_0x487406)&&_0x2af2ea['set'](_0x487406,[]),_0x2af2ea['get'](_0x487406)['push'](_0x5ee56c);}return _0x2af2ea;}__name(getUserFeatureToUserIdMap,'getUserFeatureToUserIdMap');async function createUserFeature(_0x153d6a,_0x451ab9,_0x1a205f,_0x21a1a6,_0x62a79d){if(!_0x1a205f['has'](_0x451ab9))throw createError(metaErrorMessages['featureCodeMissing']['replace']('{0}',_0x451ab9));const _0x2db350=_0x1a205f['get'](_0x451ab9),_0x3c0d55=_0x21a1a6['find'](_0x1a8320=>_0x1a8320['featureId']===_0x2db350['id']&&_0x1a8320['userId']===_0x153d6a);if(!_0x3c0d55){const _0x4deedd={...createBaseResourceProperties(),'featureId':_0x2db350['id'],'state':_0x62a79d,'userId':_0x153d6a,'workspaceId':workspaceConstants['defaultWorkspaceId']};await createResource(_0x4deedd,resourceNames['userFeature']);}}__name(createUserFeature,'createUserFeature');
 export { createUserFeatures, getOneUserFeatureEnabledByUserId, getUserFeatureToUserIdMap, getUserFeatures, getUserFeaturesByUserId, tryGetOneByCode };

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

@@ -1,8 +1,10 @@
 'use strict';
 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';
+import { getDbSchema } from '../../db/db-schema.js';
+import { getTableColumn } from '../../db/drizzle-queries.js';
+import { schemaNames, columnNames } from '../../db/constants/schema-names.js';
-var __defProp=Object['defineProperty'],__name=(_0x1bd2d5,_0xd8f2fd)=>__defProp(_0x1bd2d5,'name',{'value':_0xd8f2fd,'configurable':!![]});function getUserFeatureByFeatureCode(_0x5dccb6,_0x21f5d4){return and(_0x21f5d4?eq(userFeatureSchema['userId'],_0x21f5d4):void(-0x34+0x4*0x2eb+-0xb78),eq(featureSchema['code'],_0x5dccb6),eq(featureSchema['state'],featureStates['enabled']),eq(userFeatureSchema['state'],userFeatureStates['enabled']));}__name(getUserFeatureByFeatureCode,'getUserFeatureByFeatureCode');function getUserFeaturesByFeatureCodes(_0x126592,_0x380938){return and(_0x380938?eq(userFeatureSchema['userId'],_0x380938):void(0x11*0x40+-0x7bd*-0x2+-0x13ba),inArray(featureSchema['code'],_0x126592),eq(featureSchema['state'],featureStates['enabled']),eq(userFeatureSchema['state'],userFeatureStates['enabled']));}__name(getUserFeaturesByFeatureCodes,'getUserFeaturesByFeatureCodes');
+var __defProp=Object['defineProperty'],__name=(_0x4ec617,_0x55d562)=>__defProp(_0x4ec617,'name',{'value':_0x55d562,'configurable':!![]});function getUserFeatureByFeatureCode(_0x189210,_0x451ee7){const _0x171dfb=getDbSchema(),_0x5727d7=_0x171dfb[schemaNames['featureSchema']],_0x59f17e=_0x171dfb[schemaNames['userFeatureSchema']];return and(_0x451ee7?eq(getTableColumn(_0x59f17e,columnNames['userId']),_0x451ee7):void(0xc7e+-0x2d3+-0x9ab),eq(getTableColumn(_0x5727d7,columnNames['code']),_0x189210),eq(getTableColumn(_0x5727d7,columnNames['state']),featureStates['enabled']),eq(getTableColumn(_0x59f17e,columnNames['state']),userFeatureStates['enabled']));}__name(getUserFeatureByFeatureCode,'getUserFeatureByFeatureCode');function getUserFeaturesByFeatureCodes(_0x53b9ff,_0x11a626){const _0x682fc8=getDbSchema(),_0x44172e=_0x682fc8[schemaNames['featureSchema']],_0x1c18bc=_0x682fc8[schemaNames['userFeatureSchema']];return and(_0x11a626?eq(getTableColumn(_0x1c18bc,columnNames['userId']),_0x11a626):void(0xb0b+0x16dc+-0xb*0x315),inArray(getTableColumn(_0x44172e,columnNames['code']),_0x53b9ff),eq(getTableColumn(_0x44172e,columnNames['state']),featureStates['enabled']),eq(getTableColumn(_0x1c18bc,columnNames['state']),userFeatureStates['enabled']));}__name(getUserFeaturesByFeatureCodes,'getUserFeaturesByFeatureCodes');
 export { getUserFeatureByFeatureCode, getUserFeaturesByFeatureCodes };

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

@@ -1,18 +1,14 @@
+import { Result } from "../../fd-app-toolbox/models/result";
 import { User } from "../../meta/core/resources/users/user.resource";
 export declare function getUserRolesForPermission(userId: string): Promise<any>;
+/** @monorepo-internal */
 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<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;
-    userFriendlyMessage: "Password has been changed successfully";
-} | {
-    isSuccess: false;
-    userFriendlyMessage: string;
-}>;
+export declare function resetPassword(token: string, userModel: User, newPassword: string): Promise<Result>;
 export declare function updateUser(updatedUser: User): Promise<{
     isSuccess: boolean;
     userFriendlyMessage: "User updated successfully";

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

@@ -1,21 +1,25 @@
 'use strict';
 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 { getTableColumn, runQuery } from '../../db/drizzle-queries.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 { singleOrUndefined } 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 _0x4be08b from 'jsonwebtoken';
+import _0x58b317 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';
 import { metaErrorMessages } from '../../meta/constants/meta-error-messages-constants.js';
 import { getUserDtosOrSingle, addRoleToUser } from './user-db.js';
 import { userManagerMessages } from './user-manager-messages.js';
+import { getDbSchema } from '../../db/db-schema.js';
+import { schemaNames, columnNames } from '../../db/constants/schema-names.js';
+import { userTokenConstants } from './user-token-constants.js';
+import { wellKnownMetaProps } from '../../../fd-toolbox-core/constants/meta-constants.js';
+import { commonLowerCaseWords } from '../../../base-repo/constants/internal-common-strings.js';
-var __defProp=Object['defineProperty'],__name=(_0x49be1a,_0x1ede7d)=>__defProp(_0x49be1a,'name',{'value':_0x1ede7d,'configurable':!![]});async function getUserRolesForPermission(_0x1ca464){const _0x3472ff=await getRolesAsync(_0x1ca464);if(_0x3472ff&&_0x3472ff['length']>-0x2651+-0xf5+-0x2746*-0x1)return _0x3472ff;else throw createError(metaErrorMessages['noRolesForUser']['replace']('{0}',_0x1ca464));}__name(getUserRolesForPermission,'getUserRolesForPermission');async function getUserDto(_0x3e9e3f){return singleOrDefault(await getUserDtosOrSingle(_0x3e9e3f));}__name(getUserDto,'getUserDto');async function getUserDtos(){return getUserDtosOrSingle();}__name(getUserDtos,'getUserDtos');async function userManagerDeleteUser(_0x44e782){let _0x334db8;try{_0x334db8=await dbDelete(userSchema)['where'](eq(userSchema['id'],_0x44e782))['returning']();}catch(_0x4d2ec3){if(_0x4d2ec3&&typeof _0x4d2ec3==='object'&&'detail'in _0x4d2ec3)throw apiConflictError(_0x4d2ec3['detail']?String(_0x4d2ec3['detail']):'');}return _0x334db8;}__name(userManagerDeleteUser,'userManagerDeleteUser');async function getRolesAsync(_0x1e02b6){const _0x4773dd=createDynamicSelect(userRoleSchema,{'name':roleSchema['name']});dbInnerJoin(_0x4773dd,roleSchema,eq(userRoleSchema['roleId'],roleSchema['id'])),dbWhere(_0x4773dd,eq(userRoleSchema['userId'],_0x1e02b6));const _0x332d0e=await runQuery(_0x4773dd);return _0x332d0e['map'](_0x4a9e98=>_0x4a9e98['name']);}__name(getRolesAsync,'getRolesAsync');async function addToRole(_0x123b63,_0x5249f9){const _0x251685=await getRoleByName(_0x5249f9);return addRoleToUser(_0x123b63,_0x251685['id']);}__name(addToRole,'addToRole');function generatePasswordResetToken(_0x2a6b0d){return generateUserToken(_0x2a6b0d,userTokenPurposeConstants['resetPassword']);}__name(generatePasswordResetToken,'generatePasswordResetToken');async function resetPassword(_0x87569a,_0xb8d53a,_0x15f165){if(!validateUserToken(_0x87569a,_0xb8d53a,userTokenPurposeConstants['resetPassword']))return {'isSuccess':![],'userFriendlyMessage':userManagerMessages['invalidToken']};_0xb8d53a['passwordHash']=await hash(_0x15f165,{'memoryCost':0x4c00,'timeCost':0x2,'outputLen':0x20,'parallelism':0x1});try{return await updateResource(_0xb8d53a,resourceNames['user']),{'isSuccess':!![],'userFriendlyMessage':userManagerMessages['passwordChanged']};}catch(_0x153f70){return {'isSuccess':![],'userFriendlyMessage':_0x153f70 instanceof Error?_0x153f70['message']:metaErrorMessages['resetPasswordError']};}}__name(resetPassword,'resetPassword');async function updateUser(_0x508c9e){const _0x35105c=await dbUpdate(userSchema)['set'](_0x508c9e)['where'](and(eq(userSchema['id'],_0x508c9e['id']),eq(userSchema['passwordHash'],userSchema['passwordHash'])))['returning']();return {'isSuccess':!!_0x35105c,'userFriendlyMessage':userManagerMessages['userUpdated']};}__name(updateUser,'updateUser');function generateUserToken(_0x425b06,_0x4a3676=''){const _0x5f406a={'id':_0x425b06['id'],'purpose':_0x4a3676};return _0x4be08b['sign'](_0x5f406a,_0x425b06['securityStamp'],{'algorithm':'HS256','expiresIn':'1d'});}__name(generateUserToken,'generateUserToken');function validateUserToken(_0x207bab,_0x5edb4f,_0x28b8b6=''){try{const _0x231e31=_0x4be08b['verify'](_0x207bab,_0x5edb4f['securityStamp'],{'algorithms':['HS256']});if(!hasTokenShape(_0x231e31))return ![];if(typeof _0x231e31['id']!=='string'||typeof _0x231e31['purpose']!=='string')return ![];return _0x231e31['id']===_0x5edb4f['id']&&_0x231e31['purpose']===_0x28b8b6;}catch{return ![];}}__name(validateUserToken,'validateUserToken');function hasTokenShape(_0x5f4f6b){return typeof _0x5f4f6b==='object'&&!!_0x5f4f6b&&'id'in _0x5f4f6b&&'purpose'in _0x5f4f6b;}__name(hasTokenShape,'hasTokenShape');
+var __defProp=Object['defineProperty'],__name=(_0x4fae15,_0x5a96f8)=>__defProp(_0x4fae15,'name',{'value':_0x5a96f8,'configurable':!![]});const userSettings={'detail':commonLowerCaseWords['detail']};async function getUserRolesForPermission(_0x546cfe){const _0x59be2f=await getRolesAsync(_0x546cfe);if(_0x59be2f&&_0x59be2f['length']>-0x1*-0x827+0xb51+-0x1378)return _0x59be2f;else throw createError(metaErrorMessages['noRolesForUser']['replace']('{0}',_0x546cfe));}__name(getUserRolesForPermission,'getUserRolesForPermission');async function getUserDto(_0x11dba6){return singleOrUndefined(await getUserDtosOrSingle(_0x11dba6));}__name(getUserDto,'getUserDto');async function getUserDtos(){return getUserDtosOrSingle();}__name(getUserDtos,'getUserDtos');async function userManagerDeleteUser(_0x597199){const _0x3c452d=getDbSchema(),_0x1fb0a5=_0x3c452d[schemaNames['userSchema']];let _0x214adc;try{_0x214adc=await dbDelete(_0x1fb0a5)['where'](eq(getTableColumn(_0x1fb0a5,columnNames['id']),_0x597199))['returning']();}catch(_0x304ab7){if(_0x304ab7&&typeof _0x304ab7==='object'&&userSettings['detail']in _0x304ab7)throw apiConflictError(_0x304ab7['detail']?String(_0x304ab7['detail']):'');}return _0x214adc;}__name(userManagerDeleteUser,'userManagerDeleteUser');async function getRolesAsync(_0x326a95){const _0x3ab6d1=getDbSchema(),_0x340ba2=_0x3ab6d1[schemaNames['roleSchema']],_0x1a3f3a=_0x3ab6d1[schemaNames['userRoleSchema']],_0xabfecf=createDynamicSelect(_0x1a3f3a,{'name':getTableColumn(_0x340ba2,columnNames['name'])});dbInnerJoin(_0xabfecf,_0x340ba2,eq(getTableColumn(_0x1a3f3a,columnNames['roleId']),getTableColumn(_0x340ba2,columnNames['id']))),dbWhere(_0xabfecf,eq(getTableColumn(_0x1a3f3a,columnNames['userId']),_0x326a95));const _0x10a3f1=await runQuery(_0xabfecf);return _0x10a3f1['map'](_0x184916=>_0x184916['name']);}__name(getRolesAsync,'getRolesAsync');async function addToRole(_0x83537,_0xc66058){const _0x480cdf=await getRoleByName(_0xc66058);return addRoleToUser(_0x83537,_0x480cdf['id']);}__name(addToRole,'addToRole');function generatePasswordResetToken(_0x53a66f){return generateUserToken(_0x53a66f,userTokenPurposeConstants['resetPassword']);}__name(generatePasswordResetToken,'generatePasswordResetToken');async function resetPassword(_0x1e28a4,_0x39d109,_0x444e11){let _0x46fb34;if(!validateUserToken(_0x1e28a4,_0x39d109,userTokenPurposeConstants['resetPassword']))_0x46fb34={'isSuccess':![],'userFriendlyMessage':userManagerMessages['invalidToken']};else {_0x39d109['passwordHash']=await hash(_0x444e11,{'memoryCost':0x4c00,'timeCost':0x2,'outputLen':0x20,'parallelism':0x1});try{await updateResource(_0x39d109,resourceNames['user']),_0x46fb34={'isSuccess':!![],'userFriendlyMessage':userManagerMessages['passwordChanged']};}catch(_0xd3ebf3){_0x46fb34={'isSuccess':![],'userFriendlyMessage':_0xd3ebf3 instanceof Error?_0xd3ebf3['message']:metaErrorMessages['resetPasswordError']};}}return _0x46fb34;}__name(resetPassword,'resetPassword');async function updateUser(_0x30a789){const _0x1b4e24=getDbSchema(),_0x472176=_0x1b4e24[schemaNames['userSchema']],_0x4ccb18=await dbUpdate(_0x472176)['set'](_0x30a789)['where'](and(eq(getTableColumn(_0x472176,columnNames['id']),_0x30a789['id']),eq(getTableColumn(_0x472176,columnNames['passwordHash']),getTableColumn(_0x472176,columnNames['passwordHash']))))['returning']();return {'isSuccess':!!_0x4ccb18,'userFriendlyMessage':userManagerMessages['userUpdated']};}__name(updateUser,'updateUser');function generateUserToken(_0x24bffc,_0x39e321=''){const _0x30ef8a={'id':_0x24bffc['id'],'purpose':_0x39e321};return _0x58b317['sign'](_0x30ef8a,_0x24bffc['securityStamp'],{'algorithm':userTokenConstants['signingAlgorithm'],'expiresIn':'1d'});}__name(generateUserToken,'generateUserToken');function validateUserToken(_0x35e3f5,_0x181637,_0x28809a=''){try{const _0x258302=_0x58b317['verify'](_0x35e3f5,_0x181637['securityStamp'],{'algorithms':[userTokenConstants['signingAlgorithm']]});if(!hasTokenShape(_0x258302))return ![];if(typeof _0x258302['id']!=='string'||typeof _0x258302['purpose']!=='string')return ![];return _0x258302['id']===_0x181637['id']&&_0x258302['purpose']===_0x28809a;}catch{return ![];}}__name(validateUserToken,'validateUserToken');function hasTokenShape(_0x205a6d){return typeof _0x205a6d==='object'&&!!_0x205a6d&&wellKnownMetaProps['id']in _0x205a6d&&'purpose'in _0x205a6d;}__name(hasTokenShape,'hasTokenShape');
 export { addToRole, generatePasswordResetToken, getRolesAsync, getUserDto, getUserDtos, getUserRolesForPermission, resetPassword, updateUser, userManagerDeleteUser };

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

@@ -12,10 +12,12 @@ import { getUserFeatureToUserIdMap, createUserFeatures } from './user-feature-db
 import { getUserSeedModels, createWorkerBot } from './user-mother.js';
 import { auths } from '../../../fd-toolbox-core/server/constants/auth-constants.js';
 import { publicImages } from '../../../fd-toolbox/constants/public-files.js';
-import { fileExtensionsWithoutDot } from '../../../base-repo/app-constants/system-constants.js';
+import { fileExtensionsWithoutDot, stringEncodingNames } from '../../../base-repo/app-constants/internal-system-constants.js';
 import { createResourceDirectlyInDb } from '../../meta/server/db/db.js';
 import { createResource } from '../../meta/server/resources/crud-resources.js';
+import { resourceFolders } from '../../../fd-toolbox/constants/resource-folders.js';
+import { commonLowerCaseWords } from '../../../base-repo/constants/internal-common-strings.js';
-var __defProp=Object['defineProperty'],__name=(_0x24da7a,_0x1411c2)=>__defProp(_0x24da7a,'name',{'value':_0x1411c2,'configurable':!![]});async function seedUsers(){const _0x2b6b30=getUserSeedModels();for(const _0x245e6a of Object['keys'](_0x2b6b30)){const _0xa588e7=_0x2b6b30[_0x245e6a],_0x55acca=await createUser(_0xa588e7);for(const _0xf9c785 of _0xa588e7['roles']){await createUserRole(_0x55acca,_0xf9c785);}const _0x1723ab=await createUserSetting(_0xa588e7,_0x245e6a);await createUserSetting$1(_0x1723ab);}}__name(seedUsers,'seedUsers');async function seedWorkerBotDirectlyInDb(){const _0x173222=createWorkerBot(),_0x2d5dd1=await createUserDirectlyInDb(_0x173222);for(const _0x17048a of _0x173222['roles']){await createUserRoleDirectlyInDb(_0x2d5dd1,_0x17048a);}const _0x29b28e=await createUserSetting(_0x173222,_0x173222['userId']);await createUserSettingDirectlyInDb(_0x29b28e);}__name(seedWorkerBotDirectlyInDb,'seedWorkerBotDirectlyInDb');async function seedOtherUsersInfo(_0x20b9b4){const _0xc7c802=getUserSeedModels(),_0x22136a=await getUserFeatureToUserIdMap();for(const _0x2ff72e of Object['keys'](_0xc7c802)){const _0x2d5a86=_0xc7c802[_0x2ff72e];let _0x311010=_0x22136a['get'](_0x2d5a86['userId']);_0x311010??=[],await seedOtherUserInfo(_0x2d5a86,_0x20b9b4,_0x311010,_0x2ff72e);}}__name(seedOtherUsersInfo,'seedOtherUsersInfo');async function seedOtherUserInfo(_0x1cc418,_0x28628f,_0x57652f,_0x4a0b31){await createTask('dev',_0x1cc418),await createTask('help',_0x1cc418);const _0x4033b0=await tryGetUserSettingByUserId(_0x1cc418['userId']);if(!_0x4033b0){const _0x120d2f=await createUserSetting(_0x1cc418,_0x4a0b31);await createUserSetting$1(_0x120d2f);}await createUserFeatures(_0x1cc418,_0x28628f,_0x57652f);}__name(seedOtherUserInfo,'seedOtherUserInfo');async function createTask(_0xad7580,_0x42605a){const _0x5f3d03=_0x42605a['firstName']+'.'+_0x42605a['lastName']+'\x20'+_0xad7580,_0x58e0c5=await tryGetItemByItemName(_0x42605a['userId'],_0x5f3d03);if(_0x58e0c5)return;const _0x27a420={...createBaseResourceProperties(),'content':_0xad7580,'name':_0x5f3d03,'userId':_0x42605a['userId']};await createItem(_0x27a420);}__name(createTask,'createTask');async function createUserSetting(_0x35edb3,_0x3d51f8){const _0x118e00={...createBaseResourceProperties(getNewUuid()),'userId':_0x35edb3['userId'],'firstName':_0x35edb3['firstName'],'lastName':_0x35edb3['lastName'],'imageUrl':'/'+publicImages['user']+'/'+_0x3d51f8+'.'+fileExtensionsWithoutDot['webp']};return _0x118e00;}__name(createUserSetting,'createUserSetting');async function mapUserSeedModelToUser(_0x9294f7){const _0x23d689={'id':_0x9294f7['userId'],'firstName':_0x9294f7['firstName'],'lastName':_0x9294f7['lastName'],'userId':_0x9294f7['userId'],'email':_0x9294f7['email'],'passwordHash':await hash(auths['defaultPwd']),'isDisabled':![],'securityStamp':randomBytes(-0x2*-0x12cc+0x31d+0x3*-0xd87)['toString']('hex'),'imageUrl':_0x9294f7['imageUrl'],'homeWorkspaceId':_0x9294f7['homeWorkspaceId'],'currentWorkspaceId':_0x9294f7['currentWorkspaceId']};return _0x23d689;}__name(mapUserSeedModelToUser,'mapUserSeedModelToUser');async function createUser(_0x581ea2){const _0x152ecc=await mapUserSeedModelToUser(_0x581ea2);return createUserResource(_0x152ecc);}__name(createUser,'createUser');async function createUserDirectlyInDb(_0xf3c366){const _0x39930d=await mapUserSeedModelToUser(_0xf3c366);return createResourceDirectlyInDb(_0x39930d,resourceNames['user']);}__name(createUserDirectlyInDb,'createUserDirectlyInDb');async function userToUserRole(_0x48585d,_0x1ec182){if(!await isRoleExists(_0x1ec182)||!_0x48585d)return void(0x2135*0x1+-0x7bf*-0x2+-0x30b3);const _0x47e4c2=await getRoleByName(_0x1ec182),_0xf46e9b={'id':getNewUuid(),'userId':_0x48585d['id'],'roleId':_0x47e4c2['id'],'user':_0x48585d,'role':_0x47e4c2};return _0xf46e9b;}__name(userToUserRole,'userToUserRole');async function createUserRole(_0x5173e1,_0x134955){const _0x5c7901=await userToUserRole(_0x5173e1,_0x134955);if(!_0x5c7901)return;await createResource(_0x5c7901,resourceNames['userRole']);}__name(createUserRole,'createUserRole');async function createUserRoleDirectlyInDb(_0x156918,_0x4bba7a){const _0x254c0a=await userToUserRole(_0x156918,_0x4bba7a);if(!_0x254c0a)return;await createResourceDirectlyInDb(_0x254c0a,resourceNames['userRole']);}__name(createUserRoleDirectlyInDb,'createUserRoleDirectlyInDb');
+var __defProp=Object['defineProperty'],__name=(_0x37e3d6,_0x1cbbbc)=>__defProp(_0x37e3d6,'name',{'value':_0x1cbbbc,'configurable':!![]});async function seedUsers(){const _0x3f7e69=getUserSeedModels();for(const _0x2e047d of Object['keys'](_0x3f7e69)){const _0x110abe=_0x3f7e69[_0x2e047d],_0x20f143=await createUser(_0x110abe);for(const _0x56a588 of _0x110abe['roles']){await createUserRole(_0x20f143,_0x56a588);}const _0x2fc12b=await createUserSetting(_0x110abe,_0x2e047d);await createUserSetting$1(_0x2fc12b);}}__name(seedUsers,'seedUsers');async function seedWorkerBotDirectlyInDb(){const _0x3efadf=createWorkerBot(),_0x1be5ef=await createUserDirectlyInDb(_0x3efadf);for(const _0x45cc13 of _0x3efadf['roles']){await createUserRoleDirectlyInDb(_0x1be5ef,_0x45cc13);}const _0x259a92=await createUserSetting(_0x3efadf,_0x3efadf['userId']);await createUserSettingDirectlyInDb(_0x259a92);}__name(seedWorkerBotDirectlyInDb,'seedWorkerBotDirectlyInDb');async function seedOtherUsersInfo(_0x3560c1){const _0x292852=getUserSeedModels(),_0x5a2824=await getUserFeatureToUserIdMap();for(const _0x357e24 of Object['keys'](_0x292852)){const _0x56bf34=_0x292852[_0x357e24];let _0x4c938d=_0x5a2824['get'](_0x56bf34['userId']);_0x4c938d??=[],await seedOtherUserInfo(_0x56bf34,_0x3560c1,_0x4c938d,_0x357e24);}}__name(seedOtherUsersInfo,'seedOtherUsersInfo');const seedUserInfoTasks={'dev':resourceFolders['dev'],'help':commonLowerCaseWords['help']};async function seedOtherUserInfo(_0x6aa5b1,_0x5bf761,_0x18c609,_0x45e3c2){await createTask(seedUserInfoTasks['dev'],_0x6aa5b1),await createTask(seedUserInfoTasks['help'],_0x6aa5b1);const _0x28ac9f=await tryGetUserSettingByUserId(_0x6aa5b1['userId']);if(!_0x28ac9f){const _0x415647=await createUserSetting(_0x6aa5b1,_0x45e3c2);await createUserSetting$1(_0x415647);}await createUserFeatures(_0x6aa5b1['userId'],_0x5bf761,_0x18c609);}__name(seedOtherUserInfo,'seedOtherUserInfo');async function createTask(_0x40ac1d,_0x7ea350){const _0x3fb737=_0x7ea350['firstName']+'.'+_0x7ea350['lastName']+'\x20'+_0x40ac1d,_0x41ec3d=await tryGetItemByItemName(_0x7ea350['userId'],_0x3fb737);if(_0x41ec3d)return;const _0x27b8ca={...createBaseResourceProperties(),'content':_0x40ac1d,'name':_0x3fb737,'userId':_0x7ea350['userId']};await createItem(_0x27b8ca);}__name(createTask,'createTask');async function createUserSetting(_0x4f052d,_0x208a52){const _0x3f8a32={...createBaseResourceProperties(getNewUuid()),'userId':_0x4f052d['userId'],'firstName':_0x4f052d['firstName'],'lastName':_0x4f052d['lastName'],'imageUrl':'/'+publicImages['user']+'/'+_0x208a52+'.'+fileExtensionsWithoutDot['webp']};return _0x3f8a32;}__name(createUserSetting,'createUserSetting');async function mapUserSeedModelToUser(_0x417061){const _0x588097={'id':_0x417061['userId'],'firstName':_0x417061['firstName'],'lastName':_0x417061['lastName'],'userId':_0x417061['userId'],'email':_0x417061['email'],'passwordHash':await hash(auths['defaultPwd']),'isDisabled':![],'securityStamp':randomBytes(0x1*0x15d7+0xaab+-0x2062)['toString'](stringEncodingNames['hexEncoding']),'imageUrl':_0x417061['imageUrl'],'homeWorkspaceId':_0x417061['homeWorkspaceId'],'currentWorkspaceId':_0x417061['currentWorkspaceId']};return _0x588097;}__name(mapUserSeedModelToUser,'mapUserSeedModelToUser');async function createUser(_0x4e1fb0){const _0x3364d9=await mapUserSeedModelToUser(_0x4e1fb0);return createUserResource(_0x3364d9);}__name(createUser,'createUser');async function createUserDirectlyInDb(_0x3a75f0){const _0x1fcc8f=await mapUserSeedModelToUser(_0x3a75f0);return createResourceDirectlyInDb(_0x1fcc8f,resourceNames['user']);}__name(createUserDirectlyInDb,'createUserDirectlyInDb');async function userToUserRole(_0x4f143b,_0x4ace24){if(!await isRoleExists(_0x4ace24)||!_0x4f143b)return void(0xbc4+-0xf81+-0x57*-0xb);const _0xd91a2f=await getRoleByName(_0x4ace24),_0x126b32={'id':getNewUuid(),'userId':_0x4f143b['id'],'roleId':_0xd91a2f['id'],'user':_0x4f143b,'role':_0xd91a2f};return _0x126b32;}__name(userToUserRole,'userToUserRole');async function createUserRole(_0x393587,_0x27c22d){const _0x2f9228=await userToUserRole(_0x393587,_0x27c22d);if(!_0x2f9228)return;await createResource(_0x2f9228,resourceNames['userRole']);}__name(createUserRole,'createUserRole');async function createUserRoleDirectlyInDb(_0x13974b,_0x2b3329){const _0x26edf1=await userToUserRole(_0x13974b,_0x2b3329);if(!_0x26edf1)return;await createResourceDirectlyInDb(_0x26edf1,resourceNames['userRole']);}__name(createUserRoleDirectlyInDb,'createUserRoleDirectlyInDb');
 export { seedOtherUserInfo, seedOtherUsersInfo, seedUsers, seedWorkerBotDirectlyInDb };

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

@@ -1,12 +1,13 @@
 'use strict';
-import { users, userNames } from '../../meta/constants/user-names.js';
+import { users } from '../../meta/constants/user-names.js';
+import { userConstants } from '../../../fd-toolbox/constants/user-infos.js';
 import { userIds } from '../../common/dev/constants/user-ids.js';
 import { roleNames } from '../../common/auth/roles/role-names.js';
 import { toolboxUserConstants } from '../../meta/constants/toolbox-users.js';
 import { publicImages } from '../../../fd-toolbox/constants/public-files.js';
-import { fileExtensionsWithoutDot } from '../../../base-repo/app-constants/system-constants.js';
+import { fileExtensionsWithoutDot } from '../../../base-repo/app-constants/internal-system-constants.js';
 import { workspaceConstants } from '../../../fd-toolbox/server/constants/workspace-constants.js';
-var __defProp=Object['defineProperty'],__name=(_0x2e46ca,_0x2f4b09)=>__defProp(_0x2e46ca,'name',{'value':_0x2f4b09,'configurable':!![]});function getUserSeedModels(){const _0x4be03e={[userIds['timWId']]:createTimWUserSeedModel(),[userIds['prestonAId']]:createPrestonAUserSeedModel(),[userIds['victorWId']]:createVictorWUserSeedModel(),[userIds['colinBId']]:createColinBUserSeedModel(),[userIds['adilFId']]:createAdilFUserSeedModel()};return _0x4be03e;}__name(getUserSeedModels,'getUserSeedModels');function createWorkerBot(){return {'userId':toolboxUserConstants['workerBotId'],'email':toolboxUserConstants['workerBotUserName']+toolboxUserConstants['atExampleDomain'],'roles':[roleNames['admin']],'firstName':toolboxUserConstants['workerBotFirstName'],'lastName':toolboxUserConstants['workerBotLastName'],'imageUrl':'/'+publicImages['user']+'/'+toolboxUserConstants['workerBotId']+'.'+fileExtensionsWithoutDot['webp'],'homeWorkspaceId':workspaceConstants['defaultWorkspaceId'],'currentWorkspaceId':workspaceConstants['defaultWorkspaceId']};}__name(createWorkerBot,'createWorkerBot');function createTimWUserSeedModel(){return {'userId':userIds['timWId'],'email':userNames['timWUserName']+toolboxUserConstants['atExampleDomain'],'roles':[roleNames['admin']],'firstName':users['tim']['firstName'],'lastName':users['tim']['lastName'],'imageUrl':'/'+publicImages['user']+'/'+userIds['timWId']+'.'+fileExtensionsWithoutDot['webp'],'homeWorkspaceId':workspaceConstants['defaultWorkspaceId'],'currentWorkspaceId':workspaceConstants['defaultWorkspaceId']};}__name(createTimWUserSeedModel,'createTimWUserSeedModel');function createPrestonAUserSeedModel(){return {'userId':userIds['prestonAId'],'email':userNames['prestonAUserName']+toolboxUserConstants['atExampleDomain'],'roles':[roleNames['admin']],'firstName':users['preston']['firstName'],'lastName':users['preston']['lastName'],'imageUrl':'/'+publicImages['user']+'/'+userIds['prestonAId']+'.'+fileExtensionsWithoutDot['webp'],'homeWorkspaceId':workspaceConstants['westMountainWorkspaceId'],'currentWorkspaceId':workspaceConstants['westMountainWorkspaceId']};}__name(createPrestonAUserSeedModel,'createPrestonAUserSeedModel');function createVictorWUserSeedModel(){return {'userId':userIds['victorWId'],'email':userNames['victorWUserName']+toolboxUserConstants['atExampleDomain'],'roles':[roleNames['trainee']],'firstName':users['victor']['firstName'],'lastName':users['victor']['lastName'],'imageUrl':'/'+publicImages['user']+'/'+userIds['victorWId']+'.'+fileExtensionsWithoutDot['webp'],'homeWorkspaceId':workspaceConstants['defaultWorkspaceId'],'currentWorkspaceId':workspaceConstants['defaultWorkspaceId']};}__name(createVictorWUserSeedModel,'createVictorWUserSeedModel');function createColinBUserSeedModel(){return {'userId':userIds['colinBId'],'email':userNames['colinBUserName']+toolboxUserConstants['atExampleDomain'],'roles':[roleNames['admin']],'firstName':users['colin']['firstName'],'lastName':users['colin']['lastName'],'imageUrl':'/'+publicImages['user']+'/'+userIds['colinBId']+'.'+fileExtensionsWithoutDot['webp'],'homeWorkspaceId':workspaceConstants['defaultWorkspaceId'],'currentWorkspaceId':workspaceConstants['defaultWorkspaceId']};}__name(createColinBUserSeedModel,'createColinBUserSeedModel');function createAdilFUserSeedModel(){return {'userId':userIds['adilFId'],'email':userNames['adilFUserName']+toolboxUserConstants['atExampleDomain'],'roles':[roleNames['assistant']],'firstName':users['adil']['firstName'],'lastName':users['adil']['lastName'],'imageUrl':'/'+publicImages['user']+'/'+userIds['adilFId']+'.'+fileExtensionsWithoutDot['webp'],'homeWorkspaceId':workspaceConstants['defaultWorkspaceId'],'currentWorkspaceId':workspaceConstants['defaultWorkspaceId']};}__name(createAdilFUserSeedModel,'createAdilFUserSeedModel');
+var __defProp=Object['defineProperty'],__name=(_0x3843c8,_0x35d09b)=>__defProp(_0x3843c8,'name',{'value':_0x35d09b,'configurable':!![]});function getUserSeedModels(){const _0x3f585c={[userIds['timWId']]:createTimWUserSeedModel(),[userIds['prestonAId']]:createPrestonAUserSeedModel(),[userIds['victorWId']]:createVictorWUserSeedModel(),[userIds['colinBId']]:createColinBUserSeedModel(),[userIds['adilFId']]:createAdilFUserSeedModel()};return _0x3f585c;}__name(getUserSeedModels,'getUserSeedModels');function createWorkerBot(){return {'userId':toolboxUserConstants['workerBotId'],'email':toolboxUserConstants['workerBotUserName']+toolboxUserConstants['atExampleDomain'],'roles':[roleNames['admin']],'firstName':toolboxUserConstants['workerBotFirstName'],'lastName':toolboxUserConstants['workerBotLastName'],'imageUrl':'/'+publicImages['user']+'/'+toolboxUserConstants['workerBotId']+'.'+fileExtensionsWithoutDot['webp'],'homeWorkspaceId':workspaceConstants['defaultWorkspaceId'],'currentWorkspaceId':workspaceConstants['defaultWorkspaceId']};}__name(createWorkerBot,'createWorkerBot');function createTimWUserSeedModel(){return {'userId':userIds['timWId'],'email':userConstants['timWUserName']+toolboxUserConstants['atExampleDomain'],'roles':[roleNames['admin']],'firstName':users['tim']['firstName'],'lastName':users['tim']['lastName'],'imageUrl':'/'+publicImages['user']+'/'+userIds['timWId']+'.'+fileExtensionsWithoutDot['webp'],'homeWorkspaceId':workspaceConstants['defaultWorkspaceId'],'currentWorkspaceId':workspaceConstants['defaultWorkspaceId']};}__name(createTimWUserSeedModel,'createTimWUserSeedModel');function createPrestonAUserSeedModel(){return {'userId':userIds['prestonAId'],'email':userConstants['prestonAUserName']+toolboxUserConstants['atExampleDomain'],'roles':[roleNames['admin']],'firstName':users['preston']['firstName'],'lastName':users['preston']['lastName'],'imageUrl':'/'+publicImages['user']+'/'+userIds['prestonAId']+'.'+fileExtensionsWithoutDot['webp'],'homeWorkspaceId':workspaceConstants['westMountainWorkspaceId'],'currentWorkspaceId':workspaceConstants['westMountainWorkspaceId']};}__name(createPrestonAUserSeedModel,'createPrestonAUserSeedModel');function createVictorWUserSeedModel(){return {'userId':userIds['victorWId'],'email':userConstants['victorWUserName']+toolboxUserConstants['atExampleDomain'],'roles':[roleNames['trainee']],'firstName':users['victor']['firstName'],'lastName':users['victor']['lastName'],'imageUrl':'/'+publicImages['user']+'/'+userIds['victorWId']+'.'+fileExtensionsWithoutDot['webp'],'homeWorkspaceId':workspaceConstants['defaultWorkspaceId'],'currentWorkspaceId':workspaceConstants['defaultWorkspaceId']};}__name(createVictorWUserSeedModel,'createVictorWUserSeedModel');function createColinBUserSeedModel(){return {'userId':userIds['colinBId'],'email':userConstants['colinBUserName']+toolboxUserConstants['atExampleDomain'],'roles':[roleNames['admin']],'firstName':users['colin']['firstName'],'lastName':users['colin']['lastName'],'imageUrl':'/'+publicImages['user']+'/'+userIds['colinBId']+'.'+fileExtensionsWithoutDot['webp'],'homeWorkspaceId':workspaceConstants['defaultWorkspaceId'],'currentWorkspaceId':workspaceConstants['defaultWorkspaceId']};}__name(createColinBUserSeedModel,'createColinBUserSeedModel');function createAdilFUserSeedModel(){return {'userId':userIds['adilFId'],'email':userConstants['adilFUserName']+toolboxUserConstants['atExampleDomain'],'roles':[roleNames['assistant']],'firstName':users['adil']['firstName'],'lastName':users['adil']['lastName'],'imageUrl':'/'+publicImages['user']+'/'+userIds['adilFId']+'.'+fileExtensionsWithoutDot['webp'],'homeWorkspaceId':workspaceConstants['defaultWorkspaceId'],'currentWorkspaceId':workspaceConstants['defaultWorkspaceId']};}__name(createAdilFUserSeedModel,'createAdilFUserSeedModel');
 export { createWorkerBot, getUserSeedModels };

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

@@ -1,6 +1,6 @@
 'use strict';
 import { removePermissionsFromCoreCache } from '../../meta/server/permission/permissions.js';
-var __defProp=Object['defineProperty'],__name=(_0x43b662,_0x5b22d1)=>__defProp(_0x43b662,'name',{'value':_0x5b22d1,'configurable':!![]});async function afterUpdate(){await removePermissionsFromCoreCache();}__name(afterUpdate,'afterUpdate');async function afterDelete(){await removePermissionsFromCoreCache();}__name(afterDelete,'afterDelete');async function afterCreate(){await removePermissionsFromCoreCache();}__name(afterCreate,'afterCreate');
+var __defProp=Object['defineProperty'],__name=(_0x3e7456,_0x208ca7)=>__defProp(_0x3e7456,'name',{'value':_0x208ca7,'configurable':!![]});async function afterUpdate(){await removePermissionsFromCoreCache();}__name(afterUpdate,'afterUpdate');async function afterDelete(){await removePermissionsFromCoreCache();}__name(afterDelete,'afterDelete');async function afterCreate(){await removePermissionsFromCoreCache();}__name(afterCreate,'afterCreate');
 export { afterCreate, afterDelete, afterUpdate };

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

@@ -3,6 +3,6 @@ import { getRolesAsync, addToRole } from './user-manager.js';
 import { roleNames } from '../../common/auth/roles/role-names.js';
 import { publishMessage } from '../../meta/server/messaging/messages.js';
-var __defProp=Object['defineProperty'],__name=(_0x39be9b,_0x9d1aa6)=>__defProp(_0x39be9b,'name',{'value':_0x9d1aa6,'configurable':!![]});async function addUserToRoles(_0x47f637,_0x19bf82){const _0x59ab5e=await getRolesAsync(_0x19bf82)??[];for(const _0x2e2d7f of _0x47f637){if(!_0x59ab5e['includes'](_0x2e2d7f)){await addToRole(_0x19bf82,_0x2e2d7f);const _0x2b75ab={'roleNames':_0x47f637,'userId':_0x19bf82};await publishMessage(_0x2b75ab);}}}__name(addUserToRoles,'addUserToRoles');async function isUserInRole(_0x26788c,_0x163ab5=roleNames['admin']){const _0x348e62=await getRolesAsync(_0x26788c)??[];return _0x348e62['includes'](_0x163ab5);}__name(isUserInRole,'isUserInRole');
+var __defProp=Object['defineProperty'],__name=(_0x254278,_0x4a5069)=>__defProp(_0x254278,'name',{'value':_0x4a5069,'configurable':!![]});async function addUserToRoles(_0x5f5cca,_0x1eb8d1){const _0x1ebaf8=await getRolesAsync(_0x1eb8d1)??[];for(const _0x2b78f0 of _0x5f5cca){if(!_0x1ebaf8['includes'](_0x2b78f0)){await addToRole(_0x1eb8d1,_0x2b78f0);const _0x11ea11={'roleNames':_0x5f5cca,'userId':_0x1eb8d1};await publishMessage(_0x11ea11);}}}__name(addUserToRoles,'addUserToRoles');async function isUserInRole(_0x468b01,_0xd854f8=roleNames['admin']){const _0x3fe02a=await getRolesAsync(_0x468b01)??[];return _0x3fe02a['includes'](_0xd854f8);}__name(isUserInRole,'isUserInRole');
 export { addUserToRoles, isUserInRole };

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

@@ -4,6 +4,6 @@ import { hash, verify } from '@node-rs/argon2';
 import { updateResource } from '../../meta/server/db/db.js';
 import { resourceNames } from '../../../fd-toolbox/resources/resource-names.js';
-var __defProp=Object['defineProperty'],__name=(_0x5ee947,_0x5b4197)=>__defProp(_0x5ee947,'name',{'value':_0x5b4197,'configurable':!![]});async function changeUserPassword(_0x2795cb,_0x332c44){let _0x301eb2={'isSuccess':!![],'userFriendlyMessage':''};const _0x2aa756=await getUserById(_0x332c44);if(!_0x2795cb['newPassword']||!_0x2aa756)return _0x301eb2;if(!_0x2795cb['currentPassword'])return _0x301eb2={'isSuccess':![],'userFriendlyMessage':'Current\x20password\x20cannot\x20be\x20null\x20or\x20empty'},_0x301eb2;return changePasswordAsync(_0x2aa756,_0x2795cb['currentPassword'],_0x2795cb['newPassword']);}__name(changeUserPassword,'changeUserPassword');async function changePasswordAsync(_0x2f6e45,_0x5f8bf5,_0x5d20df){const _0x1fd6e4=await hash(_0x5d20df,{'memoryCost':0x4c00,'timeCost':0x2,'outputLen':0x20,'parallelism':0x1}),_0x52235c={'isSuccess':!![],'userFriendlyMessage':''};if(!await verify(_0x2f6e45['passwordHash'],_0x5f8bf5))return _0x52235c['isSuccess']=![],_0x52235c['userFriendlyMessage']='Passwords\x20aren\x27t\x20match',_0x52235c;return _0x2f6e45['passwordHash']=_0x1fd6e4,await updateResource(_0x2f6e45,resourceNames['user']),_0x52235c;}__name(changePasswordAsync,'changePasswordAsync');
+var __defProp=Object['defineProperty'],__name=(_0x4af892,_0x2914f2)=>__defProp(_0x4af892,'name',{'value':_0x2914f2,'configurable':!![]});async function changeUserPassword(_0x30d9fc,_0x1f086f){let _0x22c9be={'isSuccess':!![],'userFriendlyMessage':''};const _0x103fa0=await getUserById(_0x1f086f);if(!_0x30d9fc['newPassword']||!_0x103fa0)return _0x22c9be;if(!_0x30d9fc['currentPassword'])return _0x22c9be={'isSuccess':![],'userFriendlyMessage':'Current\x20password\x20cannot\x20be\x20null\x20or\x20empty'},_0x22c9be;return changePasswordAsync(_0x103fa0,_0x30d9fc['currentPassword'],_0x30d9fc['newPassword']);}__name(changeUserPassword,'changeUserPassword');async function changePasswordAsync(_0x474923,_0x553033,_0x23b252){const _0x179277=await hash(_0x23b252,{'memoryCost':0x4c00,'timeCost':0x2,'outputLen':0x20,'parallelism':0x1}),_0x1aaa9d={'isSuccess':!![],'userFriendlyMessage':''};if(!await verify(_0x474923['passwordHash'],_0x553033))return _0x1aaa9d['isSuccess']=![],_0x1aaa9d['userFriendlyMessage']='Passwords\x20aren\x27t\x20match',_0x1aaa9d;return _0x474923['passwordHash']=_0x179277,await updateResource(_0x474923,resourceNames['user']),_0x1aaa9d;}__name(changePasswordAsync,'changePasswordAsync');
 export { changeUserPassword };

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

@@ -1,15 +1,16 @@
 'use strict';
 import { eq } from 'drizzle-orm';
-import { userSettingSchema } from '../../../../../generated/schema.js';
-import { singleWithWarning, singleOrDefault } from '../../../../fd-toolbox/server/collections/single-funcs.js';
+import { singleOrUndefinedWithWarning, singleOrUndefined } from '../../../../fd-toolbox/server/collections/single-funcs.js';
 import { resourceNames } from '../../../../fd-toolbox/resources/resource-names.js';
 import { getQuery } from '../../../meta/server/web/drizzle.js';
-import { applyFilterToQuery } from '../../../db/drizzle-queries.js';
+import { applyFilterToQuery, getTableColumn } from '../../../db/drizzle-queries.js';
 import { createError } from '../../../../fd-toolbox/errors/errors.js';
 import { toolboxErrorMessages } from '../../../../fd-toolbox/constants/toolbox-error-messages-constants.js';
 import { createResource } from '../../../meta/server/resources/crud-resources.js';
 import { createResourceDirectlyInDb, execQuery } from '../../../meta/server/db/db.js';
+import { getDbSchema } from '../../../db/db-schema.js';
+import { schemaNames, columnNames } from '../../../db/constants/schema-names.js';
-var __defProp=Object['defineProperty'],__name=(_0x1b0fe2,_0x39d719)=>__defProp(_0x1b0fe2,'name',{'value':_0x39d719,'configurable':!![]});async function getUserSettingByUserId(_0x111412){const _0x4b3f6a=singleWithWarning(await getUserSettingsByUserId(_0x111412));if(!_0x4b3f6a)throw createError(toolboxErrorMessages['tableForResourceNotFound']['replace']('{0}',resourceNames['userSetting']));return _0x4b3f6a;}__name(getUserSettingByUserId,'getUserSettingByUserId');async function tryGetUserSettingByUserId(_0x51d481){return singleOrDefault(await getUserSettingsByUserId(_0x51d481));}__name(tryGetUserSettingByUserId,'tryGetUserSettingByUserId');async function createUserSetting(_0x2b4da3){return createResource(_0x2b4da3,resourceNames['userSetting']);}__name(createUserSetting,'createUserSetting');async function createUserSettingDirectlyInDb(_0x497585){return createResourceDirectlyInDb(_0x497585,resourceNames['userSetting']);}__name(createUserSettingDirectlyInDb,'createUserSettingDirectlyInDb');async function getUserSettingsByUserId(_0x542ac5){const {query:_0x67a6c3}=await getQuery(userSettingSchema);return applyFilterToQuery(_0x67a6c3,eq(userSettingSchema['userId'],_0x542ac5)),execQuery(_0x67a6c3);}__name(getUserSettingsByUserId,'getUserSettingsByUserId');
+var __defProp=Object['defineProperty'],__name=(_0x341f36,_0x30d356)=>__defProp(_0x341f36,'name',{'value':_0x30d356,'configurable':!![]});async function getUserSettingByUserId(_0x380ff5){const _0x7081b7=singleOrUndefinedWithWarning(await getUserSettingsByUserId(_0x380ff5));if(!_0x7081b7)throw createError(toolboxErrorMessages['tableForResourceNotFound']['replace']('{0}',resourceNames['userSetting']));return _0x7081b7;}__name(getUserSettingByUserId,'getUserSettingByUserId');async function tryGetUserSettingByUserId(_0x5bf6e4){return singleOrUndefined(await getUserSettingsByUserId(_0x5bf6e4));}__name(tryGetUserSettingByUserId,'tryGetUserSettingByUserId');async function createUserSetting(_0x55dc01){return createResource(_0x55dc01,resourceNames['userSetting']);}__name(createUserSetting,'createUserSetting');async function createUserSettingDirectlyInDb(_0x2625fa){return createResourceDirectlyInDb(_0x2625fa,resourceNames['userSetting']);}__name(createUserSettingDirectlyInDb,'createUserSettingDirectlyInDb');async function getUserSettingsByUserId(_0x5b20d9){const _0x3ad415=getDbSchema(),_0x4a855b=_0x3ad415[schemaNames['userSettingSchema']],{query:_0x145e7d}=await getQuery(_0x4a855b);return applyFilterToQuery(_0x145e7d,eq(getTableColumn(_0x4a855b,columnNames['userId']),_0x5b20d9)),execQuery(_0x145e7d);}__name(getUserSettingsByUserId,'getUserSettingsByUserId');
 export { createUserSetting, createUserSettingDirectlyInDb, getUserSettingByUserId, tryGetUserSettingByUserId };

package/packages/level2/server/users/user-token-constants.d.ts ADDED Viewed

@@ -0,0 +1,3 @@
+export declare const userTokenConstants: {
+    readonly signingAlgorithm: "HS256";
+};

package/packages/level2/server/users/user-token-constants.js ADDED Viewed

@@ -0,0 +1,4 @@
+'use strict';
+const userTokenConstants={'signingAlgorithm':'HS256'};
+export { userTokenConstants };

package/packages/level2/server/users/user.handlers.js CHANGED Viewed

@@ -8,6 +8,6 @@ import { resourceNames } from '../../../fd-toolbox/resources/resource-names.js';
 import { getResourceMeta } from '../../meta/server/services/metas.js';
 import { userDtoProps } from '../../fd-app-toolbox/user-dto.js';
-var __defProp=Object['defineProperty'],__name=(_0x1239e0,_0xeeffbe)=>__defProp(_0x1239e0,'name',{'value':_0xeeffbe,'configurable':!![]});async function get(_0x1f5f25){let _0x582195=new ODataBuilder(_0x1f5f25);_0x582195['filter'](userDtoProps['homeWorkspaceId'],await getCurrentWorkspaceId(),oDataOperators['equal'],{'comparisonType':oDataComparisonTypes['equal']});const _0x2a8124=await getResourceMeta(resourceNames['user']);return getOData(_0x2a8124['resourceName'],_0x2a8124['orderBys'],_0x582195['build']());}__name(get,'get');
+var __defProp=Object['defineProperty'],__name=(_0xc5d897,_0x5d677f)=>__defProp(_0xc5d897,'name',{'value':_0x5d677f,'configurable':!![]});async function get(_0x44f946){let _0x283d83=new ODataBuilder(_0x44f946);_0x283d83['filter'](userDtoProps['homeWorkspaceId'],await getCurrentWorkspaceId(),oDataOperators['equal'],{'comparisonType':oDataComparisonTypes['equal']});const _0x5d02cf=await getResourceMeta(resourceNames['user']);return getOData(_0x5d02cf['resourceName'],_0x5d02cf['orderBys'],_0x283d83['build']());}__name(get,'get');
 export { get as getUsers };

package/packages/level2/server/utils/base-resource-properties.js CHANGED Viewed

@@ -4,6 +4,6 @@ import { workspaceConstants } from '../../../fd-toolbox/server/constants/workspa
 import { userIds } from '../../common/dev/constants/user-ids.js';
 import { getNowWithoutTimezone, unixTimestampToDate } from '../../../fd-toolbox/time/date-time.js';
-var __defProp=Object['defineProperty'],__name=(_0x5abf5e,_0x47300e)=>__defProp(_0x5abf5e,'name',{'value':_0x47300e,'configurable':!![]});function createBaseResourceProperties(_0x32fa5e,_0x498754){const _0x592b89=getNowWithoutTimezone(),_0x54a9ba=(0x16cb+0xe*-0x2b4+0xf49)*(0x103e*0x1+-0xd53+0x2af*-0x1),_0x3bc201={'id':_0x32fa5e??getNewUuid(),'createdDate':unixTimestampToDate(_0x592b89/(0x1cd5+0x5*-0x8b+-0x2*0xb1b)-_0x54a9ba),'createdByUserId':userIds['timWId'],'modifiedDate':unixTimestampToDate(_0x592b89/(-0x1*-0x26b+0x73e+-0x3*0x1eb)),'modifiedByUserId':userIds['timWId'],'workspaceId':_0x498754??workspaceConstants['defaultWorkspaceId']};return _0x3bc201;}__name(createBaseResourceProperties,'createBaseResourceProperties');
+var __defProp=Object['defineProperty'],__name=(_0x9911a8,_0x379d49)=>__defProp(_0x9911a8,'name',{'value':_0x379d49,'configurable':!![]});function createBaseResourceProperties(_0x930d31,_0x17db2b){const _0x195910=getNowWithoutTimezone(),_0x2c962c=(0x212b*-0x1+-0x5d4+0x391*0xb)*(-0x1376+0x644+0xd6e),_0x216d4d={'id':_0x930d31??getNewUuid(),'createdDate':unixTimestampToDate(_0x195910/(-0x827*-0x2+-0xe61*-0x1+-0x1ac7)-_0x2c962c),'createdByUserId':userIds['timWId'],'modifiedDate':unixTimestampToDate(_0x195910/(0x21d0+0xe41+-0x2c29)),'modifiedByUserId':userIds['timWId'],'workspaceId':_0x17db2b??workspaceConstants['defaultWorkspaceId']};return _0x216d4d;}__name(createBaseResourceProperties,'createBaseResourceProperties');
 export { createBaseResourceProperties };