chore: wip

Author: glennmichael123

storage/framework/core/api/build.ts

@@ -1,5 +1,4 @@
 import { intro, outro } from '../build/src'
-import { dts } from './dts'
 
 const { startTime } = await intro({
   dir: import.meta.dir,
@@ -12,12 +11,7 @@ const result = await Bun.build({
   target: 'bun',
   sourcemap: 'linked',
   minify: true,
-  plugins: [
-    dts({
-      root: './src',
-      outdir: './dist',
-    }),
-  ],
+  plugins: [],
 })
 
 await outro({

storage/framework/core/api/src/ofetch.ts

@@ -5,11 +5,11 @@ interface Params {
 }
 
 interface ApiFetch {
-  get(url: string, params?: Params): Promise<FetchResponse>
-  post(url: string, params?: Params): Promise<FetchResponse>
-  destroy(url: string, params?: Params): Promise<FetchResponse>
-  patch(url: string, params?: Params): Promise<FetchResponse>
-  put(url: string, params?: Params): Promise<FetchResponse>
+  get(url: string, params?: Params, header?: Headers): Promise<FetchResponse>
+  post(url: string, params?: Params, header?: Headers): Promise<FetchResponse>
+  destroy(url: string, params?: Params, header?: Headers): Promise<FetchResponse>
+  patch(url: string, params?: Params, header?: Headers): Promise<FetchResponse>
+  put(url: string, params?: Params, header?: Headers): Promise<FetchResponse>
   setToken(authToken: string): void
   baseURL: '/' | string
   loading: boolean

storage/framework/core/auth/src/authentication.ts

@@ -1,22 +1,27 @@
 import { request } from '@stacksjs/router'
 import { verifyHash } from '@stacksjs/security'
 import AccessToken from '../../../orm/src/models/AccessToken'
-import Team from '../../../orm/src/models/Team'
+import Team, { type TeamModel } from '../../../orm/src/models/Team'
 import User from '../../../orm/src/models/User'
 
 interface Credentials {
-  password: string | number | undefined
+  password: string
   [key: string]: string | number | undefined
 }
 
+type AuthToken = `${number}:${number}:${string}`
+
 const authConfig = { username: 'email', password: 'password' }
 
 let authUser: any = undefined
 
 export async function attempt(credentials: Credentials, remember?: boolean): Promise<boolean> {
+  let hashCheck = false
+
   const user = await User.where(authConfig.username, credentials[authConfig.username]).first()
+  const authPass = credentials[authConfig.password]
 
-  const hashCheck = await verifyHash(credentials[authConfig.password], user?.password, 'bcrypt')
+  if (typeof authPass === 'string' && user?.password) hashCheck = await verifyHash(authPass, user?.password, 'bcrypt')
 
   if (hashCheck) {
     if (user) {
@@ -29,7 +34,7 @@ export async function attempt(credentials: Credentials, remember?: boolean): Pro
   return false
 }
 
-export async function team() {
+export async function team(): Promise<TeamModel | undefined> {
   if (authUser) {
     const teams = await authUser.userTeams()
 
@@ -65,8 +70,7 @@ export async function team() {
   return team
 }
 
-// TODO: type this string better based on our token format
-export async function authToken(): Promise<string | undefined> {
+export async function authToken(): Promise<AuthToken | undefined> {
   if (authUser) {
     const teams = await authUser.userTeams()
 

storage/framework/core/router/src/request.ts

@@ -12,6 +12,8 @@ interface ValidationField {
   message: Record<string, string>
 }
 
+type AuthToken = `${number}:${number}:${string}`
+
 interface CustomAttributes {
   [key: string]: ValidationField
 }
@@ -86,7 +88,7 @@ export class Request<T extends RequestData = RequestData> implements RequestInst
     return this.params ? this.params[key] || null : null
   }
 
-  public bearerToken(): string | null {
+  public bearerToken(): string | null | AuthToken {
     const authorizationHeader = this.headers.get('authorization')
 
     if (authorizationHeader?.startsWith('Bearer ')) {