Merge pull request #475 from lbryio/fix/youtube_redirects_error_and_index

Add redirect with if youtube token is invalid and also fix an index invalid bug
This commit is contained in:
Niko 2018-03-25 15:00:54 -04:00 committed by GitHub
commit 1edba56551
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 5 deletions

View file

@ -30,9 +30,13 @@ class AcquisitionActions extends Actions
public static function executeYouTube()
{
if(isset($_GET['error_message'])){
$error_message = Request::encodeStringFromUser($_GET['error_message']);
}
return ['acquisition/youtube', [
'reward' => LBRY::youtubeReward(),
'error_message' => Request::encodeStringFromUser($_GET['error_message']) ?? null
'error_message' => $error_message ?? ''
]];
}
@ -48,10 +52,18 @@ class AcquisitionActions extends Actions
public static function executeYoutubeStatus(string $token)
{
if(isset($_GET['error_message'])){
$error_message = Request::encodeStringFromUser($_GET['error_message']);
}
$data = LBRY::statusYoutube($token);
if ($data['success'] == false){
Controller::redirect('/youtube?error=true&error_message=' . $data['error']);
}
return ['acquisition/youtube_status', [
'token' => $token,
'status_token' => LBRY::statusYoutube($token),
'error_message' => Request::encodeStringFromUser($_GET['error_message']) ?? null
'status_token' => $data,
'error_message' => $error_message ?? ''
]];
}

View file

@ -35,7 +35,7 @@
</li>
</ul>
</div>
<div class="blocks">
<div class="block">
<p>Your Sync Status<br>
@ -101,4 +101,4 @@
</form>
</div>
</div>
</main>
</main>