cabloy 5.1.240 → 5.1.242

package/vona/pnpm-lock.yaml

@@ -995,11 +995,11 @@ importers:
         specifier: npm:@cabloy/zod@4.3.8
         version: '@cabloy/zod@4.3.8'
       zova:
-        specifier: ^5.1.176
-        version: 5.1.176(debug@4.4.3(supports-color@7.2.0))(supports-color@7.2.0)(typescript@5.9.3)(vue@3.5.43(typescript@5.9.3))
+        specifier: ^5.1.177
+        version: 5.1.177(debug@4.4.3(supports-color@7.2.0))(supports-color@7.2.0)(typescript@5.9.3)(vue@3.5.43(typescript@5.9.3))
       zova-jsx:
-        specifier: ^1.1.94
-        version: 1.1.94(typescript@5.9.3)
+        specifier: ^1.1.95
+        version: 1.1.95(typescript@5.9.3)
       zova-module-a-api:
         specifier: ^5.1.23
         version: 5.1.23
@@ -1061,8 +1061,8 @@ importers:
         specifier: ^5.1.36
         version: 5.1.36
       zova-module-a-ssr:
-        specifier: ^5.1.41
-        version: 5.1.41
+        specifier: ^5.1.42
+        version: 5.1.42
       zova-module-a-ssrhmr:
         specifier: ^5.1.24
         version: 5.1.24
@@ -1079,8 +1079,8 @@ importers:
         specifier: ^5.1.39
         version: 5.1.39
       zova-module-a-zova:
-        specifier: ^5.1.113
-        version: 5.1.113(typescript@5.9.3)(vue@3.5.43(typescript@5.9.3))
+        specifier: ^5.1.114
+        version: 5.1.114(typescript@5.9.3)(vue@3.5.43(typescript@5.9.3))
       zova-module-pay-mock:
         specifier: ^5.0.6
         version: 5.0.6
@@ -1124,11 +1124,11 @@ importers:
         specifier: npm:@cabloy/zod@4.3.8
         version: '@cabloy/zod@4.3.8'
       zova:
-        specifier: ^5.1.176
-        version: 5.1.176(debug@4.4.3(supports-color@7.2.0))(supports-color@7.2.0)(typescript@5.9.3)(vue@3.5.43(typescript@5.9.3))
+        specifier: ^5.1.177
+        version: 5.1.177(debug@4.4.3(supports-color@7.2.0))(supports-color@7.2.0)(typescript@5.9.3)(vue@3.5.43(typescript@5.9.3))
       zova-jsx:
-        specifier: ^1.1.94
-        version: 1.1.94(typescript@5.9.3)
+        specifier: ^1.1.95
+        version: 1.1.95(typescript@5.9.3)
       zova-module-a-api:
         specifier: ^5.1.23
         version: 5.1.23
@@ -1190,8 +1190,8 @@ importers:
         specifier: ^5.1.36
         version: 5.1.36
       zova-module-a-ssr:
-        specifier: ^5.1.41
-        version: 5.1.41
+        specifier: ^5.1.42
+        version: 5.1.42
       zova-module-a-ssrhmr:
         specifier: ^5.1.24
         version: 5.1.24
@@ -1208,8 +1208,8 @@ importers:
         specifier: ^5.1.39
         version: 5.1.39
       zova-module-a-zova:
-        specifier: ^5.1.113
-        version: 5.1.113(typescript@5.9.3)(vue@3.5.43(typescript@5.9.3))
+        specifier: ^5.1.114
+        version: 5.1.114(typescript@5.9.3)(vue@3.5.43(typescript@5.9.3))
       zova-module-pay-mock:
         specifier: ^5.0.6
         version: 5.0.6
@@ -1990,7 +1990,7 @@ importers:
         specifier: ^5.0.3
         version: link:modules/a-markdown
       vona-module-a-rbac:
-        specifier: ^5.0.17
+        specifier: ^5.0.18
         version: link:modules/a-rbac
       vona-module-a-socket:
         specifier: workspace:^
