diff options
| -rw-r--r-- | lib/api/users.rb | 2 | ||||
| -rw-r--r-- | spec/requests/api/users_spec.rb | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/api/users.rb b/lib/api/users.rb index 47a44ba9598..c469751c31c 100644 --- a/lib/api/users.rb +++ b/lib/api/users.rb @@ -57,7 +57,7 @@ module API get do authenticated_as_admin! if params[:external].present? || (params[:extern_uid].present? && params[:provider].present?) - unless current_user.admin? + unless current_user&.admin? params.except!(:created_after, :created_before) end diff --git a/spec/requests/api/users_spec.rb b/spec/requests/api/users_spec.rb index ae1764c3d49..c34b88f0741 100644 --- a/spec/requests/api/users_spec.rb +++ b/spec/requests/api/users_spec.rb @@ -165,7 +165,7 @@ describe API::Users do end it "returns a user created before a specific date" do - user = create(:user, created_at: Date.new(2000,1,1)) + user = create(:user, created_at: Date.new(2000, 1, 1)) get api("/users?created_before=2000-01-02T00:00:00.060Z", admin) @@ -175,7 +175,7 @@ describe API::Users do end it "returns no users created before a specific date" do - create(:user, created_at: Date.new(2001,1,1)) + create(:user, created_at: Date.new(2001, 1, 1)) get api("/users?created_before=2000-01-02T00:00:00.060Z", admin) @@ -184,7 +184,7 @@ describe API::Users do end it "returns users created before and after a specific date" do - user = create(:user, created_at: Date.new(2001,1,1)) + user = create(:user, created_at: Date.new(2001, 1, 1)) get api("/users?created_before=2001-01-02T00:00:00.060Z&created_after=1999-01-02T00:00:00.060", admin) |