Skip to content

Add email null check #119

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 14, 2022
Merged

Add email null check #119

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion src/Authentication/Actions/EmailActivator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
use CodeIgniter\Exceptions\PageNotFoundException;
use CodeIgniter\HTTP\IncomingRequest;
use CodeIgniter\HTTP\RedirectResponse;
use CodeIgniter\Shield\Exceptions\LogicException;
use CodeIgniter\Shield\Exceptions\RuntimeException;
use CodeIgniter\Shield\Models\UserIdentityModel;

Expand All @@ -23,6 +24,13 @@ public function show(): string
throw new RuntimeException('Cannot get the User.');
}

$userEmail = $user->getAuthEmail();
Copy link
Contributor

@lonnie-vault lonnie-vault May 13, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

At this point calling getAuthEmail() is the same as just calling ->email, right? With no trait that needs the getAuth* methods do we even need them anymore?

Copy link
Member Author

@kenjis kenjis May 13, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, it is the same as calling getEmail(), so it is the same as ->email.

About getAuth*() methods, we don't need them now. But when we introduce Interface for User, probably we will need them. So I am okay to remove getAuth*() now.

if ($userEmail === null) {
throw new LogicException(
'Email Activation needs user email address. user_id: ' . $user->getAuthId()
);
}

/** @var UserIdentityModel $identityModel */
$identityModel = model(UserIdentityModel::class);

Expand All @@ -44,7 +52,7 @@ public function show(): string
// Send the email
helper('email');
$return = emailer()->setFrom(setting('Email.fromEmail'), setting('Email.fromName') ?? '')
->setTo($user->getAuthEmail())
->setTo($userEmail)
->setSubject(lang('Auth.emailActivateSubject'))
->setMessage(view(setting('Auth.views')['action_email_activate_email'], ['code' => $code]))
->send();
Expand Down