Skip to content

Email Verification and Password Reset support continueUrl #220

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
jeromegamez merged 3 commits into from
Jul 16, 2018
Merged

Email Verification and Password Reset support continueUrl #220

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
21c70c9
Email Verification and Password Reset support continueUrl
wadewomersley Jul 13, 2018
3c8d49f
Comments where relevant
wadewomersley Jul 13, 2018
450f5f3
Filter out null values
wadewomersley Jul 13, 2018
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
9 changes: 5 additions & 4 deletions src/Firebase/Auth.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,21 +214,22 @@ public function deleteUser(string $uid)

/**
* @param string $uid
* @param string $continueUrl
*/
public function sendEmailVerification(string $uid)
public function sendEmailVerification(string $uid, string $continueUrl = null)
{
$response = $this->client->exchangeCustomTokenForIdAndRefreshToken(
$this->createCustomToken($uid)
);

$idToken = JSON::decode((string) $response->getBody(), true)['idToken'];

$this->client->sendEmailVerification($idToken);
$this->client->sendEmailVerification($idToken, $continueUrl);
}

public function sendPasswordResetEmail(string $email)
public function sendPasswordResetEmail(string $email, string $continueUrl = null)
{
$this->client->sendPasswordResetEmail($email);
$this->client->sendPasswordResetEmail($email, $continueUrl);
}

public function setCustomUserAttributes(string $uid, array $attributes): UserRecord
Expand Down
15 changes: 9 additions & 6 deletions src/Firebase/Auth/ApiClient.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,23 +191,26 @@ public function verifyPassword(string $email, string $password): ResponseInterfa

/**
* @param string $idToken
* @param string $continueUrl
*
* @return ResponseInterface
*/
public function sendEmailVerification(string $idToken): ResponseInterface
public function sendEmailVerification(string $idToken, string $continueUrl = null): ResponseInterface
{
return $this->request('getOobConfirmationCode', [
return $this->request('getOobConfirmationCode', array_filter([
'requestType' => 'VERIFY_EMAIL',
'idToken' => $idToken,
]);
'continueUrl' => $continueUrl,
]));
}

public function sendPasswordResetEmail(string $email): ResponseInterface
public function sendPasswordResetEmail(string $email, string $continueUrl = null): ResponseInterface
{
return $this->request('getOobConfirmationCode', [
return $this->request('getOobConfirmationCode', array_filter([
'email' => $email,
'requestType' => 'PASSWORD_RESET',
]);
'continueUrl' => $continueUrl,
]));
}

public function revokeRefreshTokens(string $uid): ResponseInterface
Expand Down