fix: Finish cleanup

Signed-off-by: Joas Schilling <coding@schilljs.com>

Author: nickvergessen

apps/cloud_federation_api/appinfo/info.xml

@@ -22,9 +22,6 @@
 		<nextcloud min-version="35" max-version="35"/>
 	</dependencies>
 
-	<background-jobs>
-		<job>OCA\CloudFederationAPI\BackgroundJob\CleanupExpiredOcmTokensJob</job>
-	</background-jobs>
 	<repair-steps>
 		<post-migration>
 			<step>OCA\CloudFederationAPI\Migration\DropFederatedInvitesTable</step>

apps/cloud_federation_api/lib/AppInfo/Application.php

@@ -9,12 +9,10 @@
 
 namespace OCA\CloudFederationAPI\AppInfo;
 
-use OCA\CloudFederationAPI\Listener\ShareDeletedListener;
 use OCP\AppFramework\App;
 use OCP\AppFramework\Bootstrap\IBootContext;
 use OCP\AppFramework\Bootstrap\IBootstrap;
 use OCP\AppFramework\Bootstrap\IRegistrationContext;
-use OCP\Share\Events\ShareDeletedEvent;
 
 class Application extends App implements IBootstrap {
 	public const APP_ID = 'cloud_federation_api';

apps/cloud_federation_api/lib/Controller/RequestHandlerController.php

@@ -11,7 +11,6 @@
 use OC\Authentication\Token\PublicKeyTokenProvider;
 use OC\OCM\OCMSignatoryManager;
 use OCA\CloudFederationAPI\Config;
-use OCA\CloudFederationAPI\Db\OcmTokenMapMapper;
 use OCA\CloudFederationAPI\ResponseDefinitions;
 use OCP\AppFramework\Controller;
 use OCP\AppFramework\Http;
@@ -20,7 +19,6 @@
 use OCP\AppFramework\Http\Attribute\OpenAPI;
 use OCP\AppFramework\Http\Attribute\PublicPage;
 use OCP\AppFramework\Http\JSONResponse;
-use OCP\AppFramework\Utility\ITimeFactory;
 use OCP\EventDispatcher\IEventDispatcher;
 use OCP\Federation\Exceptions\ActionNotSupportedException;
 use OCP\Federation\Exceptions\AuthenticationFailedException;
@@ -470,14 +468,7 @@ private function resolveNotificationIdentity(string $resourceType, array $notifi
 		try {
 			$provider = $this->cloudFederationProviderManager->getCloudFederationProvider($resourceType);
 			if ($provider instanceof ISignedCloudFederationProvider || $provider instanceof \NCU\Federation\ISignedCloudFederationProvider) {
-				$identity = $provider->getFederationIdFromSharedSecret($sharedSecret, $notification);
-				if ($identity === '') {
-					$tokenProvider = Server::get(PublicKeyTokenProvider::class);
-					$accessTokenDb = $tokenProvider->getToken($sharedSecret);
-					$mapping = Server::get(OcmTokenMapMapper::class)->getByAccessTokenId($accessTokenDb->getId());
-					$identity = $provider->getFederationIdFromSharedSecret($mapping->getRefreshToken(), $notification);
-				}
-				return $identity;
+				return $provider->getFederationIdFromSharedSecret($sharedSecret, $notification);
 			}
 			$this->logger->debug('cloud federation provider {provider} does not implement ISignedCloudFederationProvider', ['provider' => $provider::class]);
 		} catch (\Exception $e) {