Update to support Nextcloud 30

Signed-off-by: H2CK <dev@jagel.net>
H2CK · Aug 29, 2024 · b03d86e · b03d86e
1 parent 9b9a043
commit b03d86e
Show file tree

Hide file tree

Showing 52 changed files with 13,791 additions and 5,447 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,16 @@
 
 All notable changes to this project will be documented in this file.
 
+## [0.9.3] - 2024-08-29
+
+### Changed
+
+- Added support for Nextcloud 30
+- Removed support for Nextcloud 27
+- Updated dependencies
+- Updated translations
+- Code cleanup and replacement of deprecated Nextcloud functions
+
 ## [0.9.2] - 2024-07-25
 
 ### Changed

diff --git a/appinfo/info.xml b/appinfo/info.xml
@@ -14,7 +14,7 @@ Full documentation can be found at:
 - [Developer Documentation](https://github.com/H2CK/oidc/wiki#developer-documentation)
 
 	]]></description>
-  <version>0.9.2</version>
+  <version>0.9.3</version>
   <licence>agpl</licence>
   <author mail="dev@jagel.net" homepage="https://github.com/H2CK/oidc">Thorsten Jagel</author>
   <namespace>OIDCIdentityProvider</namespace>
@@ -40,7 +40,7 @@ Full documentation can be found at:
   <screenshot>https://raw.githubusercontent.com/H2CK/oidc/master/docs/oidc-app.png</screenshot>
   <dependencies>
     <lib>openssl</lib>
-    <nextcloud min-version="27" max-version="29"/>
+    <nextcloud min-version="28" max-version="30"/>
   </dependencies>
 
   <background-jobs>

diff --git a/composer.lock b/composer.lock
diff --git a/js/oidc-main.js b/js/oidc-main.js
diff --git a/js/oidc-main.js.map b/js/oidc-main.js.map
diff --git a/lib/AppInfo/Application.php b/lib/AppInfo/Application.php
@@ -34,28 +34,28 @@
 use OCP\AppFramework\Bootstrap\IRegistrationContext;
 
 class Application extends App implements IBootstrap {
-	public const APP_ID = 'oidc';
+    public const APP_ID = 'oidc';
 
-	private $backend;
+    private $backend;
 
-	public function __construct() {
-		parent::__construct(self::APP_ID);
-	}
+    public function __construct() {
+        parent::__construct(self::APP_ID);
+    }
 
-	public function register(IRegistrationContext $context): void {
+    public function register(IRegistrationContext $context): void {
         // Register the composer autoloader for packages shipped by this app
         require_once __DIR__ . '/../../vendor/autoload.php';
-		// Register WebFingerHandler
-		$context->registerWellKnownHandler(WebFingerHandler::class);
-		// Register OIDCDiscoveryHandler
-		$context->registerWellKnownHandler(OIDCDiscoveryHandler::class);
+        // Register WebFingerHandler
+        $context->registerWellKnownHandler(WebFingerHandler::class);
+        // Register OIDCDiscoveryHandler
+        $context->registerWellKnownHandler(OIDCDiscoveryHandler::class);
 
-		$this->backend = $this->getContainer()->get(BasicAuthBackend::class);
-		OC_User::useBackend($this->backend);
+        $this->backend = $this->getContainer()->get(BasicAuthBackend::class);
+        OC_User::useBackend($this->backend);
     }
 
     public function boot(IBootContext $context): void {
-
+        // Currently not needed
     }
 
 }
diff --git a/lib/BackgroundJob/CleanupExpiredClients.php b/lib/BackgroundJob/CleanupExpiredClients.php
@@ -33,29 +33,29 @@
 class CleanupExpiredClients extends TimedJob {
 
     /** @var ClientMapper */
-	private $clientMapper;
-	/** @var IConfig */
-	private $settings;
-
-	/**
-	 * @param ITimeFactory $time
-	 * @param ClientMapper $clientMapper
-	 */
-	public function __construct(ITimeFactory $time,
-								ClientMapper $clientMapper,
-								IConfig $settings) {
-		parent::__construct($time);
-		$this->clientMapper = $clientMapper;
-		$this->settings = $settings;
-
-		// Run each hour
-		$this->setInterval(1 * 60 * 60);
-		$this->setTimeSensitivity(\OCP\BackgroundJob\IJob::TIME_INSENSITIVE);
-	}
-
-	protected function run($argument): void {
-		// Don't run CleanUpJob when backgroundjobs_mode is ajax or webcron
-		// if ($this->settings->getAppValue('core', 'backgroundjobs_mode') !== 'cron') return;
+    private $clientMapper;
+    /** @var IConfig */
+    private $settings;
+
+    /**
+     * @param ITimeFactory $time
+     * @param ClientMapper $clientMapper
+     */
+    public function __construct(ITimeFactory $time,
+                                ClientMapper $clientMapper,
+                                IConfig $settings) {
+        parent::__construct($time);
+        $this->clientMapper = $clientMapper;
+        $this->settings = $settings;
+
+        // Run each hour
+        $this->setInterval(1 * 60 * 60);
+        $this->setTimeSensitivity(\OCP\BackgroundJob\IJob::TIME_INSENSITIVE);
+    }
+
+    protected function run($argument): void {
+        // Don't run CleanUpJob when backgroundjobs_mode is ajax or webcron
+        // if ($this->settings->getAppValue('core', 'backgroundjobs_mode') !== 'cron') return;
         $this->clientMapper->cleanUp();
-	}
+    }
 }
diff --git a/lib/BackgroundJob/CleanupExpiredTokens.php b/lib/BackgroundJob/CleanupExpiredTokens.php
@@ -33,29 +33,29 @@
 class CleanupExpiredTokens extends TimedJob {
 
     /** @var AccessTokenMapper */
-	private $accessTokenMapper;
-	/** @var IConfig */
-	private $settings;
-
-	/**
-	 * @param ITimeFactory $time
-	 * @param AccessTokenMapper $accessTokenMapper
-	 */
-	public function __construct(ITimeFactory $time,
-								AccessTokenMapper $accessTokenMapper,
-								IConfig $settings) {
-		parent::__construct($time);
-		$this->accessTokenMapper = $accessTokenMapper;
-		$this->settings = $settings;
-
-		// Run four times a day
-		$this->setInterval(6 * 60 * 60);
-		$this->setTimeSensitivity(\OCP\BackgroundJob\IJob::TIME_INSENSITIVE);
-	}
-
-	protected function run($argument): void {
-		// Don't run CleanUpJob when backgroundjobs_mode is ajax or webcron
-		// if ($this->settings->getAppValue('core', 'backgroundjobs_mode') !== 'cron') return;
+    private $accessTokenMapper;
+    /** @var IConfig */
+    private $settings;
+
+    /**
+     * @param ITimeFactory $time
+     * @param AccessTokenMapper $accessTokenMapper
+     */
+    public function __construct(ITimeFactory $time,
+                                AccessTokenMapper $accessTokenMapper,
+                                IConfig $settings) {
+        parent::__construct($time);
+        $this->accessTokenMapper = $accessTokenMapper;
+        $this->settings = $settings;
+
+        // Run four times a day
+        $this->setInterval(6 * 60 * 60);
+        $this->setTimeSensitivity(\OCP\BackgroundJob\IJob::TIME_INSENSITIVE);
+    }
+
+    protected function run($argument): void {
+        // Don't run CleanUpJob when backgroundjobs_mode is ajax or webcron
+        // if ($this->settings->getAppValue('core', 'backgroundjobs_mode') !== 'cron') return;
         $this->accessTokenMapper->cleanUp();
-	}
+    }
 }