From 5441560acf81fee0b6272f2960c2782518b60992 Mon Sep 17 00:00:00 2001 From: Robin Date: Tue, 30 Jan 2018 09:26:32 +0000 Subject: [PATCH 1/2] ActivateAccount renamed to AccountOnboarding url kept the same --- src/AuthenticationModule.php | 5 ++++- ...nEmail.php => AccountOnboardingInvitationEmail.php} | 7 ++++--- .../{ActivateAccount.php => AccountOnboarding.php} | 4 ++-- ...tivateAccountView.php => AccountOnboardingView.php} | 10 +++++----- src/Settings/ProtectedUrl.php | 6 +++--- ...=> SendAccountOnboardingInvitationEmailUseCase.php} | 6 +++--- 6 files changed, 21 insertions(+), 17 deletions(-) rename src/Emails/{ActivateAccountInvitationEmail.php => AccountOnboardingInvitationEmail.php} (84%) rename src/Leaves/{ActivateAccount.php => AccountOnboarding.php} (53%) rename src/Leaves/{ActivateAccountView.php => AccountOnboardingView.php} (88%) rename src/UseCases/{SendActivateAccountInvitationEmailUseCase.php => SendAccountOnboardingInvitationEmailUseCase.php} (62%) diff --git a/src/AuthenticationModule.php b/src/AuthenticationModule.php index 3801a13..7818860 100644 --- a/src/AuthenticationModule.php +++ b/src/AuthenticationModule.php @@ -94,7 +94,10 @@ protected function registerUrlHandlers() $className = $url->logoutLeafClassName; return new $className($provider, $url->loginProviderClassName); }), - $url->activateChildUrl => $activate = new LeafCollectionUrlHandler($url->activatePasswordLeafClassName,$url->activatePasswordLeafClassName), + $url->onboardingChildUrl => $activate = new GreedyUrlHandler(function ($parentHandler, $captured) use ($url, $provider) { + $className = $url->onboardingPasswordLeafClassName; + return new $className($provider, $captured); + }) ]), $url->urlToProtect => $protected = new ValidateLoginUrlHandler($provider, $url->loginUrl), diff --git a/src/Emails/ActivateAccountInvitationEmail.php b/src/Emails/AccountOnboardingInvitationEmail.php similarity index 84% rename from src/Emails/ActivateAccountInvitationEmail.php rename to src/Emails/AccountOnboardingInvitationEmail.php index 44ef0f5..bcfdd9f 100644 --- a/src/Emails/ActivateAccountInvitationEmail.php +++ b/src/Emails/AccountOnboardingInvitationEmail.php @@ -3,8 +3,9 @@ namespace Rhubarb\Scaffolds\Authentication\Emails; use Rhubarb\Crown\Settings\WebsiteSettings; +use Rhubarb\Scaffolds\Authentication\Settings\ProtectedUrl; -class ActivateAccountInvitationEmail extends ResetPasswordInvitationEmail +class AccountOnboardingInvitationEmail extends ResetPasswordInvitationEmail { public function getText() { @@ -26,12 +27,12 @@ public function getText() */ public function getSubject() { - return 'Activate Your Account'; + return 'Create Your Account'; } public function getHtmlHeading() { - return "

Activate Your Account

"; + return "

Create Your Account

"; } public function getHtmlBody() diff --git a/src/Leaves/ActivateAccount.php b/src/Leaves/AccountOnboarding.php similarity index 53% rename from src/Leaves/ActivateAccount.php rename to src/Leaves/AccountOnboarding.php index d1bac50..6d6b8ae 100644 --- a/src/Leaves/ActivateAccount.php +++ b/src/Leaves/AccountOnboarding.php @@ -2,10 +2,10 @@ namespace Rhubarb\Scaffolds\Authentication\Leaves; -class ActivateAccount extends ConfirmResetPassword +class AccountOnboarding extends ConfirmResetPassword { protected function getViewClass() { - return ActivateAccountView::class; + return AccountOnboardingView::class; } } \ No newline at end of file diff --git a/src/Leaves/ActivateAccountView.php b/src/Leaves/AccountOnboardingView.php similarity index 88% rename from src/Leaves/ActivateAccountView.php rename to src/Leaves/AccountOnboardingView.php index 787a70c..cdb7d71 100644 --- a/src/Leaves/ActivateAccountView.php +++ b/src/Leaves/AccountOnboardingView.php @@ -4,7 +4,7 @@ use Rhubarb\Leaf\Controls\Common\Buttons\Button; -class ActivateAccountView extends ConfirmResetPasswordView +class AccountOnboardingView extends ConfirmResetPasswordView { protected function createSubLeaves() { @@ -36,8 +36,8 @@ protected function printViewContent() $this->layoutItemsWithContainer($this->getTitle(), "

{$this->getTitleParagraph()}

", [ - "Enter new password" => "newPassword", - "Enter again to confirm" => "confirmNewPassword", + "Create your password" => "newPassword", + "Confirm your password" => "confirmNewPassword", "" => "ActivateAccount" ] ); @@ -45,12 +45,12 @@ protected function printViewContent() protected function getTitle() { - return "Activate your account"; + return "Create your account"; } protected function getTitleParagraph() { - return "Activate your account by setting your password."; + return "Create your account by setting your password."; } protected function getMessages() diff --git a/src/Settings/ProtectedUrl.php b/src/Settings/ProtectedUrl.php index ca3e382..ea5736e 100644 --- a/src/Settings/ProtectedUrl.php +++ b/src/Settings/ProtectedUrl.php @@ -2,7 +2,7 @@ namespace Rhubarb\Scaffolds\Authentication\Settings; -use Rhubarb\Scaffolds\Authentication\Leaves\ActivateAccount; +use Rhubarb\Scaffolds\Authentication\Leaves\AccountOnboarding; use Rhubarb\Scaffolds\Authentication\Leaves\ConfirmResetPassword; use Rhubarb\Scaffolds\Authentication\Leaves\Login; use Rhubarb\Scaffolds\Authentication\Leaves\Logout; @@ -23,8 +23,8 @@ class ProtectedUrl public $resetPasswordLeafClassName = ResetPassword::class; public $confirmResetPasswordLeafClassName = ConfirmResetPassword::class; - public $activateChildUrl = 'activate/'; - public $activatePasswordLeafClassName = ActivateAccount::class; + public $onboardingChildUrl = 'activate/'; + public $onboardingPasswordLeafClassName = AccountOnboarding::class; public function __construct($urlToProtect, $loginProviderClassName, $loginUrl) { diff --git a/src/UseCases/SendActivateAccountInvitationEmailUseCase.php b/src/UseCases/SendAccountOnboardingInvitationEmailUseCase.php similarity index 62% rename from src/UseCases/SendActivateAccountInvitationEmailUseCase.php rename to src/UseCases/SendAccountOnboardingInvitationEmailUseCase.php index 6e5e3b2..4748a91 100644 --- a/src/UseCases/SendActivateAccountInvitationEmailUseCase.php +++ b/src/UseCases/SendAccountOnboardingInvitationEmailUseCase.php @@ -4,15 +4,15 @@ use Rhubarb\Crown\DependencyInjection\Container; use Rhubarb\Crown\Sendables\Email\EmailProvider; -use Rhubarb\Scaffolds\Authentication\Emails\ActivateAccountInvitationEmail; +use Rhubarb\Scaffolds\Authentication\Emails\AccountOnboardingInvitationEmail; use Rhubarb\Scaffolds\Authentication\User; -class SendActivateAccountInvitationEmailUseCase +class SendAccountOnboardingInvitationEmailUseCase { public static function execute(User $user) { $user->generatePasswordResetHash(); - $resetPasswordEmail = Container::instance(ActivateAccountInvitationEmail::class, $user); + $resetPasswordEmail = Container::instance(AccountOnboardingInvitationEmail::class, $user); EmailProvider::selectProviderAndSend($resetPasswordEmail); } } \ No newline at end of file From 39ce9197df571a22ea5924df8add697adf86dc72 Mon Sep 17 00:00:00 2001 From: Robin Date: Fri, 2 Feb 2018 10:36:23 +0000 Subject: [PATCH 2/2] Deprecated shells of classes that extend their replacements --- src/Emails/ActivateAccountInvitationEmail.php | 9 +++++++++ src/Leaves/ActivateAccount.php | 9 +++++++++ src/Leaves/ActivateAccountView.php | 9 +++++++++ .../SendActivateAccountInvitationEmailUseCase.php | 11 +++++++++++ 4 files changed, 38 insertions(+) create mode 100644 src/Emails/ActivateAccountInvitationEmail.php create mode 100644 src/Leaves/ActivateAccount.php create mode 100644 src/Leaves/ActivateAccountView.php create mode 100644 src/UseCases/SendActivateAccountInvitationEmailUseCase.php diff --git a/src/Emails/ActivateAccountInvitationEmail.php b/src/Emails/ActivateAccountInvitationEmail.php new file mode 100644 index 0000000..8be8160 --- /dev/null +++ b/src/Emails/ActivateAccountInvitationEmail.php @@ -0,0 +1,9 @@ +