chris/pixelfed
1
0
Fork 0
forked from mirror/pixelfed
Code Pull requests Activity

Merge pull request #4720 from pixelfed/staging

Browse source 
Update ApiV1Dot1Controller, update iar redirect url format
This commit is contained in:
daniel 2023-10-29 04:50:58 -06:00 committed by GitHub
commit 12fc8fd0c0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
app/Http/Controllers/Api/ApiV1Dot1Controller.php
View file

@ -558,7 +558,12 @@ class ApiV1Dot1Controller extends Controller
$verify->random_token = $rtoken; $verify->random_token = $rtoken;
$verify->save(); $verify->save();
$appUrl = url('/api/v1.1/auth/iarer?ut=' . $user->app_register_token . '&rt=' . $rtoken); $params = http_build_query([
'ut' => $user->app_register_token,
'rt' => $rtoken,
'ea' => base64_encode($user->email)
]);
$appUrl = url('/api/v1.1/auth/iarer?'. $params);
Mail::to($user->email)->send(new ConfirmAppEmail($verify, $appUrl)); Mail::to($user->email)->send(new ConfirmAppEmail($verify, $appUrl));
@ -571,14 +576,17 @@ class ApiV1Dot1Controller extends Controller
{ {
$this->validate($request, [ $this->validate($request, [
'ut' => 'required', 'ut' => 'required',
'rt' => 'required' 'rt' => 'required',
'ea' => 'required'
]); ]);
$ut = $request->input('ut'); $ut = $request->input('ut');
$rt = $request->input('rt'); $rt = $request->input('rt');
$ea = $request->input('ea');
$params = http_build_query([ $params = http_build_query([
'ut' => $ut, 'ut' => $ut,
'rt' => $rt, 'rt' => $rt,
'domain' => config('pixelfed.domain.app') 'domain' => config('pixelfed.domain.app'),
'ea' => $ea
]); ]);
$url = 'pixelfed://confirm-account/'. $ut . '?' . $params; $url = 'pixelfed://confirm-account/'. $ut . '?' . $params;
return redirect()->away($url); return redirect()->away($url);