chore: wip

Author: glennmichael123

app/Middleware/Api.ts

@@ -1,43 +1,43 @@
-import { HttpError } from '@stacksjs/error-handling'
-import { Middleware, request } from '@stacksjs/router'
-import { AccessToken, Team } from '../../storage/framework/orm/src'
+// import { HttpError } from '@stacksjs/error-handling'
+// import { Middleware, request } from '@stacksjs/router'
+// import { AccessToken, Team } from '../../storage/framework/orm/src'
 
-export default new Middleware({
-  name: 'API Authentication',
-  priority: 1,
-  async handle() {
-    const bearerToken = request.bearerToken() || ''
+// export default new Middleware({
+//   name: 'API Authentication',
+//   priority: 1,
+//   async handle() {
+//     const bearerToken = request.bearerToken() || ''
 
-    if (!bearerToken)
-      throw new HttpError(401, 'Unauthorized.')
+//     if (!bearerToken)
+//       throw new HttpError(401, 'Unauthorized.')
 
-    const parts = bearerToken.split(':')
+//     const parts = bearerToken.split(':')
 
-    if (parts.length !== 3)
-      throw new HttpError(401, 'Invalid bearer token format')
+//     if (parts.length !== 3)
+//       throw new HttpError(401, 'Invalid bearer token format')
 
-    const tokenId = Number(parts[0])
-    const teamId = parts[1] as string
-    const plainString = parts[2] as string
+//     const tokenId = Number(parts[0])
+//     const teamId = parts[1] as string
+//     const plainString = parts[2] as string
 
-    const team = await Team.find(Number(teamId))
+//     const team = await Team.find(Number(teamId))
 
-    if (!team)
-      throw new HttpError(401, 'Invalid bearer token')
+//     if (!team)
+//       throw new HttpError(401, 'Invalid bearer token')
 
-    const accessTokens = await team.teamAccessTokens()
+//     const accessTokens = await team.teamAccessTokens()
 
-    if (!accessTokens.length)
-      throw new HttpError(401, 'Invalid bearer token')
+//     if (!accessTokens.length)
+//       throw new HttpError(401, 'Invalid bearer token')
 
-    const accessTokenIds = accessTokens.map(accessToken => accessToken.id)
+//     const accessTokenIds = accessTokens.map(accessToken => accessToken.id)
 
-    if (!accessTokenIds.includes(tokenId))
-      throw new HttpError(401, 'Invalid bearer token')
+//     if (!accessTokenIds.includes(tokenId))
+//       throw new HttpError(401, 'Invalid bearer token')
 
-    const teamBearerToken = await AccessToken.where('token', plainString).first()
+//     const teamBearerToken = await AccessToken.where('token', plainString).first()
 
-    if (!teamBearerToken)
-      throw new HttpError(401, 'Invalid bearer token')
-  },
-})
+//     if (!teamBearerToken)
+//       throw new HttpError(401, 'Invalid bearer token')
+//   },
+// })

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

@@ -12,7 +12,6 @@ type ActionPath = string
 
 export class Router implements RouterInterface {
   private routes: Route[] = []
-  private groupPrefix = ''
   private path = ''
 
   private addRoute(
@@ -168,8 +167,6 @@ export class Router implements RouterInterface {
 
     let cb: () => void
 
-    this.prepareGroupPrefix(options)
-
     if (typeof options === 'function') {
       cb = options
       options = {}
@@ -191,21 +188,61 @@ export class Router implements RouterInterface {
     // Execute the callback. This will add routes to the new this.routes array
     cb()
 
-    // For each route added by the callback, adjust the URI and add to the original routes array
-    this.routes.forEach((r) => {
-      if (middleware.length)
-        r.middleware = middleware
+    if (typeof options === 'object') {
+      this.routes.forEach((r) => {
+        // Add middleware if any
+        if (middleware.length)
+          r.middleware = middleware
+      
+        // Add the prefix to the route path
+
+        if (options.prefix) {
+          r.path = `${options.prefix}/${r.uri}`
+          r.uri = `${options.prefix}/${r.uri}`
+          r.url = `${options.prefix}/${r.uri}`
+        }
+      
+        // Push the modified route to the original routes array
+        originalRoutes.push(r)
+
+        return this
+      })
+    }
 
-      originalRoutes.push(r)
-      return this
-    })
+    // this.prepareGroupPrefix(this.routes, options, middleware)
 
     // Restore the original routes array.
     this.routes = originalRoutes
 
     return this
   }
 
+  // private prepareGroupPrefix(routes: Route[], options: string | RouteGroupOptions, middleware: string | string[]): void {
+  //   if (typeof options !== 'string') {
+  //     routes.forEach((r) => {
+  //       // Add middleware if any
+  //       if (middleware.length)
+  //         r.middleware = middleware
+      
+  //       // Add the prefix to the route path
+  //       if (options.prefix) {
+  //         r.path = `/${options.prefix}${r.path}`
+  //       }
+      
+  //       // Push the modified route to the original routes array
+  //       originalRoutes.push(r)
+  //       return this
+  //     })
+
+  //     return
+  //   }
+
+  //   if (typeof options === 'string') {
+  
+  //     return
+  //   }
+  // }
+
   public name(name: string): this {
     this.routes[this.routes.length - 1].name = name
 
@@ -231,33 +268,6 @@ export class Router implements RouterInterface {
     return this.routes
   }
 
-  private setGroupPrefix(prefix: string, options: RouteGroupOptions = {}) {
-    if (prefix !== '') {
-      prefix = `/${this.groupPrefix}/${prefix}`.replace(/\/\//g, '/') // remove double slashes in case there are any
-      this.groupPrefix = prefix
-      return
-    }
-
-    // Ensure options is always treated as an object, even if it's undefined or a function
-    const effectiveOptions = typeof options === 'object' ? options : {}
-
-    this.groupPrefix = effectiveOptions.prefix ?? prefix ?? ''
-  }
-
-  private prepareGroupPrefix(options: string | RouteGroupOptions): void {
-    if (this.groupPrefix !== '' && typeof options !== 'string') {
-      this.setGroupPrefix(this.groupPrefix, options)
-      return
-    }
-
-    if (typeof options === 'string') {
-      this.setGroupPrefix(options)
-      return
-    }
-
-    this.setGroupPrefix('', options)
-  }
-
   public async resolveCallback(callback: Route['callback']): Promise<Route['callback']> {
     if (callback instanceof Promise) {
       const actionModule = await callback
@@ -377,8 +387,7 @@ export class Router implements RouterInterface {
     if (path.startsWith('/'))
       path = path.slice(1)
 
-    path = `${this.groupPrefix}/${path}`
-
+    path = `/${path}`
     // if path ends in "/", then remove it
     // e.g. triggered when route is "/"
     return path.endsWith('/') ? path.slice(0, -1) : path