@oxyhq/core 3.4.16 → 3.4.18

package/dist/cjs/AuthManager.js

@@ -401,6 +401,7 @@ class AuthManager {
                 user: {
                     id: session.user.id,
                     username: session.user.username,
+                    name: session.user.name,
                     avatar: session.user.avatar ?? null,
                 },
                 accessToken: session.accessToken,
@@ -632,6 +633,7 @@ class AuthManager {
         return {
             id: account.user.id,
             username: account.user.username,
+            name: account.user.name,
             avatar: account.user.avatar ?? undefined,
         };
     }
@@ -676,6 +678,7 @@ class AuthManager {
             this.currentUser = {
                 id: hydrated.id,
                 username: hydrated.username,
+                name: hydrated.name,
                 avatar: hydrated.avatar ?? undefined,
             };
             this.notifyListeners();
@@ -877,6 +880,7 @@ class AuthManager {
             ? {
                 id: updated.user.id,
                 username: updated.user.username,
+                name: updated.user.name,
                 avatar: updated.user.avatar ?? undefined,
             }
             : null;
@@ -932,6 +936,7 @@ class AuthManager {
                     ? {
                         id: next.user.id,
                         username: next.user.username,
+                        name: next.user.name,
                         avatar: next.user.avatar ?? undefined,
                     }
                     : null;

package/dist/cjs/HttpService.js

@@ -700,7 +700,10 @@ class HttpService {
                 const refreshed = await this.refreshAccessToken('preflight');
                 if (refreshed)
                     return `Bearer ${refreshed}`;
-                // Refresh failed — don't use the expired token (would cause 401 loop)
+                if (decoded.exp > currentTime) {
+                    return `Bearer ${accessToken}`;
+                }
+                // Refresh failed — don't use an expired token (would cause 401 loop)
                 return null;
             }
             return `Bearer ${accessToken}`;

package/dist/cjs/mixins/OxyServices.auth.js

@@ -494,7 +494,7 @@ function OxyServicesAuthMixin(Base) {
                     continue;
                 }
                 const userId = e.user.id ?? e.user._id;
-                if (!userId || !e.user.username) {
+                if (!userId || !e.user.username || !e.user.name?.displayName) {
                     continue;
                 }
                 if (typeof e.authuser !== 'number') {

package/dist/cjs/mixins/OxyServices.sso.js

@@ -115,12 +115,13 @@ function OxyServicesSsoMixin(Base) {
                 throw this.handleError(new Error('SSO exchange returned no sessionId'));
             }
             const userId = payload.user?.id ?? payload.user?._id;
-            if (!userId || typeof payload.user?.username !== 'string') {
+            if (!userId || typeof payload.user?.username !== 'string' || typeof payload.user.name?.displayName !== 'string') {
                 throw this.handleError(new Error('SSO exchange returned an invalid user'));
             }
             const user = {
                 id: userId,
                 username: payload.user.username,
+                name: payload.user.name,
                 avatar: payload.user.avatar,
             };
             // Plant the access token exactly like exchangeIdTokenForSession does.

package/dist/cjs/mixins/OxyServices.user.js

@@ -27,7 +27,7 @@ function OxyServicesUserMixin(Base) {
         }
         /**
          * Lightweight username lookup for login flows.
-         * Returns minimal public info: exists, color, avatar, displayName.
+         * Returns minimal public info: exists, color, avatar, name.displayName.
          * Faster than getProfileByUsername — no stats, no formatting.
          */
         async lookupUsername(username) {

package/dist/cjs/utils/accountUtils.js

@@ -21,12 +21,13 @@ exports.formatPublicKeyHandle = formatPublicKeyHandle;
  * Resolve a friendly display name for a user.
  *
  * Order of preference:
- *  1. `displayName` from the API contract.
+ *  1. `name.displayName` from the API user contract.
  *  2. `name.full`, or composed `name.first name.last` for local unsaved shapes.
- *  3. `name` when stored as a plain string.
- *  4. `username`
- *  5. `Account 0x12345678…` (derived from publicKey, when present)
- *  6. Translated fallback (e.g. "Unnamed")
+ *  3. `name` when passed as a plain string by local non-DTO call sites.
+ *  4. pre-normalized account-row `displayName`.
+ *  5. `username`
+ *  6. `Account 0x12345678…` (derived from publicKey, when present)
+ *  7. Translated fallback (e.g. "Unnamed")
  *
  * The translation key `common.unnamed` is used for the final fallback. If the
  * caller does not pass a locale, the default English translation is used.
@@ -35,9 +36,10 @@ const getAccountDisplayName = (user, locale) => {
     if (!user)
         return (0, i18n_1.translate)(locale, 'common.unnamed');
     const { name, displayName, username, publicKey } = user;
-    if (typeof displayName === 'string' && displayName.trim())
-        return displayName.trim();
     if (name && typeof name === 'object') {
+        if (typeof name.displayName === 'string' && name.displayName.trim()) {
+            return name.displayName.trim();
+        }
         if (typeof name.full === 'string' && name.full.trim())
             return name.full.trim();
         const first = typeof name.first === 'string' ? name.first.trim() : '';
@@ -49,6 +51,8 @@ const getAccountDisplayName = (user, locale) => {
     else if (typeof name === 'string' && name.trim()) {
         return name.trim();
     }
+    if (typeof displayName === 'string' && displayName.trim())
+        return displayName.trim();
     if (typeof username === 'string' && username.trim())
         return username.trim();
     if (typeof publicKey === 'string' && publicKey.length > 0) {
@@ -103,18 +107,19 @@ const createQuickAccount = (sessionId, userData, existingAccount, getFileDownloa
     const userId = userData.id || (typeof userData._id === 'string' ? userData._id : userData._id?.toString());
     // Preserve existing avatarUrl if avatar hasn't changed (prevents image reload)
     let avatarUrl;
-    if (existingAccount && existingAccount.avatar === userData.avatar && existingAccount.avatarUrl) {
+    const avatar = userData.avatar ?? undefined;
+    if (existingAccount && existingAccount.avatar === avatar && existingAccount.avatarUrl) {
         avatarUrl = existingAccount.avatarUrl;
     }
-    else if (userData.avatar && getFileDownloadUrl) {
-        avatarUrl = getFileDownloadUrl(userData.avatar, 'thumb');
+    else if (avatar && getFileDownloadUrl) {
+        avatarUrl = getFileDownloadUrl(avatar, 'thumb');
     }
     return {
         sessionId,
         userId,
         username: userData.username || '',
         displayName,
-        avatar: userData.avatar,
+        avatar,
         avatarUrl,
     };
 };