インストールの際にInternal Server Error が発生する fix baserproject#2128

fuchigam1 · Mar 19, 2023 · 09bff8b · 09bff8b
1 parent a67913a
commit 09bff8b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/plugins/bc-admin-third/templates/plugin/BcInstaller/Admin/Installations/index.php b/plugins/bc-admin-third/templates/plugin/BcInstaller/Admin/Installations/index.php
@@ -32,15 +32,14 @@
     </p>
   </div>
   <div class="submit bca-actions">
-    <?php echo $this->BcAdminForm->create(null, ['url' => ['action' => 'step2'], 'type' => 'post']) ?>
-    <?php echo $this->BcAdminForm->button('<span>' . __d('baser_core', 'インストール開始') . '</span>', [
+    <?php $this->BcBaser->link('<span>' . __d('baser_core', 'インストール開始') . '</span>',
+      ['action' => 'step2'], [
       'class' => 'bca-btn bca-actions__item bca-loading',
       'data-bca-btn-size' => 'lg',
       'data-bca-btn-width' => 'lg',
       'data-bca-btn-type' => 'save',
       'escapeTitle' => false
       ]) ?>
-    <?php echo $this->BcAdminForm->end() ?>
   </div>
 
 </div>
diff --git a/plugins/bc-installer/src/Controller/Admin/InstallationsController.php b/plugins/bc-installer/src/Controller/Admin/InstallationsController.php
@@ -20,6 +20,7 @@
 use BcInstaller\Service\Admin\InstallationsAdminServiceInterface;
 use Cake\Core\Configure;
 use Cake\Event\EventInterface;
+use Cake\Http\Cookie\Cookie;
 use Cake\ORM\Exception\PersistenceFailedException;
 use Cake\Utility\Hash;
 use BaserCore\Annotation\UnitTest;
@@ -61,6 +62,8 @@ public function beforeFilter(EventInterface $event)
     public function index()
     {
         BcUtil::clearAllCache();
+        // クッキーを削除。インストール中のCSRF エラーの発生防止
+        $this->setResponse($this->getResponse()->withExpiredCookie(new Cookie('csrfToken')));
     }
 
     /**