@@ -9412,15 +9412,9 @@ packages:
     resolution: {integrity: sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==}
     engines: {node: '>=10'}
 
-  zova-core@5.1.94:
-    resolution: {integrity: sha512-puo3pqa4/ngwZj//Md457XMloZ4FRaoJlmwf+zyPyxKL7GoV81BaJeUPi9szzY8aM9EkoWXBhSVA0cp6mTXBhw==}
-
   zova-core@5.1.95:
     resolution: {integrity: sha512-nvBb3zVdJEQ9SWi+cl5j2PLs/T0FRRIULfHqU3SBFUn3jFSZFizniRlak+qoSq3mzj+LGD61BfnFJQb2JJ8+Zg==}
 
-  zova-jsx@1.1.94:
-    resolution: {integrity: sha512-4QGgNE5J32PXYCgHBt8JBrTRp8CXADgZzIBUsovQmKfIwtMY6DK5+zPQeWBVqHoV5vK95RKhRPwdAKFGOLupeg==}
-
   zova-jsx@1.1.95:
     resolution: {integrity: sha512-gzmR01Qt4oBrMCejH4W0fqfFx62L+XQOfOROs6mBVdFYGmbyXzy/lDXtTH4v4WjlrmVbuoAyZE/BrYmNxn2swA==}
 
@@ -9484,9 +9478,6 @@ packages:
   zova-module-a-routertabs@5.1.36:
     resolution: {integrity: sha512-QYkeK7ql0B2AdFcCj9a+oIyqZi7oW/Ay/YHMFSseRgoRU/dTQnK79/v/DWB8+JluxY0tWMakLDcSq7bIolRdgg==}
 
-  zova-module-a-ssr@5.1.41:
-    resolution: {integrity: sha512-2p19mMzc9MjvYDdEbV6qjOngxuM7vdzwA1+Z4+/81pOfptU7nBobqDaDUNZxblHEoiIHrDM8NCeghPBO6Fz2sg==}
-
   zova-module-a-ssr@5.1.42:
     resolution: {integrity: sha512-XaZcUHwDxwyQi4VNLK6CxkdG4lV5aUNgPNkiLjN3LWh9l2yS0u8CQqGV8+gEKcpOOj7XhZIubu4gb4GUNNQoGw==}
 
@@ -9505,9 +9496,6 @@ packages:
   zova-module-a-zod@5.1.39:
     resolution: {integrity: sha512-nyVgDGt7Xly/8ccGau/ZRck3PJfo+9WFMR4EudXo2YBFMahNeXUegTyUPeSV6DfJDUjCqpy2V060PipBVJ5QzQ==}
 
-  zova-module-a-zova@5.1.113:
-    resolution: {integrity: sha512-PuasOjYgRz8F94oVPSjQepwVxL+LySauwJQKNzly+yD7YCbQJcHy6tw7IejwcaSTjlBe3M1Iy6IWX7IwrOrfyw==}
-
   zova-module-a-zova@5.1.114:
     resolution: {integrity: sha512-H16jQ2YRw3Q9KSO7RDKMl+QRFZSZ7J/AkUUD71BTQA1oDLY+zBLuKTABwicEgS3S44R4qJC79rR/yuTXLlZnkw==}
 
@@ -9523,15 +9511,9 @@ packages:
   zova-module-rest-resource@5.1.57:
     resolution: {integrity: sha512-xpx42J+ZCx3KGzFZPQBHfUUDxgYTPlQGrUTrN0/SCY8PD/qYu77kqQ29+B5B9WcUeSnSAzUtbZx0UzzFia1slQ==}
 
-  zova-suite-a-zova@5.1.175:
-    resolution: {integrity: sha512-cjN97iaDZ3WhvOtu27YnqfZpEnnKptLGqqpllIhAtOFaTXtuMGiGVTmH7Q1tc/k9OPEHzvvCThsYKRxzYbR5DQ==}
-
   zova-suite-a-zova@5.1.176:
     resolution: {integrity: sha512-w7JQ0cutO3zaZosxfsSLn9/mcY5deftZWTGkiPJTTG6I6eGGZlFJRDCQpu+dBd8eYI66xe4kstdH3KGhLSt74A==}
 
-  zova@5.1.176:
-    resolution: {integrity: sha512-7E/Kc9QkuB6ckDX2ual9DFmiVrcPy/umDVlC+QlRFy5A30L8D5/WNKzWxmBubXYsXWmsAd/VZQUQPwditMmNkA==}
-
   zova@5.1.177:
     resolution: {integrity: sha512-35jZVs08Qn4cybwNqu1/PE3qz1J7Vi64y7AgTD98rVv5uOnDPkuwIIIVgMYZllV/C3kCsWPBLoC3tz/UG4SEcA==}
 
@@ -15880,37 +15862,6 @@ snapshots:
 
   yocto-queue@0.1.0: {}
 
-  zova-core@5.1.94(typescript@5.9.3):
-    dependencies:
-      '@cabloy/compose': link:packages-utils/compose
-      '@cabloy/extend': link:packages-utils/extend
-      '@cabloy/json5': link:packages-utils/json5
-      '@cabloy/localeutil': link:packages-utils/localeutil
-      '@cabloy/logger': 1.1.25
-      '@cabloy/module-info': 2.0.3
-      '@cabloy/utils': link:packages-utils/utils
-      '@cabloy/vue-compiler-sfc': 3.5.14
-      '@cabloy/vue-reactivity': 3.5.16
-      '@cabloy/vue-router': 4.4.18(vue@3.5.43(typescript@5.9.3))
-      '@cabloy/vue-runtime-core': 3.5.57
-      '@cabloy/vue-runtime-dom': 3.5.13
-      '@cabloy/vue-server-renderer': 3.5.18(vue@3.5.43(typescript@5.9.3))
-      '@cabloy/word-utils': 2.1.14
-      '@cabloy/zod-errors-custom': link:packages-utils/zod-errors-custom
-      '@cabloy/zod-openapi': link:packages-utils/zod-openapi
-      '@cabloy/zod-query': link:packages-utils/zod-query
-      '@types/js-cookie': 3.0.6
-      '@types/ms': 2.1.0
-      '@vue/shared': 3.5.36
-      deep-equal: 2.2.3
-      ms: 2.1.3
-      reflect-metadata: 0.2.2
-      vue: 3.5.43(typescript@5.9.3)
-      vue-plugin-render-freeze: 2.0.4(vue@3.5.43(typescript@5.9.3))
-      zod: '@cabloy/zod@4.3.8'
-    transitivePeerDependencies:
-      - typescript
-
   zova-core@5.1.95(patch_hash=44197c3f359a73a1a5bb3dc0a8a97e705a55b30f9a434717aa24d75a96f2c6b6)(typescript@5.9.3):
     dependencies:
       '@cabloy/compose': link:packages-utils/compose
@@ -15942,17 +15893,6 @@ snapshots:
     transitivePeerDependencies:
       - typescript
 
-  zova-jsx@1.1.94(typescript@5.9.3):
-    dependencies:
-      '@cabloy/compose': link:packages-utils/compose
-      '@cabloy/utils': link:packages-utils/utils
-      '@cabloy/word-utils': 2.1.14
-      typestyle: 2.4.0
-      vue: 3.5.43(typescript@5.9.3)
-      zova-core: 5.1.94(typescript@5.9.3)
-    transitivePeerDependencies:
-      - typescript
-
   zova-jsx@1.1.95(typescript@5.9.3):
     dependencies:
       '@cabloy/compose': link:packages-utils/compose
@@ -16033,11 +15973,6 @@ snapshots:
 
   zova-module-a-routertabs@5.1.36: {}
 
-  zova-module-a-ssr@5.1.41:
-    dependencies:
-      devalue: 5.9.4
-      ms: 2.1.3
-
   zova-module-a-ssr@5.1.42:
     dependencies:
       devalue: 5.9.4
@@ -16071,22 +16006,6 @@ snapshots:
       '@cabloy/zod-query': link:packages-utils/zod-query
       zod: '@cabloy/zod@4.3.8'
 
-  zova-module-a-zova@5.1.113(typescript@5.9.3)(vue@3.5.43(typescript@5.9.3)):
-    dependencies:
-      '@cabloy/compose': link:packages-utils/compose
-      '@cabloy/deps': link:packages-utils/deps
-      '@cabloy/json5': link:packages-utils/json5
-      '@cabloy/module-info': 2.0.3
-      '@cabloy/utils': link:packages-utils/utils
-      '@cabloy/vue-router': 4.4.18(vue@3.5.43(typescript@5.9.3))
-      '@cabloy/word-utils': 2.1.14
-      defu: 6.1.7
-      luxon: 3.7.2
-      zova-jsx: 1.1.94(typescript@5.9.3)
-    transitivePeerDependencies:
-      - typescript
-      - vue
-
   zova-module-a-zova@5.1.114(typescript@5.9.3)(vue@3.5.43(typescript@5.9.3)):
     dependencies:
       '@cabloy/compose': link:packages-utils/compose
@@ -16111,39 +16030,6 @@ snapshots:
 
   zova-module-rest-resource@5.1.57: {}
 
-  zova-suite-a-zova@5.1.175(debug@4.4.3(supports-color@7.2.0))(supports-color@7.2.0)(typescript@5.9.3)(vue@3.5.43(typescript@5.9.3)):
-    dependencies:
-      zova-module-a-api: 5.1.23
-      zova-module-a-app: 5.1.27
-      zova-module-a-bean: 5.1.37
-      zova-module-a-behavior: 5.1.28
-      zova-module-a-behaviors: 5.1.23
-      zova-module-a-command: 5.1.36
-      zova-module-a-fetch: 5.1.26(debug@4.4.3(supports-color@7.2.0))(supports-color@7.2.0)
-      zova-module-a-form: 5.1.55(vue@3.5.43(typescript@5.9.3))
-      zova-module-a-icon: 5.1.28
-      zova-module-a-interceptor: 5.1.32
-      zova-module-a-logger: 5.1.29
-      zova-module-a-meta: 5.1.23
-      zova-module-a-model: 5.1.39(vue@3.5.43(typescript@5.9.3))
-      zova-module-a-openapi: 5.1.59
-      zova-module-a-router: 5.1.43
-      zova-module-a-routerstack: 5.1.30
-      zova-module-a-routertabs: 5.1.36
-      zova-module-a-ssr: 5.1.41
-      zova-module-a-ssrhmr: 5.1.24
-      zova-module-a-ssrserver: 5.1.27
-      zova-module-a-style: 5.1.36
-      zova-module-a-table: 5.1.45(vue@3.5.43(typescript@5.9.3))
-      zova-module-a-zod: 5.1.39
-      zova-module-a-zova: 5.1.113(typescript@5.9.3)(vue@3.5.43(typescript@5.9.3))
-    transitivePeerDependencies:
-      - '@vue/composition-api'
-      - debug
-      - supports-color
-      - typescript
-      - vue
-
   zova-suite-a-zova@5.1.176(debug@4.4.3(supports-color@7.2.0))(supports-color@7.2.0)(typescript@5.9.3)(vue@3.5.43(typescript@5.9.3)):
     dependencies:
       zova-module-a-api: 5.1.23
@@ -16177,17 +16063,6 @@ snapshots:
       - typescript
       - vue
 
-  zova@5.1.176(debug@4.4.3(supports-color@7.2.0))(supports-color@7.2.0)(typescript@5.9.3)(vue@3.5.43(typescript@5.9.3)):
-    dependencies:
-      zova-core: 5.1.94(typescript@5.9.3)
-      zova-suite-a-zova: 5.1.175(debug@4.4.3(supports-color@7.2.0))(supports-color@7.2.0)(typescript@5.9.3)(vue@3.5.43(typescript@5.9.3))
-    transitivePeerDependencies:
-      - '@vue/composition-api'
-      - debug
-      - supports-color
-      - typescript
-      - vue
-
   zova@5.1.177(debug@4.4.3(supports-color@7.2.0))(supports-color@7.2.0)(typescript@5.9.3)(vue@3.5.43(typescript@5.9.3)):
     dependencies:
       zova-core: 5.1.95(patch_hash=44197c3f359a73a1a5bb3dc0a8a97e705a55b30f9a434717aa24d75a96f2c6b6)(typescript@5.9.3)

package/vona/src/suite/a-commerce/modules/commerce-siteadmin/src/dto/operatorContext.ts

@@ -1,6 +1,6 @@
 import type { IDecoratorDtoOptions } from 'vona-module-a-web';
 
-import { Api } from 'vona-module-a-openapiutils';
+import { Api, v } from 'vona-module-a-openapiutils';
 import { Dto } from 'vona-module-a-web';
 
 export interface IDtoOptionsOperatorContext extends IDecoratorDtoOptions {}
@@ -18,4 +18,7 @@ export class DtoOperatorContext {
 
   @Api.field()
   userName: string;
+
+  @Api.field(v.optional())
+  displayName?: string;
 }

package/vona/src/suite/a-commerce/modules/commerce-siteadmin/src/service/operator.ts

@@ -13,6 +13,7 @@ export class ServiceOperator extends BeanBase {
       instanceName: instanceName ?? '',
       userId: user.id.toString(),
       userName: user.name,
+      displayName: user.displayName,
     };
   }
 }

