Skip to content
Snippets Groups Projects
Commit 46a35ce0 authored by Benoît Harrault's avatar Benoît Harrault
Browse files

Improve/clean some code

parent 226daaa5
No related branches found
No related tags found
1 merge request!4Resolve "Improve/clean code"
Show whitespace changes
Inline Side-by-side
public/auth.php
+ 3
− 15
View file @ 46a35ce0
<?php <?php
session_start(); require '../spotify/spotify.php';
require '../vendor/autoload.php'; $session = new SpotifyWebAPI\Session($CLIENT_ID, $CLIENT_SECRET, $REDIRECT_URI);
require '../config.php';
$session = new SpotifyWebAPI\Session(
$CLIENT_ID,
$CLIENT_SECRET,
$REDIRECT_URI
);
$state = $session->generateState(); $state = $session->generateState();
$_SESSION['state'] = $state; $_SESSION['state'] = $state;
$options = [ $options = [
'scope' => [ 'scope' => $SPOTIFY_REQUIRED_SCOPES,
'playlist-read-private',
'playlist-modify-private',
'playlist-modify-public',
'user-read-private',
],
'state' => $state, 'state' => $state,
]; ];
......
public/callback.php
+ 2
− 9
View file @ 46a35ce0
<?php <?php
session_start(); require '../spotify/spotify.php';
require '../vendor/autoload.php'; $session = new SpotifyWebAPI\Session($CLIENT_ID, $CLIENT_SECRET, $REDIRECT_URI);
require '../config.php';
$session = new SpotifyWebAPI\Session(
$CLIENT_ID,
$CLIENT_SECRET,
$REDIRECT_URI
);
$storedState = $_SESSION['state']; $storedState = $_SESSION['state'];
$state = $_GET['state']; $state = $_GET['state'];
......
public/index.php
+ 16
− 38
View file @ 46a35ce0
<?php <?php
session_start(); require '../spotify/spotify.php';
require '../vendor/autoload.php';
require '../config.php';
if (isset($_GET['logout'])) { if (isset($_GET['logout'])) {
$_SESSION['accessToken'] = ''; $_SESSION['accessToken'] = '';
$_SESSION['refreshToken'] = ''; $_SESSION['refreshToken'] = '';
} }
$accessToken = ''; $_SESSION['accessToken'] = isset($_SESSION['accessToken']) ? $_SESSION['accessToken'] : '';
if (isset($_SESSION['accessToken'])) { $_SESSION['refreshToken'] = isset($_SESSION['refreshToken']) ? $_SESSION['refreshToken'] : '';
$accessToken = $_SESSION['accessToken'];
}
$refreshToken = '';
if (isset($_SESSION['refreshToken'])) {
$refreshToken = $_SESSION['refreshToken'];
}
if (!$accessToken) { if (!$_SESSION['accessToken']) {
header('Location: auth.php'); header('Location: auth.php');
die(); die();
} }
$session = new SpotifyWebAPI\Session( $session = new SpotifyWebAPI\Session($CLIENT_ID, $CLIENT_SECRET, $REDIRECT_URI);
$CLIENT_ID,
$CLIENT_SECRET,
$REDIRECT_URI
);
// Use previously requested tokens fetched from session // Use previously requested tokens fetched from session
if ($accessToken) { if ($_SESSION['accessToken']) {
$session->setAccessToken($accessToken); $session->setAccessToken($_SESSION['accessToken']);
$session->setRefreshToken($refreshToken); $session->setRefreshToken($_SESSION['refreshToken']);
} else { } else {
// Or request a new access token // Or request a new access token
$session->refreshAccessToken($refreshToken); $session->refreshAccessToken($_SESSION['refreshToken']);
} }
$options = [ $options = [
'scope' => [ 'scope' => $SPOTIFY_REQUIRED_SCOPES,
'playlist-read-private',
'playlist-modify-private',
'playlist-modify-public',
'user-read-private',
],
'auto_refresh' => true, 'auto_refresh' => true,
]; ];
...@@ -58,23 +40,19 @@ $_SESSION['refreshToken'] = $session->getRefreshToken(); ...@@ -58,23 +40,19 @@ $_SESSION['refreshToken'] = $session->getRefreshToken();
$user = $api->me(); $user = $api->me();
$templateData = []; $templateData = [
$templateData['user'] = $user; 'user' => $user,
$templateData['userImageUrl'] = ''; 'playlists' => [],
if ($user->images[0]) {
$templateData['userImageUrl'] = $user->images[0]->url;
}
$templateData['infos'] = []; 'infos' => [],
$templateData['errors'] = []; 'errors' => [],
];
$selectedPlaylistId = ''; $selectedPlaylistId = '';
if (isset($_GET['playlist'])) { if (isset($_GET['playlist'])) {
$selectedPlaylistId = $_GET['playlist']; $selectedPlaylistId = $_GET['playlist'];
} }
$templateData['playlists'] = [];
if ($selectedPlaylistId) { if ($selectedPlaylistId) {
$playlist = $api->getPlaylist($selectedPlaylistId); $playlist = $api->getPlaylist($selectedPlaylistId);
error_log('Will create new playlist from tracks in playlist '.$selectedPlaylistId.' "'.$playlist->name.'".'); error_log('Will create new playlist from tracks in playlist '.$selectedPlaylistId.' "'.$playlist->name.'".');
......
config.php → spotify/spotify.php
+ 18
− 0
View file @ 46a35ce0
<?php <?php
session_start();
$parametersFile = __DIR__.'/parameters.php'; require '../vendor/autoload.php';
$parametersFile = realpath(__DIR__.'/../parameters.php');
if (!is_file($parametersFile)) { if (!is_file($parametersFile)) {
die('Missing parameters file: '.$parametersFile); die('Missing parameters file: '.$parametersFile);
} }
require $parametersFile; require $parametersFile;
$SPOTIFY_REQUIRED_SCOPES = [
'playlist-read-private',
'playlist-modify-private',
'playlist-modify-public',
'user-read-private',
];
template.php
+ 3
− 1
View file @ 46a35ce0
...@@ -16,7 +16,9 @@ ...@@ -16,7 +16,9 @@
<div class="col-md-2"> <div class="col-md-2">
<div class="card"> <div class="card">
<img src="<?php echo $templateData['userImageUrl']; ?>" class="card-img-top" alt="<?php echo $templateData['user']->display_name; ?>"> <?php if (count($templateData['user']->images)) { ?>
<img src="<?php echo $templateData['user']->images[0]->url; ?>" class="card-img-top" alt="<?php echo $templateData['user']->display_name; ?>">
<?php } ?>
<div class="card-body"> <div class="card-body">
<h5 class="card-title"><?php echo $templateData['user']->display_name; ?></h5> <h5 class="card-title"><?php echo $templateData['user']->display_name; ?></h5>
<a href="<?php echo $templateData['user']->external_urls->spotify; ?>" class="btn btn-primary">View profile</a> <a href="<?php echo $templateData['user']->external_urls->spotify; ?>" class="btn btn-primary">View profile</a>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment