@meistrari/auth-core 1.5.0 → 1.5.2

package/README.md

@@ -157,14 +157,10 @@ const organizations = await authClient.organization.listOrganizations()
 
 #### getOrganization
 
-Retrieves a single organization with optional related data.
+Retrieves a single organization with teams, invites and members.
 
 ```typescript
-const organization = await authClient.organization.getOrganization('org-123', {
-    includeMembers: true,
-    includeInvitations: true,
-    includeTeams: true
-})
+const organization = await authClient.organization.getOrganization('org-123')
 ```
 
 #### setActiveOrganization

package/dist/index.d.mts

@@ -5985,9 +5985,9 @@ type ExtendedOrganization = Organization & {
     settings?: OrganizationSettings;
 };
 type FullOrganization = ExtendedOrganization & {
-    members?: Member[];
-    invitations?: Invitation[];
-    teams?: Team[];
+    members: Member[];
+    invitations: Invitation[];
+    teams: Team[];
 };
 type TeamMember = {
     id: string;
@@ -5996,12 +5996,7 @@ type TeamMember = {
     createdAt: Date;
 };
 
-type GetOrganizationOptions = {
-    includeMembers?: boolean;
-    includeInvitations?: boolean;
-    includeTeams?: boolean;
-};
-type UpdateOrganizationPayload = Pick<ExtendedOrganization, 'name' | 'logo' | 'settings'>;
+type UpdateOrganizationPayload = Partial<Pick<ExtendedOrganization, 'name' | 'logo' | 'settings'>>;
 type ListMembersOptions = {
     limit?: number;
     offset?: number;
@@ -6047,21 +6042,24 @@ declare class OrganizationService {
      * Retrieves a single organization by ID with optional related data.
      *
      * @param id - The organization ID
-     * @param options - Configuration for including related data
-     * @param options.includeMembers - Include organization members
-     * @param options.includeInvitations - Include pending invitations
-     * @param options.includeTeams - Include organization teams
-     * @returns The organization with optionally included related data
+     * @returns The organization with members, invitations, and teams
      */
-    getOrganization(id: string, options?: GetOrganizationOptions): Promise<{
-        teams?: {
+    getOrganization(id: string): Promise<{
+        members: {
             id: string;
-            name: string;
             organizationId: string;
+            role: "org:admin" | "org:member" | "org:reviewer";
             createdAt: Date;
-            updatedAt?: Date | undefined;
-        }[] | undefined;
-        invitations?: {
+            userId: string;
+            teamId?: string | undefined | undefined;
+            user: {
+                id: string;
+                email: string;
+                name: string;
+                image?: string | undefined;
+            };
+        }[];
+        invitations: {
             id: string;
             organizationId: string;
             email: string;
@@ -6071,38 +6069,21 @@ declare class OrganizationService {
             expiresAt: Date;
             createdAt: Date;
             teamId?: string | undefined | undefined;
-        }[] | undefined;
-        members?: ({
+        }[];
+        teams: {
             id: string;
+            name: string;
             organizationId: string;
-            role: "org:admin" | "org:member" | "org:reviewer";
             createdAt: Date;
-            userId: string;
-            teamId?: string | undefined | undefined;
-            user: {
-                id: string;
-                email: string;
-                name: string;
-                image?: string | undefined;
-            };
-        } & {
-            user: {
-                id: string;
-                name: string;
-                email: string;
-                image: string | null | undefined;
-            };
-        })[] | undefined;
+            updatedAt?: Date | undefined;
+        }[];
+    } & {
         id: string;
         name: string;
         slug: string;
         createdAt: Date;
-        logo?: string | null | undefined;
+        logo?: string | null | undefined | undefined;
         metadata?: any;
-        settings?: {
-            disableStorage?: boolean;
-            dataRetentionHours?: number;
-        };
     }>;
     /**
      * Lists all organizations accessible to the current user.
@@ -6710,4 +6691,4 @@ declare function validateToken(token: string, apiUrl: string): Promise<boolean>;
 declare function extractTokenPayload(token: string): JWTTokenPayload;
 
 export { AuthClient, EmailRequired, InvalidCallbackURL, InvalidSocialProvider, Roles, ac, createAPIClient, extractTokenPayload, isTokenExpired, organizationAdditionalFields, rolesAccessControl, userAdditionalFields, validateToken };
-export type { APIClient, ApiKeyMetadata, CreateApiKeyPayload, CreateTeamPayload, FullOrganization, GetOrganizationOptions, Invitation, InviteUserToOrganizationOptions, JWTTokenPayload, ListMembersOptions, ExtendedMember as Member, ExtendedOrganization as Organization, RemoveUserFromOrganizationOptions, Role, Session, SignInWithEmailAndPasswordOptions, SignInWithSamlOptions, SocialSignInOptions, Team, TeamMember, UpdateApiKeyPayload, UpdateMemberRoleOptions, UpdateOrganizationPayload, UpdateTeamPayload, User };
+export type { APIClient, ApiKeyMetadata, CreateApiKeyPayload, CreateTeamPayload, FullOrganization, Invitation, InviteUserToOrganizationOptions, JWTTokenPayload, ListMembersOptions, ExtendedMember as Member, ExtendedOrganization as Organization, RemoveUserFromOrganizationOptions, Role, Session, SignInWithEmailAndPasswordOptions, SignInWithSamlOptions, SocialSignInOptions, Team, TeamMember, UpdateApiKeyPayload, UpdateMemberRoleOptions, UpdateOrganizationPayload, UpdateTeamPayload, User };

package/dist/index.d.ts

@@ -5985,9 +5985,9 @@ type ExtendedOrganization = Organization & {
     settings?: OrganizationSettings;
 };
 type FullOrganization = ExtendedOrganization & {
-    members?: Member[];
-    invitations?: Invitation[];
-    teams?: Team[];
+    members: Member[];
+    invitations: Invitation[];
+    teams: Team[];
 };
 type TeamMember = {
     id: string;
@@ -5996,12 +5996,7 @@ type TeamMember = {
     createdAt: Date;
 };
 
-type GetOrganizationOptions = {
-    includeMembers?: boolean;
-    includeInvitations?: boolean;
-    includeTeams?: boolean;
-};
-type UpdateOrganizationPayload = Pick<ExtendedOrganization, 'name' | 'logo' | 'settings'>;
+type UpdateOrganizationPayload = Partial<Pick<ExtendedOrganization, 'name' | 'logo' | 'settings'>>;
 type ListMembersOptions = {
     limit?: number;
     offset?: number;
@@ -6047,21 +6042,24 @@ declare class OrganizationService {
      * Retrieves a single organization by ID with optional related data.
      *
      * @param id - The organization ID
-     * @param options - Configuration for including related data
-     * @param options.includeMembers - Include organization members
-     * @param options.includeInvitations - Include pending invitations
-     * @param options.includeTeams - Include organization teams
-     * @returns The organization with optionally included related data
+     * @returns The organization with members, invitations, and teams
      */
-    getOrganization(id: string, options?: GetOrganizationOptions): Promise<{
-        teams?: {
+    getOrganization(id: string): Promise<{
+        members: {
             id: string;
-            name: string;
             organizationId: string;
+            role: "org:admin" | "org:member" | "org:reviewer";
             createdAt: Date;
-            updatedAt?: Date | undefined;
-        }[] | undefined;
-        invitations?: {
+            userId: string;
+            teamId?: string | undefined | undefined;
+            user: {
+                id: string;
+                email: string;
+                name: string;
+                image?: string | undefined;
+            };
+        }[];
+        invitations: {
             id: string;
             organizationId: string;
             email: string;
@@ -6071,38 +6069,21 @@ declare class OrganizationService {
             expiresAt: Date;
             createdAt: Date;
             teamId?: string | undefined | undefined;
-        }[] | undefined;
-        members?: ({
+        }[];
+        teams: {
             id: string;
+            name: string;
             organizationId: string;
-            role: "org:admin" | "org:member" | "org:reviewer";
             createdAt: Date;
-            userId: string;
-            teamId?: string | undefined | undefined;
-            user: {
-                id: string;
-                email: string;
-                name: string;
-                image?: string | undefined;
-            };
-        } & {
-            user: {
-                id: string;
-                name: string;
-                email: string;
-                image: string | null | undefined;
-            };
-        })[] | undefined;
+            updatedAt?: Date | undefined;
+        }[];
+    } & {
         id: string;
         name: string;
         slug: string;
         createdAt: Date;
-        logo?: string | null | undefined;
+        logo?: string | null | undefined | undefined;
         metadata?: any;
-        settings?: {
-            disableStorage?: boolean;
-            dataRetentionHours?: number;
-        };
     }>;
     /**
      * Lists all organizations accessible to the current user.
@@ -6710,4 +6691,4 @@ declare function validateToken(token: string, apiUrl: string): Promise<boolean>;
 declare function extractTokenPayload(token: string): JWTTokenPayload;
 
 export { AuthClient, EmailRequired, InvalidCallbackURL, InvalidSocialProvider, Roles, ac, createAPIClient, extractTokenPayload, isTokenExpired, organizationAdditionalFields, rolesAccessControl, userAdditionalFields, validateToken };
-export type { APIClient, ApiKeyMetadata, CreateApiKeyPayload, CreateTeamPayload, FullOrganization, GetOrganizationOptions, Invitation, InviteUserToOrganizationOptions, JWTTokenPayload, ListMembersOptions, ExtendedMember as Member, ExtendedOrganization as Organization, RemoveUserFromOrganizationOptions, Role, Session, SignInWithEmailAndPasswordOptions, SignInWithSamlOptions, SocialSignInOptions, Team, TeamMember, UpdateApiKeyPayload, UpdateMemberRoleOptions, UpdateOrganizationPayload, UpdateTeamPayload, User };
+export type { APIClient, ApiKeyMetadata, CreateApiKeyPayload, CreateTeamPayload, FullOrganization, Invitation, InviteUserToOrganizationOptions, JWTTokenPayload, ListMembersOptions, ExtendedMember as Member, ExtendedOrganization as Organization, RemoveUserFromOrganizationOptions, Role, Session, SignInWithEmailAndPasswordOptions, SignInWithSamlOptions, SocialSignInOptions, Team, TeamMember, UpdateApiKeyPayload, UpdateMemberRoleOptions, UpdateOrganizationPayload, UpdateTeamPayload, User };

package/dist/index.mjs

@@ -6,7 +6,7 @@ import { createAccessControl } from 'better-auth/plugins/access';
 import { defaultStatements } from 'better-auth/plugins/organization/access';
 export { BetterFetchError as APIError } from '@better-fetch/fetch';
 
-const version = "1.5.0";
+const version = "1.5.2";
 
 const statements = {
   ...defaultStatements,
@@ -122,40 +122,15 @@ class OrganizationService {
    * Retrieves a single organization by ID with optional related data.
    *
    * @param id - The organization ID
-   * @param options - Configuration for including related data
-   * @param options.includeMembers - Include organization members
-   * @param options.includeInvitations - Include pending invitations
-   * @param options.includeTeams - Include organization teams
-   * @returns The organization with optionally included related data
-   */
-  async getOrganization(id, options) {
-    const organizationPromise = this.client.organization.list({
-      query: {
-        id
-      }
-    });
-    const membersPromise = options?.includeMembers ? this.client.organization.listMembers({
-      query: {
-        organizationId: id
-      }
-    }) : void 0;
-    const invitationsPromise = options?.includeInvitations ? this.client.organization.listInvitations({
-      query: {
-        organizationId: id
-      }
-    }) : void 0;
-    const teamsPromise = options?.includeTeams ? this.client.organization.listTeams({
+   * @returns The organization with members, invitations, and teams
+   */
+  async getOrganization(id) {
+    const organization = await this.client.organization.getFullOrganization({
       query: {
         organizationId: id
       }
-    }) : void 0;
-    const [organization, members, invitations, teams] = await Promise.all([organizationPromise, membersPromise, invitationsPromise, teamsPromise]);
-    return {
-      ...organization[0],
-      ...members && { members: members.members },
-      ...invitations && { invitations },
-      ...teams && { teams }
-    };
+    });
+    return organization;
   }
   /**
    * Lists all organizations accessible to the current user.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@meistrari/auth-core",
-  "version": "1.5.0",
+  "version": "1.5.2",
   "type": "module",
   "exports": {
     ".": {