Update Lock, Auth0.js; add setting to use default #635
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
joshcanhelp
changed the title
joshcanhelp
force-pushed
the
update-lock-auth0-js
branch
from
e139c1a
to
0906209
Compare
joshcanhelp
force-pushed
the
update-lock-auth0-js
branch
from
0906209
to
917df13
Compare
joshcanhelp
commented
Mar 19, 2019
| @@ -95,7 +95,6 @@ public function install_db( $version_to_install = null, $app_token = '' ) { | |||
| // Plugin version < 3.4.0 | |||
| if ( $this->current_db_version < 15 || 15 === $version_to_install ) { | |||
| $options->set( 'cdn_url', WPA0_LOCK_CDN_URL ); | |||
| $options->set( 'auth0js-cdn', WPA0_AUTH0_JS_CDN_URL ); | |||
There was a problem hiding this comment.
Setting removed, no need to migrate anything.
joshcanhelp
commented
Mar 19, 2019
| @@ -130,10 +129,6 @@ public function install_db( $version_to_install = null, $app_token = '' ) { | |||
| $options->set( 'cdn_url', WPA0_LOCK_CDN_URL ); | |||
| } | |||
|
|
|||
| if ( '//cdn.auth0.com/js/auth0/9.0.0/auth0.min.js' === $options->get( 'auth0js-cdn' ) ) { | |||
There was a problem hiding this comment.
Setting removed, no need to migrate anything.
joshcanhelp
commented
Mar 19, 2019
| @@ -270,9 +265,6 @@ public function install_db( $version_to_install = null, $app_token = '' ) { | |||
| $options->set( 'extra_conf', json_encode( $lock_json_decoded ) ); | |||
| } | |||
|
|
|||
| // Set passwordless_cdn_url to latest Lock | |||
There was a problem hiding this comment.
Setting removed, no need to migrate anything.
joshcanhelp
commented
Mar 19, 2019
| @@ -619,7 +619,7 @@ public function auth0_sso_footer( $previous_html ) { | |||
| return $previous_html; | |||
| } | |||
|
|
|||
| wp_enqueue_script( 'wpa0_auth0js', $this->a0_options->get( 'auth0js-cdn' ) ); | |||
| wp_enqueue_script( 'wpa0_auth0js', apply_filters( 'auth0_sso_auth0js_url', WPA0_AUTH0_JS_CDN_URL ) ); | |||
There was a problem hiding this comment.
Filter to allow changing the URL if needed.
joshcanhelp
commented
Mar 19, 2019
| @@ -128,7 +128,7 @@ protected function coo_fallback() { | |||
| var auth0 = new auth0.WebAuth({clientID:"%s",domain:"%s",redirectUri:"%s"}); | |||
| auth0.crossOriginAuthenticationCallback(); | |||
| </script></head><body></body></html>', | |||
| esc_url( $this->a0_options->get( 'auth0js-cdn' ) ), | |||
| esc_url( apply_filters( 'auth0_coo_auth0js_url', WPA0_AUTH0_JS_CDN_URL ) ), | |||
There was a problem hiding this comment.
Filter to allow changing the URL if needed.
damieng
reviewed
Mar 20, 2019
| // 3.10.0 | ||
| if ( ( $this->current_db_version < 21 && 0 !== $this->current_db_version ) || 21 === $version_to_install ) { | ||
|
|
||
| if ( 'https://cdn.auth0.com/js/lock/11.5/lock.min.js' === $options->get( 'cdn_url' ) ) { |
There was a problem hiding this comment.
Nice automagical upgrade for existing users 👍
damieng
approved these changes
Mar 20, 2019
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Changes
v11.5tov11.14v9.4tov9.10auth0js-cdn,cdn_url_legacy,passwordless_cdn_urlWP_Auth0_Options::get_lock_url()to get the correct Lock CDN URL based on the new setting.auth0_coo_auth0js_urlandauth0_sso_auth0js_urlto allow overriding the Auth0.js URL based on context used.cdn_urlto make sure we have a valid URL to use.Custom URL off
Custom URL on
References
Testing
Manual testing:
On a new install ...
https://cdn.auth0.com/js/lock/11.9/lock.min.jswp-login.phppage for your siteChecklist