package/vona/src/suite/a-commerce/modules/commerce-siteadmin/test/operatorAccess.test.ts

@@ -47,6 +47,7 @@ describe('operatorAccess.test.ts', () => {
         assert.equal(result.instanceName, app.ctx.instanceName);
         assert.equal(result.userId, app.bean.passport.current!.user!.id.toString());
         assert.equal(result.userName, app.bean.passport.current!.user!.name);
+        assert.equal(result.displayName, app.bean.passport.current!.user!.displayName);
       } finally {
         await app.bean.passport.signout();
       }

package/vona/src/suite/a-home/modules/home-user/src/bean/meta.version.ts

@@ -32,6 +32,7 @@ export class MetaVersion extends BeanBase implements IMetaVersionUpdate, IMetaVe
         table.comment(entityUser.$comment.$table);
         table.basicFields();
         table.string(entityUser.name, 255).comment(entityUser.$comment.name);
+        table.string(entityUser.displayName, 100).comment(entityUser.$comment.displayName);
         table.string(entityUser.avatar, 255).comment(entityUser.$comment.avatar);
         table.string(entityUser.email, 255).comment(entityUser.$comment.email);
         table.string(entityUser.mobile, 255).comment(entityUser.$comment.mobile);

package/vona/src/suite/a-home/modules/home-user/src/controller/passport.ts

@@ -157,6 +157,7 @@ export class ControllerPassport extends BeanBase {
       user: {
         id: user.id,
         name: user.name,
+        displayName: user.displayName,
         avatar: user.avatar,
         email: user.email,
         mobile: user.mobile,

package/vona/src/suite/a-home/modules/home-user/src/dto/accountCurrent.ts

@@ -11,6 +11,9 @@ export class DtoAccountCurrent {
   @Api.field()
   name: string;
 
+  @Api.field(v.optional())
+  displayName?: string;
+
   @Api.field(v.optional())
   avatar?: string;
 

package/vona/src/suite/a-home/modules/home-user/src/dto/accountProfileUpdate.ts

@@ -29,8 +29,15 @@ const avatarSchema = avatar.openapi({
 
 @Dto<IDtoOptionsAccountProfileUpdate>()
 export class DtoAccountProfileUpdate {
-  @Api.field(v.title($locale('AccountDisplayName')), v.min(1), v.max(100), v.trim())
-  name: string;
+  @Api.field(
+    v.title($locale('AccountDisplayName')),
+    z.preprocess(
+      // Preserve an explicit clear before optional-string coercion treats '' as omitted.
+      value => (value === '' ? null : value),
+      z.string().trim().max(100).nullable().optional(),
+    ),
+  )
+  displayName?: string | null;
 
   @Api.field(v.title($locale('AccountAvatar')), v.optional(), v.nullable(), avatarSchema)
   avatar?: string | null;

package/vona/src/suite/a-home/modules/home-user/src/dto/passportUser.ts

@@ -17,6 +17,9 @@ export class DtoPassportUser {
   @Api.field()
   name: string;
 
+  @Api.field(v.optional())
+  displayName?: string;
+
   @Api.field(v.optional())
   avatar?: string;
 

package/vona/src/suite/a-home/modules/home-user/src/entity/user.ts

@@ -15,6 +15,9 @@ export class EntityUser extends EntityBase implements IUser {
   @Api.field(v.title($locale('UserName')))
   name: string;
 
+  @Api.field(v.title($locale('AccountDisplayName')), z.string().trim().max(100).optional())
+  displayName?: string;
+
   @Api.field(v.title($locale('UserAvatar')), v.optional())
   avatar?: string;
 

package/vona/src/suite/a-home/modules/home-user/src/service/account.ts

@@ -63,7 +63,10 @@ export class ServiceAccount extends BeanBase {
     const locale = this._resolveLocale(command.locale, user.locale);
     const tz = this._resolveTimezone(command.tz, user.tz);
     await this.scope.model.user.updateById(user.id, {
-      name: command.name,
+      displayName:
+        command.displayName === undefined
+          ? user.displayName
+          : command.displayName?.trim() || undefined,
       avatar,
       locale,
       tz,
@@ -218,12 +221,12 @@ export class ServiceAccount extends BeanBase {
       await this.bean.mail.send({
         to: currentUser.email,
         subject: replaceTemplate(this.scope.locale.ActivationEmailSubject(), {
-          userName: currentUser.name,
+          userName: currentUser.displayName || currentUser.name,
           link,
           siteName: this.ctx.instance.title || this.app.meta.env.APP_TITLE,
         }),
         text: replaceTemplate(this.scope.locale.ActivationEmailBody(), {
-          userName: currentUser.name,
+          userName: currentUser.displayName || currentUser.name,
           link,
           siteName: this.ctx.instance.title || this.app.meta.env.APP_TITLE,
         }),
@@ -521,6 +524,7 @@ export class ServiceAccount extends BeanBase {
     const eligibleEmail = user.email?.trim() || undefined;
     return {
       name: user.name,
+      displayName: user.displayName,
       avatar: user.avatar,
       locale: user.locale,
       tz: user.tz,

package/vona/src/suite/a-home/modules/home-user/src/service/userAdapter.ts

@@ -13,6 +13,7 @@ export class ServiceUserAdapter extends BeanBase implements IUserAdapter {
   async userOfProfile(profile: IAuthUserProfile): Promise<Partial<IUser>> {
     return {
       name: profile.username!,
+      displayName: profile.displayName?.trim() || undefined,
       email: profile.emails?.[0].value,
       avatar: profile.photos?.[0].value,
       locale: profile.locale || this.ctx.locale,

package/vona/src/suite/a-home/modules/home-user/test/account.test.ts

@@ -34,19 +34,22 @@ describe('account.test.ts', { concurrency: false }, () => {
             innerAccess: false,
           });
           assert.equal(current.name, fixture!.name);
+          assert.equal(current.displayName, undefined);
           assert.equal(current.hasSimpleAuth, true);
           assert.equal(current.canSendSetPasswordLink, false);
 
           const updated = await app.bean.executor.performAction('patch', profilePath, {
             innerAccess: false,
             body: {
-              name: `${fixture!.name}-updated`,
+              displayName: '  Updated display name  ',
+              name: `${fixture!.name}-must-not-rename`,
               locale: 'en_us',
               tz: 'America/New_York',
               ignored: 'must-not-persist',
             },
           });
-          assert.equal(updated.name, `${fixture!.name}-updated`);
+          assert.equal(updated.name, fixture!.name);
+          assert.equal(updated.displayName, 'Updated display name');
           assert.equal(updated.locale, 'en-us');
           assert.equal(updated.tz, 'America/New_York');
         } finally {
@@ -56,13 +59,23 @@ describe('account.test.ts', { concurrency: false }, () => {
 
       await app.bean.executor.mockCtx(async () => {
         const user = await app.bean.user.findOneById(fixture!.userId);
-        assert.equal(user?.name, `${fixture!.name}-updated`);
+        assert.equal(user?.name, fixture!.name);
+        assert.equal(user?.displayName, 'Updated display name');
         assert.ok(user);
         assert.equal('ignored' in user, false);
+        assert.equal(
+          await app.bean.user.findOneByName(`${fixture!.name}-must-not-rename`),
+          undefined,
+        );
       });
 
       await app.bean.executor.mockCtx(async () => {
-        await app.bean.passport.signinSystem('mock', -10002 as any, `${fixture!.name}-updated`);
+        const jwt = await app.bean.auth.authenticate('auth-simple:simple', {
+          clientName: 'default',
+          state: { intention: 'login' },
+          clientOptions: { username: fixture!.name, password: 'initial-password' },
+        });
+        assert.ok(jwt?.accessToken);
         try {
           const result = await app.bean.executor.performAction('post', passwordChangePath, {
             innerAccess: false,
@@ -91,6 +104,105 @@ describe('account.test.ts', { concurrency: false }, () => {
     }
   });
 
+  it('retains omitted displayName, clears null or blank, and validates the trimmed limit', async () => {
+    let fixture: IAccountFixture | undefined;
+    try {
+      fixture = await createFixture();
+      const displayName = 'd'.repeat(100);
+      const updated = await updateProfile(fixture, { displayName: `  ${displayName}  ` });
+      assert.equal(updated.displayName, displayName);
+      assert.equal(updated.name, fixture.name);
+
+      const retained = await updateProfile(fixture, { locale: 'en-us' });
+      assert.equal(retained.displayName, displayName);
+
+      await app.bean.executor.mockCtx(async () => {
+        await app.bean.passport.signinSystem('mock', -10005 as any, fixture!.name);
+        try {
+          const account = app.scope('home-user').service.account;
+          const result = await account.updateProfile({
+            name: `${fixture!.name}-service-must-not-rename`,
+          } as unknown as Parameters<typeof account.updateProfile>[0]);
+          assert.equal(result.name, fixture!.name);
+          assert.equal(result.displayName, displayName);
+        } finally {
+          await app.bean.passport.signout();
+        }
+      });
+
+      for (const invalid of ['d'.repeat(101), `  ${'d'.repeat(101)}  `]) {
+        await assert.rejects(
+          () => updateProfile(fixture!, { displayName: invalid }),
+          (error: { code?: number }) => error.code === 422,
+        );
+      }
+      await app.bean.executor.mockCtx(async () => {
+        const user = await app.bean.user.findOneById(fixture!.userId);
+        assert.equal(user?.name, fixture!.name);
+        assert.equal(user?.displayName, displayName);
+      });
+
+      for (const empty of [null, ' \t\n ', '']) {
+        await updateProfile(fixture, { displayName: 'Before clearing' });
+        const cleared = await updateProfile(fixture, { displayName: empty });
+        assert.equal(cleared.name, fixture.name);
+        assert.equal(cleared.displayName, undefined);
+        await app.bean.executor.mockCtx(async () => {
+          const user = await app.bean.user.findOneById(fixture!.userId);
+          assert.ok(user);
+          assert.ok(user.displayName == null);
+          await app.bean.passport.signinSystem('mock', -10006 as any, fixture!.name);
+          try {
+            const current = await app.bean.executor.performAction('get', currentPath, {
+              innerAccess: false,
+            });
+            assert.equal(current.displayName, undefined);
+          } finally {
+            await app.bean.passport.signout();
+          }
+        });
+      }
+    } finally {
+      if (fixture) await removeFixture(fixture);
+    }
+  });
+
+  it('allows two users to share displayName while retaining their original username logins', async () => {
+    const fixtures: IAccountFixture[] = [];
+    const displayName = `Shared ${crypto.randomUUID()}`;
+    try {
+      fixtures.push(await createFixture());
+      fixtures.push(await createFixture());
+      for (const fixture of fixtures) {
+        const updated = await updateProfile(fixture, { displayName });
+        assert.equal(updated.name, fixture.name);
+        assert.equal(updated.displayName, displayName);
+      }
+      for (const fixture of fixtures) {
+        await app.bean.executor.mockCtx(async () => {
+          try {
+            const jwt = await app.bean.auth.authenticate('auth-simple:simple', {
+              clientName: 'default',
+              state: { intention: 'login' },
+              clientOptions: { username: fixture.name, password: 'initial-password' },
+            });
+            assert.ok(jwt?.accessToken);
+            assert.equal(app.bean.passport.currentUser?.id.toString(), fixture.userId);
+            const current = await app.bean.executor.performAction('get', currentPath, {
+              innerAccess: false,
+            });
+            assert.equal(current.name, fixture.name);
+            assert.equal(current.displayName, displayName);
+          } finally {
+            await app.bean.passport.signout();
+          }
+        });
+      }
+    } finally {
+      for (const fixture of fixtures.reverse()) await removeFixture(fixture);
+    }
+  });
+
   it('accepts a freshly uploaded avatar during profile update', async () => {
     let fixture: IAccountFixture | undefined;
     let imageId: string | number | undefined;
@@ -133,7 +245,6 @@ describe('account.test.ts', { concurrency: false }, () => {
           const updated = await app.bean.executor.performAction('patch', profilePath, {
             innerAccess: false,
             body: {
-              name: fixture!.name,
               avatar: uploadedUrl,
             },
           });
@@ -145,7 +256,7 @@ describe('account.test.ts', { concurrency: false }, () => {
 
           const preserved = await app.bean.executor.performAction('patch', profilePath, {
             innerAccess: false,
-            body: { name: fixture!.name },
+            body: {},
           });
           assert.equal(preserved.avatar, uploadedUrl);
 
@@ -153,7 +264,6 @@ describe('account.test.ts', { concurrency: false }, () => {
           const thirdPartyUpdated = await app.bean.executor.performAction('patch', profilePath, {
             innerAccess: false,
             body: {
-              name: fixture!.name,
               avatar: thirdPartyAvatar,
             },
           });
@@ -161,7 +271,7 @@ describe('account.test.ts', { concurrency: false }, () => {
 
           const cleared = await app.bean.executor.performAction('patch', profilePath, {
             innerAccess: false,
-            body: { name: fixture!.name, avatar: null },
+            body: { avatar: null },
           });
           assert.equal(cleared.avatar, undefined);
         } finally {
@@ -214,6 +324,20 @@ describe('account.test.ts', { concurrency: false }, () => {
   });
 });
 
+async function updateProfile(fixture: IAccountFixture, body: Record<string, unknown>) {
+  return await app.bean.executor.mockCtx(async () => {
+    await app.bean.passport.signinSystem('mock', -10007 as any, fixture.name);
+    try {
+      return await app.bean.executor.performAction('patch', profilePath, {
+        innerAccess: false,
+        body,
+      });
+    } finally {
+      await app.bean.passport.signout();
+    }
+  });
+}
+
 async function createFixture(): Promise<IAccountFixture> {
   return await app.bean.executor.mockCtx(async () => {
     const name = `account-test-${crypto.randomUUID()}`;
@@ -244,6 +368,7 @@ async function removeFixture(fixture: IAccountFixture): Promise<void> {
   await app.bean.executor.mockCtx(async () => {
     await app.scope('a-auth').model.auth.deleteById(fixture.authId);
     await app.scope('auth-simple').model.authSimple.deleteById(fixture.authSimpleId);
+    await app.scope('home-user').model.roleUser.delete({ userId: fixture.userId });
     await app.bean.user.removeById(fixture.userId);
   });
 }