aiden
/
pixelfed
mirror of https://github.com/pixelfed/pixelfed
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix oauth

Browse Source
pull/6510/head
Daniel Supernault 7 months ago
parent a73bbb12e2
commit 695e851026
No known key found for this signature in database
GPG Key ID: 23740873EE6F76A1
4 changed files with 110 additions and 6 deletions
Show Stats Download Patch File Download Diff File

12
app/Http/Controllers/Api/ApiV1Controller.php
Unescape Escape View File

@ -86,7 +86,7 @@ use DB;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\RateLimiter;
use Illuminate\Support\Str;
use Laravel\Passport\Passport;
use Laravel\Passport\Client;
use League\Fractal;
use League\Fractal\Serializer\ArraySerializer;
use Storage;
@ -145,16 +145,18 @@ class ApiV1Controller extends Controller
->filter()
->join(',');
$client = Passport::client()->forceFill([
$secret = Str::random(40);
$client = new Client;
$client->forceFill([
'user_id' => null,
'name' => e($request->client_name),
'secret' => Str::random(40),
'secret' => $secret,
'redirect' => $uris,
'personal_access_client' => false,
'password_client' => false,
'revoked' => false,
]);
$client->save();
$res = [
@ -163,7 +165,7 @@ class ApiV1Controller extends Controller
'website' => null,
'redirect_uri' => $client->redirect,
'client_id' => (string) $client->id,
'client_secret' => $client->secret,
'client_secret' => $secret,
'vapid_key' => null,
];

4
app/Providers/AppServiceProvider.php
Unescape Escape View File

@ -37,6 +37,7 @@ use Illuminate\Support\Facades\RateLimiter;
use Illuminate\Support\Facades\Schema;
use Illuminate\Support\Facades\Validator;
use Illuminate\Support\ServiceProvider;
use Laravel\Passport\Passport;
use Laravel\Pulse\Facades\Pulse;
use URL;
@ -53,6 +54,9 @@ class AppServiceProvider extends ServiceProvider
URL::forceScheme('https');
}
Passport::$clientUuids = false;
Passport::authorizationView('auth.oauth.authorize');
Schema::defaultStringLength(191);
Paginator::useBootstrap();
Avatar::observe(AvatarObserver::class);

3
app/User.php
Unescape Escape View File

@ -8,10 +8,11 @@ use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\SoftDeletes;
use Illuminate\Foundation\Auth\User as Authenticatable;
use Illuminate\Notifications\Notifiable;
use Laravel\Passport\Contracts\OAuthenticatable;
use Laravel\Passport\HasApiTokens;
use NotificationChannels\WebPush\HasPushSubscriptions;
class User extends Authenticatable
class User extends Authenticatable implements OAuthenticatable
{
use HasApiTokens, HasFactory, HasPushSubscriptions, Notifiable, SoftDeletes, UserRateLimit;

97
resources/views/auth/oauth/authorize.blade.php
Unescape Escape View File

@ -0,0 +1,97 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>{{ config_cache('app.name') }} - Authorization</title>
<link href="{{ mix('/css/app.css') }}" rel="stylesheet">
<style>
.passport-authorize .container {
margin-top: 30px;
}
.passport-authorize .scopes {
margin-top: 20px;
}
.passport-authorize .buttons {
margin-top: 25px;
text-align: center;
}
.passport-authorize .btn {
width: 125px;
}
.passport-authorize .btn-approve {
margin-right: 15px;
}
.passport-authorize form {
display: inline;
}
</style>
</head>
<body class="passport-authorize">
<div class="container">
<div class="row justify-content-center">
<div class="col-md-6">
<div class="text-center mb-5">
<img src="/img/pixelfed-icon-grey.svg">
</div>
<p class="text-center h3 font-weight-light mb-3">Authorize {{ $client->name }}</p>
<div class="card card-default shadow-none border">
<div class="card-body">
<div class="media">
<img src="/img/icon/alert-circle.svg" class="mr-3" width="32" height="32">
<div class="media-body">
<p class="my-0"><span class="font-weight-bold">{{ $client->name }}</span></p>
<p class="mb-0 text-muted small">wants access to your <strong>{{request()->user()->username}}</strong> account</p>
</div>
</div>
<hr>
@if (count($scopes) > 0)
<div class="scopes">
@foreach ($scopes as $scope)
<div class="media mb-3">
<img src="/img/icon/unlock.svg" class="mr-3" width="32" height="32">
<div class="media-body">
<p class="my-0"><span class="font-weight-bold">{{ $scope->id }}</span></p>
<p class="mb-0 text-muted small">{{$scope->description}}</p>
</div>
</div>
@endforeach
</div>
@endif
<div class="buttons">
<form method="post" action="{{ route('passport.authorizations.approve') }}">
{{ csrf_field() }}
<input type="hidden" name="state" value="{{ $request->state }}">
<input type="hidden" name="client_id" value="{{ $client->id }}">
<button type="submit" class="btn btn-success font-weight-bold btn-approve">Authorize</button>
</form>
<form method="post" action="{{ route('passport.authorizations.deny') }}">
{{ csrf_field() }}
{{ method_field('DELETE') }}
<input type="hidden" name="state" value="{{ $request->state }}">
<input type="hidden" name="client_id" value="{{ $client->id }}">
<button class="btn btn-outline-danger font-weight-bold">Cancel</button>
</form>
</div>
<hr>
<p class="mb-0 text-center small text-muted">Click <a href="{{ route('logout') }}" class="font-weight-bold" onclick="event.preventDefault();document.getElementById('logout_auth').submit();">here</a> to log out of this account.</p>
<form id="logout_auth" action="{{ route('logout') }}" method="POST" style="display: none;">
@csrf
</form>
</div>
</div>
</div>
</div>
</div>
</body>
</html>
Write Preview
Loading…
Cancel
Save