@absolutejs/auth 0.55.6 → 0.55.7

package/dist/index.d.ts

@@ -3462,6 +3462,7 @@ export { providersFromEnv, type ProviderSelection } from './providersFromEnv';
 export { createRedisAuthSessionStore, type RedisSessionClient } from './session/redisStore';
 export { createLinkedProviderCredentialResolver } from './linkedProviders/resolver';
 export { createOAuthLinkedProviderCredentialResolver } from './linkedProviders/oauthResolver';
+export { createOAuthAccountLinkedProviderCredentialResolver, type OAuthLinkedProviderAccount, type OAuthLinkedProviderAccountStore } from './linkedProviders/oauthAccountResolver';
 export { createNeonLinkedProviderStores, createNeonOAuthLinkedProviderCredentialResolver } from './linkedProviders/neonStores';
 export { createInMemoryLinkedProviderStores } from './linkedProviders/inMemoryStores';
 export { protectRoutePlugin } from './routes/protectRoute';

package/dist/index.js

@@ -23587,13 +23587,12 @@ var createLinkedProviderCredentialResolver = ({
   },
   resolveCredential: async (input) => {
     const bindings = sortNewestFirst(await bindingStore.listBindingsByOwner(input.ownerRef)).filter((binding) => binding.connectorProvider === input.connectorProvider && isBindingUsable(binding) && (input.bindingId === undefined || binding.id === input.bindingId) && (input.externalAccountId === undefined || binding.externalAccountId === input.externalAccountId));
-    for (const binding of bindings) {
-      const credential = await resolveBindingCredential(grantStore, binding, input);
-      if (credential) {
+    return bindings.reduce(async (pendingCredential, binding) => {
+      const credential = await pendingCredential;
+      if (credential)
         return credential;
-      }
-    }
-    return null;
+      return resolveBindingCredential(grantStore, binding, input);
+    }, Promise.resolve(null));
   }
 });
 // src/linkedProviders/oauthResolver.ts
@@ -23696,6 +23695,111 @@ var createOAuthLinkedProviderCredentialResolver = async ({
     }
   });
 };
