From 3e63e56d4e9ac7e2968dc9a706b66a6d4abdcd29 Mon Sep 17 00:00:00 2001
From: "sosuke.iwabuchi" <sosuke.iwabuchi@satellite-tech.co.jp>
Date: Thu, 20 Jul 2023 16:48:10 +0900
Subject: [PATCH] =?UTF-8?q?App=E3=81=AE=E3=83=9A=E3=83=BC=E3=82=B8?=
 =?UTF-8?q?=E3=83=AB=E3=83=BC=E3=83=86=E3=82=A3=E3=83=B3=E3=82=B0=E3=82=92?=
 =?UTF-8?q?=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/contexts/AppContext.tsx       |  7 +++++++
 src/pages/app/EmailOrder.tsx      |  7 ++-----
 src/pages/app/MailOrder.tsx       | 14 +++++---------
 src/storage/localstorage/index.ts |  3 +++
 4 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/src/contexts/AppContext.tsx b/src/contexts/AppContext.tsx
index 412e9cb..c0d28a8 100644
--- a/src/contexts/AppContext.tsx
+++ b/src/contexts/AppContext.tsx
@@ -7,6 +7,7 @@ import useNavigateCustom from "hooks/useNavigateCustom";
 import { createContext, useEffect, useState } from "react";
 import { useParams } from "react-router-dom";
 import { getPath } from "routes/path";
+import { StoreId, getStore, setStore } from "storage/localstorage";
 
 type App = {
   token: string;
@@ -47,6 +48,8 @@ export function AppContextProvider({ children }: Props) {
       setTokenResult("ok");
       _setToken(sendData.access_token);
       setReceiptIssuingOrder(res.data.receipt_issuing_order);
+
+      setStore(StoreId.ACCESS_TOKEN, sendData.access_token);
     },
     onFailed: () => {
       setTokenResult("ng");
@@ -74,8 +77,12 @@ export function AppContextProvider({ children }: Props) {
   };
 
   useEffect(() => {
+    const storeToken = getStore(StoreId.ACCESS_TOKEN);
+
     if (paramToken && !token) {
       setToken(paramToken);
+    } else if (storeToken && !token) {
+      setToken(storeToken);
     } else if (!token && !paramToken) {
       setTokenResult("ng");
       navigateWhenChanged(getPath(PageID.PAGE_404));
diff --git a/src/pages/app/EmailOrder.tsx b/src/pages/app/EmailOrder.tsx
index d3ea22d..5f113f2 100644
--- a/src/pages/app/EmailOrder.tsx
+++ b/src/pages/app/EmailOrder.tsx
@@ -16,7 +16,6 @@ import { HasChildren } from "@types";
 import { emailRequest } from "api/app/receipt-issuing-order";
 import useAPICall from "hooks/useAPICall";
 import useApp from "hooks/useApp";
-import useNavigateCustom from "hooks/useNavigateCustom";
 import useSnackbarCustom from "hooks/useSnackbarCustom";
 import { useMemo, useState } from "react";
 import useInputEmailStep from "./hooks/useInputEmailStep";
@@ -64,9 +63,7 @@ export default function EmailOrder() {
     receiptIssuingOrder: order,
   } = useApp();
 
-  const { success, error } = useSnackbarCustom();
-
-  const { navigate } = useNavigateCustom();
+  const { error } = useSnackbarCustom();
 
   const [mode, setMode] = useState<"input" | "confirm" | "done">("input");
 
@@ -75,7 +72,7 @@ export default function EmailOrder() {
       setMode("confirm");
     },
     onPrev: () => {
-      navigate(-1);
+      navigateToHome();
     },
   });
 
diff --git a/src/pages/app/MailOrder.tsx b/src/pages/app/MailOrder.tsx
index 1cf6bba..082bacf 100644
--- a/src/pages/app/MailOrder.tsx
+++ b/src/pages/app/MailOrder.tsx
@@ -1,7 +1,6 @@
 import {
   Box,
   Button,
-  Divider,
   Paper,
   Stack,
   Step,
@@ -14,14 +13,13 @@ import {
   Typography,
 } from "@mui/material";
 import { HasChildren } from "@types";
+import { mailRequest } from "api/app/receipt-issuing-order";
 import { getPrefName } from "codes/prefcode";
+import useAPICall from "hooks/useAPICall";
 import useApp from "hooks/useApp";
-import useNavigateCustom from "hooks/useNavigateCustom";
+import useSnackbarCustom from "hooks/useSnackbarCustom";
 import { useMemo, useState } from "react";
 import useInputMailStep from "./hooks/useInputMailStep";
-import useAPICall from "hooks/useAPICall";
-import { mailRequest } from "api/app/receipt-issuing-order";
-import useSnackbarCustom from "hooks/useSnackbarCustom";
 
 type TableRowCustomProps = {
   title: string;
@@ -66,9 +64,7 @@ export default function MailOrder() {
     receiptIssuingOrder: order,
   } = useApp();
 
-  const { success, error } = useSnackbarCustom();
-
-  const { navigate } = useNavigateCustom();
+  const { error } = useSnackbarCustom();
 
   const [mode, setMode] = useState<"input" | "confirm" | "done">("input");
 
@@ -77,7 +73,7 @@ export default function MailOrder() {
       setMode("confirm");
     },
     onPrev: () => {
-      navigate(-1);
+      navigateToHome();
     },
   });
 
diff --git a/src/storage/localstorage/index.ts b/src/storage/localstorage/index.ts
index 1252a0f..2851e62 100644
--- a/src/storage/localstorage/index.ts
+++ b/src/storage/localstorage/index.ts
@@ -1,6 +1,9 @@
 let id = 0;
 export const StoreId = {
   LOGIN_ROUTE: "LOGIN_ROUTE",
+
+  // APP向け
+  ACCESS_TOKEN: "ACCESS_TOKEN",
 } as const;
 export type StoreId = (typeof StoreId)[keyof typeof StoreId];