Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: post early bird launch fixes #46

Merged
merged 4 commits into from
Feb 10, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion website/app/controllers/profiles_controller.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ export default class ProfilesController {

const profile = await createProfileValidator.validate(data)

console.log(profile)
const profileAdd = new ParticipantProfile()
profileAdd.fill(profile)

Expand Down
17 changes: 17 additions & 0 deletions website/app/middleware/log_user_middleware.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
import type { HttpContext } from '@adonisjs/core/http'
import { Logger } from '@adonisjs/core/logger'
import type { NextFn } from '@adonisjs/core/types/http'

export default class LogUserMiddleware {
async handle(ctx: HttpContext, next: NextFn) {
await ctx.auth.check()
const user = ctx.auth.user

if (user) {
ctx.logger = ctx.logger.child({ user_id: user.id })
ctx.containerResolver.bindValue(Logger, ctx.logger)
}

return next()
}
}
9 changes: 9 additions & 0 deletions website/app/middleware/update_logger_storage_middleware.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
import { loggerStorage } from '#lib/adonisjs/logger.js'
import type { HttpContext } from '@adonisjs/core/http'
import type { NextFn } from '@adonisjs/core/types/http'

export default class SetupLoggerStorageMiddleware {
async handle(ctx: HttpContext, next: NextFn) {
return loggerStorage.run(ctx.logger, next)
}
}
10 changes: 7 additions & 3 deletions website/app/services/user_service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,17 @@ import SendForgotPasswordEmail from '#listeners/send_forgot_password_email'
import SendVerificationEmail from '#listeners/send_verification_email'
import User from '#models/user'
import db from '@adonisjs/lucid/services/db'
import logger from '@adonisjs/core/services/logger'
import { DateTime } from 'luxon'
import app from '@adonisjs/core/services/app'
import Account from '#models/account'
import { errors } from '@adonisjs/auth'
import app from '@adonisjs/core/services/app'
import { inject } from '@adonisjs/core'
import { Logger } from '@adonisjs/core/logger'

@inject()
export class UserService {
constructor(private logger: Logger) {}

async getUserWithCredentials(email: string, password: string) {
try {
const account = await Account.verifyCredentials(`credentials:${email}`, password)
Expand Down Expand Up @@ -44,7 +48,7 @@ export class UserService {
async sendVerificationEmail(user: User) {
const listener = await app.container.make(SendVerificationEmail)
listener.handle(new UserCreated(user))
.catch((error) => logger.error(error))
.catch((error) => this.logger.error(error))
}

async verifyEmail(email: string) {
Expand Down
9 changes: 7 additions & 2 deletions website/config/logger.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,15 @@ const loggerConfig = defineConfig({
enabled: true,
name: env.get('APP_NAME'),
level: env.get('LOG_LEVEL'),

formatters: {
level: (label) => ({ level: label }),
},

transport: {
targets: targets()
pipeline: targets()
.pushIf(!app.inProduction, targets.pretty())
.pushIf(app.inProduction, targets.file({ destination: 1 }))
.pushIf(!app.inProduction, targets.file({ destination: 1 }))
.toArray(),
},
},
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
import { BaseSchema } from '@adonisjs/lucid/schema'

export default class extends BaseSchema {
protected tableName = 'participant_profiles'

async up() {
this.schema.alterTable(this.tableName, (table) => {
table.dropUnique(['phone'])
})
}

async down() {
this.schema.alterTable(this.tableName, (table) => {
table.unique(['phone'])
})
}
}
4 changes: 2 additions & 2 deletions website/lib/adonisjs/events.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import { BaseEvent as $BaseEvent } from '@adonisjs/core/events'
import logger from '@adonisjs/core/services/logger'
import { logger } from './logger.js'

export class BaseEvent extends $BaseEvent {
static async tryDispatch<T extends typeof BaseEvent>(this: T, ...args: ConstructorParameters<T>) {
try {
await this.dispatch(...args)
return [true, undefined] as const
} catch (error) {
logger.error(error)
logger().error(error)
return [false, error] as const
}
}
Expand Down
9 changes: 9 additions & 0 deletions website/lib/adonisjs/logger.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
import { AsyncLocalStorage } from 'node:async_hooks'
import $logger from '@adonisjs/core/services/logger'
import { Logger } from '@adonisjs/core/logger'

export const loggerStorage = new AsyncLocalStorage<Logger>()

export function logger() {
return loggerStorage.getStore() || $logger
}
4 changes: 2 additions & 2 deletions website/start/events.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import UserCreated from '#events/user_created'
import UserEmailVerified from '#events/user_email_verified'
// import UserEmailVerified from '#events/user_email_verified'
import UserRequestedVerificationEmail from '#events/user_requested_verification_email'
import emitter from '@adonisjs/core/services/emitter'

Expand All @@ -8,4 +8,4 @@ const SendVerificationEmail = () => import('#listeners/send_verification_email')
emitter.on(UserCreated, [SendVerificationEmail, 'handle'])
emitter.on(UserRequestedVerificationEmail, [SendVerificationEmail, 'handle'])

emitter.on(UserEmailVerified, (ev) => console.log(ev))
// emitter.on(UserEmailVerified, (ev) => console.log(ev))
3 changes: 3 additions & 0 deletions website/start/kernel.ts
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,14 @@ server.use([
* requests with a registered route.
*/
router.use([
() => import('#middleware/update_logger_storage_middleware'),
() => import('@adonisjs/core/bodyparser_middleware'),
() => import('@adonisjs/session/session_middleware'),
() => import('@adonisjs/shield/shield_middleware'),
() => import('@adonisjs/auth/initialize_auth_middleware'),
() => import('#middleware/auth/logout_if_authentication_disabled_middleware'),
() => import('#middleware/log_user_middleware'),
() => import('#middleware/update_logger_storage_middleware')
])

/**
Expand Down
30 changes: 16 additions & 14 deletions website/start/routes.ts
Original file line number Diff line number Diff line change
Expand Up @@ -33,15 +33,15 @@ router
.group(() => {
router.post('/logout', [AuthenticationController, 'logout']).as('actions:auth.logout')

router.group(() => {
router.on('/verify').renderInertia('auth/verify').as('pages:auth.verify')
router
.post('/verify/new', [AuthenticationController, 'retryEmailVerification'])
.as('actions:auth.verify.send')
.use(emailVerificationThrottle)
})
.use(middleware.noVerifiedEmail())

router
.group(() => {
router.on('/verify').renderInertia('auth/verify').as('pages:auth.verify')
router
.post('/verify/new', [AuthenticationController, 'retryEmailVerification'])
.as('actions:auth.verify.send')
.use(emailVerificationThrottle)
})
.use(middleware.noVerifiedEmail())
})
.use(middleware.auth())

Expand Down Expand Up @@ -135,16 +135,18 @@ router
router
.group(() => {
router.get('/', [TicketsController, 'index']).as('pages:tickets')
router.get('/:id/checkout', [TicketsController, 'showPayment']).as('checkout')
router
.get('/:id/checkout', [TicketsController, 'showPayment'])
.as('checkout')
.use([middleware.auth(), middleware.verifiedEmail(), middleware.participant()])
})
.prefix('/tickets')
.use([middleware.auth(), middleware.participant(), middleware.verifiedEmail()])

router
.group(() => {
//router.get('/', [OrdersController, 'index']) acho que isto já nao e usado
router.post('/mbway', [OrdersController, 'createMBWay']).use(middleware.auth())
router.get('/:id', [OrdersController, 'show']).as('payment.show').use(middleware.auth())
router.post('/mbway', [OrdersController, 'createMBWay'])
router.get('/:id', [OrdersController, 'show']).as('payment.show')
})
.middleware(middleware.requireAuthenticationEnabled())
.use([middleware.auth(), middleware.verifiedEmail(), middleware.participant()])
.prefix('payment')