Use wp_login_url instead of hardcoding login path (#3090)

* use wp_login_url instead of hardcoding login path * generating changeset for pull request * generating changeset for pull request Co-authored-by: github-actions <github-actions@github.com>
woocommerce · Sep 1, 2020 · 22d3d15 · 22d3d15
1 parent ce4c242
commit 22d3d15
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/assets/js/blocks/cart-checkout/checkout/utils.js b/assets/js/blocks/cart-checkout/checkout/utils.js
@@ -1,3 +1,8 @@
-export const LOGIN_TO_CHECKOUT_URL = `/wp-login.php?redirect_to=${ encodeURIComponent(
+/**
+ * External dependencies
+ */
+import { LOGIN_URL } from '@woocommerce/block-settings';
+
+export const LOGIN_TO_CHECKOUT_URL = `${ LOGIN_URL }?redirect_to=${ encodeURIComponent(
 	window.location.href
 ) }`;
diff --git a/assets/js/settings/blocks/constants.js b/assets/js/settings/blocks/constants.js
@@ -109,3 +109,4 @@ export const CHECKOUT_ALLOWS_SIGNUP = getSetting(
 	'checkoutAllowsSignup',
 	false
 );
+export const LOGIN_URL = getSetting( 'loginUrl', '/wp-login.php' );
diff --git a/src/Assets.php b/src/Assets.php
@@ -187,6 +187,7 @@ public static function get_wc_block_data( $settings ) {
 				'baseLocation'                  => wc_get_base_location(),
 				'woocommerceBlocksPhase'        => WOOCOMMERCE_BLOCKS_PHASE,
 				'hasDarkEditorStyleSupport'     => current_theme_supports( 'dark-editor-style' ),
+				'loginUrl'                      => wp_login_url(),
 
 				/*
 				 * translators: If your word count is based on single characters (e.g. East Asian characters),