Merge pull request #1084 from traPtitech/fix#1083

Fix#1083
traPtitech · Aug 20, 2023 · 452e021 · 452e021
2 parents 513ebe8 + 2e951e8
commit 452e021
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 19 deletions.
diff --git a/client/package-lock.json b/client/package-lock.json
diff --git a/client/package.json b/client/package.json
@@ -11,7 +11,6 @@
   "dependencies": {
     "@traptitech/traq": "^3.4.5-1",
     "axios": "^0.21.2",
-    "base64url": "^3.0.1",
     "bulma": "^0.9.1",
     "caniuse-lite": "^1.0.30001239",
     "js-sha256": "^0.9.0",

diff --git a/client/src/bin/traqAuth.js b/client/src/bin/traqAuth.js
@@ -1,6 +1,5 @@
 import axios from 'axios'
 import sha256 from 'js-sha256'
-import base64url from 'base64url'
 
 const baseUrl = 'https://q.trap.jp/api/v3/oauth2'
 
@@ -24,7 +23,17 @@ const randomString = len => {
 }
 
 const getCodeChallenge = codeVerifier => {
-  return base64url(sha256.arrayBuffer(codeVerifier))
+  const sha256Result = sha256(codeVerifier)
+  const bytes = new Uint8Array(sha256Result.length / 2)
+  for (let i = 0; i < sha256Result.length; i += 2) {
+    bytes[i / 2] = parseInt(sha256Result.substring(i, i + 2), 16)
+  }
+  const base64 = btoa(String.fromCharCode(...bytes))
+  const base64url = base64
+    .replace(/\+/g, '-')
+    .replace(/\//g, '_')
+    .replace(/=/g, '')
+  return base64url
 }
 
 export function sendCodeRequest() {

diff --git a/client/src/components/Utils/SideMenu.vue b/client/src/components/Utils/SideMenu.vue
@@ -48,7 +48,7 @@ export default {
   methods: {
     createQuestionnaire() {
       this.$emit('close-side-menu')
-      router.push('/questionnaires/new')
+      router.push('/questionnaires/new').catch(err => console.error(err))
     }
   }
 }
@@ -59,24 +59,29 @@ export default {
   min-width: fit-content;
   background-color: $base-lightbrown;
 }
+
 .menu-list {
   hr {
     // border-style: outset;
     // border-top-color: $base-brown;
     border: $base-darkbrown solid 2px;
     margin: 0.3rem 0;
   }
+
   .button {
     margin: 0.5rem;
   }
 }
+
 .menu-list a {
   position: relative;
   display: inline-block;
   text-decoration: none;
+
   &:hover {
     background-color: inherit;
   }
+
   &::after {
     position: absolute;
     bottom: 3.5px;
@@ -90,6 +95,7 @@ export default {
     transition: transform 0.3s;
   }
 }
+
 .menu-list :hover::after {
   transform-origin: left top;
   transform: scale(1, 1);

diff --git a/docker/dev/.air.toml b/docker/dev/.air.toml
@@ -2,7 +2,7 @@ root = "."
 tmp_dir = "tmp"
 
 [build]
-cmd = "go build -o ./tmp/main ."
+cmd = "go build -buildvcs=false -o ./tmp/main ."
 bin = "./tmp/main"
 include_ext = ["go", "tpl", "tmpl", "html"]
 exclude_dir = ["assets", "tmp", "vendor", "node_modules","client","tuning",".github"]