feat: fix miniapp

roziscoding · Oct 11, 2023 · f15c6fe · f15c6fe
1 parent 3aac709
commit f15c6fe
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 10 deletions.
diff --git a/deno.lock b/deno.lock
diff --git a/src/bot.ts b/src/bot.ts
@@ -31,7 +31,7 @@ export async function getBot(config: AppConfig, environment = Environment.Develo
   /** Common middleware */
   bot.use(loggerMiddleware(environment));
   bot.use(sessionMiddleware(config, environment));
-  bot.use(qrCodeUrl(config));
+  bot.use(qrCodeUrl);
 
   /** Conversations */
   bot.use(grammyConversations());

diff --git a/src/deps.ts b/src/deps.ts
@@ -1,5 +1,5 @@
 export * from "common-tags";
-export * from "https://deno.land/[email protected]/encoding/base64.ts";
+export { decodeBase64, encodeBase64 } from "https://deno.land/[email protected]/encoding/base64.ts";
 export { Collection, MongoClient } from "https://deno.land/x/[email protected]/mod.ts";
 export { debug } from "https://deno.land/x/[email protected]/mod.ts";
 export * from "https://deno.land/x/[email protected]/mod.ts";

diff --git a/src/endpoints/miniapp.ts b/src/endpoints/miniapp.ts
@@ -26,7 +26,7 @@ export const miniapp = () => {
           document.addEventListener("DOMContentLoaded", () => {
             const img = document.getElementById("img");
             const search = new URLSearchParams(location.search);
-            const pixcode = search.get("pixcode");
+            const pixcode = search.get("tgWebAppStartParam");
             img.src = "https://${config.WEBHOOK_URL}/qrcode?pixCode=" + pixcode;
           })
         </script>

diff --git a/src/endpoints/qrcode.ts b/src/endpoints/qrcode.ts
@@ -1,14 +1,14 @@
-import { decode, json, qrcode } from "../deps.ts";
+import { decodeBase64, json, qrcode } from "../deps.ts";
 
 function createQrCode(content: string) {
   return qrcode(content)
     .then((codeString) => codeString.split(",")[1])
-    .then((codeString) => decode(codeString));
+    .then((codeString) => decodeBase64(codeString));
 }
 
 export async function getQRCode(req: Request) {
   const url = new URL(req.url);
-  const pixCode = url.searchParams.get("pixCode");
+  const pixCode = new TextDecoder().decode(decodeBase64(url.searchParams.get("pixCode") ?? ""));
 
   if (!pixCode) {
     return json({ message: "missing pixCode param" }, { status: 422 });

diff --git a/src/handlers/registered.ts b/src/handlers/registered.ts
@@ -74,7 +74,7 @@ composer
           parse_mode: "HTML",
         },
         reply_markup: new InlineKeyboard()
-          .webApp("Visualizar QRCode", qrCodeUrl)
+          .url("Visualizar QRCode", qrCodeUrl)
           .row()
           .text("Marcar como concluído", `done_${finalValue}`),
       },

diff --git a/src/util/qr-code-url.ts b/src/util/qr-code-url.ts
@@ -1,11 +1,11 @@
-import { AppConfig } from "../config.ts";
 import type { Context, MiddlewareFn } from "../deps.ts";
+import { encodeBase64 } from "../deps.ts";
 
 export type QRCodeUrlFlavor = {
   getQrCodeUrl: (pixCode: string) => string;
 };
 
-export const qrCodeUrl = (config: AppConfig): MiddlewareFn<Context & QRCodeUrlFlavor> => async (ctx, next) => {
-  ctx.getQrCodeUrl = (pixCode) => `https://${config.WEBHOOK_URL}/miniapp?pixcode=${encodeURIComponent(pixCode)}`;
+export const qrCodeUrl: MiddlewareFn<Context & QRCodeUrlFlavor> = async (ctx, next) => {
+  ctx.getQrCodeUrl = (pixCode) => `https://t.me/${ctx.me.username}/qrcode?startapp=${encodeBase64(pixCode)}`;
   await next();
 };