Add basic endpoint for account data

Signed-off-by: Julius Härtl <jus@bitgrid.net>
alpha1
Julius Härtl 2018-10-23 15:37:18 +02:00
rodzic 31489e37d6
commit 35cc358808
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 4C614C6ED2CDE6DF
6 zmienionych plików z 87 dodań i 7 usunięć

Wyświetl plik

@ -10,8 +10,14 @@
return [
'routes' => [
['name' => 'Navigation#navigate', 'url' => '/', 'verb' => 'GET'],
['name' => 'Navigation#timeline', 'url' => '/timeline/{path}', 'verb' => 'GET', 'requirements' => ['path' => '.+'], 'defaults' => ['path' => '']],
['name' => 'Navigation#account', 'url' => '/account/{path}', 'verb' => 'GET', 'requirements' => ['path' => '.+'], 'defaults' => ['path' => '']],
['name' => 'Navigation#public', 'url' => '/{username}', 'verb' => 'GET'],
// ['name' => 'Account#create', 'url' => '/local/account/{username}', 'verb' => 'POST'],
['name' => 'Account#info', 'url' => '/local/account/{username}', 'verb' => 'GET'],
['name' => 'ActivityPub#sharedInbox', 'url' => '/inbox', 'verb' => 'POST'],
['name' => 'ActivityPub#actor', 'url' => '/users/{username}', 'verb' => 'GET'],

Wyświetl plik

@ -30,14 +30,18 @@ declare(strict_types=1);
namespace OCA\Social\Controller;
use OC\Accounts\AccountManager;
use OC\User\NoUserException;
use OCA\Social\AppInfo\Application;
use OCA\Social\Exceptions\AccountAlreadyExistsException;
use OCA\Social\Service\ActorService;
use OCA\Social\Service\MiscService;
use OCP\AppFramework\Controller;
use OCP\AppFramework\Http\RedirectResponse;
use OCP\AppFramework\Http\Template\PublicTemplateResponse;
use OCP\AppFramework\Http\TemplateResponse;
use OCP\IConfig;
use OCP\IL10N;
use OCP\IRequest;
use OCP\IURLGenerator;
@ -58,6 +62,8 @@ class NavigationController extends Controller {
/** @var MiscService */
private $miscService;
/** @var IL10N */
private $l10n;
/**
* NavigationController constructor.
@ -70,8 +76,8 @@ class NavigationController extends Controller {
* @param MiscService $miscService
*/
public function __construct(
IRequest $request, string $userId, IConfig $config, IURLGenerator $urlGenerator,
ActorService $actorService, MiscService $miscService
IRequest $request, $userId, IConfig $config, IURLGenerator $urlGenerator,
ActorService $actorService, MiscService $miscService, IL10N $l10n
) {
parent::__construct(Application::APP_NAME, $request);
@ -81,6 +87,7 @@ class NavigationController extends Controller {
$this->actorService = $actorService;
$this->miscService = $miscService;
$this->l10n = $l10n;
}
@ -94,8 +101,12 @@ class NavigationController extends Controller {
* @return TemplateResponse
* @throws NoUserException
*/
public function navigate(): TemplateResponse {
$data = [];
public function navigate($path = ''): TemplateResponse {
$data = [
'serverData' => [
'public' => false,
]
];
try {
$this->actorService->createActor($this->userId, $this->userId);
@ -103,8 +114,73 @@ class NavigationController extends Controller {
// we do nothing
}
return new TemplateResponse(Application::APP_NAME, 'main', $data);
}
/**
* Display the navigation page of the Social app.
*
* @NoCSRFRequired
* @NoAdminRequired
* @NoSubAdminRequired
*
* @return TemplateResponse
* @throws NoUserException
*/
public function timeline($path = ''): TemplateResponse {
return $this->navigate();
}
/**
* Display the navigation page of the Social app.
*
* @NoCSRFRequired
* @NoAdminRequired
* @NoSubAdminRequired
*
* @return TemplateResponse
* @throws NoUserException
*/
public function account($path = ''): TemplateResponse {
return $this->navigate();
}
/**
* @NoCSRFRequired
* @PublicPage
*
* @param $username
* @return RedirectResponse|PublicTemplateResponse
*/
public function public($username) {
if (\OC::$server->getUserSession()->isLoggedIn()) {
return new RedirectResponse(\OC::$server->getURLGenerator()->linkToRoute('social.Navigation.navigate'));
}
// TODO public interface for account manager
/** @var AccountManager $accountManager */
$accountManager = \OC::$server->query(AccountManager::class);
$userData = $accountManager->getUser(\OC::$server->getUserManager()->get($username));
$data = [
'username' => $username,
'displayName' => $this->getPublicValue($userData, AccountManager::PROPERTY_DISPLAYNAME),
'website' => $this->getPublicValue($userData, AccountManager::PROPERTY_WEBSITE),
'account' => json_encode($userData),
'serverData' => [
'public' => true,
]
];
$page = new PublicTemplateResponse(Application::APP_NAME, 'main', $data);
$page->setHeaderTitle($this->l10n->t('Social') . ' ' . $username);
return $page;
}
private function getPublicValue($userData, $value) {
if ($userData[$value]['scope'] === 'public') {
return $userData[$value]['value'];
}
}
}

Wyświetl plik

@ -1 +0,0 @@
ACTOR !

Wyświetl plik

@ -1 +0,0 @@
FOLLOWERS !!!1

Wyświetl plik

@ -1 +0,0 @@
FOLLOWING

Wyświetl plik

@ -2,4 +2,5 @@
script('social', 'social');
style('social', 'style');
?>
<span id="serverData" data-server="<?php p(json_encode($_['serverData']));?>"></span>
<div id="vue-content"></div>