chore: wip

glennmichael123 · glennmichael123 · commit c0c08afa10e2 · 2024-12-09T14:27:14.000+08:00
diff --git a/app/Actions/Payment/CancelSubscriptionAction.ts b/app/Actions/Payment/CancelSubscriptionAction.ts
@@ -7,9 +7,10 @@ export default new Action({
   description: 'Cancel Subscription for stripe',
   method: 'POST',
   async handle(request: RequestInstance) {
+    const userId = Number(request.getParam('id'))
     const providerId = request.get('providerId') as string
 
-    const user = await User.find(1)
+    const user = await User.find(userId)
 
     const subscription = await user?.cancelSubscription(providerId)
 
diff --git a/app/Actions/Payment/CreateCheckoutAction.ts b/app/Actions/Payment/CreateCheckoutAction.ts
@@ -1,12 +1,15 @@
+import type { RequestInstance } from '@stacksjs/types'
 import { Action } from '@stacksjs/actions'
 import User from '../../../storage/framework/orm/src/models/User.ts'
 
 export default new Action({
   name: 'CreateCheckoutAction',
   description: 'Create Checkout link for stripe',
   method: 'POST',
-  async handle() {
-    const user = await User.find(1)
+  async handle(request: RequestInstance) {
+    const userId = Number(request.getParam('id'))
+
+    const user = await User.find(userId)
 
     const checkout = await user?.checkout([
       {
diff --git a/app/Actions/Payment/CreateInvoiceSubscription.ts b/app/Actions/Payment/CreateInvoiceSubscription.ts
@@ -1,12 +1,15 @@
+import type { RequestInstance } from '@stacksjs/types'
 import { Action } from '@stacksjs/actions'
 import User from '../../../storage/framework/orm/src/models/User.ts'
 
 export default new Action({
   name: 'CreateInvoiceSubscription',
   description: 'Create Invoice Subscription for Stripe',
   method: 'POST',
-  async handle() {
-    const user = await User.find(1)
+  async handle(request: RequestInstance) {
+    const userId = Number(request.getParam('id'))
+
+    const user = await User.find(userId)
 
     const subscription = await user?.newSubscriptionInvoice('pro', 'stacks_pro_monthly')
 
diff --git a/app/Actions/Payment/CreatePaymentIntentAction.ts b/app/Actions/Payment/CreatePaymentIntentAction.ts
@@ -7,9 +7,10 @@ export default new Action({
   description: 'Create Payment Intent for stripe',
   method: 'POST',
   async handle(request: RequestInstance) {
+    const userId = Number(request.getParam('id'))
     const amount = Number(request.get('amount'))
 
-    const user = await User.find(1)
+    const user = await User.find(userId)
 
     const paymentIntent = await user?.paymentIntent({
       amount,
diff --git a/app/Actions/Payment/CreateSetupIntentAction.ts b/app/Actions/Payment/CreateSetupIntentAction.ts
@@ -7,7 +7,8 @@ export default new Action({
   description: 'Create Setup Intent for stripe',
   method: 'POST',
   async handle(request: RequestInstance) {
-    const user = await User.find(1)
+    const userId = Number(request.getParam('id'))
+    const user = await User.find(userId)
 
     const setupIntent = await user?.createSetupIntent()
 
diff --git a/app/Actions/Payment/CreateSubscriptionAction.ts b/app/Actions/Payment/CreateSubscriptionAction.ts
@@ -7,12 +7,14 @@ export default new Action({
   description: 'Create Subscription for stripe',
   method: 'POST',
   async handle(request: RequestInstance) {
+    const userId = Number(request.getParam('id'))
+
     const type = request.get('type') as string
     const plan = request.get('plan') as string
     const period = request.get('period') as string
     const description = request.get('description') as string
 
-    const user = await User.find(1)
+    const user = await User.find(userId)
 
     const subscription = await user?.newSubscription(plan, type, { description, metadata: { period } })
 
diff --git a/app/Actions/Payment/DeleteDefaultPaymentAction.ts b/app/Actions/Payment/DeleteDefaultPaymentAction.ts
@@ -7,7 +7,9 @@ export default new Action({
   description: 'Delete the customers default payment method',
   method: 'POST',
   async handle(request: RequestInstance) {
-    const user = await User.find(1)
+    const userId = Number(request.getParam('id'))
+
+    const user = await User.find(userId)
     const paymentMethod = request.get('paymentMethod') as string
 
     await user?.deletePaymentMethod(paymentMethod)
diff --git a/app/Actions/Payment/FetchActiveSubscriptionAction.ts b/app/Actions/Payment/FetchActiveSubscriptionAction.ts
@@ -6,7 +6,9 @@ export default new Action({
   description: 'Fetch the current active subscription',
   method: 'GET',
   async handle() {
-    const user = await User.find(1)
+    const userId = Number(request.getParam('id'))
+
+    const user = await User.find(userId)
 
     const subscription = await user?.activeSubscription()
 
diff --git a/app/Actions/Payment/FetchDefaultPaymentMethodAction.ts b/app/Actions/Payment/FetchDefaultPaymentMethodAction.ts
@@ -6,7 +6,8 @@ export default new Action({
   description: 'Fetch the users default payment method',
   method: 'GET',
   async handle() {
-    const user = await User.find(1)
+    const userId = Number(request.getParam('id'))
+    const user = await User.find(userId)
 
     const paymentMethod = await user?.defaultPaymentMethod()
 
diff --git a/app/Actions/Payment/FetchPaymentCustomerAction.ts b/app/Actions/Payment/FetchPaymentCustomerAction.ts
@@ -1,12 +1,15 @@
+import type { RequestInstance } from '@stacksjs/types'
 import { Action } from '@stacksjs/actions'
 import User from '../../../storage/framework/orm/src/models/User.ts'
 
 export default new Action({
   name: 'FetchPaymentCustomerAction',
   description: 'Fetch the payment customer',
   method: 'GET',
-  async handle() {
-    const user = await User.find(1)
+  async handle(request: RequestInstance) {
+    const id = Number(request.getParam('id'))
+
+    const user = await User.find(id)
 
     const customer = await user?.asStripeUser()
 
diff --git a/app/Actions/Payment/FetchPaymentMethodsAction.ts b/app/Actions/Payment/FetchPaymentMethodsAction.ts
@@ -1,12 +1,14 @@
+import type { RequestInstance } from '@stacksjs/types'
 import { Action } from '@stacksjs/actions'
 import User from '../../../storage/framework/orm/src/models/User.ts'
 
 export default new Action({
   name: 'FetchPaymentMethodsAction',
   description: 'Fetch the user payment methods',
   method: 'GET',
-  async handle() {
-    const user = await User.find(1)
+  async handle(request: RequestInstance) {
+    const userId = Number(request.getParam('id'))
+    const user = await User.find(userId)
 
     const paymentMethods = await user?.paymentMethods()
 
diff --git a/app/Actions/Payment/FetchTransactionHistoryAction.ts b/app/Actions/Payment/FetchTransactionHistoryAction.ts
@@ -1,12 +1,14 @@
+import type { RequestInstance } from '@stacksjs/types'
 import { Action } from '@stacksjs/actions'
 import User from '../../../storage/framework/orm/src/models/User.ts'
 
 export default new Action({
   name: 'FetchTransactionHistoryAction',
   description: 'Fetch the users transaction history',
   method: 'GET',
-  async handle() {
-    const user = await User.find(1)
+  async handle(request: RequestInstance) {
+    const userId = Number(request.getParam('id'))
+    const user = await User.find(userId)
 
     const transactions = await user?.subscriptionHistory()
 
diff --git a/app/Actions/Payment/FetchUserSubscriptionsAction.ts b/app/Actions/Payment/FetchUserSubscriptionsAction.ts
@@ -1,12 +1,14 @@
+import type { RequestInstance } from '@stacksjs/types'
 import { Action } from '@stacksjs/actions'
 import User from '../../../storage/framework/orm/src/models/User.ts'
 
 export default new Action({
   name: 'FetchUserSubscriptionsAction',
   description: 'Fetch the users subscriptions',
   method: 'GET',
-  async handle() {
-    const user = await User.find(1)
+  async handle(request: RequestInstance) {
+    const userId = Number(request.getParam('id'))
+    const user = await User.find(userId)
 
     const subscriptions = await user?.subscriptions()
 
diff --git a/app/Actions/Payment/SetDefaultPaymentAction.ts b/app/Actions/Payment/SetDefaultPaymentAction.ts
@@ -7,7 +7,8 @@ export default new Action({
   description: 'Set the customers default payment method',
   method: 'POST',
   async handle(request: RequestInstance) {
-    const user = await User.find(1)
+    const userId = Number(request.getParam('id'))
+    const user = await User.find(userId)
     const paymentIntent = request.get('setupIntent') as string
 
     const paymentMethod = await user?.setDefaultPaymentMethod(paymentIntent)
diff --git a/app/Actions/Payment/UpdateCustomerAction.ts b/app/Actions/Payment/UpdateCustomerAction.ts
@@ -1,13 +1,14 @@
+import type { RequestInstance } from '@stacksjs/types'
 import { Action } from '@stacksjs/actions'
 import User from '../../../storage/framework/orm/src/models/User.ts'
 
 export default new Action({
   name: 'UpdateCustomerAction',
   description: 'Update customer detauls',
   method: 'POST',
-  async handle() {
-    // async handle(request: RequestInstance) {
-    const user = await User.find(1)
+  async handle(request: RequestInstance) {
+    const userId = Number(request.getParam('id'))
+    const user = await User.find(userId)
 
     const customer = await user?.syncStripeCustomerDetails({ address: {
       line1: '123 Elm St',
diff --git a/app/Actions/Payment/UpdateDefaultPaymentMethodAction.ts b/app/Actions/Payment/UpdateDefaultPaymentMethodAction.ts
@@ -7,7 +7,9 @@ export default new Action({
   description: 'Update the customers default payment method',
   method: 'POST',
   async handle(request: RequestInstance) {
-    const user = await User.find(1)
+    const userId = Number(request.getParam('id'))
+    const user = await User.find(userId)
+
     const paymentMethod = request.get('paymentMethod') as string
 
     await user?.setDefaultPaymentMethod(paymentMethod)
diff --git a/app/Actions/Payment/UpdateSubscriptionAction.ts b/app/Actions/Payment/UpdateSubscriptionAction.ts
@@ -11,7 +11,8 @@ export default new Action({
     const plan = request.get('plan') as string
     const description = request.get('description') as string
 
-    const user = await User.find(1)
+    const userId = Number(request.getParam('id'))
+    const user = await User.find(userId)
 
     const subscription = await user?.updateSubscription(plan, type, { description })
 
diff --git a/app/Middleware/Api.ts b/app/Middleware/Api.ts
@@ -1,43 +1,41 @@
-import { HttpError } from '@stacksjs/error-handling'
-import { Middleware, request } from '@stacksjs/router'
-import { AccessToken, Team } from '../../storage/framework/orm/src'
+import { Middleware } from '@stacksjs/router'
 
 export default new Middleware({
   name: 'API Authentication',
   priority: 1,
   async handle() {
-    const bearerToken = request.bearerToken() || ''
+    // 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')
   },
 })
diff --git a/database/migrations/1733721923422-create-personal_access_tokens-table.ts b/database/migrations/1733721923422-create-personal_access_tokens-table.ts
@@ -9,9 +9,8 @@ export async function up(db: Database<any>) {
     .addColumn('token', 'varchar(512)', col => col.unique())
     .addColumn('plain_text_token', 'varchar(512)')
     .addColumn('abilities', 'text')
-    .addColumn('team_id', 'integer', (col) =>
-        col.references('teams.id').onDelete('cascade')
-      ) 
+    .addColumn('team_id', 'integer', col =>
+      col.references('teams.id').onDelete('cascade'))
     .addColumn('created_at', 'timestamp', col => col.notNull().defaultTo(sql`CURRENT_TIMESTAMP`))
     .addColumn('updated_at', 'timestamp')
     .execute()
diff --git a/database/migrations/1733721923424-create-personal_access_token_teams-table.ts b/database/migrations/1733721923424-create-personal_access_token_teams-table.ts
@@ -1,9 +1,10 @@
 import type { Database } from '@stacksjs/database'
+
 export async function up(db: Database<any>) {
   await db.schema
     .createTable('personal_access_token_teams')
     .addColumn('id', 'integer', col => col.primaryKey().autoIncrement())
     .addColumn('team_id', 'integer')
     .addColumn('personal_access_token_id', 'integer')
     .execute()
-    }
+}
diff --git a/database/migrations/1733721923424-create-team_users-table.ts b/database/migrations/1733721923424-create-team_users-table.ts
@@ -1,9 +1,10 @@
 import type { Database } from '@stacksjs/database'
+
 export async function up(db: Database<any>) {
   await db.schema
     .createTable('team_users')
     .addColumn('id', 'integer', col => col.primaryKey().autoIncrement())
     .addColumn('team_id', 'integer')
     .addColumn('user_id', 'integer')
     .execute()
-    }
+}
diff --git a/database/migrations/1733721923424-create-teams-table.ts b/database/migrations/1733721923424-create-teams-table.ts
@@ -13,12 +13,10 @@ export async function up(db: Database<any>) {
     .addColumn('description', 'varchar(255)')
     .addColumn('path', 'varchar(255)')
     .addColumn('is_personal', 'boolean')
-    .addColumn('accesstoken_id', 'integer', (col) =>
-        col.references('personal_access_tokens.id').onDelete('cascade')
-      ) 
-    .addColumn('user_id', 'integer', (col) =>
-        col.references('users.id').onDelete('cascade')
-      ) 
+    .addColumn('accesstoken_id', 'integer', col =>
+      col.references('personal_access_tokens.id').onDelete('cascade'))
+    .addColumn('user_id', 'integer', col =>
+      col.references('users.id').onDelete('cascade'))
     .addColumn('created_at', 'timestamp', col => col.notNull().defaultTo(sql`CURRENT_TIMESTAMP`))
     .addColumn('updated_at', 'timestamp')
     .execute()
diff --git a/database/migrations/1733721923427-create-subscribers-table.ts b/database/migrations/1733721923427-create-subscribers-table.ts
@@ -6,9 +6,8 @@ export async function up(db: Database<any>) {
     .createTable('subscribers')
     .addColumn('id', 'integer', col => col.primaryKey().autoIncrement())
     .addColumn('subscribed', 'boolean')
-    .addColumn('user_id', 'integer', (col) =>
-        col.references('users.id').onDelete('cascade')
-      ) 
+    .addColumn('user_id', 'integer', col =>
+      col.references('users.id').onDelete('cascade'))
     .addColumn('created_at', 'timestamp', col => col.notNull().defaultTo(sql`CURRENT_TIMESTAMP`))
     .addColumn('updated_at', 'timestamp')
     .execute()
diff --git a/database/migrations/1733721923430-create-deployments-table.ts b/database/migrations/1733721923430-create-deployments-table.ts
@@ -13,9 +13,8 @@ export async function up(db: Database<any>) {
     .addColumn('execution_time', 'integer')
     .addColumn('deploy_script', 'varchar(255)')
     .addColumn('terminal_output', 'varchar(255)')
-    .addColumn('user_id', 'integer', (col) =>
-        col.references('users.id').onDelete('cascade')
-      ) 
+    .addColumn('user_id', 'integer', col =>
+      col.references('users.id').onDelete('cascade'))
     .addColumn('created_at', 'timestamp', col => col.notNull().defaultTo(sql`CURRENT_TIMESTAMP`))
     .addColumn('updated_at', 'timestamp')
     .execute()
diff --git a/database/migrations/1733721923435-create-passkeys-table.ts b/database/migrations/1733721923435-create-passkeys-table.ts
@@ -1,5 +1,5 @@
 import type { Database } from '@stacksjs/database'
- import { sql } from '@stacksjs/database'
+import { sql } from '@stacksjs/database'
 
 export async function up(db: Database<any>) {
   await db.schema
@@ -17,4 +17,4 @@ export async function up(db: Database<any>) {
     .addColumn('last_used_at', 'text')
     .addColumn('created_at', 'timestamp', col => col.notNull().defaultTo(sql.raw('CURRENT_TIMESTAMP')))
     .execute()
-    }
+}
diff --git a/database/migrations/1733721923435-create-subscriptions-table.ts b/database/migrations/1733721923435-create-subscriptions-table.ts
diff --git a/database/migrations/1733721923436-create-payment_methods-table.ts b/database/migrations/1733721923436-create-payment_methods-table.ts
diff --git a/database/migrations/1733721923438-create-users-table.ts b/database/migrations/1733721923438-create-users-table.ts
diff --git a/database/migrations/1733721923441-create-posts-table.ts b/database/migrations/1733721923441-create-posts-table.ts
diff --git a/resources/views/dashboard/components/core/payment-methods.vue b/resources/views/dashboard/components/core/payment-methods.vue
diff --git a/routes/api.ts b/routes/api.ts
diff --git a/storage/framework/core/router/src/request.ts b/storage/framework/core/router/src/request.ts
diff --git a/storage/framework/core/router/src/router.ts b/storage/framework/core/router/src/router.ts
diff --git a/storage/framework/core/types/src/request.ts b/storage/framework/core/types/src/request.ts
diff --git a/storage/framework/orm/src/models/PaymentMethod.ts b/storage/framework/orm/src/models/PaymentMethod.ts
diff --git a/storage/framework/orm/src/models/User.ts b/storage/framework/orm/src/models/User.ts
