Merge pull request #242 from auth0/dev

3.2.8

Author: glena

WP_Auth0.php

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

lib/WP_Auth0_Options.php

@@ -62,7 +62,7 @@ protected function defaults() {
 			'passwordless_method' => 'magiclink',
 			'passwordless_cdn_url' => '//cdn.auth0.com/js/lock-passwordless-2.2.min.js',
 			'use_lock_10' => null,
-			'cdn_url' => '//cdn.auth0.com/js/lock/10.0/lock.min.js',
+			'cdn_url' => '//cdn.auth0.com/js/lock/10.3/lock.min.js',
 			'cdn_url_legacy' => '//cdn.auth0.com/js/lock-9.2.min.js',
 			'requires_verified_email' => true,
 			'wordpress_login_enabled' => true,
@@ -74,7 +74,7 @@ protected function defaults() {
 			'custom_signup_fields' => '',
 
 			'social_big_buttons' => false,
-			'username_style' => 'username',
+			'username_style' => '',
 			'extra_conf' => '',
 			'remember_last_login' => true,
 			'custom_css' => '',

lib/admin/WP_Auth0_Admin_Advanced.php

@@ -485,17 +485,23 @@ public function migration_ws_validation( $old_options, $input ) {
         $input['migration_token'] = null;
         $input['migration_token_id'] = null;
 
-        $connection = WP_Auth0_Api_Client::get_connection($input['domain'], $input['auth0_app_token'], $old_options['db_connection_id']);
+        if (isset($old_options['db_connection_id'])) {
 
-        $connection->options->enabledDatabaseCustomization = false;
-        $connection->options->import_mode = false;
 
-        unset($connection->name);
-        unset($connection->strategy);
-        unset($connection->id);
+          $connection = WP_Auth0_Api_Client::get_connection($input['domain'], $input['auth0_app_token'], $old_options['db_connection_id']);
 
-        $response = WP_Auth0_Api_Client::update_connection($input['domain'], $input['auth0_app_token'], $old_options['db_connection_id'], $connection);
-  
+          $connection->options->enabledDatabaseCustomization = false;
+          $connection->options->import_mode = false;
+
+
+          unset($connection->name);
+          unset($connection->strategy);
+          unset($connection->id);
+
+          $response = WP_Auth0_Api_Client::update_connection($input['domain'], $input['auth0_app_token'], $old_options['db_connection_id'], $connection);
+        } else {
+          $response = false;
+        }
 
         if ( $response === false ) {
           $error = __( 'There was an error disabling your custom database. Check how to do it manually ', WPA0_LANG );
@@ -568,7 +574,7 @@ public function connections_validation( $old_options, $input ) {
       $matching = array_intersect($enabled_connections, $check_if_enabled);
 
       if (array_diff($matching, $check_if_enabled) !== array_diff($check_if_enabled, $matching)) {
-        $error = __( 'The passwordless connection is not enabled. Pleas go to the Auth0 Dashboard and configure it.', WPA0_LANG );
+        $error = __( 'The passwordless connection is not enabled. Please go to the Auth0 Dashboard and configure it.', WPA0_LANG );
         $this->add_validation_error( $error );
       }
 

lib/admin/WP_Auth0_Admin_Appearance.php

@@ -104,6 +104,9 @@ public function render_custom_js() {
 	public function render_username_style() {
 		$v = $this->options->get( 'username_style' );
 ?>
+      <input type="radio" name="<?php echo $this->options->get_options_name(); ?>[username_style]" id="wpa0_username_style_auto" value="" <?php echo esc_attr( $v ) == '' ? 'checked="true"' : ''; ?> />
+      <label for="wpa0_username_style_auto"><?php echo __( 'Auto', WPA0_LANG ); ?></label>
+
       <input type="radio" name="<?php echo $this->options->get_options_name(); ?>[username_style]" id="wpa0_username_style_email" value="email" <?php echo esc_attr( $v ) == 'email' ? 'checked="true"' : ''; ?> />
       <label for="wpa0_username_style_email"><?php echo __( 'Email', WPA0_LANG ); ?></label>
 
@@ -112,7 +115,7 @@ public function render_username_style() {
 
       <div class="subelement">
         <span class="description">
-          <?php echo __( 'If you don\'t want to validate that the user enters an email, just set this to username.', WPA0_LANG ); ?>
+          <?php echo __( 'If you want to allow the user to use either email or password, set it to Auto.', WPA0_LANG ); ?>
           <a target="_blank" href="https://auth0.com/docs/libraries/lock/customization#usernamestyle-string-"><?php echo __( 'More info', WPA0_LANG ); ?></a>
         </span>
       </div>

lib/admin/WP_Auth0_Admin_Features.php

@@ -54,7 +54,7 @@ public function render_sso() {
 
       <div class="subelement">
         <span class="description">
-          <?php echo __( 'Single Sign On (SSO) allows users to signing once to multiple services. For more details, see our ', WPA0_LANG ); ?>
+          <?php echo __( 'Single Sign On (SSO) allows users to sign in once to multiple services. For more details, see our ', WPA0_LANG ); ?>
           <a target="_blank" href="https://auth0.com/docs/sso/single-sign-on"><?php echo __( 'help page on SSO', WPA0_LANG ); ?></a>.
         </span>
       </div>

templates/auth0-login-form-lock10.php

@@ -163,12 +163,14 @@ function a0ShowLoginModal() {
     <?php } ?>
 
     if (lock.on) {
-        lock.on('ready', function(){
-            if ( lock.options['$client'].subscription === 'free' ) {
-                jQuery('#attributionBadge').fadeIn();
-                jQuery(".a0-footer").parent().css('margin-bottom', '50px');
-            }
-        });
+
+    // lock does not expose client info now
+    // lock.on('hash_parsed', function(){
+    //     if ( lock.options['$client'].subscription === 'free' ) {
+    //         jQuery('#attributionBadge').fadeIn();
+    //         jQuery(".a0-footer").parent().css('margin-bottom', '50px');
+    //     }
+    // });
 
         lock.on('error shown', function(){
             jQuery(".a0-footer").parent().css('margin-bottom', '50px');

templates/settings.php

@@ -8,7 +8,7 @@
 			<h1><?php _e( 'Auth0 WordPress Plugin Settings', WPA0_LANG ); ?></h1>
 
 			<div class="row a0-message a0-warning manage">
-				For your Auth0 dashboard with more settings click <a href="https://manage.auth0.com">here</a>.
+				For your Auth0 dashboard with more settings click <a target="_blank" href="https://manage.auth0.com">here</a>.
 			</div>
 
 	    <?php if ( count( get_settings_errors() ) == 0 && isset( $_GET['settings-updated'] ) ) { ?>