Merge pull request #317 from nakazawakan/newbackend

iOSの問題の修正

backend/app/Http/Controllers/Api/AuthenticationTrait.php

@@ -129,12 +129,6 @@ trait AuthenticationTrait {
 
         // セッションを想像する
         $login_user_datum = $this->makeSession($this->getGuard(), $get->toArray());
-        Log::info([
-            'expire' => $expire,
-            'now' => time(),
-            'env' => env('SESSION_LIFETIME'),
-            'config' => config('session.lifetime')
-        ]);
 
         return ['status_code' => 200, 'params' => ['id' => $login_user_datum['id'], 'expire' => (int)$expire * 1000]];
     }

backend/resources/js/admin/meeting/detail.jsx

@@ -232,4 +232,4 @@ const AdminMeetingDetail = () => {
 	)
 }
 
-export default AdminMeetingDetail;
+export default AdminMeetingDetail;

backend/resources/js/app.js

@@ -6,14 +6,16 @@ import {HeaderContextProvider} from './context'
 
 import ScrollToTop from './component/scroll_top';
 
-
 const KIKIAPP = () => {
   const routing = useRoutes(routes);
   return routing;
 };
 
-
-if(document.getElementById('root')){
+if (document.getElementById('root')){
+  if (!sessionStorage.getItem('initcheck')) {
+    sessionStorage.setItem('initcheck', true);
+    window.location.reload();
+  }
   ReactDOM.render((
     <CookiesProvider>
       <BrowserRouter>

backend/resources/js/context.js

@@ -21,15 +21,15 @@ export const HeaderContextProvider = ({ children }) => {
 
   const isAuthenticate = () => {
     let token = localStorage.getItem(`${acc_type}_token`);
-    if(!token){
-        navigator(`/${acc_type}/login`);
-        return false;
+    if (!token){
+      navigator(`/${acc_type}/login`);
+      return false;
     }
-    else{
+    else {
       token = JSON.parse(token);
       let expires = token.expires;
       let now = new Date().getTime();  //current timestamp
-      if(now >= expires){
+      if (now >= expires){
         handleLogout();
         return false;
       }

backend/webpack.mix.js

@@ -11,6 +11,6 @@ const mix = require('laravel-mix');
  |
  */
 
- mix.js('resources/js/index.js', 'public/js')
+mix.js('resources/js/index.js', 'public/js')
     .react()
     .sass('resources/sass/app.scss', 'public/css');