diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 6a19e3d0..94e7183f 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -2,8 +2,4 @@ class ApplicationController < ActionController::Base include Authentication # Only allow modern browsers supporting webp images, web push, badges, import maps, CSS nesting, and CSS :has. allow_browser versions: :modern - - def check_admin! - redirect_to root_path unless Current.user.is_admin? - end end diff --git a/app/controllers/concerns/authentication.rb b/app/controllers/concerns/authentication.rb index 985bf255..d0cec6ef 100644 --- a/app/controllers/concerns/authentication.rb +++ b/app/controllers/concerns/authentication.rb @@ -12,6 +12,10 @@ def allow_unauthenticated_access(**options) end end + def redirect_contributors + redirect_to dashboard_path unless Current.user.is_admin? + end + private def authenticated? resume_session @@ -35,7 +39,7 @@ def request_authentication end def after_authentication_url - session.delete(:return_to_after_authenticating) || regions_url + session.delete(:return_to_after_authenticating) || dashboard_url end def start_new_session_for(user) diff --git a/app/controllers/dashboard_controller.rb b/app/controllers/dashboard_controller.rb new file mode 100644 index 00000000..e1192e4d --- /dev/null +++ b/app/controllers/dashboard_controller.rb @@ -0,0 +1,2 @@ +class DashboardController < ApplicationController +end diff --git a/app/controllers/languages_controller.rb b/app/controllers/languages_controller.rb index 4366eca3..bd9ae4d1 100644 --- a/app/controllers/languages_controller.rb +++ b/app/controllers/languages_controller.rb @@ -1,4 +1,5 @@ class LanguagesController < ApplicationController + before_action :redirect_contributors before_action :set_language, only: [ :edit, :update ] def index diff --git a/app/controllers/providers_controller.rb b/app/controllers/providers_controller.rb index 0be0ee45..4aa3afc5 100644 --- a/app/controllers/providers_controller.rb +++ b/app/controllers/providers_controller.rb @@ -1,5 +1,6 @@ class ProvidersController < ApplicationController before_action :set_provider, only: %i[ show edit update destroy ] + before_action :redirect_contributors def index @providers = Provider.all diff --git a/app/controllers/regions_controller.rb b/app/controllers/regions_controller.rb index 1b6b548e..7ff1c692 100644 --- a/app/controllers/regions_controller.rb +++ b/app/controllers/regions_controller.rb @@ -1,4 +1,5 @@ class RegionsController < ApplicationController + before_action :redirect_contributors before_action :set_region, only: %i[ show edit update destroy ] # GET /regions diff --git a/app/controllers/topics_controller.rb b/app/controllers/topics_controller.rb index ac1331b1..ebe37ccc 100644 --- a/app/controllers/topics_controller.rb +++ b/app/controllers/topics_controller.rb @@ -1,6 +1,5 @@ class TopicsController < ApplicationController before_action :set_topic, only: [ :show, :edit, :update, :destroy, :archive ] - before_action :check_admin!, only: :destroy def index @topics = scope.includes(:language, :provider) @@ -32,6 +31,7 @@ def update end def destroy + redirect_to topics_path and return unless Current.user.is_admin? @topic.destroy redirect_to topics_path end diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 16aed061..10f38317 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -1,4 +1,5 @@ class UsersController < ApplicationController + before_action :redirect_contributors before_action :set_user, only: %i[ edit update destroy ] def index diff --git a/app/views/dashboard/index.html.erb b/app/views/dashboard/index.html.erb new file mode 100644 index 00000000..68b9281f --- /dev/null +++ b/app/views/dashboard/index.html.erb @@ -0,0 +1,27 @@ +<% content_for :title, "Dashboard" %> + +
+
+
+
+
+

Dashboard

+
+
+
+

+ Welcome to your dashboard! Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed do eiusmod tempor incididunt ut + labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut + aliquip + ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse + cillum dolore eu fugiat nulla + pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt + mollit anim id est + laborum. +

