Skip to content

Commit 5158dfe

Browse files
committed
Rename config to elevated_sessions_enabled with true default.
1 parent 386337d commit 5158dfe

5 files changed

Lines changed: 9 additions & 9 deletions

File tree

config/users.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -187,12 +187,12 @@
187187
| Elevated Session Disabled
188188
|--------------------------------------------------------------------------
189189
|
190-
| Here you may disable elevated sessions entirely. This can be
191-
| useful when using OAuth.
190+
| Here you may enable or disable elevated sessions. Disabling
191+
| can be useful when using OAuth.
192192
|
193193
*/
194194

195-
'elevated_session_disabled' => false,
195+
'elevated_sessions_enabled' => true,
196196

197197
/*
198198
|--------------------------------------------------------------------------

src/Http/Controllers/CP/CpController.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ public function authorizeProIf($condition)
7272

7373
public function requireElevatedSession(): void
7474
{
75-
if (! config('statamic.users.elevated_session_disabled') && ! request()->hasElevatedSession()) {
75+
if (config('statamic.users.elevated_sessions_enabled') && ! request()->hasElevatedSession()) {
7676
throw new ElevatedSessionAuthorizationException;
7777
}
7878
}

src/Http/Middleware/CP/RequireElevatedSession.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ class RequireElevatedSession
99
{
1010
public function handle($request, Closure $next)
1111
{
12-
if (! config('statamic.users.elevated_session_disabled') && ! $request->hasElevatedSession()) {
12+
if (config('statamic.users.elevated_sessions_enabled') && ! $request->hasElevatedSession()) {
1313
throw new ElevatedSessionAuthorizationException;
1414
}
1515

tests/Auth/ElevatedSessionTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -303,7 +303,7 @@ public function middleware_denies_request_when_elevated_session_has_expired_via_
303303
#[Test]
304304
public function middleware_does_not_require_elevated_session_when_elevated_session_is_disabled()
305305
{
306-
config(['statamic.users.elevated_session_disabled' => true]);
306+
config(['statamic.users.elevated_sessions_enabled' => false]);
307307

308308
$this->actingAs($this->user);
309309

@@ -316,7 +316,7 @@ public function middleware_does_not_require_elevated_session_when_elevated_sessi
316316
#[Test]
317317
public function middleware_does_not_require_elevated_session_when_elevated_session_is_disabled_even_if_session_expired()
318318
{
319-
config(['statamic.users.elevated_session_disabled' => true]);
319+
config(['statamic.users.elevated_sessions_enabled' => false]);
320320

321321
$this->actingAs($this->user);
322322

@@ -330,7 +330,7 @@ public function middleware_does_not_require_elevated_session_when_elevated_sessi
330330
#[Test]
331331
public function middleware_does_not_require_elevated_session_when_elevated_session_is_disabled_via_json()
332332
{
333-
config(['statamic.users.elevated_session_disabled' => true]);
333+
config(['statamic.users.elevated_sessions_enabled' => false]);
334334

335335
$this->actingAs($this->user);
336336

tests/Feature/Roles/StoreRoleTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ public function it_denies_access_without_active_elevated_session()
7171
#[Test]
7272
public function it_allows_storing_a_role_without_elevated_session_when_elevated_sessions_are_disabled()
7373
{
74-
config(['statamic.users.elevated_session_disabled' => true]);
74+
config(['statamic.users.elevated_sessions_enabled' => false]);
7575

7676
$this
7777
->actingAsUserWithPermissions(['edit roles'])

0 commit comments

Comments
 (0)