@tulip-systems/core 0.10.1 → 0.10.3

package/dist/modules/auth/handler/service.server.mjs

@@ -1,78 +1,52 @@
-import { url } from "../../../lib/utils/url.mjs";
-import { users } from "../db/schema.mjs";
-import ForgetPasswordEmail from "../../../components/emails/forget-password-email.mjs";
-import { eq } from "drizzle-orm";
-import { passkey } from "@better-auth/passkey";
+import { adminPlugin } from "../plugins/admin.mjs";
+import { emailOtpPlugin } from "../plugins/email-otp.mjs";
 import { drizzleAdapter } from "better-auth/adapters/drizzle";
-import { createAuthMiddleware } from "better-auth/api";
 import { betterAuth } from "better-auth/minimal";
-import { admin, emailOTP } from "better-auth/plugins";
 
 //#region src/modules/auth/handler/service.server.ts
 const authCookiePrefix = "tulip";
 /**
-* Create the Better Auth server instance.
+* Additional fields
 */
-function createAuth(props) {
+const authAdditionalFields = {
+	firstName: {
+		type: "string",
+		required: true,
+		input: true
+	},
+	lastName: {
+		type: "string",
+		required: true,
+		input: true
+	}
+};
+function createAuthServer(props) {
+	const { db, advanced, user, baseURL, emailAndPassword, hooks, plugins } = props;
 	return betterAuth({
+		...props,
 		advanced: {
 			cookiePrefix: authCookiePrefix,
-			database: { generateId: () => false }
+			database: { generateId: () => false },
+			...advanced ?? {}
 		},
-		baseURL: { allowedHosts: props.allowedHosts },
-		database: drizzleAdapter(props.db, {
+		baseURL,
+		database: drizzleAdapter(db, {
 			provider: "pg",
 			usePlural: true
 		}),
-		emailAndPassword: { enabled: true },
+		emailAndPassword: {
+			enabled: true,
+			...emailAndPassword ?? {}
+		},
 		user: {
-			changeEmail: { enabled: true },
-			additionalFields: {
-				firstName: {
-					type: "string",
-					required: true,
-					input: true
-				},
-				lastName: {
-					type: "string",
-					required: true,
-					input: true
-				}
+			...user ?? {},
+			changeEmail: {
+				enabled: true,
+				...user?.changeEmail ?? {}
 			}
 		},
-		hooks: { after: createAuthMiddleware(async (ctx) => {
-			if (!ctx.path.startsWith("/sign-up")) return;
-			const session = ctx.context.newSession;
-			if (!session) return;
-			if ((await props.db.select().from(users)).length === 1) await props.db.update(users).set({ role: "developer" }).where(eq(users.id, session.user.id));
-		}) },
-		plugins: [
-			passkey(),
-			admin({
-				roles: props.roles,
-				ac: props.ac,
-				adminRoles: ["admin", "developer"],
-				defaultRole: props.defaultRole ?? "user"
-			}),
-			emailOTP({ sendVerificationOTP: async ({ email, otp, type }) => {
-				/**
-				* Send a forget password mail
-				*/
-				if (type === "forget-password") {
-					const searchParams = new URLSearchParams();
-					searchParams.set("email", email);
-					searchParams.set("otp", otp);
-					const resetPasswordHref = url(`/auth/reset-password?${searchParams.toString()}`);
-					const result = await props.email.emails.send({
-						from: props.config.email.defaultFrom,
-						to: email,
-						subject: "Wachtwoord herstellen",
-						react: ForgetPasswordEmail({ resetPasswordHref })
-					});
-					if (result.error) throw new Error(result.error.message);
-				}
-			} })
-		]
+		hooks,
+		plugins
 	});
 }
 /**
@@ -81,7 +55,13 @@ function createAuth(props) {
 * @example
 * const auth = Auth.init({ db, email, config, ac, roles, allowedHosts });
 */
-const Auth = { init: createAuth };
+const Auth = {
+	init: createAuthServer,
+	plugins: {
+		admin: adminPlugin,
+		emailOTP: emailOtpPlugin
+	}
+};
 
 //#endregion
-export { Auth, authCookiePrefix };
+export { Auth, authAdditionalFields, authCookiePrefix, createAuthServer };

package/dist/modules/auth/hooks/use-auth-client.d.mts

@@ -1,23 +1,22 @@
-import { ClientAuth } from "../handler/create-client.client.mjs";
+import { AnyAuthClient, AuthClient } from "../handler/create-client.client.mjs";
 import * as react_jsx_runtime0 from "react/jsx-runtime";
 import * as react from "react";
 import { PropsWithChildren } from "react";
-import { AccessControl, Role } from "better-auth/plugins";
 
 //#region src/modules/auth/hooks/use-auth-client.d.ts
 /**
  * Auth client context
  */
-declare const AuthClientContext: react.Context<ClientAuth<never, never>>;
+declare const AuthClientContext: react.Context<AnyAuthClient | null>;
 /**
  * Use auth client
  */
-declare function useAuthClient<TAccessControl extends AccessControl = never, TRoles extends { [key in string]: Role } = never>(): ClientAuth<TAccessControl, TRoles>;
+declare function useAuthClient<TAuthClient extends AnyAuthClient = AuthClient<object>>(): TAuthClient;
 /**
  * Auth client provider
  */
-declare function AuthProvider<TAccessControl extends AccessControl, TRoles extends { [key in string]: Role }>(props: PropsWithChildren<{
-  authClient: ClientAuth<TAccessControl, TRoles>;
+declare function AuthProvider(props: PropsWithChildren<{
+  authClient: AnyAuthClient;
 }>): react_jsx_runtime0.JSX.Element;
 //#endregion
 export { AuthClientContext, AuthProvider, useAuthClient };

package/dist/modules/auth/hooks/use-permission.d.mts

@@ -1,7 +1,7 @@
-import { Permission } from "../lib/permissions.mjs";
+import { AccessControl, Permission } from "../lib/permissions.mjs";
 
 //#region src/modules/auth/hooks/use-permission.d.ts
-type UsePermissionProps = {
+type UsePermissionProps<TAccessControl extends AccessControl = AccessControl> = {
   /**
    * Strategy to use when checking multiple permissions
    * - "all": all permissions must be allowed
@@ -13,7 +13,7 @@ type UsePermissionProps = {
    * Permission to check
    * @example { project: ["view", "create"] }
    */
-  permission?: Permission;
+  permission?: Permission<TAccessControl>;
 } | {
   /**
    * Strategy to use when checking multiple permissions
@@ -26,16 +26,16 @@ type UsePermissionProps = {
    * Permission to check
    * @example [{ project: ["view", "create"] }, { client: ["view"] }, { drive: ["view"] }]
    */
-  permission?: Permission[];
+  permission?: Permission<TAccessControl>[];
 };
 /**
  * UsePermission
  */
-declare function usePermission({
+declare function usePermission<TAccessControl extends AccessControl = AccessControl>({
   strategy,
   permission
-}: UsePermissionProps): {
-  permission: Permission | Permission[] | undefined;
+}?: UsePermissionProps<TAccessControl>): {
+  permission: Permission<TAccessControl> | Permission<TAccessControl>[] | undefined;
   success: boolean;
 };
 //#endregion

package/dist/modules/auth/hooks/use-permission.mjs

@@ -7,7 +7,7 @@ import { useSession } from "./use-session.mjs";
 /**
 * UsePermission
 */
-function usePermission({ strategy = "all", permission }) {
+function usePermission({ strategy = "all", permission } = {}) {
 	const authClient = useAuthClient();
 	/**
 	* If no role is found in the session, deny by default

package/dist/modules/auth/hooks/use-session.d.mts

@@ -1,40 +1,18 @@
-import { ClientAuth } from "../handler/create-client.client.mjs";
-import "../../../auth/client.mjs";
+import { AuthClient, AuthClientOptions } from "../handler/create-client.client.mjs";
 import * as _tanstack_react_query0 from "@tanstack/react-query";
-import * as better_auth0 from "better-auth";
+import { InferSessionFromClient, InferUserFromClient } from "better-auth";
 
 //#region src/modules/auth/hooks/use-session.d.ts
-declare function useSession(authClient: ClientAuth<never, never>): _tanstack_react_query0.UseSuspenseQueryResult<{
-  user: better_auth0.StripEmptyObjects<{
-    id: string;
-    createdAt: Date;
-    updatedAt: Date;
-    email: string;
-    emailVerified: boolean;
-    name: string;
-    image?: string | null | undefined;
-  } & {
-    firstName: string;
-    lastName: string;
-  } & {} & {
-    banned: boolean | null | undefined;
-  } & {
-    role?: string | null | undefined;
-    banReason?: string | null | undefined;
-    banExpires?: Date | null | undefined;
-  }>;
-  session: better_auth0.StripEmptyObjects<{
-    id: string;
-    createdAt: Date;
-    updatedAt: Date;
-    userId: string;
-    expiresAt: Date;
-    token: string;
-    ipAddress?: string | null | undefined;
-    userAgent?: string | null | undefined;
-  } & {} & {
-    impersonatedBy?: string | null | undefined;
-  } & {} & {}>;
-} | null, Error>;
+/**
+ * Use session return type
+ */
+type UseSessionReturnType<TOptions extends AuthClientOptions> = {
+  user: InferUserFromClient<TOptions>;
+  session: InferSessionFromClient<TOptions>;
+} | null;
+/**
+ * Use session
+ */
+declare function useSession<TOptions extends AuthClientOptions>(authClient: AuthClient<TOptions>): _tanstack_react_query0.UseSuspenseQueryResult<UseSessionReturnType<TOptions>, Error>;
 //#endregion
 export { useSession };

package/dist/modules/auth/hooks/use-session.mjs

@@ -3,6 +3,9 @@
 import { useSuspenseQuery } from "@tanstack/react-query";
 
 //#region src/modules/auth/hooks/use-session.ts
+/**
+* Use session
+*/
 function useSession(authClient) {
 	return useSuspenseQuery({
 		queryKey: ["session"],

package/dist/modules/auth/lib/helpers.server.d.mts

@@ -1,84 +1,14 @@
-import { CreateUserSchema, UpdateUserSchema } from "./validators.mjs";
-import { TDatabaseSchema } from "../../database/lib/types.mjs";
-import { TulipContext } from "../../config/lib/context.mjs";
-import "../../../config.mjs";
+import { Auth, AuthServerSession, AuthServerUser, TAuthServerOptions } from "../handler/service.server.mjs";
 import "server-cli-only";
-import * as better_auth_plugins0 from "better-auth/plugins";
 
 //#region src/modules/auth/lib/helpers.server.d.ts
 /**
  * Get the session
  */
-declare function getSession<TSchema extends TDatabaseSchema>({
-  auth
-}: Pick<TulipContext<TSchema>, "auth">): Promise<{
-  session: {
-    id: string;
-    createdAt: Date;
-    updatedAt: Date;
-    userId: string;
-    expiresAt: Date;
-    token: string;
-    ipAddress?: string | null | undefined | undefined;
-    userAgent?: string | null | undefined | undefined;
-    impersonatedBy?: string | null | undefined;
-  };
-  user: {
-    id: string;
-    createdAt: Date;
-    updatedAt: Date;
-    email: string;
-    emailVerified: boolean;
-    name: string;
-    image?: string | null | undefined | undefined;
-    firstName: string;
-    lastName: string;
-    banned: boolean | null | undefined;
-    role?: string | null | undefined;
-    banReason?: string | null | undefined;
-    banExpires?: Date | null | undefined;
-  };
-} | null>;
-/**
- * Create a user
- */
-declare function createUser<TSchema extends TDatabaseSchema>({
-  auth,
-  headers
-}: TulipContext<TSchema> & {
-  headers: Headers;
-}, {
-  body
-}: {
-  body: CreateUserSchema;
-}): Promise<{
-  user: better_auth_plugins0.UserWithRole;
-}>;
-/**
- * Update a user
- */
-declare function updateUser<TSchema extends TDatabaseSchema>({
-  db
-}: TulipContext<TSchema>, {
-  userId,
-  body
-}: {
-  userId: string;
-  body: Partial<UpdateUserSchema>;
-}): Promise<{
-  name: string;
-  firstName: string;
-  lastName: string;
-  email: string;
-  emailVerified: boolean;
-  image: string | null;
-  role: string | null;
-  banned: boolean | null;
-  banReason: string | null;
-  banExpires: Date | null;
-  id: string;
-  createdAt: Date;
-  updatedAt: Date;
-}>;
+type GetSessionResult<TAuthOptions extends TAuthServerOptions> = {
+  session: AuthServerSession<TAuthOptions>;
+  user: AuthServerUser<TAuthOptions>;
+} | null;
+declare function getSession<TAuthOptions extends TAuthServerOptions>(auth: Auth<TAuthOptions>): Promise<GetSessionResult<TAuthOptions>>;
 //#endregion
-export { createUser, getSession, updateUser };
+export { GetSessionResult, getSession };

package/dist/modules/auth/lib/helpers.server.mjs

@@ -1,41 +1,11 @@
-import { ServerError } from "../../router/lib/error.server.mjs";
-import { users } from "../db/schema.mjs";
 import "server-cli-only";
-import { eq } from "drizzle-orm";
 import { headers } from "next/headers";
 
 //#region src/modules/auth/lib/helpers.server.ts
-/**
-* Get the session
-*/
-async function getSession({ auth }) {
-	return auth.api.getSession({ headers: await headers() });
-}
-/**
-* Create a user
-*/
-function createUser({ auth, headers }, { body }) {
-	const { firstName, lastName } = body;
-	return auth.api.createUser({
-		headers,
-		body: {
-			...body,
-			name: `${firstName} ${lastName}`,
-			data: {
-				firstName,
-				lastName
-			}
-		}
-	});
-}
-/**
-* Update a user
-*/
-async function updateUser({ db }, { userId, body }) {
-	const [result] = await db.update(users).set(body).where(eq(users.id, userId)).returning();
-	if (!result) throw new ServerError("INTERNAL_SERVER_ERROR", { message: "Gebruiker kon niet worden aangemaakt" });
-	return result;
+async function getSession(auth) {
+	const headersList = await headers();
+	return await auth.api.getSession({ headers: headersList });
 }
 
 //#endregion
-export { createUser, getSession, updateUser };
+export { getSession };

package/dist/modules/auth/lib/permissions.d.mts

@@ -1,8 +1,27 @@
-import { Role, createAccessControl } from "better-auth/plugins/access";
+import { AccessControl, Role, Statements, createAccessControl } from "better-auth/plugins/access";
 import { adminAc, defaultStatements } from "better-auth/plugins/admin/access";
 
 //#region src/modules/auth/lib/permissions.d.ts
-type Permission = Record<string, string[]>;
+/**
+ * Permission Statements
+ * @description These are the statements that define the permissions for the application. They are used to create the access control and to check the permissions for the users.
+ */
+type Statements$1 = Statements;
+/**
+ * Access Control
+ * @description The access control is created using the statements and is used to check the permissions for the users. It is also used to define the roles for the application.
+ */
+type AccessControl$1<TStatements extends Statements$1 = Statements$1> = AccessControl<TStatements>;
+/**
+ * Permission Actions
+ * @description The actions that can be performed on a resource. For example, if the resource is "project", the actions can be "view", "create", "edit", "delete", etc.
+ */
+type Actions<T> = T extends readonly unknown[] ? T[number] : never;
+/**
+ * Permission
+ * @description The permission is an object that defines the resource and the actions that can be performed on that resource. For example, { project: ["view", "create"] } means that the user has permission to view and create projects.
+ */
+type Permission<TAccessControl extends AccessControl$1 = AccessControl$1> = TAccessControl extends AccessControl$1<infer S extends Statements$1> ? { [K in keyof S]?: Actions<S[K]>[] } : Record<string, string[]>;
 /**
  * Create statements
  */
@@ -14,4 +33,4 @@ declare const createStatements: <TStatements extends Parameters<typeof createAcc
  * Exports
  */
 //#endregion
-export { Permission, type Role, adminAc, createAccessControl, createStatements, defaultStatements };
+export { AccessControl$1 as AccessControl, Permission, type Role, adminAc, createAccessControl, createStatements, defaultStatements };