高速化

takoserver · Feb 20, 2024 · 5d9330e · 5d9330e
1 parent be22fa4
commit 5d9330e
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 24 deletions.
diff --git a/islands/RegisterForm.tsx b/islands/RegisterForm.tsx
@@ -21,6 +21,7 @@ export default function RegisterForm({ text, color,tako }: { text: string, color
     };
     const handleSubmit = async (event: JSX.TargetedEvent<HTMLFormElement, Event>) => {
         event.preventDefault();
+        const startTime = Date.now();
         const token = await fetch("http://localhost:8000/api/token?origin=http://localhost:8000")
         const csrftoken = await token.json();
         const data = {
@@ -38,6 +39,9 @@ export default function RegisterForm({ text, color,tako }: { text: string, color
         })
         const response = await res.json()
         if(response.status == true) {
+
+          const endTime = Date.now();
+          alert(endTime - startTime);
           alert("ueeeee")
         } else {
           alert("takotako")

diff --git a/routes/api/logins/register.js b/routes/api/logins/register.js
@@ -1,6 +1,6 @@
 // deno-lint-ignore-file
 import { Client } from "https://deno.land/x/[email protected]/mod.ts";
-import { isMail, isUserDuplication, isMailDuplication, isMailDuplicationTemp, hashPassword, sendMail,client} from "../../../util/takoFunction.ts";
+import { isMail, isUserDuplication, isMailDuplication, isMailDuplicationTemp, isCsrftoken, sendMail,client} from "../../../util/takoFunction.ts";
 
 export const handler = {
   async POST(req) {
@@ -12,32 +12,39 @@ export const handler = {
       }
       const ismail = isMail(email)
       const ismailduplication = await isMailDuplication(email)
-      if(ismail) {
-        if(!ismailduplication) {
-            try {
-            await isMailDuplicationTemp(email)
-            const key = generateRandomString(255);
-            await client.query(`INSERT INTO temp_users (id,created_at,mail, kye) VALUES (default,default,"${email}",'${key}');`)
-            sendMail(email,"本登録を完了してください",`https://takos.jp/register?key=${key}`)
-            return new Response(JSON.stringify({status: true}), {
-              headers: { "Content-Type": "application/json" },
-            });
-            } catch (error) {
-              return new Response(JSON.stringify({"status": "error"}), {
+      const iscsrftoken = await isCsrftoken(CsrfToken)
+      if(isCsrftoken) {
+        client.execute(`DELETE FROM csrftoken WHERE csrftoken = "${CsrfToken}";`)
+      }
+      if(iscsrftoken) {
+        if(ismail) {
+          if(!ismailduplication) {
+              try {
+              const key = generateRandomString(255);
+              if(isMailDuplicationTemp(email)) {
+                client.execute(`DELETE FROM temp_users WHERE mail = "${email}";`)
+              }
+              client.query(`INSERT INTO temp_users (id,created_at,mail, kye) VALUES (default,default,"${email}",'${key}');`)
+              sendMail(email,"本登録を完了してください",`https://takos.jp/register?key=${key}`)
+              return new Response(JSON.stringify({status: true}), {
                 headers: { "Content-Type": "application/json" },
               });
-            }
+              } catch (error) {
+                return new Response(JSON.stringify({"status": "error"}), {
+                  headers: { "Content-Type": "application/json" },
+                });
+              }
+          }else {
+            return new Response(JSON.stringify({"status": "error"}), {
+              headers: { "Content-Type": "application/json" },
+            });
+          }
         }else {
           return new Response(JSON.stringify({"status": "error"}), {
             headers: { "Content-Type": "application/json" },
           });
         }
-      }else {
-        return new Response(JSON.stringify({"status": "error"}), {
-          headers: { "Content-Type": "application/json" },
-        });
-      }
-
+    }
   }
 };
 function generateRandomString(length) {

diff --git a/util/takoFunction.ts b/util/takoFunction.ts
@@ -73,14 +73,22 @@ async function isUserDuplication(userid: string): Promise<boolean> {
     return result.length > 0;
 }
 async function isMailDuplication(mail: string): Promise<boolean> {
-    const result = await client.query(`SELECT * FROM users WHERE name = "${mail}"`);
+    const result = await client.query(`SELECT * FROM users WHERE mail = "${mail}"`);
     return result.length > 0;
 }
-async function isMailDuplicationTemp(mail: string): Promise<any>/*Promise<boolean>*/ {
+async function isCsrftoken(token:string):Promise<any> {
+  const query = `SELECT * FROM csrftoken WHERE csrftoken = "${token}"`
+  const result = await client.query(query);
+  if(result.length > 0) {
+    return true
+  } else {
+     return false
+  }
+}
+async function isMailDuplicationTemp(mail: string): Promise<boolean> {
   const query = `SELECT * FROM temp_users WHERE mail = "${mail}"`
   const result = await client.query(query);
   if(result.length > 0) {
-    await client.execute(`DELETE FROM temp_users WHERE mail = "${mail}";`)
     return true
   } else {
      return false
@@ -108,4 +116,4 @@ async function hashPassword(password: string, salt: string): Promise<string> {
     password: string;
     userName: string;
   }
-export { envRoader,client,sql, isMail, isUserDuplication, isMailDuplication, isSavePassword, sendMail, generateSalt, hashPassword,hostname,username,db,password,isMailDuplicationTemp};
+export { isCsrftoken,envRoader,client,sql, isMail, isUserDuplication, isMailDuplication, isSavePassword, sendMail, generateSalt, hashPassword,hostname,username,db,password,isMailDuplicationTemp};