Rewrite DB with Doctrine

Signed-off-by: Carl Schwan <[email protected]>

Author: CarlSchwan

appinfo/routes.php

@@ -67,8 +67,8 @@
 		['name' => 'OStatus#getLink', 'url' => '/api/v1/ostatus/link/{local}/{account}', 'verb' => 'GET'],
 
 		// OAuth
-		['name' => 'OAuth#nodeinfo', 'url' => '/.well-known/nodeinfo', 'verb' => 'GET'],
-		['name' => 'OAuth#nodeinfo2', 'url' => '/.well-known/nodeinfo/2.0', 'verb' => 'GET'],
+		['name' => 'OAuth#index', 'url' => '/.well-known/nodeinfo', 'verb' => 'GET'],
+		['name' => 'OAuth#show', 'url' => '/.well-known/nodeinfo/2.{version}{extension}', 'verb' => 'GET'],
 		['name' => 'OAuth#apps', 'url' => '/api/v1/apps', 'verb' => 'POST'],
 		['name' => 'OAuth#authorize', 'url' => '/oauth/authorize', 'verb' => 'GET'],
 		['name' => 'OAuth#token', 'url' => '/oauth/token', 'verb' => 'POST'],

lib/Controller/ApiController.php

@@ -43,7 +43,7 @@
 use OCA\Social\Model\Client\SocialClient;
 use OCA\Social\Service\AccountService;
 use OCA\Social\Service\CacheActorService;
-use OCA\Social\Service\ClientService;
+use OCA\Social\Service\ApplicationService;
 use OCA\Social\Service\ConfigService;
 use OCA\Social\Service\FollowService;
 use OCA\Social\Service\InstanceService;
