@mframework/layer-auth 0.0.1 → 0.0.2

package/app/composables/useAuth.ts

@@ -1,20 +1,8 @@
-import type {
-  Subscription
-} from '@better-auth/stripe'
-import type {
-  CustomerState
-} from '@polar-sh/sdk/models/components/customerstate.js'
-import type {
-  BetterAuthClientOptions,
-  InferSessionFromClient,
-  User
-} from 'better-auth/client'
-import {
-  createAuthClient
-} from 'better-auth/client'
-import {
-  getAuthPlugins
-} from '../utils/plugins'
+import type { Subscription } from '@better-auth/stripe'
+import type { CustomerState } from '@polar-sh/sdk/models/components/customerstate.js'
+import type { BetterAuthClientOptions, InferSessionFromClient, User } from 'better-auth/client'
+import { createAuthClient } from 'better-auth/client'
+import { getAuthPlugins } from '../utils/plugins'
 
 export type UseAuthOptions = {
   /** An existing auth client. If provided, it's used as-is. */
@@ -41,29 +29,50 @@ export function useAuth(options: UseAuthOptions = {}) {
     reload
   } = options
 
-  const client = providedClient || createAuthClient({
-    baseURL: baseURL || undefined,
-    fetchOptions: {
-      headers
-    },
-    socialProviders: {
-      github: {
-        clientId: process.env.GITHUB_CLIENT_ID!,
-        clientSecret: process.env.GITHUB_CLIENT_SECRET!
-      },
-      microsoft: {
-        clientId: process.env.MICROSOFT_CLIENT_ID!,
-        clientSecret: process.env.MICROSOFT_CLIENT_SECRET!
-      },
-      twitter: {
-        clientId: process.env.TWITTER_CLIENT_ID!,
-        clientSecret: process.env.TWITTER_CLIENT_SECRET!
+  // Resolve a client in this order:
+  // 1. providedClient (explicit)
+  // 2. adapter provider (if adapter-betterauth is present)
+  // 3. local createAuthClient fallback
+  let client: any = providedClient || null
+
+  if (!client) {
+    // Attempt to use adapter registry/provider if available
+    try {
+      // eslint-disable-next-line @typescript-eslint/no-var-requires
+      const adapter = require('@mframework/adapter-betterauth')
+      if (adapter && typeof adapter.getAuthProvider === 'function') {
+        const prov = adapter.getAuthProvider()
+        // Wrap provider methods into a minimal client-like interface
+        client = {
+          async getSession() {
+            const s = await prov.session()
+            return { data: { session: s, user: (s && s.user) || null } }
+          },
+          signIn: prov.login?.bind(prov),
+          signUp: prov.register?.bind(prov),
+          signOut: prov.logout?.bind(prov),
+          refresh: prov.refresh?.bind(prov),
+          subscription: { list: async () => ({ data: [] }) },
+          $ERROR_CODES: {},
+        }
       }
-    },
-    plugins: getAuthPlugins({
-      subscription: true
+    } catch (e) {
+      // adapter-betterauth not available — fall back to client library below
+    }
+  }
+
+  if (!client) {
+    client = createAuthClient({
+      baseURL: baseURL || undefined,
+      fetchOptions: { headers },
+      socialProviders: {
+        github: { clientId: process.env.GITHUB_CLIENT_ID!, clientSecret: process.env.GITHUB_CLIENT_SECRET! },
+        microsoft: { clientId: process.env.MICROSOFT_CLIENT_ID!, clientSecret: process.env.MICROSOFT_CLIENT_SECRET! },
+        twitter: { clientId: process.env.TWITTER_CLIENT_ID!, clientSecret: process.env.TWITTER_CLIENT_SECRET! }
+      },
+      plugins: getAuthPlugins({ subscription: true })
     })
-  })
+  }
 
   let session: InferSessionFromClient < BetterAuthClientOptions > | null = null
   let user: User | null = null

package/app/types/shims-mframework-api.d.ts

@@ -0,0 +1,4 @@
+declare module '@mframework/api' {
+  export const prisma: any
+  export default prisma
+}

package/app/utils/plugins.ts

@@ -1,24 +1,42 @@
-import { stripeClient } from '@better-auth/stripe/client'
-import { polarClient, adminClient, inferAdditionalFields } from '@mframework/adapter-betterauth/'
-
-export type AuthPluginOptions = {
-  /** whether to enable subscription support for stripe plugin */
-  subscription?: boolean
-}
+export type AuthPluginOptions = { subscription?: boolean }
 
 export function getAuthPlugins(opts: AuthPluginOptions = {}): any[] {
   const { subscription = true } = opts
 
-  return [
-    inferAdditionalFields({
-      user: {
-        polarCustomerId: {
-          type: 'string'
-        }
-      }
-    }),
-    adminClient(),
-    polarClient(),
-    stripeClient({ subscription })
-  ]
+  const plugins: any[] = []
+
+  // Try to load adapter-provided plugin helpers when available, otherwise
+  // return an empty plugin list (safer for build-time without adapters).
+  try {
+    // eslint-disable-next-line @typescript-eslint/no-var-requires
+    const adapter = require('@mframework/adapter-betterauth')
+    const inferAdditionalFields = adapter.inferAdditionalFields || adapter.default?.inferAdditionalFields
+    const adminClient = adapter.adminClient || adapter.default?.adminClient
+    const polarClient = adapter.polarClient || adapter.default?.polarClient
+
+    if (inferAdditionalFields) {
+      plugins.push(
+        inferAdditionalFields({
+          user: { polarCustomerId: { type: 'string' } }
+        })
+      )
+    }
+
+    if (adminClient) plugins.push(adminClient())
+    if (polarClient) plugins.push(polarClient())
+  } catch (e) {
+    // adapter not present — ignore
+  }
+
+  // Try to load stripe client plugin separately
+  try {
+    // eslint-disable-next-line @typescript-eslint/no-var-requires
+    const stripe = require('@better-auth/stripe/client')
+    const stripeClient = stripe?.stripeClient || stripe?.default || stripe
+    if (typeof stripeClient === 'function') plugins.push(stripeClient({ subscription }))
+  } catch (e) {
+    // stripe plugin not available — ignore
+  }
+
+  return plugins
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mframework/layer-auth",
-  "version": "0.0.1",
+  "version": "0.0.2",
   "description": "The authentication layer for M Framework applications.",
   "type": "module",
   "main": "./nuxt.config.ts",
@@ -19,7 +19,6 @@
   "author": "M Framework",
   "license": "MIT",
   "dependencies": {
-    "@mframework/adapter-betterauth": "^0.0.7",
     "typescript": "^5.9.3"
   },
   "devDependencies": {

package/tsconfig.json

@@ -5,12 +5,15 @@
     "declaration": true,
     "emitDeclarationOnly": false,
     "outDir": "dist",
-    "moduleResolution": "bundler",
     "module": "ESNext",
-    "target": "ESNext",
+    "target": "ES2017",
+    "moduleResolution": "bundler",
+    "esModuleInterop": true,
+    "allowSyntheticDefaultImports": true,
+    "lib": ["ES2017", "DOM"],
     "strict": true,
     "jsx": "react-jsx",
-    "skipLibCheck": true, 
+    "skipLibCheck": true,
     "noEmitOnError": false
     ,
     "paths": {
@@ -20,4 +23,13 @@
       "@mframework/api": ["../../packages/modules/api/src/index.ts"]
     }
   }
+  ,
+  "exclude": [
+    "node_modules",
+    "dist"
+  ],
+  "include": [
+    "app/**/*",
+    "server/**/*"
+  ]
 }