Remove csrf_cookie_name

knuckleswtf · Sep 9, 2021 · 249e6e6 · 249e6e6
1 parent a56eafe
commit 249e6e6
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 9 deletions.
diff --git a/config/scribe.php b/config/scribe.php
@@ -187,19 +187,14 @@
         'base_url' => null,
 
         /**
-         * Fetch a CSRF token before each request. Needed if you're using Laravel Sanctum.
+         * Fetch a CSRF token before each request, and add it as an X-XSRF-TOKEN header. Needed if you're using Laravel Sanctum.
          */
         'use_csrf' => false,
 
         /**
          * The URL to fetch the CSRF token from (if `use_csrf` is true).
          */
         'csrf_url' => '/sanctum/csrf-token',
-
-        /**
-         * The name of the cookie to fetch the CSRF token from after hitting the `csrf_url`.
-         */
-        'csrf_cookie_name' => 'XSRF-TOKEN',
     ],
 
     /*

diff --git a/resources/js/tryitout.js b/resources/js/tryitout.js
@@ -227,7 +227,7 @@ async function executeTryOut(endpointId, form) {
     let preflightPromise = Promise.resolve();
     if (window.useCsrf && window.csrfUrl) {
         preflightPromise = makeAPICall('GET', window.csrfUrl, {}, {}, {}, null).then(() => {
-            headers['X-XSRF-TOKEN'] = getCookie(window.csrfCookieName);
+            headers['X-XSRF-TOKEN'] = getCookie('XSRF-TOKEN');
         });
     }
 

diff --git a/resources/views/themes/default/index.blade.php b/resources/views/themes/default/index.blade.php
@@ -26,7 +26,6 @@
         var baseUrl = "{{ $tryItOut['base_url'] ?? config('app.url') }}";
         var useCsrf = Boolean({{ $tryItOut['use_csrf'] ?? null }});
         var csrfUrl = "{{ $tryItOut['csrf_url'] ?? null }}";
-        var csrfCookieName = "{{ $tryItOut['csrf_cookie_name'] ?? "XSRF-TOKEN" }}";
     </script>
     <script src="{{ u::getVersionedAsset($assetPathPrefix.'js/tryitout.js') }}"></script>
 @endif

diff --git a/src/Commands/GenerateDocumentation.php b/src/Commands/GenerateDocumentation.php
@@ -120,7 +120,7 @@ protected function upgradeConfigFileIfNeeded(): void
         $changes = $upgrader->dryRun();
         if (!empty($changes)) {
             $this->newLine();
-            sleep(0.4);
+
             $this->warn("You're using an updated version of Scribe, which added new items to the config file.");
             $this->info("Here are the changes:");
             foreach ($changes as $change) {