header('HTTP/1.0 500 Internal Server Error');
require 'www-header.php';
-function getOrCreateUser($mode, $name, $email)
+function getOrCreateUser($mode, $name, $imageurl, $email)
{
if ($mode == 'anonymous') {
- $name = 'Anonymous';
- $email = '';
+ $name = 'Anonymous';
+ $email = '';
+ $imageurl = '';
} else {
if ($name == '') {
$name = 'Anonymous';
}
}
- $imageurl = getImageUrl($email);
+ if ($imageurl == '') {
+ $imageurl = getImageUrl($email);
+ }
$storage = new Storage();
$id = $storage->findUser($name, $imageurl);
$response_type = getOptionalParameter($_GET, 'response_type', 'id');
$scope = getOptionalParameter($_GET, 'scope', null);
- //FIXME: if $me is an actual user, load his data
+ $id = array(
+ 'mode' => 'anonymous',
+ 'name' => '',
+ 'imageurl' => '',
+ );
+ $userId = Urls::userId($me);
+ if ($userId !== null) {
+ $storage = new Storage();
+ $rowUser = $storage->getUser($userId);
+ if ($rowUser !== null) {
+ $id['mode'] = 'data';
+ $id['name'] = $rowUser->user_name;
+ $id['imageurl'] = $rowUser->user_imageurl;
+ if ($id['imageurl'] == Urls::userImg()) {
+ $id['imageurl'] = '';
+ }
+ }
+ }
//let the user choose his identity
header('HTTP/1.0 200 OK');
'response_type' => $response_type,
'scope' => $scope,
),
+ 'id' => $id,
'formaction' => '/auth.php?action=login',
)
);
verifyParameter($id, 'mode');
$userId = getOrCreateUser(
- $id['mode'], trim($id['name']), trim($id['email'])
+ $id['mode'], trim($id['name']), trim($id['imageurl']),
+ trim($id['email'])
);
$me = Urls::full(Urls::user($userId));
//redirect back to client
$url = new \Net_URL2($redirect_uri);
- if ($response_type == 'code') {
- $url->setQueryVariable('code', $code);
- }
+ $url->setQueryVariable('code', $code);
$url->setQueryVariable('me', $me);
$url->setQueryVariable('state', $state);
header('Location: ' . $url->getURL());
error('Invalid signature');
}
header('HTTP/1.0 200 OK');
- header('Content-type: application/x-www-form-urlencoded');
- echo http_build_query(['me' => $me]);
+ header('Content-type: application/json');
+ echo json_encode(['me' => $me]);
exit();
}
} else if ($_SERVER['REQUEST_METHOD'] == 'HEAD') {