Update oauth setting, use config_cache

2024-03-12 03:55:51 -06:00 · 2024-03-12 03:55:51 -06:00 · ce228f7fa4
parent 5071aaf408
commit ce228f7fa4
7 changed files with 101 additions and 103 deletions
--- a/app/Http/Controllers/Admin/AdminDirectoryController.php
+++ b/app/Http/Controllers/Admin/AdminDirectoryController.php
@ -2,30 +2,20 @@

 namespace App\Http\Controllers\Admin;

-use DB, Cache;
-use App\{
-    DiscoverCategory,
-    DiscoverCategoryHashtag,
-    Hashtag,
-    Media,
-    Profile,
-    Status,
-    StatusHashtag,
-    User
-};
+use App\Http\Controllers\PixelfedDirectoryController;
 use App\Models\ConfigCache;
 use App\Services\AccountService;
 use App\Services\ConfigCacheService;
 use App\Services\StatusService;
-use Carbon\Carbon;
+use App\Status;
+use App\User;
+use Cache;
 use Illuminate\Http\Request;
-use Illuminate\Validation\Rule;
-use League\ISO3166\ISO3166;
-use Illuminate\Support\Str;
+use Illuminate\Support\Facades\Http;
 use Illuminate\Support\Facades\Storage;
 use Illuminate\Support\Facades\Validator;
-use Illuminate\Support\Facades\Http;
-use App\Http\Controllers\PixelfedDirectoryController;
+use Illuminate\Support\Str;
+use League\ISO3166\ISO3166;

 trait AdminDirectoryController
 {
@ -46,7 +36,7 @@ trait AdminDirectoryController
                    'uid' => (string) $user->id,
                    'pid' => (string) $user->profile_id,
                    'username' => $user->username,
-                'created_at' => $user->created_at
+                    'created_at' => $user->created_at,
                ];
            });
        $config = ConfigCache::whereK('pixelfed.directory')->first();
@ -99,7 +89,7 @@ trait AdminDirectoryController
                ->map(function ($t) {
                    return [
                        'profile' => AccountService::get($t['profile_id']),
-                        'body' => $t['body']
+                        'body' => $t['body'],
                    ];
                });
            $res['testimonials'] = $testimonials;
@ -120,7 +110,7 @@ trait AdminDirectoryController
            'max_account_size' => 'required_if:enforce_account_limit,true|integer|min:1000000',
            'max_album_length' => 'required|integer|min:4|max:20',
            'account_deletion' => 'required|accepted',
-            'max_caption_length' => 'required|integer|min:500|max:10000'
+            'max_caption_length' => 'required|integer|min:500|max:10000',
        ]);

        $res['requirements_validator'] = $validator->errors();
@ -160,10 +150,11 @@ trait AdminDirectoryController

        $submissionState = Http::withoutVerifying()
            ->post('https://pixelfed.org/api/v1/directory/check-submission', [
-            'domain' => config('pixelfed.domain.app')
+                'domain' => config('pixelfed.domain.app'),
            ]);

        $res['submission_state'] = $submissionState->json();
+
        return $res;
    }

@ -194,11 +185,11 @@ trait AdminDirectoryController
            'favourite_posts' => 'array|max:12',
            'favourite_posts.*' => 'distinct',
            'privacy_pledge' => 'sometimes',
-            'banner_image' => 'sometimes|mimes:jpg,png|dimensions:width=1920,height:1080|max:5000'
+            'banner_image' => 'sometimes|mimes:jpg,png|dimensions:width=1920,height:1080|max:5000',
        ]);

        $config = ConfigCache::firstOrNew([
-            'k' => 'pixelfed.directory'
+            'k' => 'pixelfed.directory',
        ]);

        $res = $config->v ? json_decode($config->v, true) : [];
@ -221,8 +212,9 @@ trait AdminDirectoryController
                    $protected = [
                        'public/headers/.gitignore',
                        'public/headers/default.jpg',
-                    'public/headers/missing.png'
+                        'public/headers/missing.png',
                    ];
+
                    return ! in_array($name, $protected);
                })
                ->each(function ($name) {
@ -243,6 +235,7 @@ trait AdminDirectoryController
        if (isset($updated['banner_image'])) {
            $updated['banner_image'] = url(Storage::url($updated['banner_image']));
        }
+
        return $updated;
    }

@ -253,7 +246,7 @@ trait AdminDirectoryController
            'open_registration' => (bool) config_cache('pixelfed.open_registration'),
            'curated_onboarding' => (bool) config_cache('instance.curated_registration.enabled'),
            'activitypub_enabled' => config_cache('federation.activitypub.enabled'),
-            'oauth_enabled' => config_cache('pixelfed.oauth_enabled'),
+            'oauth_enabled' => (bool) config_cache('pixelfed.oauth_enabled'),
            'media_types' => Str::of(config_cache('pixelfed.media_types'))->explode(','),
            'image_quality' => config_cache('pixelfed.image_quality'),
            'optimize_image' => config_cache('pixelfed.optimize_image'),
@ -285,7 +278,7 @@ trait AdminDirectoryController
            'max_account_size' => 'required_if:enforce_account_limit,true|integer|min:1000000',
            'max_album_length' => 'required|integer|min:4|max:20',
            'account_deletion' => 'required|accepted',
-            'max_caption_length' => 'required|integer|min:500|max:10000'
+            'max_caption_length' => 'required|integer|min:500|max:10000',
        ]);

        if (! $validator->validate()) {
@ -297,6 +290,7 @@ trait AdminDirectoryController

        $data = (new PixelfedDirectoryController())->buildListing();
        $res = Http::withoutVerifying()->post('https://pixelfed.org/api/v1/directory/submission', $data);
+
        return 200;
    }

@ -312,7 +306,7 @@ trait AdminDirectoryController
        $protected = [
            'public/headers/.gitignore',
            'public/headers/default.jpg',
-            'public/headers/missing.png'
+            'public/headers/missing.png',
        ];
        if (! $path || in_array($path, $protected)) {
            return;
@ -328,6 +322,7 @@ trait AdminDirectoryController
        $bannerImage->save();
        Cache::forget('api:v1:instance-data-response-v1');
        ConfigCacheService::put('pixelfed.directory', $directory);
+
        return $bannerImage->v;
    }

@ -357,7 +352,7 @@ trait AdminDirectoryController
    public function directoryGetAddPostByIdSearch(Request $request)
    {
        $this->validate($request, [
-            'q' => 'required|integer'
+            'q' => 'required|integer',
        ]);

        $id = $request->input('q');
@ -385,6 +380,7 @@ trait AdminDirectoryController
            })
            ->values();
        ConfigCacheService::put('pixelfed.directory.testimonials', $existing);
+
        return $existing;
    }

@ -392,13 +388,13 @@ trait AdminDirectoryController
    {
        $this->validate($request, [
            'username' => 'required',
-            'body' => 'required|string|min:5|max:500'
+            'body' => 'required|string|min:5|max:500',
        ]);

        $user = User::whereUsername($request->input('username'))->whereNull('status')->firstOrFail();

        $configCache = ConfigCache::firstOrCreate([
-            'k' => 'pixelfed.directory.testimonials'
+            'k' => 'pixelfed.directory.testimonials',
        ]);

        $testimonials = $configCache->v ? collect(json_decode($configCache->v, true)) : collect([]);
@ -409,7 +405,7 @@ trait AdminDirectoryController
        $testimonials->push([
            'profile_id' => (string) $user->profile_id,
            'username' => $request->input('username'),
-            'body' => $request->input('body')
+            'body' => $request->input('body'),
        ]);

        $configCache->v = json_encode($testimonials->toArray());
@ -417,8 +413,9 @@ trait AdminDirectoryController
        ConfigCacheService::put('pixelfed.directory.testimonials', $configCache->v);
        $res = [
            'profile' => AccountService::get($user->profile_id),
-            'body' => $request->input('body')
+            'body' => $request->input('body'),
        ];
+
        return $res;
    }

@ -426,7 +423,7 @@ trait AdminDirectoryController
    {
        $this->validate($request, [
            'profile_id' => 'required',
-            'body' => 'required|string|min:5|max:500'
+            'body' => 'required|string|min:5|max:500',
        ]);

        $profile_id = $request->input('profile_id');
@ -434,7 +431,7 @@ trait AdminDirectoryController
        $user = User::whereProfileId($profile_id)->firstOrFail();

        $configCache = ConfigCache::firstOrCreate([
-            'k' => 'pixelfed.directory.testimonials'
+            'k' => 'pixelfed.directory.testimonials',
        ]);

        $testimonials = $configCache->v ? collect(json_decode($configCache->v, true)) : collect([]);
@ -443,6 +440,7 @@ trait AdminDirectoryController
            if ($t['profile_id'] == $profile_id) {
                $t['body'] = $body;
            }
+
            return $t;
        })
            ->values();