+// src/linkedProviders/oauthAccountResolver.ts
+var bindingId = (accountId) => `oauth-account:${accountId}`;
+var accountIdFromBinding = (id) => {
+  const prefix = "oauth-account:";
+  return id.startsWith(prefix) ? id.slice(prefix.length) : null;
+};
+var toGrant = (account) => ({
+  accessTokenCiphertext: account.accessToken,
+  authProviderKey: account.authProviderKey,
+  createdAt: account.createdAt,
+  expiresAt: account.expiresAt,
+  grantedScopes: [...account.grantedScopes],
+  id: account.id,
+  metadata: account.metadata,
+  ownerRef: account.ownerRef,
+  providerFamily: account.authProviderKey,
+  providerSubject: account.providerSubject,
+  refreshTokenCiphertext: account.refreshToken,
+  status: account.status,
+  tokenType: account.tokenType,
+  updatedAt: account.updatedAt
+});
+var toBinding = (account) => ({
+  availableScopes: [...account.grantedScopes],
+  connectorProvider: account.authProviderKey,
+  createdAt: account.createdAt,
+  externalAccountId: account.providerSubject,
+  externalAccountType: "user",
+  grantId: account.id,
+  id: bindingId(account.id),
+  metadata: account.metadata,
+  status: account.status === "revoked" || account.status === "error" ? "disconnected" : "active",
+  updatedAt: account.updatedAt
+});
+var accountWithGrant = (account, grant) => ({
+  ...account,
+  accessToken: grant.accessTokenCiphertext,
+  authProviderKey: grant.authProviderKey,
+  expiresAt: grant.expiresAt,
+  grantedScopes: [...grant.grantedScopes],
+  metadata: grant.metadata,
+  ownerRef: grant.ownerRef,
+  providerSubject: grant.providerSubject,
+  refreshToken: grant.refreshTokenCiphertext,
+  status: grant.status,
+  tokenType: grant.tokenType,
+  updatedAt: grant.updatedAt
+});
+var accountStatusForBinding = (account, binding) => {
+  if (binding.status === "disconnected")
+    return "revoked";
+  if (binding.status === "restricted")
+    return "error";
+  return account.status;
+};
+var createOAuthAccountLinkedProviderCredentialResolver = async ({
+  accountStore,
+  now,
+  providersConfiguration
+}) => {
+  const grantStore = {
+    getGrant: async (id) => {
+      const account = await accountStore.getAccount(id);
+      return account ? toGrant(account) : undefined;
+    },
+    listGrantsByOwner: async (ownerRef) => (await accountStore.listAccountsByOwner(ownerRef)).map(toGrant),
+    saveGrant: async (grant) => {
+      const account = await accountStore.getAccount(grant.id);
+      if (!account)
+        throw new Error("OAuth linked account is unavailable");
+      await accountStore.saveAccount(accountWithGrant(account, grant));
+    }
+  };
+  const bindingStore = {
+    getBinding: async (id) => {
+      const accountId = accountIdFromBinding(id);
+      if (!accountId)
+        return;
+      const account = await accountStore.getAccount(accountId);
+      return account ? toBinding(account) : undefined;
+    },
+    listBindingsByGrant: async (grantId) => {
+      const account = await accountStore.getAccount(grantId);
+      return account ? [toBinding(account)] : [];
+    },
+    listBindingsByOwner: async (ownerRef) => (await accountStore.listAccountsByOwner(ownerRef)).map(toBinding),
+    saveBinding: async (binding) => {
+      const account = await accountStore.getAccount(binding.grantId);
+      if (!account)
+        throw new Error("OAuth linked account is unavailable");
+      await accountStore.saveAccount({
+        ...account,
+        metadata: binding.metadata,
+        status: accountStatusForBinding(account, binding),
+        updatedAt: binding.updatedAt
+      });
+    }
+  };
+  return createOAuthLinkedProviderCredentialResolver({
+    bindingStore,
+    grantStore,
+    ...now ? { now } : {},
+    providersConfiguration
+  });
+};
 // src/linkedProviders/neonStores.ts
 var linkedProviderBindingsTable = pgTable("linked_provider_bindings", {
   available_scopes: jsonb("available_scopes").$type().notNull().default([]),
@@ -23737,7 +23841,7 @@ var linkedProviderGrantsTable = pgTable("linked_provider_grants", {
 });
 var toTimestamp = (value) => value === undefined ? null : new Date(value);
 var fromTimestamp = (value) => value === null ? undefined : value.getTime();
-var toGrant = (row) => ({
+var toGrant2 = (row) => ({
   accessTokenCiphertext: row.access_token_ciphertext ?? undefined,
   authProviderKey: row.auth_provider_key,
   createdAt: row.created_at.getTime(),
@@ -23755,7 +23859,7 @@ var toGrant = (row) => ({
   tokenType: row.token_type ?? undefined,
   updatedAt: row.updated_at.getTime()
 });
-var toBinding = (row) => ({
+var toBinding2 = (row) => ({
   availableScopes: row.available_scopes ?? [],
   capabilities: row.capabilities ?? undefined,
   connectorProvider: row.connector_provider,
@@ -23774,15 +23878,15 @@ var toBinding = (row) => ({
 var createNeonLinkedProviderBindingStore = (db) => ({
   getBinding: async (id) => {
     const [row] = await db.select().from(linkedProviderBindingsTable).where(eq(linkedProviderBindingsTable.id, id)).limit(1);
-    return row ? toBinding(row) : undefined;
+    return row ? toBinding2(row) : undefined;
   },
   listBindingsByGrant: async (grantId) => {
     const rows = await db.select().from(linkedProviderBindingsTable).where(eq(linkedProviderBindingsTable.grant_id, grantId)).orderBy(desc(linkedProviderBindingsTable.updated_at));
-    return rows.map(toBinding);
+    return rows.map(toBinding2);
   },
   listBindingsByOwner: async (ownerRef) => {
     const rows = await db.select({ binding: linkedProviderBindingsTable }).from(linkedProviderBindingsTable).innerJoin(linkedProviderGrantsTable, eq(linkedProviderBindingsTable.grant_id, linkedProviderGrantsTable.id)).where(eq(linkedProviderGrantsTable.owner_ref, ownerRef)).orderBy(desc(linkedProviderBindingsTable.updated_at));
-    return rows.map(({ binding }) => toBinding(binding));
+    return rows.map(({ binding }) => toBinding2(binding));
   },
   removeBinding: async (id) => {
     await db.delete(linkedProviderBindingsTable).where(eq(linkedProviderBindingsTable.id, id));
@@ -23825,11 +23929,11 @@ var createNeonLinkedProviderBindingStore = (db) => ({
 var createNeonLinkedProviderGrantStore = (db) => ({
   getGrant: async (id) => {
     const [row] = await db.select().from(linkedProviderGrantsTable).where(eq(linkedProviderGrantsTable.id, id)).limit(1);
-    return row ? toGrant(row) : undefined;
+    return row ? toGrant2(row) : undefined;
   },
   listGrantsByOwner: async (ownerRef) => {
     const rows = await db.select().from(linkedProviderGrantsTable).where(eq(linkedProviderGrantsTable.owner_ref, ownerRef)).orderBy(desc(linkedProviderGrantsTable.updated_at));
-    return rows.map(toGrant);
+    return rows.map(toGrant2);
   },
   removeGrant: async (id) => {
     await db.delete(linkedProviderBindingsTable).where(eq(linkedProviderBindingsTable.grant_id, id));
@@ -23921,7 +24025,7 @@ var createInMemoryLinkedProviderStores = (input = {}) => {
     listGrantsByOwner: async (ownerRef) => [...grants.values()].filter((grant) => grant.ownerRef === ownerRef).map(cloneGrant),
     removeGrant: async (id) => {
       grants.delete(id);
-      [...bindings.entries()].filter(([, binding]) => binding.grantId === id).forEach(([bindingId]) => bindings.delete(bindingId));
+      [...bindings.entries()].filter(([, binding]) => binding.grantId === id).forEach(([bindingId2]) => bindings.delete(bindingId2));
     },
     saveGrant: async (grant) => {
       grants.set(grant.id, cloneGrant(grant));
@@ -29788,6 +29892,7 @@ export {
   createOrganization,
   createOidcAgentCredentialVerifier,
   createOAuthLinkedProviderCredentialResolver,
+  createOAuthAccountLinkedProviderCredentialResolver,
   createNeonWebhookDeliveryStore,
   createNeonWebAuthnCredentialStore,
   createNeonWarrantStore,
@@ -29979,5 +30084,5 @@ export {
   AGENT_CLAIM_GRANT_TYPE
 };
 
-//# debugId=C32E620BB25CD5D564756E2164756E21
+//# debugId=DCA509B790E265BD64756E2164756E21
 //# sourceMappingURL=index.js.map