@rolder/kit 3.0.0-alpha.96 → 3.0.0-alpha.97

package/dist/betterAuth/client/getAuthClient.d.ts

@@ -2799,12 +2799,12 @@ export declare const getAuthClient: <TRoles extends Record<string, Role>>(config
             emailVerified: boolean;
             name: string;
             image?: string | null | undefined;
-            username?: string | null | undefined;
-            displayUsername?: string | null | undefined;
             banned: boolean | null | undefined;
             role?: string | null | undefined;
             banReason?: string | null | undefined;
             banExpires?: Date | null | undefined;
+            username?: string | null | undefined;
+            displayUsername?: string | null | undefined;
         };
         session: {
             id: string;
@@ -2850,12 +2850,12 @@ export declare const getAuthClient: <TRoles extends Record<string, Role>>(config
                 emailVerified: boolean;
                 name: string;
                 image?: string | null | undefined;
-                username?: string | null | undefined;
-                displayUsername?: string | null | undefined;
                 banned: boolean | null | undefined;
                 role?: string | null | undefined;
                 banReason?: string | null | undefined;
                 banExpires?: Date | null | undefined;
+                username?: string | null | undefined;
+                displayUsername?: string | null | undefined;
             };
             session: {
                 id: string;
@@ -2886,12 +2886,12 @@ export declare const getAuthClient: <TRoles extends Record<string, Role>>(config
                 emailVerified: boolean;
                 name: string;
                 image?: string | null | undefined;
-                username?: string | null | undefined;
-                displayUsername?: string | null | undefined;
                 banned: boolean | null | undefined;
                 role?: string | null | undefined;
                 banReason?: string | null | undefined;
                 banExpires?: Date | null | undefined;
+                username?: string | null | undefined;
+                displayUsername?: string | null | undefined;
             };
             session: {
                 id: string;

package/dist/betterAuth/server/getAuthServerConfig.d.ts

@@ -0,0 +1,7 @@
+import type { BetterAuthOptions } from 'better-auth/minimal';
+import { type Role } from 'better-auth/plugins';
+export interface AuthServerConfig {
+    betterAuthOptions?: Partial<BetterAuthOptions>;
+    roles?: Record<string, Role>;
+}
+export declare const getAuthServerConfig: (config?: AuthServerConfig) => BetterAuthOptions;

package/dist/betterAuth/server/{getAuthServer.js → getAuthServerConfig.js}

@@ -1,13 +1,12 @@
-import { betterAuth } from "better-auth";
-import { admin, customSession, jwt, username } from "better-auth/plugins";
+import { admin, jwt, username } from "better-auth/plugins";
 import { defaultRoles } from "better-auth/plugins/admin/access";
 import { tanstackStartCookies } from "better-auth/tanstack-start";
 import { surrealDbAdapter } from "./surrealDbAdapter/index.js";
 const baseUrl = "/";
-const getAuthServer = (config)=>{
+const getAuthServerConfig = (config)=>{
     const roles = config?.roles || defaultRoles;
     const betterAuthOptions = config?.betterAuthOptions;
-    const resultOptions = {
+    return {
         baseURL: baseUrl,
         secret: process.env.BETTER_AUTH_SECRET,
         database: surrealDbAdapter(),
@@ -24,20 +23,7 @@ const getAuthServer = (config)=>{
                 bannedUserMessage: 'Доступ к приложению заблокирован. Обратитесь к администратору.'
             }),
             username(),
-            ...betterAuthOptions?.plugins || []
-        ]
-    };
-    const auth = betterAuth({
-        ...resultOptions,
-        plugins: [
-            ...resultOptions.plugins,
-            customSession(async ({ user, session })=>({
-                    user: {
-                        ...user,
-                        role: user.role
-                    },
-                    session
-                }), resultOptions),
+            ...betterAuthOptions?.plugins || [],
             jwt({
                 jwks: {
                     keyPairConfig: {
@@ -63,7 +49,6 @@ const getAuthServer = (config)=>{
             }),
             tanstackStartCookies()
         ]
-    });
-    return auth;
+    };
 };
-export { getAuthServer };
+export { getAuthServerConfig };

package/dist/betterAuth/server/index.d.ts

@@ -1,9 +1,9 @@
-export { betterAuth } from 'better-auth';
 export * from 'better-auth/client/plugins';
+export { betterAuth as betterAuthServer } from 'better-auth/minimal';
 export * from 'better-auth/plugins';
 export * from 'better-auth/plugins/admin/access';
 export * from 'better-auth/react';
 export { tanstackStartCookies } from 'better-auth/tanstack-start';
-export * from './getAuthServer';
+export * from './getAuthServerConfig';
 export * from './getDBSession';
 export * from './getSessionUser';

package/dist/betterAuth/server/index.js

@@ -1,10 +1,10 @@
-import { betterAuth } from "better-auth";
+import { betterAuth } from "better-auth/minimal";
 import { tanstackStartCookies } from "better-auth/tanstack-start";
 export * from "better-auth/client/plugins";
 export * from "better-auth/plugins";
 export * from "better-auth/plugins/admin/access";
 export * from "better-auth/react";
-export * from "./getAuthServer.js";
+export * from "./getAuthServerConfig.js";
 export * from "./getDBSession.js";
 export * from "./getSessionUser.js";
-export { betterAuth, tanstackStartCookies };
+export { betterAuth as betterAuthServer, tanstackStartCookies };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@rolder/kit",
-	"version": "3.0.0-alpha.96",
+	"version": "3.0.0-alpha.97",
 	"type": "module",
 	"exports": {
 		"./ai": {

package/dist/betterAuth/server/auth.test.d.ts

@@ -1 +0,0 @@
-export {};

package/dist/betterAuth/server/auth.test.js

@@ -1,71 +0,0 @@
-import { beforeAll, describe, expect, it } from "vitest";
-const ensureDbEnv = ()=>{
-    process.env.SURREALDB_DATABASE = 'tests';
-};
-const hasDbEnv = ()=>Boolean(process.env.SURREALDB_URL && process.env.SURREALDB_NAMESPACE && process.env.SURREALDB_USERNAME && process.env.SURREALDB_PASSWORD);
-let auth;
-const createUser = ()=>{
-    const id = crypto.randomUUID();
-    return {
-        name: 'Test User',
-        email: `test.user+${id}@example.com`,
-        password: 'password-123'
-    };
-};
-describe.skipIf(!hasDbEnv())('better auth', ()=>{
-    beforeAll(async ()=>{
-        ensureDbEnv();
-        auth = (await import("./index.js")).getAuthServer();
-    });
-    it('rejects protected endpoints without a session', async ()=>{
-        const request = new Request('http://localhost/api/auth/list-accounts');
-        const response = await auth.handler(request);
-        expect([
-            401,
-            403
-        ]).toContain(response.status);
-    });
-    it('supports sign-up and sign-in with session retrieval', async ()=>{
-        const origin = 'http://localhost';
-        const user = createUser();
-        const signUpRequest = new Request('http://localhost/api/auth/sign-up/email', {
-            method: 'POST',
-            headers: {
-                'content-type': 'application/json',
-                origin
-            },
-            body: JSON.stringify({
-                name: user.name,
-                email: user.email,
-                password: user.password
-            })
-        });
-        const signUpResponse = await auth.handler(signUpRequest);
-        expect(signUpResponse.status).toBe(200);
-        const signInRequest = new Request('http://localhost/api/auth/sign-in/email', {
-            method: 'POST',
-            headers: {
-                'content-type': 'application/json',
-                origin
-            },
-            body: JSON.stringify({
-                email: user.email,
-                password: user.password
-            })
-        });
-        const signInResponse = await auth.handler(signInRequest);
-        expect(signInResponse.status).toBe(200);
-        const setCookie = signInResponse.headers.get('set-cookie');
-        expect(setCookie).toBeTruthy();
-        const cookie = setCookie?.split(';')[0];
-        const sessionRequest = new Request('http://localhost/api/auth/get-session', {
-            headers: cookie ? {
-                cookie
-            } : void 0
-        });
-        const sessionResponse = await auth.handler(sessionRequest);
-        expect(sessionResponse.status).toBe(200);
-        const sessionBody = await sessionResponse.json();
-        expect(sessionBody?.user?.email).toBe(user.email);
-    });
-});

package/dist/betterAuth/server/getAuthServer.d.ts

@@ -1,7 +0,0 @@
-import type { BetterAuthOptions } from 'better-auth';
-import { type Role } from 'better-auth/plugins';
-export interface AuthServer<TRoles extends Record<string, Role>> {
-    betterAuthOptions?: Partial<BetterAuthOptions>;
-    roles?: TRoles;
-}
-export declare const getAuthServer: <TRoles extends Record<string, Role>>(config?: AuthServer<TRoles>) => any;