+
+
+
+
+
+
diff --git a/app/views/layouts/_sidebar.html.erb b/app/views/layouts/_sidebar.html.erb index f6a41de2..f7761865 100644 --- a/app/views/layouts/_sidebar.html.erb +++ b/app/views/layouts/_sidebar.html.erb @@ -4,7 +4,7 @@
    -
  • Administration
    • - -
  • - <%= link_to regions_path, class: "sidebar-link" do %> - - Regions - <% end %> -
    • - -
  • - <%= link_to providers_path, class: "sidebar-link" do %> - - Providers - <% end %> -
    • -
  • <%= link_to topics_path, class: "sidebar-link" do %> @@ -68,19 +52,37 @@ <% end %>
    • -
  • - <%= link_to languages_path, class: "sidebar-link" do %> - - Languages - <% end %> -
    • + <% if Current.user.is_admin? %> +
  • Administration
    • +
  • + <%= link_to regions_path, class: "sidebar-link" do %> + + Regions + <% end %> +
    • -
  • - <%= link_to users_path, class: 'sidebar-link' do %> - - Users - <% end %> -
    • +
  • + <%= link_to providers_path, class: "sidebar-link" do %> + + Providers + <% end %> +
    • + +
  • + <%= link_to languages_path, class: "sidebar-link" do %> + + Languages + <% end %> +
    • + +
  • + <%= link_to users_path, class: 'sidebar-link' do %> + + Users + <% end %> +
    • + + <% end %>
