chore: wip

Author: glennmichael123

app/Middleware/Api.ts

@@ -1,10 +1,31 @@
-import { log } from '@stacksjs/cli'
 import { Middleware } from '@stacksjs/router'
+import { request } from '@stacksjs/router'
+import { AccessToken, Team } from '../../storage/framework/orm/src'
 
 export default new Middleware({
   name: 'API Authentication',
   priority: 1,
-  handle() {
-    log.info('API Authentication')
+  async handle() {
+    const bearerToken = request.bearerToken() || ''
+
+    const parts = bearerToken.split('|');
+    
+    // Ensure that the input string contains exactly one '|'
+    if (parts.length !== 2) {
+      throw { message: 'Invalid bearer token format', status: 401 }
+    }
+    
+    const teamToken = parts[0]
+    const plainString = parts[1] as string
+
+    const team = await Team.find(Number(teamToken))
+
+    // if (! team) {
+    //   throw { message: 'Invalid bearer token', status: 401 }
+    // }
+
+    const teamBearerToken = await AccessToken.where('token', plainString)
+
+    console.log(teamBearerToken.length)
   },
 })

bun.lockb

@@ -134,7 +134,7 @@ async function writeModelRequest() {
 
     for (const attribute of attributes) {
       let defaultValue: any = `''`
-      const entity = attribute.fieldArray?.entity === 'enum' ? 'string' : attribute.fieldArray?.entity
+      const entity = attribute.fieldArray?.entity === 'enum' ? 'string[]' : attribute.fieldArray?.entity
 
       if (attribute.fieldArray?.entity === 'boolean') defaultValue = false
 
@@ -649,6 +649,7 @@ async function generateModelString(
     const pivotTableRelation = relation.pivotTable
     const formattedModelRelation = modelRelation.toLowerCase()
     const capitalizeTableRelation = tableRelation.charAt(0).toUpperCase() + tableRelation.slice(1)
+    
 
     const relationType = getRelationType(relation.relationship)
     const relationCount = getRelationCount(relation.relationship)
@@ -758,7 +759,11 @@ async function generateModelString(
     }
   }
 
-  for (const attribute of attributes) fieldString += ` ${attribute.field}: ${attribute.fieldArray?.entity}\n     `
+  for (const attribute of attributes) {
+    const entity = attribute.fieldArray?.entity === 'enum' ? 'string[]' : attribute.fieldArray?.entity
+
+    fieldString += ` ${attribute.field}: ${entity}\n     `
+  } 
 
   const otherModelRelations = await fetchOtherModelRelations(model, modelName)
 
@@ -950,7 +955,7 @@ async function generateModelString(
 
         query = query.where(column, operator, value)
 
-        return await query.selectAll().execute()
+        return await query.selectAll()
       }
 
       async whereIs(criteria: Partial<${modelName}Type>, options: QueryOptions = {}) {
@@ -1140,6 +1145,8 @@ async function generateModelString(
 
     const Model = ${modelName}Model
 
+    let queryInstance: any = null 
+
     // starting here, ORM functions
     export async function find(id: number, fields?: (keyof ${modelName}Type)[]) {
       let query = db.selectFrom('${tableName}').where('id', '=', id)
@@ -1194,7 +1201,14 @@ async function generateModelString(
       return results.length
     }
 
-    export async function get(criteria: Partial<${modelName}Type>, sort: { column: keyof ${modelName}Type, order: 'asc' | 'desc' } = { column: 'created_at', order: 'desc' }) {
+    export async function get() {
+      if (queryInstance)
+        return queryInstance.execute()
+
+      return await query.selectAll().execute()
+    }
+
+    export async function fetch(criteria: Partial<${modelName}Type>, sort: { column: keyof ${modelName}Type, order: 'asc' | 'desc' } = { column: 'created_at', order: 'desc' }) {
       let query = db.selectFrom('${tableName}')
 
       if (criteria.id)
@@ -1246,8 +1260,11 @@ async function generateModelString(
       return await find(Number(result.insertId))
     }
 
-    export async function first(): Promise<${modelName}Model> {
-     return await db.selectFrom('${tableName}')
+    export async function first(): Promise<AccessTokenModel> {
+      if (queryInstance)
+        return queryInstance.executeTakeFirst()
+      
+     return await db.selectFrom('personal_access_tokens')
         .selectAll()
         .executeTakeFirst()
     }
@@ -1294,11 +1311,13 @@ async function generateModelString(
           throw new Error("Invalid number of arguments")
       }
 
-      let query = db.selectFrom('${tableName}')
+      let query = db.selectFrom('personal_access_tokens')
 
       query = query.where(column, operator, value)
 
-      return await query.selectAll().execute()
+      queryInstance = await query.selectAll()
+
+      return queryInstance
     }
 
     export async function whereIs(

storage/framework/core/actions/src/orm/generate-model.ts

@@ -1,6 +1,6 @@
 import type { ProjectsTable } from '../../../../orm/src/models/Project'
 import type { SubscriberEmailsTable } from '../../../../orm/src/models/SubscriberEmail'
-import type { AccessTokensTable } from '../../../../orm/src/models/AccessToken'
+import type { PersonalAccessTokensTable } from '../../../../orm/src/models/AccessToken'
 import type { TeamsTable } from '../../../../orm/src/models/Team'
 import type { SubscribersTable } from '../../../../orm/src/models/Subscriber'
 import type { DeploymentsTable } from '../../../../orm/src/models/Deployment'
@@ -9,16 +9,16 @@ import type { UsersTable } from '../../../../orm/src/models/User'
 import type { PostsTable } from '../../../../orm/src/models/Post'
 import type { Generated } from 'kysely'
 
-export interface TeamAccessTokensTable {
+export interface TeamPersonalAccessTokensTable {
         id: Generated<number>
         team_id: number
         accesstoken_id: number
       }
 export interface Database {
   projects: ProjectsTable
   subscriber_emails: SubscriberEmailsTable
-  access_tokens: AccessTokensTable
-  team_access_tokens: TeamAccessTokensTable
+  personal_access_tokens: PersonalAccessTokensTable
+  team_personal_access_tokens: TeamPersonalAccessTokensTable
   teams: TeamsTable
   subscribers: SubscribersTable
   deployments: DeploymentsTable

storage/framework/core/orm/src/generated/types.ts

@@ -1,10 +1 @@
-export type ModelNames =
-  | 'Project'
-  | 'SubscriberEmail'
-  | 'AccessToken'
-  | 'Team'
-  | 'Subscriber'
-  | 'Deployment'
-  | 'Release'
-  | 'User'
-  | 'Post'
+export type ModelNames = 'Project' | 'SubscriberEmail' | 'AccessToken' | 'Team' | 'Subscriber' | 'Deployment' | 'Release' | 'User' | 'Post'

storage/framework/core/types/src/model-names.ts

@@ -1,18 +1,19 @@
 import { Action } from '@stacksjs/actions'
-import type { ReleaseRequestType } from '../../types/requests'
 import Release from '../src/models/Release'
+  import type { ReleaseRequestType } from '../../types/requests'
 
 export default new Action({
-  name: 'Release Destroy',
-  description: 'Release Destroy ORM Action',
-  method: 'DELETE',
-  async handle(request: ReleaseRequestType) {
-    const id = request.getParam('id')
+      name: 'Release Destroy',
+      description: 'Release Destroy ORM Action',
+      method: 'DELETE',
+      async handle(request: ReleaseRequestType) {
+        const id = request.getParam('id')
 
-    const model = await Release.findOrFail(Number(id))
+        const model = await Release.findOrFail(Number(id))
 
-    model.delete()
+        model.delete()
 
-    return 'Model deleted!'
-  },
-})
+        return 'Model deleted!'
+      },
+    })
+  

storage/framework/orm/Actions/ReleaseDestroyOrmAction.ts

@@ -1,12 +1,13 @@
 import { Action } from '@stacksjs/actions'
-import type { ReleaseRequestType } from '../../types/requests'
 import Release from '../src/models/Release'
+  import type { ReleaseRequestType } from '../../types/requests'
 
 export default new Action({
-  name: 'Release Index',
-  description: 'Release Index ORM Action',
-  method: 'GET',
-  async handle(request: ReleaseRequestType) {
-    return await Release.all()
-  },
-})
+      name: 'Release Index',
+      description: 'Release Index ORM Action',
+      method: 'GET',
+      async handle(request: ReleaseRequestType) {
+        return await Release.all()
+      },
+    })
+  

storage/framework/orm/Actions/ReleaseIndexOrmAction.ts

@@ -1,14 +1,15 @@
 import { Action } from '@stacksjs/actions'
-import type { ReleaseRequestType } from '../../types/requests'
 import Release from '../src/models/Release'
+  import type { ReleaseRequestType } from '../../types/requests'
 
 export default new Action({
-  name: 'Release Show',
-  description: 'Release Show ORM Action',
-  method: 'GET',
-  async handle(request: ReleaseRequestType) {
-    const id = await request.getParam('id')
+      name: 'Release Show',
+      description: 'Release Show ORM Action',
+      method: 'GET',
+      async handle(request: ReleaseRequestType) {
+        const id = await request.getParam('id')
 
-    return Release.findOrFail(Number(id))
-  },
-})
+        return Release.findOrFail(Number(id))
+      },
+    })
+  

storage/framework/orm/Actions/ReleaseShowOrmAction.ts

@@ -1,15 +1,16 @@
 import { Action } from '@stacksjs/actions'
-import type { ReleaseRequestType } from '../../types/requests'
 import Release from '../src/models/Release'
+  import type { ReleaseRequestType } from '../../types/requests'
 
 export default new Action({
-  name: 'Release Store',
-  description: 'Release Store ORM Action',
-  method: 'POST',
-  async handle(request: ReleaseRequestType) {
-    await request.validate()
-    const model = await Release.create(request.all())
+      name: 'Release Store',
+      description: 'Release Store ORM Action',
+      method: 'POST',
+      async handle(request: ReleaseRequestType) {
+        await request.validate()
+        const model = await Release.create(request.all())
 
-    return model
-  },
-})
+        return model
+      },
+    })
+  

storage/framework/orm/Actions/ReleaseStoreOrmAction.ts

@@ -1,18 +1,19 @@
 import { Action } from '@stacksjs/actions'
-import type { ReleaseRequestType } from '../../types/requests'
 import Release from '../src/models/Release'
+  import type { ReleaseRequestType } from '../../types/requests'
 
 export default new Action({
-  name: 'Release Update',
-  description: 'Release Update ORM Action',
-  method: 'PATCH',
-  async handle(request: ReleaseRequestType) {
-    await request.validate()
+      name: 'Release Update',
+      description: 'Release Update ORM Action',
+      method: 'PATCH',
+      async handle(request: ReleaseRequestType) {
+        await request.validate()
+        
+        const id = request.getParam('id')
 
-    const id = request.getParam('id')
+        const model = await Release.findOrFail(Number(id))
 
-    const model = await Release.findOrFail(Number(id))
-
-    return model.update(request.all())
-  },
-})
+        return model.update(request.all())
+      },
+    })
+