--- a/app/Http/Controllers/Api/ApiV1Controller.php
+++ b/app/Http/Controllers/Api/ApiV1Controller.php
@ -131,7 +131,7 @@ class ApiV1Controller extends Controller
     */
    public function apps(Request $request)
    {
-        abort_if(! config_cache('pixelfed.oauth_enabled'), 404);
+        abort_if(! (bool) config_cache('pixelfed.oauth_enabled'), 404);

        $this->validate($request, [
            'client_name' => 'required',
--- a/app/Providers/AuthServiceProvider.php
+++ b/app/Providers/AuthServiceProvider.php
@ -2,9 +2,9 @@

 namespace App\Providers;

+use Gate;
 use Illuminate\Foundation\Support\Providers\AuthServiceProvider as ServiceProvider;
 use Laravel\Passport\Passport;
-use Gate;

 class AuthServiceProvider extends ServiceProvider
 {
@ -24,7 +24,7 @@ class AuthServiceProvider extends ServiceProvider
     */
    public function boot()
    {
-        if(config('app.env') === 'production' && config('pixelfed.oauth_enabled') == true) {
+        if (config('app.env') === 'production' && (bool) config_cache('pixelfed.oauth_enabled') == true) {
            Passport::tokensExpireIn(now()->addDays(config('instance.oauth.token_expiration', 356)));
            Passport::refreshTokensExpireIn(now()->addDays(config('instance.oauth.refresh_expiration', 400)));
            Passport::enableImplicitGrant();
@ -38,7 +38,7 @@ class AuthServiceProvider extends ServiceProvider
                'follow' => 'Ability to follow other profiles',
                'admin:read' => 'Read all data on the server',
                'admin:write' => 'Modify all data on the server',
-                'push'  => 'Receive your push notifications'
+                'push' => 'Receive your push notifications',
            ]);

            Passport::setDefaultScope([
--- a/resources/views/admin/diagnostics/home.blade.php
+++ b/resources/views/admin/diagnostics/home.blade.php
@ -66,7 +66,7 @@
 		</li>
 		<li>
 			<strong><span class="badge badge-primary">OAUTH</span> enabled: </strong>
-			<span>{{ config_cache('pixelfed.oauth_enabled') ? '✅ true' : '❌ false' }}</span>
+			<span>{{ (bool) config_cache('pixelfed.oauth_enabled') ? '✅ true' : '❌ false' }}</span>
 		</li>
 		<li>
 			<strong><span class="badge badge-primary">OAUTH</span> token_expiration</strong>
@ -810,7 +810,7 @@
 	<tr>
 		<td><span class="badge badge-primary">PIXELFED</span></td>
 		<td><strong>OAUTH_ENABLED</strong></td>
-		<td><span>{{config_cache('pixelfed.oauth_enabled') ? '✅ true' : '❌ false' }}</span></td>
+		<td><span>{{ (bool) config_cache('pixelfed.oauth_enabled') ? '✅ true' : '❌ false' }}</span></td>
 	</tr>
 	<tr>
 		<td><span class="badge badge-primary">PIXELFED</span></td>
--- a/resources/views/settings/applications.blade.php
+++ b/resources/views/settings/applications.blade.php
@ -6,7 +6,7 @@
 	<h3 class="font-weight-bold">Applications</h3>
 </div>
 <hr>
-@if(config_cache('pixelfed.oauth_enabled') == true)
+@if((bool) config_cache('pixelfed.oauth_enabled') == true)
 	<passport-authorized-clients></passport-authorized-clients>
 	<passport-personal-access-tokens></passport-personal-access-tokens>
@else
--- a/resources/views/settings/developers.blade.php
+++ b/resources/views/settings/developers.blade.php
@ -6,7 +6,7 @@
 	<h3 class="font-weight-bold">Developers</h3>
 </div>
 <hr>
-@if(config_cache('pixelfed.oauth_enabled') == true)
+@if((bool) config_cache('pixelfed.oauth_enabled') == true)
 	<passport-clients></passport-clients>
@else
 	<p class="lead">OAuth has not been enabled on this instance.</p>
--- a/resources/views/settings/partial/sidebar.blade.php
+++ b/resources/views/settings/partial/sidebar.blade.php
@ -39,7 +39,7 @@
                <hr>
            </li>

-            @if(config_cache('pixelfed.oauth_enabled') == true)
+            @if((bool) config_cache('pixelfed.oauth_enabled') == true)
            <li class="nav-item pl-3 {{request()->is('settings/applications')?'active':''}}">
                <a class="nav-link font-weight-light text-muted" href="{{route('settings.applications')}}">Applications</a>
            </li>