diff --git a/config/routes.rb b/config/routes.rb index db90050d..c504402b 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,6 +1,7 @@ Rails.application.routes.draw do root "home#index" get "home/index", as: :home + get "dashboard/index", as: :dashboard resources :languages, only: %i[index show new create edit update] resources :passwords, param: :token resources :providers diff --git a/spec/requests/authorizations_spec.rb b/spec/requests/authorizations_spec.rb new file mode 100644 index 00000000..b5c0b9c7 --- /dev/null +++ b/spec/requests/authorizations_spec.rb @@ -0,0 +1,63 @@ +require "rails_helper" + +RSpec.describe "Authorizations", type: :request do + let(:user) { create(:user) } + + before { sign_in(user) } + + context "contributor" do + it "can access the Topics tab" do + get "/topics" + expect(response).to be_successful + end + + it "cannot access the Regions tab" do + get "/regions" + expect(response).to redirect_to(dashboard_path) + end + + it "cannot access the Providers tab" do + get "/providers" + expect(response).to redirect_to(dashboard_path) + end + + it "cannot access the Languages tab" do + get "/languages" + expect(response).to redirect_to(dashboard_path) + end + + it "cannot access the Users tab" do + get "/users" + expect(response).to redirect_to(dashboard_path) + end + end + + context "administrator" do + before { user.update(is_admin: true) } + + it "can access the Topics tab" do + get "/topics" + expect(response).to be_successful + end + + it "cannot access the Regions tab" do + get "/regions" + expect(response).to be_successful + end + + it "cannot access the Providers tab" do + get "/providers" + expect(response).to be_successful + end + + it "cannot access the Languages tab" do + get "/languages" + expect(response).to be_successful + end + + it "cannot access the Users tab" do + get "/users" + expect(response).to be_successful + end + end +end diff --git a/spec/requests/dashboard_spec.rb b/spec/requests/dashboard_spec.rb new file mode 100644 index 00000000..da3fd9db --- /dev/null +++ b/spec/requests/dashboard_spec.rb @@ -0,0 +1,14 @@ +require "rails_helper" + +RSpec.describe "Dashboards", type: :request do + describe "GET /dashboard/index" do + let(:user) { create(:user) } + + before { sign_in(user) } + + it "displays the dashboard" do + get "/dashboard/index" + expect(page).to have_text("Welcome to your dashboard") + end + end +end diff --git a/spec/requests/languages/create_spec.rb b/spec/requests/languages/create_spec.rb index d2b1b796..36677bc9 100644 --- a/spec/requests/languages/create_spec.rb +++ b/spec/requests/languages/create_spec.rb @@ -2,7 +2,7 @@ describe "Languages", type: :request do describe "POST /languages" do - let(:user) { create(:user) } + let(:user) { create(:user, :admin) } let(:language_params) { { name: "french", file_share_folder: "languages/french" } } before { sign_in(user) } diff --git a/spec/requests/languages/index_spec.rb b/spec/requests/languages/index_spec.rb index 08c2d7bf..a786839f 100644 --- a/spec/requests/languages/index_spec.rb +++ b/spec/requests/languages/index_spec.rb @@ -2,7 +2,7 @@ describe "Languages", type: :request do describe "GET /languages" do - let(:user) { create(:user) } + let(:user) { create(:user, :admin) } before { sign_in(user) } diff --git a/spec/requests/languages/update_spec.rb b/spec/requests/languages/update_spec.rb index c18ed901..34014547 100644 --- a/spec/requests/languages/update_spec.rb +++ b/spec/requests/languages/update_spec.rb @@ -2,7 +2,7 @@ describe "Languages", type: :request do describe "PUT /languages" do - let(:user) { create(:user) } + let(:user) { create(:user, :admin) } before { sign_in(user) } diff --git a/spec/requests/providers_spec.rb b/spec/requests/providers_spec.rb index fc5369c1..5243e453 100644 --- a/spec/requests/providers_spec.rb +++ b/spec/requests/providers_spec.rb @@ -1,7 +1,7 @@ require "rails_helper" RSpec.describe "/providers", type: :request do - let(:user) { create(:user) } + let(:user) { create(:user, :admin) } before do sign_in(user) diff --git a/spec/requests/regions_spec.rb b/spec/requests/regions_spec.rb index 06c66c52..ebdc25b9 100644 --- a/spec/requests/regions_spec.rb +++ b/spec/requests/regions_spec.rb @@ -13,7 +13,7 @@ # sticking to rails and rspec-rails APIs to keep things simple and stable. RSpec.describe "/regions", type: :request do - let(:user) { create(:user) } + let(:user) { create(:user, :admin) } before do sign_in(user) diff --git a/spec/requests/topics/destroy_spec.rb b/spec/requests/topics/destroy_spec.rb index 3aa6a478..83535f57 100644 --- a/spec/requests/topics/destroy_spec.rb +++ b/spec/requests/topics/destroy_spec.rb @@ -14,13 +14,13 @@ expect(Topic.count).to be_zero end - context "when user is not ad admin" do + context "when user is not an admin" do let(:user) { create(:user) } it "does not delete a Topic" do delete topic_url(topic) - expect(response).to redirect_to(root_url) + expect(response).to redirect_to(topics_url) expect(Topic.count).to eq(1) end end diff --git a/spec/requests/users_spec.rb b/spec/requests/users_spec.rb index 8b800d21..b67e6b85 100644 --- a/spec/requests/users_spec.rb +++ b/spec/requests/users_spec.rb @@ -1,12 +1,12 @@ require "rails_helper" RSpec.describe "/users", type: :request do - let(:user) { create(:user) } + let(:admin) { create(:user, :admin) } let(:valid_attributes) { { email: "john@doe.com", password: "123" } } let(:invalid_attributes) { { email: "" } } before do - sign_in(user) + sign_in(admin) end describe "GET /index" do diff --git a/spec/system/login_spec.rb b/spec/system/login_spec.rb index 7c857cd2..38e02eba 100644 --- a/spec/system/login_spec.rb +++ b/spec/system/login_spec.rb @@ -1,23 +1,45 @@ require "rails_helper" RSpec.describe "User Login", type: :system do - # will probably need to be amended once we have a page for non-Admin users - let!(:user) { create(:user) } + let(:user) { create(:user) } + + before do + visit root_path + click_link("Sign In") + end context "with correct email and password" do - it "logs in the user" do - visit new_session_path - fill_in "email", with: user.email - fill_in "password", with: user.password - click_button("Sign in") + context "contributor" do + it "logs in the user" do + fill_in "email", with: user.email + fill_in "password", with: user.password + click_button("Sign in") + + expect(page).to have_text("Topic") + expect(page).not_to have_text("Administration") + end + end + + context "administrator" do + before { user.update(is_admin: true) } + + it "logs in the user" do + fill_in "email", with: user.email + fill_in "password", with: user.password + click_button("Sign in") - expect(page).to have_text("Regions Served") + expect(page).to have_text("Topic") + expect(page).to have_text("Administration") + expect(page).to have_text("Regions") + expect(page).to have_text("Providers") + expect(page).to have_text("Languages") + expect(page).to have_text("Users") + end end end context "with incorrect email or password" do it "shows error message" do - visit new_session_path fill_in "email", with: "incorrectemail@mail.com" fill_in "password", with: user.password click_button("Sign in") @@ -28,7 +50,6 @@ context "forgotten password" do it "allows users to reset password" do - visit new_session_path click_on("Forgot password?") expect(page).to have_text("Input your email and we will send you reset password link") expect(page).to have_link("Login", href: new_session_path) @@ -37,7 +58,6 @@ context "after logging in" do it "allows users to log out" do - visit new_session_path fill_in "email", with: user.email fill_in "password", with: user.password click_button("Sign in")