Merge branch 'feature/auth'

src/db/migrations/1764747189_brave_kree.sql

@@ -18,13 +18,11 @@ BEGIN
   DO UPDATE SET last_value = weekly_id_counters.last_value + 1
   RETURNING last_value INTO v_seq;
 
-  RETURN format(
+  RETURN
-    '%s-%02s%02s%04s',
+    p_prefix || '-' ||
-    p_prefix,
+    to_char((v_yy % 100), 'FM00') ||
-    v_yy % 100,
+    to_char(v_ww, 'FM00') ||
-    v_ww,
+    to_char(v_seq, 'FM0000');
-    v_seq
-  );
 END;
 $$;
 --> statement-breakpoint

src/middlewares/apiKeyAuth.ts

@@ -6,7 +6,7 @@ import merchantNonces from '~/db/schema/merchant_nonces'
 import { verify } from '~/helpers/signature'
 import { UnauthenticatedError } from '~/helpers/errors'
 
-export const apiKey = new Elysia().macro({
+export const apiKeyAuth = new Elysia().macro({
   verifyKey: {
     headers: t.Object({
       'x-api-key': t.String(),
@@ -14,7 +14,7 @@ export const apiKey = new Elysia().macro({
       'x-signature': t.String(),
       'x-timestamp': t.Number(),
     }),
-
+    body: t.Unknown(),
     async beforeHandle({ headers, body }) {
       const apiKey = headers['x-api-key']
       const nonce = headers['x-nonce']

src/modules/auth/commands/command.ts

@@ -15,26 +15,31 @@ export async function createMerchant(body: CreateMerchantBody) {
   const apiKey = generateApiKey()
   const secretKey = generateSecretKey()
 
-  // Insert new merchant
+  try {
-  const result = await db
+    // Insert new merchant
-    .insert(table.merchants)
+    const result = await db
-    .values({
+      .insert(table.merchants)
-      merchantName: body.merchantName,
+      .values({
-      contactEmail: body.contactEmail,
+        merchantName: body.merchantName,
-      contactPhone: body.contactPhone,
+        contactEmail: body.contactEmail,
-      apiKey,
+        contactPhone: body.contactPhone,
-      secretKey,
+        apiKey,
-    })
+        secretKey,
-    .returning({
+      })
-      merchantId: table.merchants.merchantId,
+      .returning({
-      apiKey: table.merchants.apiKey,
+        merchantId: table.merchants.merchantId,
-      secretKey: table.merchants.secretKey,
+        apiKey: table.merchants.apiKey,
-      createdAt: table.merchants.createdAt,
+        secretKey: table.merchants.secretKey,
-    })
+        createdAt: table.merchants.createdAt,
+      })
 
-  if (result.length === 0) {
+    if (result.length === 0) {
+      throw new Error('Failed to create merchant')
+    }
+
+    return result[0]
+  } catch (error) {
+    console.error('Error creating merchant:', error)
     throw new Error('Failed to create merchant')
   }
-
-  return result[0]
 }

src/modules/auth/router.ts

@@ -3,6 +3,7 @@ import { createMerchantBody, createMerchantResponseSchema } from './schema'
 import CreateMerchantService from './commands/service'
 import { basicAuthMiddleware } from '~/middlewares/basicAuth'
 import { DataAlreadyExistsError } from '~/helpers/errors'
+import { apiKeyAuth } from '~/middlewares/apiKeyAuth'
 
 export const router = new Elysia({
   name: 'modules.auth',
@@ -40,5 +41,14 @@ export const router = new Elysia({
       security: [{ basicAuth: [] }],
     },
   })
+  .use(apiKeyAuth)
+  .get('/test-key', async ({ body }) => {
+    return body
+  }, {
+    verifyKey: true,
+    detail: {
+      security: [{ basicAuth: [] }],
+    },
+  })
 
 export default router