Improve custom routing mode (#25)

* Use query param for activate token

* Update URL tags

* Ensure route is still used in auto mode

* Correct defaults

* Ensure form actions still work in custom mode

* Cleanup

* Update docs

* Cleanup

* Cleanup

* Cleanup

Author: jacksleight

config/statamic/memberbox.php

@@ -7,7 +7,7 @@
     | Enable Account
     |--------------------------------------------------------------------------
     |
-    | Enable the user account pages.
+    | Enable the automatic user account pages.
     |
     */
 
@@ -18,7 +18,8 @@
     | Enable Directory
     |--------------------------------------------------------------------------
     |
-    | Enable the user directory pages. You'll also need to uncomment the routes.
+    | Enable the automatic user directory pages. You'll also need to uncomment
+    | the routes.
     |
     | WARNING:
     | Enabling the user directory will expose user data publicly. Make sure your

docs/implementation.md

@@ -13,15 +13,15 @@ Check the [customisation](customisation.html) documentation for details on custo
 
 ---
 
-## Setting up the account and directory pages
+## Using the automatic account and directory pages
 
-To enable the account pages set the `statamic.memberbox.enable_account` config option to true (enabled by default):
+Memberbox can automatically create account and directory routes/pages for you, and comes with starter templates you can customise to match your site design. To enable the automatic account pages set the `statamic.memberbox.enable_account` config option to true (enabled by default):
 
 ```
 'enable_account' => true,
 ```
 
-To enable the directory pages set the `statamic.memberbox.enable_directory` config option to true and uncomment the routes:
+To enable the automatic directory pages set the `statamic.memberbox.enable_directory` config option to true and uncomment the routes:
 
 ```
 'enable_directory' => true,
@@ -33,11 +33,11 @@ To enable the directory pages set the `statamic.memberbox.enable_directory` conf
 ],
 ```
 
-> *Warning:* Enabling the user directory will expose user data publicly. Make sure your templates only output the data you want to be public!
+:::warning
+Enabling the user directory will expose user data publicly. Make sure your templates only output the data you want to be public!
+:::
 
----
-
-## Editing the page templates
+### Editing the page templates
 
 The starter templates have been built with the [Starters Creek](https://statamic.com/starter-kits/statamic/starters-creek) kit, which uses Tailwind CSS. To customise these to match your site's design publish the view templates:
 
@@ -57,6 +57,12 @@ The starter templates use Antlers front matter to set a title variable which you
 
 ---
 
+## Using Statamic entries for your account and directory pages
+
+If you would prefer to use pages managed through Statamic as your account and directory pages you should switch the `enable_account` and `enable_directory` options off, and then populate the `routes` array with the URLs of your Statamic entries. Setting these will ensure that the URL tags and activation email links work as expected.
+
+---
+
 ## Linking to the pages from your templates
 
 Memberbox provides a set of page URL tags for linking to the pages, check the [tags reference](tags.html#user-form-page-url-tags) for a full list. Here's an example header template that shows how you might implement these in your site:

routes/web.php

@@ -31,6 +31,14 @@
             Route::statamic($route, 'statamic-memberbox::web.change_password')->name('change_password');
             Route::post('/!/statamic-memberbox/change_password', 'UsersController@changePassword')->name('change_password.action');
         }
+    } else {
+        if (config('statamic.memberbox.routes.profile')) {
+            Route::post('/!/statamic-memberbox/profile', 'UsersController@profile')->name('profile.action');
+        }
+
+        if (config('statamic.memberbox.routes.change_password')) {
+            Route::post('/!/statamic-memberbox/change_password', 'UsersController@changePassword')->name('change_password.action');
+        }
     }
     if (config('statamic.memberbox.enable_directory', false)) {
         if ($route = config('statamic.memberbox.routes.index')) {

src/Http/Controllers/CP/MembersController.php

@@ -8,7 +8,6 @@
 use JackSleight\StatamicMemberbox\Notifications\ActivateAccount;
 use Statamic\Auth\Passwords\PasswordReset;
 use Statamic\Contracts\Auth\User as UserContract;
-use Statamic\CP\Column;
 use Statamic\Exceptions\FatalException;
 use Statamic\Exceptions\NotFoundHttpException;
 use Statamic\Facades\File;
@@ -143,7 +142,11 @@ public function store(Request $request)
 
         $user->save();
 
-        PasswordReset::resetFormroute('statamic-memberbox.activate');
+        if (config('statamic.memberbox.enable_account', true)) {
+            PasswordReset::resetFormRoute('statamic-memberbox.activate');
+        } else {
+            PasswordReset::resetFormUrl(url(config('statamic.memberbox.routes.activate')));
+        }
         PasswordReset::redirectAfterReset(null);
         $token = $user->generateActivateAccountToken();
 

src/Protectors/Member.php

@@ -4,7 +4,7 @@
 
 use JackSleight\StatamicMemberbox\Facades\Member;
 use Statamic\Facades\User;
-use Statamic\Tags\Concerns;
+use Statamic\Support\Arr;
 use Statamic\Auth\UserTags as StatamicUserTags;
 
 class UserTags extends StatamicUserTags
@@ -109,7 +109,7 @@ public function changePasswordForm()
 
     public function registerUrl()
     {
-        return route('statamic-memberbox.register');
+        return $this->accountRouteUrl('register');
     }
 
     public function loginUrl()
@@ -122,36 +122,57 @@ public function loginUrl()
                 : $append;
         }
 
-        return route('statamic-memberbox.login', ['redirect' => $redirect]);
+        return $this->accountRouteUrl('login', ['redirect' => $redirect]);
     }
 
     public function profileUrl()
     {
-        return route('statamic-memberbox.profile');
+        return $this->accountRouteUrl('profile');
     }
 
     public function forgotPasswordUrl()
     {
-        return route('statamic-memberbox.forgot_password');
+        return $this->accountRouteUrl('forgot_password');
     }
 
     public function resetPasswordUrl()
     {
-        return route('statamic-memberbox.reset_password');
+        return $this->accountRouteUrl('reset_password');
     }
 
     public function changePasswordUrl()
     {
-        return route('statamic-memberbox.change_password');
+        return $this->accountRouteUrl('change_password');
     }
 
     public function indexUrl()
     {
-        return route('statamic-memberbox.index');
+        return $this->directoryRouteUrl('index');
     }
 
     public function showUrl()
     {
-        return route('statamic-memberbox.show', $this->params->all());
+        return $this->directoryRouteUrl('show', $this->params->all());
+    }
+
+    protected function accountRouteUrl($name, array $params = [])
+    {
+        if (config('statamic.memberbox.enable_account', true)) {
+            return route('statamic-memberbox.'.$name, $params);
+        }
+        return $this->routeUrl($name, $params);
+    }
+
+    protected function directoryRouteUrl($name, array $params = [])
+    {
+        if (config('statamic.memberbox.enable_directory', false)) {
+            return route('statamic-memberbox.'.$name, $params);
+        }
+        return $this->routeUrl($name, $params);
+    }
+
+    protected function routeUrl($name, array $params = [])
+    {
+        return url(config('statamic.memberbox.routes.'.$name)).($params ? ('?'.Arr::query($params)) : null);
     }
 }