Push changes to live site (#581)

* refactor: simplify public route redirection by using template_redirect (#575) * Update API Router `import` in Auth Docs (#580) * doc: (#519) adding examples for getStaticPaths * Update API Router auth import docs * Update API Router imports to use `@faustjs/core/api` Co-authored-by: William Johnston <will@wwj.dev> Co-authored-by: Andrew Matthews <andrew.matthews@wpengine.com> Co-authored-by: William Johnston <will@wwj.dev>
wpengine · Oct 14, 2021 · eacadf8 · eacadf8 · atlas-by-wp-engine · Oct 14, 2021
1 parent 2563121
commit eacadf8
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 20 deletions.
diff --git a/docs/next/guides/authentication.mdx b/docs/next/guides/authentication.mdx
@@ -22,7 +22,7 @@ Before you get started with implementing an authentication strategy, you'll need
 
 ```ts title=src/pages/api/faust/[[...route]].ts
 import 'faust.config';
-import { apiRouter } from '@faustjs/core';
+import { apiRouter } from '@faustjs/core/api';
 
 export default apiRouter;
 ```

diff --git a/docs/next/guides/post-page-previews.mdx b/docs/next/guides/post-page-previews.mdx
@@ -60,7 +60,7 @@ Next, you will need to create the `apiRouter`. This sets up the Faust.js API end
 
 ```ts
 import 'faust.config';
-import { apiRouter } from '@faustjs/core';
+import { apiRouter } from '@faustjs/core/api';
 
 export default apiRouter;
 ```

diff --git a/docs/next/reference/api-router.mdx b/docs/next/reference/api-router.mdx
@@ -27,7 +27,7 @@ Now, add the following content to your newly created `[[...route]].ts` file:
 
 ```tsx title="src/pages/api/faust/[[...route]].ts"
 import 'faust.config';
-import { apiRouter } from '@faustjs/core';
+import { apiRouter } from '@faustjs/core/api';
 
 export default apiRouter;
 ```
@@ -69,7 +69,7 @@ Finally, the content of `src/pages/api/headless/[[...route]].ts` would be:
 
 ```ts title="src/pages/api/headless/[[...route]].ts"
 import 'faust.config';
-import { apiRouter } from '@faustjs/core';
+import { apiRouter } from '@faustjs/core/api';
 
 export default apiRouter;
 ```

diff --git a/packages/core/src/server/router/index.ts b/packages/core/src/server/router/index.ts
@@ -14,7 +14,7 @@ import {
  * @example ```ts
  * // filename: pages/api/faust/[[...route]].ts
  * import 'faust.config';
- * import { apiRouter } from '@faustjs/core';
+ * import { apiRouter } from '@faustjs/core/api';
  *
  * export default apiRouter;
  * ```

diff --git a/plugins/wpe-headless/includes/deny-public-access/callbacks.php b/plugins/wpe-headless/includes/deny-public-access/callbacks.php
@@ -9,31 +9,20 @@
 	exit;
 }
 
-add_action( 'parse_request', 'wpe_headless_deny_public_access', 99 );
+add_action( 'template_redirect', 'wpe_headless_deny_public_access', 99 );
 /**
  * Redirects non-API requests for public URLs to the specified front-end URL.
  *
- * @param object $query The current query.
- *
  * @return void
  */
-function wpe_headless_deny_public_access( $query ) {
-	if ( ! wpe_headless_is_redirects_enabled() ) {
+function wpe_headless_deny_public_access() {
+	if ( ! wpe_headless_is_redirects_enabled() || is_customize_preview() ) {
 		return;
 	}
 
 	$frontend_uri = wpe_headless_get_setting( 'frontend_uri' );
 
-	if (
-		defined( 'DOING_CRON' ) ||
-		defined( 'REST_REQUEST' ) ||
-		is_admin() ||
-		is_customize_preview() ||
-		( function_exists( 'is_graphql_http_request' ) && is_graphql_http_request() ) || // From https://wordpress.org/plugins/wp-graphql/.
-		! empty( $query->query_vars['rest_oauth1'] ) || // From https://oauth1.wp-api.org/.
-		! property_exists( $query, 'request' ) ||
-		! $frontend_uri
-	) {
+	if ( ! $frontend_uri ) {
 		return;
 	}