Merge pull request #243 from auth0/dev

Dev

Author: glena

WP_Auth0.php

@@ -2,7 +2,7 @@
 /**
  * Plugin Name: PLUGIN_NAME
  * Description: PLUGIN_DESCRIPTION
- * Version: 3.2.8
+ * Version: 3.2.9
  * Author: Auth0
  * Author URI: https://auth0.com
  */
@@ -11,8 +11,8 @@
 define( 'WPA0_PLUGIN_DIR', trailingslashit( plugin_dir_path( __FILE__ ) ) );
 define( 'WPA0_PLUGIN_URL', trailingslashit( plugin_dir_url( __FILE__ ) ) );
 define( 'WPA0_LANG', 'wp-auth0' );
-define( 'AUTH0_DB_VERSION', 11 );
-define( 'WPA0_VERSION', '3.2.8' );
+define( 'AUTH0_DB_VERSION', 12 );
+define( 'WPA0_VERSION', '3.2.9' );
 
 /**
  * Main plugin class

lib/WP_Auth0_DBManager.php

@@ -47,6 +47,15 @@ public function install_db() {
 		if ( strpos( $cdn_url, 'auth0-widget-5' ) !== false || strpos( $cdn_url, 'lock-9.1' ) !== false ) {
 			$options->set( 'cdn_url', '//cdn.auth0.com/js/lock-9.2.min.js' );
 		}
+		if ( strpos( $cdn_url, '10.0' ) !== false ) {
+			$options->set( 'cdn_url', '//cdn.auth0.com/js/lock/10.3/lock.min.js' );
+		}
+		if ( strpos( $cdn_url, '10.1' ) !== false ) {
+			$options->set( 'cdn_url', '//cdn.auth0.com/js/lock/10.3/lock.min.js' );
+		}
+		if ( strpos( $cdn_url, '10.2' ) !== false ) {
+			$options->set( 'cdn_url', '//cdn.auth0.com/js/lock/10.3/lock.min.js' );
+		}
 
 		if ( $this->current_db_version <= 7 ) {
 			if ( $options->get( 'db_connection_enabled' ) ) {
@@ -77,7 +86,7 @@ public function install_db() {
 
 			if ($options->get('use_lock_10') === null) {
 
-				if ( strpos( $cdn_url, '10.0' ) !== false ) {
+				if ( strpos( $cdn_url, '10.' ) !== false ) {
 					$options->set('use_lock_10', false);
 				} else {
 					$options->set('use_lock_10', true);
@@ -103,9 +112,9 @@ public function install_db() {
 
 		}
 
-		if ( $this->current_db_version < 11 ) {
+		if ( $this->current_db_version < 12 ) {
 
-			if ( strpos( $cdn_url, '10.0' ) === false ) {
+			if ( strpos( $cdn_url, '10.' ) === false ) {
 				$options->set('use_lock_10', false);
 			}	
 			else 

lib/WP_Auth0_UsersRepo.php

@@ -148,11 +148,13 @@ public function create( $userinfo, $token, $access_token = null, $role = null, $
 	public function find_auth0_user( $id ) {
 		global $wpdb;
 
-		$users = get_users( array( 
+		$query = array( 
   		'meta_key' => $wpdb->prefix.'auth0_id',
   		'meta_value' => $id,
-  		'blog_id' => 0)
-  	); 
+  		'blog_id' => 0,
+  	);
+
+		$users = get_users( $query ); 
 
 		if ( $users instanceof WP_Error ) {
 			WP_Auth0_ErrorManager::insert_auth0_error( '_find_auth0_user', $userRow );