@@ -65,7 +65,7 @@ class ApiController extends Controller {
 
 	private IUserSession $userSession;
 	private InstanceService $instanceService;
-	private ClientService $clientService;
+	private ApplicationService $clientService;
 	private AccountService $accountService;
 	private CacheActorService $cacheActorService;
 	private FollowService $followService;
@@ -77,10 +77,10 @@ class ApiController extends Controller {
 	private ?Person $viewer = null;
 
 	public function __construct(
-		IRequest $request, IUserSession $userSession, InstanceService $instanceService,
-		ClientService $clientService, AccountService $accountService, CacheActorService $cacheActorService,
-		FollowService $followService, StreamService $streamService, ConfigService $configService,
-		MiscService $miscService
+        IRequest           $request, IUserSession $userSession, InstanceService $instanceService,
+        ApplicationService $clientService, AccountService $accountService, CacheActorService $cacheActorService,
+        FollowService      $followService, StreamService $streamService, ConfigService $configService,
+        MiscService        $miscService
 	) {
 		parent::__construct(Application::APP_NAME, $request);
 

lib/Controller/NavigationController.php

@@ -49,6 +49,7 @@
 use OCP\AppFramework\Http\FileDisplayResponse;
 use OCP\AppFramework\Http\Response;
 use OCP\AppFramework\Http\TemplateResponse;
+use OCP\DB\ORM\IEntityManager;
 use OCP\IConfig;
 use OCP\IInitialStateService;
 use OCP\IL10N;
@@ -88,7 +89,8 @@ public function __construct(
 		DocumentService $documentService,
 		ConfigService $configService,
 		CheckService $checkService,
-		MiscService $miscService
+		MiscService $miscService,
+		IEntityManager $manager
 	) {
 		parent::__construct(Application::APP_NAME, $request);
 

lib/Controller/OAuthController.php

@@ -30,23 +30,24 @@
 
 namespace OCA\Social\Controller;
 
+use OCA\Social\Entity\Account;
+use OCA\Social\Entity\Instance;
+use OCA\Social\Repository\InstanceRepository;
 use OCA\Social\Tools\Traits\TNCDataResponse;
 use Exception;
-use OCA\Social\AppInfo\Application;
+use OCA\Social\Entity\Application;
 use OCA\Social\Exceptions\ClientException;
 use OCA\Social\Exceptions\ClientNotFoundException;
-use OCA\Social\Exceptions\InstanceDoesNotExistException;
-use OCA\Social\Model\Client\SocialClient;
 use OCA\Social\Service\AccountService;
 use OCA\Social\Service\CacheActorService;
-use OCA\Social\Service\ClientService;
+use OCA\Social\Service\ApplicationService;
 use OCA\Social\Service\ConfigService;
 use OCA\Social\Service\InstanceService;
 use OCA\Social\Service\MiscService;
 use OCP\AppFramework\Controller;
 use OCP\AppFramework\Http;
 use OCP\AppFramework\Http\DataResponse;
-use OCP\AppFramework\Http\Response;
+use OCP\DB\ORM\IEntityManager;
 use OCP\IRequest;
 use OCP\IURLGenerator;
 use OCP\IUserSession;
@@ -59,17 +60,24 @@ class OAuthController extends Controller {
 	private InstanceService $instanceService;
 	private AccountService $accountService;
 	private CacheActorService $cacheActorService;
-	private ClientService $clientService;
+	private ApplicationService $clientService;
 	private ConfigService $configService;
 	private MiscService $miscService;
+	private IEntityManager $entityManager;
 
 	public function __construct(
-		IRequest $request, IUserSession $userSession, IURLGenerator $urlGenerator,
-		InstanceService $instanceService, AccountService $accountService,
-		CacheActorService $cacheActorService, ClientService $clientService, ConfigService $configService,
-		MiscService $miscService
+		IRequest $request,
+		IUserSession $userSession,
+		IURLGenerator $urlGenerator,
+		InstanceService $instanceService,
+		AccountService $accountService,
+		CacheActorService $cacheActorService,
+		ApplicationService $clientService,
+		ConfigService $configService,
+		MiscService $miscService,
+		IEntityManager $entityManager
 	) {
-		parent::__construct(Application::APP_NAME, $request);
+		parent::__construct('social', $request);
 
 		$this->userSession = $userSession;
 		$this->urlGenerator = $urlGenerator;
@@ -79,21 +87,19 @@ public function __construct(
 		$this->clientService = $clientService;
 		$this->configService = $configService;
 		$this->miscService = $miscService;
-
-		$body = file_get_contents('php://input');
-		$this->miscService->log('[OAuthController] input: ' . $body, 0);
+		$this->entityManager = $entityManager;
 	}
 
 
 	/**
 	 * @NoCSRFRequired
 	 * @PublicPage
 	 */
-	public function nodeinfo(): DataResponse {
+	public function index(): DataResponse {
 		$nodeInfo = [
 			'links' => [
 				'rel' => 'http://nodeinfo.diaspora.software/ns/schema/2.0',
-				'href' => $this->urlGenerator->linkToRouteAbsolute('social.OAuth.nodeinfo2')
+				'href' => $this->urlGenerator->linkToRouteAbsolute('social.OAuth.show')
 			]
 		];
 
@@ -105,32 +111,24 @@ public function nodeinfo(): DataResponse {
 	 * @NoCSRFRequired
 	 * @PublicPage
 	 */
-	public function nodeinfo2(): Response {
-		try {
-			$local = $this->instanceService->getLocal();
-			$name = $local->getTitle();
-
-			$version = $local->getVersion();
-			$usage = $local->getUsage();
-			$openReg = $local->isRegistrations();
-		} catch (InstanceDoesNotExistException $e) {
-			$name = 'Nextcloud Social';
-			$version = $this->configService->getAppValue('installed_version');
-			$usage = [];
-			$openReg = false;
-		}
+	public function show(): DataResponse {
+		$query = $this->entityManager->createQuery('SELECT COUNT(a) FROM \OCA\Social\Entity\Account a');
+		$query->setCacheable(true);
+		$countUser = $query->getSingleScalarResult();
 
 		$nodeInfo = [
 			"version" => "2.0",
 			"software" => [
-				"name" => $name,
-				"version" => $version
+				"name" => 'Nextcloud Social',
+				"version" => $this->configService->getAppValue('installed_version'),
 			],
 			"protocols" => [
 				"activitypub"
 			],
-			"usage" => $usage,
-			"openRegistrations" => $openReg
+			"usage" => [
+				"total" => (int)$countUser,
+			],
+			"openRegistrations" => false,
 		];
 
 		return new DataResponse($nodeInfo, Http::STATUS_OK);
@@ -151,10 +149,10 @@ public function apps(
 			$redirect_uris = [$redirect_uris];
 		}
 
-		$client = new SocialClient();
+		$client = new Application();
 		$client->setAppWebsite($website);
 		$client->setAppRedirectUris($redirect_uris);
-		$client->setAppScopes($client->getScopesFromString($scopes));
+		$client->setAppScopes(Application::getScopesFromString($scopes));
 		$client->setAppName($client_name);
 
 		$this->clientService->createApp($client);
@@ -181,6 +179,11 @@ public function authorize(
 	): DataResponse {
 		try {
 			$user = $this->userSession->getUser();
+			$accountRepository = $this->entityManager->getRepository(Account::class);
+			$accountRepository->findBy([
+				''
+			]);
+
 			$account = $this->accountService->getActorFromUserId($user->getUID());
 
 			if ($response_type !== 'code') {