@jskit-ai/users-core 0.1.142 → 0.1.145

package/package.descriptor.mjs

@@ -1,7 +1,7 @@
 export default Object.freeze({
   packageVersion: 1,
   packageId: "@jskit-ai/users-core",
-  version: "0.1.142",
+  version: "0.1.145",
   kind: "runtime",
   description: "Users/account runtime plus HTTP routes for account features.",
   dependsOn: [
@@ -146,16 +146,16 @@ export default Object.freeze({
   mutations: {
     dependencies: {
       runtime: {
-        "@jskit-ai/auth-core": "0.1.129",
-        "@jskit-ai/crud-core": "0.1.140",
-        "@jskit-ai/database-runtime": "0.1.131",
-        "@jskit-ai/http-runtime": "0.1.130",
-        "@jskit-ai/json-rest-api-core": "0.1.76",
-        "@jskit-ai/kernel": "0.1.132",
-        "@jskit-ai/resource-core": "0.1.75",
-        "@jskit-ai/resource-crud-core": "0.1.75",
+        "@jskit-ai/auth-core": "0.1.132",
+        "@jskit-ai/crud-core": "0.1.143",
+        "@jskit-ai/database-runtime": "0.1.133",
+        "@jskit-ai/http-runtime": "0.1.132",
+        "@jskit-ai/json-rest-api-core": "0.1.78",
+        "@jskit-ai/kernel": "0.1.134",
+        "@jskit-ai/resource-core": "0.1.77",
+        "@jskit-ai/resource-crud-core": "0.1.77",
         "@local/users": "file:packages/users",
-        "@jskit-ai/uploads-runtime": "0.1.108"
+        "@jskit-ai/uploads-runtime": "0.1.110"
       },
       dev: {}
     },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jskit-ai/users-core",
-  "version": "0.1.142",
+  "version": "0.1.145",
   "type": "module",
   "scripts": {
     "test": "node --test"
@@ -11,14 +11,14 @@
     "./shared/resources/userSettingsResource": "./src/shared/resources/userSettingsResource.js"
   },
   "dependencies": {
-    "@jskit-ai/auth-core": "0.1.129",
-    "@jskit-ai/database-runtime": "0.1.131",
-    "@jskit-ai/http-runtime": "0.1.130",
-    "@jskit-ai/json-rest-api-core": "0.1.76",
-    "@jskit-ai/kernel": "0.1.132",
-    "@jskit-ai/resource-crud-core": "0.1.75",
-    "@jskit-ai/resource-core": "0.1.75",
-    "@jskit-ai/uploads-runtime": "0.1.108",
+    "@jskit-ai/auth-core": "0.1.132",
+    "@jskit-ai/database-runtime": "0.1.133",
+    "@jskit-ai/http-runtime": "0.1.132",
+    "@jskit-ai/json-rest-api-core": "0.1.78",
+    "@jskit-ai/kernel": "0.1.134",
+    "@jskit-ai/resource-crud-core": "0.1.77",
+    "@jskit-ai/resource-core": "0.1.77",
+    "@jskit-ai/uploads-runtime": "0.1.110",
     "json-rest-schema": "1.x.x"
   }
 }

package/src/server/common/repositories/userProfilesRepository.js

@@ -174,8 +174,8 @@ function createRepository({ api, knex } = {}) {
 
   const withTransaction = createWithTransaction(knex);
 
-  async function queryFirst(filters = {}, options = {}) {
-    const rows = extractJsonRestCollectionRows(
+  async function queryProfiles(filters = {}, options = {}) {
+    return extractJsonRestCollectionRows(
       await api.resources.userProfiles.query(
         {
           queryParams: {
@@ -187,8 +187,10 @@ function createRepository({ api, knex } = {}) {
         createJsonRestContext(options?.context || null)
       )
     );
+  }
 
-    return rows[0] || null;
+  async function queryFirst(filters = {}, options = {}) {
+    return (await queryProfiles(filters, options))[0] || null;
   }
 
   async function findById(userId, options = {}) {
@@ -209,6 +211,21 @@ function createRepository({ api, knex } = {}) {
     return normalizeProfileRecord(await queryFirst({ email: normalizedEmail }, options));
   }
 
+  async function findByUsername(username, options = {}) {
+    const normalizedUsername = normalizeUsername(username);
+    if (!normalizedUsername) {
+      return null;
+    }
+
+    const rows = await queryProfiles({ username: normalizedUsername }, options);
+    if (rows.length > 1) {
+      const error = new Error("Application login matches more than one user profile.");
+      error.code = "USER_PROFILE_LOGIN_AMBIGUOUS";
+      throw error;
+    }
+    return normalizeProfileRecord(rows[0] || null);
+  }
+
   async function findByIdentity(identityLike, options = {}) {
     const identity = normalizeIdentity(identityLike);
     if (!identity) {
@@ -416,6 +433,7 @@ function createRepository({ api, knex } = {}) {
     findById,
     findByEmail,
     findByIdentity,
+    findByUsername,
     updateDisplayNameById,
     updateAvatarById,
     clearAvatarById,

package/src/server/common/services/authProfileSyncService.js

@@ -68,6 +68,9 @@ function createService({ userProfilesRepository, lifecycleContributors = [], use
   if (!userProfilesRepository || typeof userProfilesRepository.findByIdentity !== "function") {
     throw new Error("authProfileSyncService requires userProfilesRepository.findByIdentity().");
   }
+  if (typeof userProfilesRepository.findByUsername !== "function") {
+    throw new Error("authProfileSyncService requires userProfilesRepository.findByUsername().");
+  }
   if (typeof userProfilesRepository.upsert !== "function") {
     throw new Error("authProfileSyncService requires userProfilesRepository.upsert().");
   }
@@ -91,6 +94,10 @@ function createService({ userProfilesRepository, lifecycleContributors = [], use
     );
   }
 
+  async function findByLogin(login, options = {}) {
+    return userProfilesRepository.findByUsername(normalizeLowerText(login), options);
+  }
+
   async function upsertByIdentity(profileLike, options = {}) {
     const normalized = buildNormalizedIdentityProfile(profileLike);
     return userProfilesRepository.upsert(
@@ -149,6 +156,7 @@ function createService({ userProfilesRepository, lifecycleContributors = [], use
 
   return Object.freeze({
     findByIdentity,
+    findByLogin,
     upsertByIdentity,
     syncIdentityProfile
   });

package/test/authProfileSyncService.test.js

@@ -12,6 +12,9 @@ test("authProfileSyncService.syncIdentityProfile uses shared transaction for pro
         calls.push({ step: "find", trx: options.trx || null });
         return null;
       },
+      async findByUsername() {
+        return null;
+      },
       async upsert(payload, options = {}) {
         calls.push({ step: "upsert", trx: options.trx || null });
         return {
@@ -78,6 +81,9 @@ test("authProfileSyncService.syncIdentityProfile skips write path when profile i
           displayName: "Tony"
         };
       },
+      async findByUsername() {
+        return null;
+      },
       async upsert() {
         upsertCalls += 1;
         return null;
@@ -123,6 +129,9 @@ test("authProfileSyncService.findByIdentity normalizes provider identity input",
         capturedIdentity = identity;
         return null;
       },
+      async findByUsername() {
+        return null;
+      },
       async upsert() {
         return null;
       },
@@ -147,3 +156,42 @@ test("authProfileSyncService.findByIdentity normalizes provider identity input",
     providerUserId: "user-1"
   });
 });
+
+test("authProfileSyncService.findByLogin resolves the normalized application username", async () => {
+  let capturedUsername = null;
+  const expectedProfile = {
+    id: "7",
+    authProvider: "local",
+    authProviderUserSid: "local-user-7",
+    email: "ada@example.com",
+    username: "merc",
+    displayName: "Ada"
+  };
+  const service = createService({
+    userProfilesRepository: {
+      async findByIdentity() {
+        return null;
+      },
+      async findByUsername(username) {
+        capturedUsername = username;
+        return expectedProfile;
+      },
+      async upsert() {
+        return null;
+      },
+      async withTransaction(work) {
+        return work({ trxId: "tx-4" });
+      }
+    },
+    userSettingsRepository: {
+      async ensureForUserId() {
+        return { userId: "7" };
+      }
+    }
+  });
+
+  const profile = await service.findByLogin("  MERC  ");
+
+  assert.equal(capturedUsername, "merc");
+  assert.equal(profile, expectedProfile);
+});

package/test/repositoryContracts.test.js

@@ -328,6 +328,64 @@ test("userProfilesRepository.findByEmail normalizes email lookup", async () => {
   assert.equal(profile?.displayName, "Ada Example");
 });
 
+test("userProfilesRepository.findByUsername normalizes login lookup", async () => {
+  const { api, calls } = createUserProfilesApiStub({
+    id: 7,
+    authProvider: "local",
+    authProviderUserSid: "local-user-7",
+    email: "ada@example.com",
+    username: "merc-user",
+    displayName: "Ada Example"
+  });
+  const repository = createUserProfilesRepository({
+    api,
+    knex: createKnexStub()
+  });
+
+  const profile = await repository.findByUsername("  Merc User  ");
+
+  assert.deepEqual(calls, [{ username: "merc-user" }]);
+  assert.equal(profile?.id, "7");
+  assert.equal(profile?.username, "merc-user");
+});
+
+test("userProfilesRepository.findByUsername rejects ambiguous login data", async () => {
+  const repository = createUserProfilesRepository({
+    knex: createKnexStub(),
+    api: {
+      resources: {
+        userProfiles: {
+          async query() {
+            return asCollectionDocument([
+              {
+                id: "7",
+                authProvider: "local",
+                authProviderUserSid: "local-user-7",
+                email: "ada@example.com",
+                username: "merc",
+                displayName: "Ada"
+              },
+              {
+                id: "8",
+                authProvider: "local",
+                authProviderUserSid: "local-user-8",
+                email: "grace@example.com",
+                username: "merc",
+                displayName: "Grace"
+              }
+            ]);
+          }
+        }
+      }
+    }
+  });
+
+  await assert.rejects(
+    () => repository.findByUsername("merc"),
+    (error) => error?.code === "USER_PROFILE_LOGIN_AMBIGUOUS"
+  );
+});
+
 test("userProfilesRepository.findByIdentity reads existing profiles from collection documents", async () => {
   const { api, calls } = createUserProfilesApiStub({
     id: 7,