Skip to content

Generalise validate_email_for_user to work for other /requestToken endpoints #710

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
anoadragon453 merged 1 commit into from
Sep 27, 2019
Merged

Generalise validate_email_for_user to work for other /requestToken endpoints #710

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
31 changes: 14 additions & 17 deletions tests/12login/01threepid-and-password.pl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,35 +1,32 @@
my $password = "my secure password";

=head2 validate_email_for_user
=head2 validate_email

validate_email_for_user(
$user, $address, $id_server,
validate_email(
$http, $address, $id_server, $path,
)->then( sub {
my ( $sid, $client_secret ) = @_;
});

Runs through the `/r0/account/3pid/email/requestToken` flow for verifying
that an email address belongs to the user. Doesn't add the address to the
account.
Runs through a `.../requestToken` flow specified by $path for verifying that an email address
belongs to the user. Doesn't add the address to the account.

Returns the session id and client secret which can then be used for binding
the address.
Returns the session id and client secret which can then be used for binding the address.

=cut

sub validate_email_for_user {
my ( $user, $address, $id_server ) = @_;
sub validate_email {
my ( $http, $address, $id_server, $path ) = @_;

# fixme: synapse screws up the escaping of non-alpha chars.
my $client_secret = join "", map { chr 65 + rand 26 } 1 .. 20;

my $sid;

return Future->needs_all(
do_request_json_for(
$user,
$http->do_request_json(
method => "POST",
uri => "/r0/account/3pid/email/requestToken",
uri => $path,
content => {
client_secret => $client_secret,
email => $address,
Expand All @@ -49,14 +46,14 @@ sub validate_email_for_user {
# our test ID server, or an email from the homeserver.
#
Future->wait_any(
await_and_confirm_email( $address, $user->http ),
await_and_confirm_email( $address, $http ),
await_id_validation( $id_server, $address ),
),
)->then( sub {
Future->done( $sid, $client_secret );
});
}
push our @EXPORT, qw( validate_email_for_user );
push our @EXPORT, qw( validate_email );

# wait for a call to /requestToken on the test IS, and act as if the
# email has been validated.
Expand Down Expand Up @@ -128,8 +125,8 @@ sub add_email_for_user {
my $id_access_token = $id_server->get_access_token();

# start by requesting an email validation.
validate_email_for_user(
$user, $address, $id_server,
validate_email(
$user->http, $address, $id_server, "/r0/account/3pid/email/requestToken",
)->then( sub {
my ( $sid, $client_secret ) = @_;

Expand Down