Skip to content
This repository has been archived by the owner on Dec 14, 2023. It is now read-only.

Commit

Permalink
Merge branch 'increase_default_api_request_quota'
Browse files Browse the repository at this point in the history 
References #167.
  • Loading branch information
@pypt
pypt committed Aug 18, 2017
2 parents 9175fe7 + df39656 commit aeba6f7
Show file tree
Hide file tree
Showing 11 changed files with 253 additions and 243 deletions.
72 changes: 32 additions & 40 deletions lib/MediaWords/Controller/Api/V2/t/Auth.t
View file
Original file line number Diff line number Diff line change
Expand Up @@ -392,16 +392,14 @@ sub test_login($)
eval {

my $new_user = MediaWords::DBI::Auth::User::NewUser->new(
email => $email,
full_name => 'auth login',
notes => '',
role_ids => [ 1 ],
active => 1,
password => $password,
password_repeat => $password,
activation_url => '', # user is active, no need for activation URL
weekly_requests_limit => 1000,
weekly_requested_items_limit => 1000,
email => $email,
full_name => 'auth login',
notes => '',
role_ids => [ 1 ],
active => 1,
password => $password,
password_repeat => $password,
activation_url => '', # user is active, no need for activation URL
);

MediaWords::DBI::Auth::Register::add_user( $db, $new_user );
Expand Down Expand Up @@ -443,16 +441,14 @@ SQL
eval {

my $new_user = MediaWords::DBI::Auth::User::NewUser->new(
email => $email,
full_name => 'auth login',
notes => '',
role_ids => [ 1 ],
active => 0,
password => $password,
password_repeat => $password,
activation_url => 'https://activate.com/activate.php',
weekly_requests_limit => 1000,
weekly_requested_items_limit => 1000,
email => $email,
full_name => 'auth login',
notes => '',
role_ids => [ 1 ],
active => 0,
password => $password,
password_repeat => $password,
activation_url => 'https://activate.com/activate.php',
);

MediaWords::DBI::Auth::Register::add_user( $db, $new_user );
Expand All @@ -478,16 +474,14 @@ sub test_change_password($)
eval {

my $new_user = MediaWords::DBI::Auth::User::NewUser->new(
email => $email,
full_name => 'auth change_password',
notes => '',
role_ids => [ 1 ],
active => 1,
password => $password,
password_repeat => $password,
activation_url => '', # user is active, no need for activation URL
weekly_requests_limit => 1000,
weekly_requested_items_limit => 1000,
email => $email,
full_name => 'auth change_password',
notes => '',
role_ids => [ 1 ],
active => 1,
password => $password,
password_repeat => $password,
activation_url => '', # user is active, no need for activation URL
);

MediaWords::DBI::Auth::Register::add_user( $db, $new_user );
Expand Down Expand Up @@ -536,16 +530,14 @@ sub test_reset_api_key($)
eval {

my $new_user = MediaWords::DBI::Auth::User::NewUser->new(
email => $email,
full_name => 'auth reset_api_key',
notes => '',
role_ids => [ 1 ],
active => 1,
password => $password,
password_repeat => $password,
activation_url => '', # user is active, no need for activation URL
weekly_requests_limit => 1000,
weekly_requested_items_limit => 1000,
email => $email,
full_name => 'auth reset_api_key',
notes => '',
role_ids => [ 1 ],
active => 1,
password => $password,
password_repeat => $password,
activation_url => '', # user is active, no need for activation URL
);

MediaWords::DBI::Auth::Register::add_user( $db, $new_user );
Expand Down
18 changes: 8 additions & 10 deletions lib/MediaWords/Controller/Api/V2/t/permissions.t
View file
Original file line number Diff line number Diff line change
Expand Up @@ -375,16 +375,14 @@ sub find_or_add_test_user($$)

eval {
my $new_user = MediaWords::DBI::Auth::User::NewUser->new(
email => $email,
full_name => $role,
notes => $role,
role_ids => $roles,
active => 1,
password => $password,
password_repeat => $password,
activation_url => '', # user is active, no need for activation URL
weekly_requests_limit => 10000000,
weekly_requested_items_limit => 10000000,
email => $email,
full_name => $role,
notes => $role,
role_ids => $roles,
active => 1,
password => $password,
password_repeat => $password,
activation_url => '', # user is active, no need for activation URL
);

MediaWords::DBI::Auth::Register::add_user( $db, $new_user );
Expand Down
6 changes: 2 additions & 4 deletions lib/MediaWords/Controller/Login.pm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -376,10 +376,8 @@ sub register : Local
role_ids => MediaWords::DBI::Auth::Roles::default_role_ids( $db ),
active => 0, # user has to activate own account via email
password => $form->param_value( 'password' ),
password_repeat => $form->param_value( 'password_repeat' ),
activation_url => $c->uri_for( '/login/activate' ),
weekly_requests_limit => 1000,
weekly_requested_items_limit => 20000,
password_repeat => $form->param_value( 'password_repeat' ),
activation_url => $c->uri_for( '/login/activate' ),
);
MediaWords::DBI::Auth::Register::add_user( $db, $new_user );
};
Expand Down
72 changes: 32 additions & 40 deletions lib/MediaWords/DBI/Auth/t/ChangeResetPassword.t
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,16 +35,14 @@ sub test_change_password($)
eval {

my $new_user = MediaWords::DBI::Auth::User::NewUser->new(
email => $email,
full_name => $full_name,
notes => 'Test test test',
role_ids => [ 1 ],
active => 1,
password => $password,
password_repeat => $password,
activation_url => '', # user is active, no need for activation URL
weekly_requests_limit => 123,
weekly_requested_items_limit => 456,
email => $email,
full_name => $full_name,
notes => 'Test test test',
role_ids => [ 1 ],
active => 1,
password => $password,
password_repeat => $password,
activation_url => '', # user is active, no need for activation URL
);

MediaWords::DBI::Auth::Register::add_user( $db, $new_user );
Expand Down Expand Up @@ -106,16 +104,14 @@ sub test_change_password_with_old_password($)
eval {

my $new_user = MediaWords::DBI::Auth::User::NewUser->new(
email => $email,
full_name => $full_name,
notes => 'Test test test',
role_ids => [ 1 ],
active => 1,
password => $password,
password_repeat => $password,
activation_url => '', # user is active, no need for activation URL
weekly_requests_limit => 123,
weekly_requested_items_limit => 456,
email => $email,
full_name => $full_name,
notes => 'Test test test',
role_ids => [ 1 ],
active => 1,
password => $password,
password_repeat => $password,
activation_url => '', # user is active, no need for activation URL
);

MediaWords::DBI::Auth::Register::add_user( $db, $new_user );
Expand Down Expand Up @@ -190,16 +186,14 @@ sub test_change_password_with_reset_token($)
eval {

my $new_user = MediaWords::DBI::Auth::User::NewUser->new(
email => $email,
full_name => $full_name,
notes => 'Test test test',
role_ids => [ 1 ],
active => 1,
password => $password,
password_repeat => $password,
activation_url => '', # user is active, no need for activation URL
weekly_requests_limit => 123,
weekly_requested_items_limit => 456,
email => $email,
full_name => $full_name,
notes => 'Test test test',
role_ids => [ 1 ],
active => 1,
password => $password,
password_repeat => $password,
activation_url => '', # user is active, no need for activation URL
);

MediaWords::DBI::Auth::Register::add_user( $db, $new_user );
Expand Down Expand Up @@ -335,16 +329,14 @@ sub test_send_password_reset_token($)
eval {

my $new_user = MediaWords::DBI::Auth::User::NewUser->new(
email => $email,
full_name => 'Test user login',
notes => 'Test test test',
role_ids => [ 1 ],
active => 1,
password => $password,
password_repeat => $password,
activation_url => '', # user is active, no need for activation URL
weekly_requests_limit => 123,
weekly_requested_items_limit => 456,
email => $email,
full_name => 'Test user login',
notes => 'Test test test',
role_ids => [ 1 ],
active => 1,
password => $password,
password_repeat => $password,
activation_url => '', # user is active, no need for activation URL
);

MediaWords::DBI::Auth::Register::add_user( $db, $new_user );
Expand Down
72 changes: 32 additions & 40 deletions lib/MediaWords/DBI/Auth/t/Login.t
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,16 +32,14 @@ sub test_login_with_email_password($)
eval {

my $new_user = MediaWords::DBI::Auth::User::NewUser->new(
email => $email,
full_name => $full_name,
notes => 'Test test test',
role_ids => [ 1 ],
active => 1,
password => $password,
password_repeat => $password,
activation_url => '', # user is active, no need for activation URL
weekly_requests_limit => 123,
weekly_requested_items_limit => 456,
email => $email,
full_name => $full_name,
notes => 'Test test test',
role_ids => [ 1 ],
active => 1,
password => $password,
password_repeat => $password,
activation_url => '', # user is active, no need for activation URL
);

MediaWords::DBI::Auth::Register::add_user( $db, $new_user );
Expand Down Expand Up @@ -83,16 +81,14 @@ sub test_login_with_email_password($)

eval {
my $new_user = MediaWords::DBI::Auth::User::NewUser->new(
email => $inactive_user_email,
full_name => $full_name,
notes => 'Test test test',
role_ids => [ 1 ],
active => 0,
password => $password,
password_repeat => $password,
activation_url => 'https://activate.com/activate',
weekly_requests_limit => 123,
weekly_requested_items_limit => 456,
email => $inactive_user_email,
full_name => $full_name,
notes => 'Test test test',
role_ids => [ 1 ],
active => 0,
password => $password,
password_repeat => $password,
activation_url => 'https://activate.com/activate',
);

MediaWords::DBI::Auth::Register::add_user( $db, $new_user );
Expand Down Expand Up @@ -120,16 +116,14 @@ sub test_login_with_api_key($)
eval {

my $new_user = MediaWords::DBI::Auth::User::NewUser->new(
email => $email,
full_name => $full_name,
notes => 'Test test test',
role_ids => [ 1 ],
active => 1,
password => $password,
password_repeat => $password,
activation_url => '', # user is active, no need for activation URL
weekly_requests_limit => 123,
weekly_requested_items_limit => 456,
email => $email,
full_name => $full_name,
notes => 'Test test test',
role_ids => [ 1 ],
active => 1,
password => $password,
password_repeat => $password,
activation_url => '', # user is active, no need for activation URL
);

MediaWords::DBI::Auth::Register::add_user( $db, $new_user );
Expand Down Expand Up @@ -176,16 +170,14 @@ sub test_login_with_api_key($)

eval {
my $new_user = MediaWords::DBI::Auth::User::NewUser->new(
email => $inactive_user_email,
full_name => $full_name,
notes => 'Test test test',
role_ids => [ 1 ],
active => 0,
password => $password,
password_repeat => $password,
activation_url => 'https://activate.com/activate',
weekly_requests_limit => 123,
weekly_requested_items_limit => 456,
email => $inactive_user_email,
full_name => $full_name,
notes => 'Test test test',
role_ids => [ 1 ],
active => 0,
password => $password,
password_repeat => $password,
activation_url => 'https://activate.com/activate',
);

MediaWords::DBI::Auth::Register::add_user( $db, $new_user );
Expand Down
18 changes: 8 additions & 10 deletions lib/MediaWords/DBI/Auth/t/Profile.t
View file
Original file line number Diff line number Diff line change
Expand Up @@ -120,16 +120,14 @@ sub test_regenerate_api_key($)
eval {

my $new_user = MediaWords::DBI::Auth::User::NewUser->new(
email => $email,
full_name => $full_name,
notes => 'Test test test',
role_ids => [ 1 ],
active => 1,
password => $password,
password_repeat => $password,
activation_url => '', # user is active, no need for activation URL
weekly_requests_limit => 123,
weekly_requested_items_limit => 456,
email => $email,
full_name => $full_name,
notes => 'Test test test',
role_ids => [ 1 ],
active => 1,
password => $password,
password_repeat => $password,
activation_url => '', # user is active, no need for activation URL
);

MediaWords::DBI::Auth::Register::add_user( $db, $new_user );
Expand Down
Loading

0 comments on commit aeba6f7

Please sign in to comment.