chore: create profile on get

chat-game · Dec 13, 2024 · 9f351b5 · 9f351b5
1 parent 562894a
commit 9f351b5
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 20 deletions.
diff --git a/apps/telegram-game/src/composables/useTelegramProfile.ts b/apps/telegram-game/src/composables/useTelegramProfile.ts
@@ -4,22 +4,8 @@ import { useFetch } from '@vueuse/core'
 export function useTelegramProfile() {
   const user = initData.user()
 
-  const { data } = useFetch(`https://chatgame.space/api/telegram/${user?.id}`, {
+  const { data } = useFetch(`https://chatgame.space/api/telegram/${user?.id}?username=${user?.username}`, {
     async onFetchError(ctx) {
-      if (ctx?.data?.statusCode === 404 && user?.id) {
-        await fetch('https://chatgame.space/api/telegram/profile', {
-          method: 'POST',
-          headers: {
-            'Content-Type': 'application/json',
-            'Authorization': `Bearer 123`,
-          },
-          body: JSON.stringify({
-            telegramId: user.id,
-            username: user?.username,
-          }),
-        })
-      }
-
       return ctx
     },
   }).get().json()

diff --git a/apps/telegram-game/src/views/InventoryView.vue b/apps/telegram-game/src/views/InventoryView.vue
@@ -7,13 +7,12 @@
           {{ data?.username }}
         </div>
         <div class="tg-hint text-sm">
-          {{ data?.id }}
+          {{ data?.id }} / {{ profile?.id }}
         </div>
       </div>
     </div>
 
     <div class="grid grid-cols-4 gap-2">
-      {{ profile }}
       <div v-for="item in items" :key="item.id" class="tg-section-bg aspect-square p-2 rounded-md">
         <div>Вещь</div>
       </div>

diff --git a/apps/website/server/api/telegram/[telegramId].get.ts b/apps/website/server/api/telegram/[telegramId].get.ts
@@ -1,6 +1,15 @@
 export default defineEventHandler(async (event) => {
   try {
     const telegramId = getRouterParam(event, 'telegramId')
+    if (!telegramId) {
+      throw createError({
+        statusCode: 400,
+        message: 'You must provide telegramId',
+      })
+    }
+
+    const query = getQuery(event)
+    const username = query?.username?.toString()
 
     const profile = await prisma.telegramProfile.findFirst({
       where: { telegramId },
@@ -9,9 +18,13 @@ export default defineEventHandler(async (event) => {
       },
     })
     if (!profile) {
-      throw createError({
-        status: 404,
+      const repository = new DBRepository()
+      const profile = await repository.findOrCreateTelegramProfile({
+        telegramId,
+        username,
       })
+
+      return profile
     }
 
     return profile

diff --git a/apps/website/server/middleware/auth.ts b/apps/website/server/middleware/auth.ts
@@ -8,7 +8,7 @@ export default defineEventHandler(async (event) => {
   }
 
   // Making request with Bearer token
-  if (event.method !== 'GET') {
+  if (event.method !== 'GET' && event.method !== 'OPTIONS') {
     const headers = getHeaders(event)
     const token = headers.authorization ?? headers.Authorization