From 14f2bc0ee6ddc80586c4400280e108f813046de5 Mon Sep 17 00:00:00 2001
From: LittleSheep <littlesheep.code@hotmail.com>
Date: Tue, 13 Aug 2024 00:52:48 +0800
Subject: [PATCH] :rewind: Rollback server side set cookie

---
 components/account/AuthTicketTable.vue    |  3 ---
 components/auth/AuthenticateCompleted.vue |  3 +++
 pages/auth/authorize.vue                  |  2 --
 stores/userinfo.ts                        | 10 +++++++++-
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/components/account/AuthTicketTable.vue b/components/account/AuthTicketTable.vue
index 3dcbcb2..216b873 100644
--- a/components/account/AuthTicketTable.vue
+++ b/components/account/AuthTicketTable.vue
@@ -131,7 +131,6 @@ async function readTickets({ page, itemsPerPage }: { page?: number; itemsPerPage
     }),
     {
       headers: { Authorization: `Bearer ${useAtk().value}` },
-      credentials: "include",
     },
   )
   if (res.status !== 200) {
@@ -157,7 +156,6 @@ async function readEvents({ page, itemsPerPage }: { page?: number; itemsPerPage?
     }),
     {
       headers: { Authorization: `Bearer ${useAtk().value}` },
-      credentials: "include",
     },
   )
   if (res.status !== 200) {
@@ -177,7 +175,6 @@ async function killTicket(item: any) {
   const res = await fetch(`${config.public.solarNetworkApi}/cgi/auth/users/me/tickets/${item.id}`, {
     method: "DELETE",
     headers: { Authorization: `Bearer ${useAtk().value}` },
-    credentials: "include",
   })
   if (res.status !== 200) {
     error.value = await res.text()
diff --git a/components/auth/AuthenticateCompleted.vue b/components/auth/AuthenticateCompleted.vue
index ef0ddef..54f4ee4 100644
--- a/components/auth/AuthenticateCompleted.vue
+++ b/components/auth/AuthenticateCompleted.vue
@@ -16,6 +16,7 @@
 <script setup lang="ts">
 import { onMounted, ref } from "vue"
 import { useRoute, useRouter } from "vue-router"
+import { setTokenSet } from "~/stores/userinfo"
 
 const config = useRuntimeConfig()
 
@@ -51,6 +52,8 @@ async function getToken(tk: string) {
     error.value = err
     throw new Error(err)
   } else {
+    const out = await res.json()
+    setTokenSet(out["access_token"], out["refresh_token"])
     error.value = null
   }
 }
diff --git a/pages/auth/authorize.vue b/pages/auth/authorize.vue
index 1d504fa..0e23586 100755
--- a/pages/auth/authorize.vue
+++ b/pages/auth/authorize.vue
@@ -88,7 +88,6 @@ const panel = ref("confirm")
 async function tryAuthorize() {
   const res = await fetch(`${config.public.solarNetworkApi}/cgi/auth/auth/o/authorize` + window.location.search, {
     headers: { Authorization: `Bearer ${useAtk().value}` },
-    credentials: "include",
   })
 
   if (res.status !== 200) {
@@ -121,7 +120,6 @@ async function approve() {
   const res = await fetch(`${config.public.solarNetworkApi}/cgi/auth/auth/o/authorize` + window.location.search, {
     method: "POST",
     headers: { Authorization: `Bearer ${useAtk().value}` },
-    credentials: "include",
   })
 
   if (res.status !== 200) {
diff --git a/stores/userinfo.ts b/stores/userinfo.ts
index f9baa2a..9b76d55 100644
--- a/stores/userinfo.ts
+++ b/stores/userinfo.ts
@@ -17,6 +17,15 @@ export function useAtk() {
   return useCookie("__hydrogen_atk", { watch: "shallow" })
 }
 
+export function useRtk() {
+  return useCookie("__hydrogen_rtk", { watch: "shallow" })
+}
+
+export function setTokenSet(atk: string, rtk: string) {
+  useAtk().value = atk
+  useRtk().value = rtk
+}
+
 export function useLoggedInState() {
   return computed(() => useAtk().value != null)
 }
@@ -34,7 +43,6 @@ export const useUserinfo = defineStore("userinfo", () => {
 
     const res = await fetch(`${config.public.solarNetworkApi}/cgi/auth/users/me`, {
       headers: { Authorization: `Bearer ${useAtk().value}` },
-      credentials: "include",
     })
 
     if (res.status !== 200) {