Changeset 3298575

Timestamp:

05/22/2025 09:17:25 AM (9 months ago)

Author:

TimsSolutions

Message:

Improvements made to the Test Connection option in the settings
Updated compatibility with WordPress 6.8.1 and Nextcloud 31.0.4

Location:

tims-nextcloud-sso-oauth2

Files:

• tags/2.0.3 (added)
• tags/2.0.3/LICENSE.txt (added)
• tags/2.0.3/README.txt (added)
• tags/2.0.3/assets (added)
• tags/2.0.3/assets/css (added)
• tags/2.0.3/assets/css/options-page.css (added)
• tags/2.0.3/assets/scss (added)
• tags/2.0.3/assets/scss/options-page.scss (added)
• tags/2.0.3/includes (added)
• tags/2.0.3/includes/button-shortcode.php (added)
• tags/2.0.3/includes/functions.php (added)
• tags/2.0.3/includes/options-page.php (added)
• tags/2.0.3/languages (added)
• tags/2.0.3/languages/tims-nextcloud-sso-oauth2-en_GB.mo (added)
• tags/2.0.3/languages/tims-nextcloud-sso-oauth2-en_GB.po (added)
• tags/2.0.3/languages/tims-nextcloud-sso-oauth2-en_US.mo (added)
• tags/2.0.3/languages/tims-nextcloud-sso-oauth2-en_US.po (added)
• tags/2.0.3/languages/tims-nextcloud-sso-oauth2.pot (added)
• tags/2.0.3/tims-nextcloud-sso-oauth2.php (added)
• trunk/README.txt (modified) (2 diffs)
• trunk/includes/functions.php (modified) (6 diffs)
• trunk/tims-nextcloud-sso-oauth2.php (modified) (1 diff)

tims-nextcloud-sso-oauth2/trunk/README.txt

@@ -5 +5 @@
 Requires at least: 4.0.0
 Tested up to: 6.8.1
-Stable tag: 2.0.2
-Requires PHP: 7.0
+Stable tag: 2.0.3
+Requires PHP: 8.0
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -125 +125 @@
  == Changelog ==
 
+= 2.0.3 =
+Release Date: 22nd May 2025
+
+- Improvements made to the Test Connection option in the settings
+- Updated compatibility with WordPress 6.8.1 and Nextcloud 31.0.4
+
+= 2.0.2 =
+Release Date: 10th August 2023
+
+- Implemented a feature request: When matching Nextcloud user groups to WordPress roles If no role matches there is now an option to select a default role for the user
+- Corrected spelling mistakes on the options page
+
 = 2.0.1 =
 Release Date: 1st July 2022

tims-nextcloud-sso-oauth2/trunk/includes/functions.php

@@ -304 +304 @@
 }
 
-
 function tims_nso_redirect_wplogin(){
     global $GLOBALS;
@@ -339 +338 @@
 add_action( 'login_form', 'tims_nso_login_button' );
 
-
-
 add_action("wp_ajax_tims_nso_test_connection", "tims_nso_test_connection");
 
@@ -350 +347 @@
         $state = bin2hex(random_bytes(10));
 
-
-        
         $authorize_url = $nextcloud_url.'apps/oauth2/authorize'.'?'.http_build_query([
             'response_type' => 'code',
@@ -360 +355 @@
         ]);
 
-
-
         $response = wp_remote_head($authorize_url);
         if(!is_wp_error($response)){
@@ -367 +360 @@
             if(isset($headers['location'])){
                 $response = esc_attr($headers['location']);
+
+                // old nextcloud response
                 $expected_response = esc_attr($nextcloud_url).'login/flow?clientIdentifier='.esc_attr($identifier);
-                if($response == $expected_response){
+
+                // also check newer nextcloud response
+                if(($response && str_contains($response, esc_attr($nextcloud_url).'login/flow?') && str_contains($response, 'clientIdentifier='.esc_attr($identifier))) || ($response == $expected_response)){
                     echo '<div class="status-success"><p>Looks Good!</p></div>';
                     die();
@@ -381 +378 @@
     echo '<div class="status-error">'.$text.'</div>';
     die();
-    
-}
-
-
-
-
-
-
-
-
+}
 
 function tims_nso_errors() {

tims-nextcloud-sso-oauth2/trunk/tims-nextcloud-sso-oauth2.php

@@ -4 +4 @@
 Plugin URI: https://www.timoxendale.co.uk/plugins/wordpress-nextcloud-sso-oauth2/
 Description: Enables you to login to your WordPress site with your Nextcloud account with OAuth2
-Version: 2.0.2
+Version: 2.0.3
 Author: Tim's Solutions
 Author URI: https://www.timoxendale.co.uk/