From aa5f1ad15703543d502db5c46bba322f9fd4bc92 Mon Sep 17 00:00:00 2001 From: Jared Cosulich Date: Thu, 19 Oct 2017 15:52:15 -0400 Subject: [PATCH] basic authentication --- app/controllers/application_controller.rb | 6 ++++++ app/controllers/categories_controller.rb | 2 ++ app/controllers/districts_controller.rb | 1 + app/controllers/schools_controller.rb | 2 ++ app/models/category.rb | 2 +- 5 files changed, 12 insertions(+), 1 deletion(-) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 55cbf0ba..4a793e59 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -9,4 +9,10 @@ class ApplicationController < ActionController::Base return false end + def authenticate(username, password) + authenticate_or_request_with_http_basic do |u, p| + u == username && p == password + end + end + end diff --git a/app/controllers/categories_controller.rb b/app/controllers/categories_controller.rb index 9052ed76..257290a8 100644 --- a/app/controllers/categories_controller.rb +++ b/app/controllers/categories_controller.rb @@ -11,6 +11,8 @@ class CategoriesController < ApplicationController # GET /categories/1 # GET /categories/1.json def show + district = @school.district + authenticate(district.name.downcase, "#{district.name.downcase}!") @school_category = SchoolCategory.for(@school, @category).first @child_school_categories = SchoolCategory.for_parent_category(@school, @category) @questions = @category.questions diff --git a/app/controllers/districts_controller.rb b/app/controllers/districts_controller.rb index 3d9129e9..ff772074 100644 --- a/app/controllers/districts_controller.rb +++ b/app/controllers/districts_controller.rb @@ -10,6 +10,7 @@ class DistrictsController < ApplicationController # GET /districts/1 # GET /districts/1.json def show + authenticate(@district.name.downcase, "#{@district.name.downcase}!") @schools = @district.schools.alphabetic end diff --git a/app/controllers/schools_controller.rb b/app/controllers/schools_controller.rb index 26c2829d..6376ae3c 100644 --- a/app/controllers/schools_controller.rb +++ b/app/controllers/schools_controller.rb @@ -7,6 +7,8 @@ class SchoolsController < ApplicationController # GET /schools/1 # GET /schools/1.json def show + district = @school.district + authenticate(district.name.downcase, "#{district.name.downcase}!") @school_categories = @school.school_categories.for_parent_category(@school, nil).sort end diff --git a/app/models/category.rb b/app/models/category.rb index b23e6b23..d23e637c 100644 --- a/app/models/category.rb +++ b/app/models/category.rb @@ -31,7 +31,7 @@ class Category < ApplicationRecord "academic-learning", "citizenship-and-wellbeing", "pilot-family-questions" - ].index(root_identifier) + ].index(root_identifier) || 0 end end