Changeset 872768

Timestamp:

03/10/2014 02:26:15 PM (10 years ago)

Author:

filosofo

Message:

Add 1.0.2 tag directory.

Location:

wp-restful-single-sign-on

Files:

• tags/1.0.2 (added)
• tags/1.0.2/LICENSE (added)
• tags/1.0.2/README.md (added)
• tags/1.0.2/RestfulSingleSignOn (added)
• tags/1.0.2/RestfulSingleSignOn/Api (added)
• tags/1.0.2/RestfulSingleSignOn/Api/AuthInterface.php (added)
• tags/1.0.2/RestfulSingleSignOn/Api/Rest.php (added)
• tags/1.0.2/RestfulSingleSignOn/DummyMailer.php (added)
• tags/1.0.2/RestfulSingleSignOn/HttpResponse.php (added)
• tags/1.0.2/RestfulSingleSignOnPlugin.php (added)
• tags/1.0.2/readme.txt (added)
• trunk/RestfulSingleSignOn/HttpResponse.php (modified) (1 diff)
• trunk/RestfulSingleSignOnPlugin.php (modified) (3 diffs)
• trunk/readme.txt (modified) (2 diffs)

wp-restful-single-sign-on/trunk/RestfulSingleSignOn/HttpResponse.php

@@ -229 +229 @@
     {
         $resp = null;
-        if (!empty($wp_response)) {
+        if (!empty($wp_response)) {
             $body = isset($wp_response['body']) ? $wp_response['body'] : '';
             $resp = new RestfulSingleSignOn_HttpResponse($body);

wp-restful-single-sign-on/trunk/RestfulSingleSignOnPlugin.php

@@ -209 +209 @@
                     if (!empty($email_property) && !empty($current_user_endpoint)) {
                         $resp = $this->_getAuthInterface()->getCurrentUserInfo($_COOKIE[$auth_cookie_name]);
-                        $data = $resp->getParsedBody();
-                        if (
-                            (!$data instanceof WP_Error)
-                            && !empty($data[$email_property])
-                        ) {
-                            $found_user = get_user_by('email', $data[$email_property]);
-                            if (!empty($found_user->ID)) {
-                                $current_user = $found_user;
-                                wp_set_current_user($found_user->ID);
+                        if (!is_null($resp)) {
+                            $data = $resp->getParsedBody();
+                            if (
+                                (!$data instanceof WP_Error)
+                                && !empty($data[$email_property])
+                            ) {
+                                $found_user = get_user_by('email', $data[$email_property]);
+                                if (!empty($found_user->ID)) {
+                                    $current_user = $found_user;
+                                    wp_set_current_user($found_user->ID);
+                                }
                             }
                         }
@@ -440 +442 @@
                     if ($db_user->get('restful_sso_user')) {
                         $resp = $this->_getAuthInterface()->authenticateUser($username, $password);
+
+
+
+
+
+
+
+
+
+
+
+
+
+
                         $data = $resp->getParsedBody();
                         if (!$data instanceof WP_Error) {
-                            $user = $db_user;
+                            // Let's create a user in the WordPress system corresponding to the user.
+                            $arbitrary_password = sha1(uniqid(microtime()));
+                            $user_id = wp_create_user($username, $arbitrary_password, $data[$email_property]);
+                            update_user_meta($user_id, 'first_name', $data[$first_name_property]);
+                            update_user_meta($user_id, 'last_name', $data[$last_name_property]);
+                            update_user_meta($user_id, 'restful_sso_user', true);
+
+                            $user = get_user_by('id', $user_id);
                             if (0 < count($cookies_to_set)) {
                                 $this->_set_cookies_from_response($cookies_to_set, $cookie_domain, $resp);
                             }
-                        }
-                    }
-
-                } else {
-                    $resp = $this->_getAuthInterface()->authenticateUser($username, $password);
-                    $data = $resp->getParsedBody();
-                    if (!$data instanceof WP_Error) {
-                        // Let's create a user in the WordPress system corresponding to the user.
-                        $arbitrary_password = sha1(uniqid(microtime()));
-                        $user_id = wp_create_user($username, $arbitrary_password, $data[$email_property]);
-                        update_user_meta($user_id, 'first_name', $data[$first_name_property]);
-                        update_user_meta($user_id, 'last_name', $data[$last_name_property]);
-                        update_user_meta($user_id, 'restful_sso_user', true);
-
-                        $user = get_user_by('id', $user_id);
-                        if (0 < count($cookies_to_set)) {
-                            $this->_set_cookies_from_response($cookies_to_set, $cookie_domain, $resp);
                         }
                     }
@@ -496 +502 @@
                             $username = $user->user_email;
                             $resp = $this->_getAuthInterface()->requestPasswordReset($username);
-                            $result = $resp->getParsedBody();
-                            if ($result instanceof WP_Error) {
-                                $phpmailer = new RestfulSingleSignOn_DummyMailer(false, $result);
-                            } else {
-                                $phpmailer = new RestfulSingleSignOn_DummyMailer(false, true);
+                            if (!is_null($resp)) {
+                                $result = $resp->getParsedBody();
+                                if ($result instanceof WP_Error) {
+                                    $phpmailer = new RestfulSingleSignOn_DummyMailer(false, $result);
+                                } else {
+                                    $phpmailer = new RestfulSingleSignOn_DummyMailer(false, true);
+                                }
                             }
                         }

wp-restful-single-sign-on/trunk/readme.txt

@@ -5 +5 @@
 Requires at least: 3.8
 Tested up to: 3.8
-Stable tag: 1.0.1
+Stable tag: 1.0.
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -56 +56 @@
 == Changelog ==
 
+
+
+
 = 1.0 =
 Initial release of plugin