Milo
3 years ago
committed by
GitHub
85 changed files with 1900 additions and 603 deletions
@ -1,2 +1,4 @@
|
||||
DB_USERNAME=postgres-user |
||||
DB_PASSWORD=postgres-password |
||||
CORE_EMAIL_USERNAME=email@example.com |
||||
CORE_EMAIL_PASSWORD=password123 |
||||
|
||||
@ -0,0 +1,27 @@
|
||||
ActiveAdmin.register AdminUser do |
||||
permit_params :email, :password, :password_confirmation |
||||
|
||||
index do |
||||
selectable_column |
||||
id_column |
||||
column :email |
||||
column :current_sign_in_at |
||||
column :sign_in_count |
||||
column :created_at |
||||
actions |
||||
end |
||||
|
||||
filter :email |
||||
filter :current_sign_in_at |
||||
filter :sign_in_count |
||||
filter :created_at |
||||
|
||||
form do |f| |
||||
f.inputs do |
||||
f.input :email |
||||
f.input :password |
||||
f.input :password_confirmation |
||||
end |
||||
f.actions |
||||
end |
||||
end |
||||
@ -0,0 +1,20 @@
|
||||
class Users::PasswordsController < Devise::PasswordsController |
||||
def reset_confirmation |
||||
@email = params["email"] |
||||
flash[:notice] = "Reset password instructions have been sent to #{@email}" |
||||
render "devise/confirmations/reset" |
||||
end |
||||
|
||||
def create |
||||
self.resource = resource_class.send_reset_password_instructions(resource_params) |
||||
yield resource if block_given? |
||||
|
||||
respond_with({}, location: after_sending_reset_password_instructions_path_for(resource_name)) |
||||
end |
||||
|
||||
protected |
||||
|
||||
def after_sending_reset_password_instructions_path_for(_resource) |
||||
confirmations_reset_path(email: params.dig("user", "email")) |
||||
end |
||||
end |
||||
@ -1,57 +1,20 @@
|
||||
module CheckAnswersHelper |
||||
def total_answered_questions(subsection, case_log, form) |
||||
total_questions(subsection, case_log, form).keys.count do |question_key| |
||||
case_log[question_key].present? |
||||
end |
||||
end |
||||
|
||||
def total_number_of_questions(subsection, case_log, form) |
||||
total_questions(subsection, case_log, form).count |
||||
end |
||||
|
||||
def total_questions(subsection, case_log, form) |
||||
questions = form.questions_for_subsection(subsection) |
||||
form.filter_conditional_questions(questions, case_log) |
||||
end |
||||
|
||||
def get_next_page_name(form, page_name, case_log) |
||||
page = form.all_pages[page_name] |
||||
if page.key?("conditional_route_to") |
||||
page["conditional_route_to"].each do |conditional_page_name, condition| |
||||
unless condition.any? { |field, value| case_log[field].blank? || !value.include?(case_log[field]) } |
||||
return conditional_page_name |
||||
end |
||||
end |
||||
def display_answered_questions_summary(subsection, case_log) |
||||
total = subsection.applicable_questions_count(case_log) |
||||
answered = subsection.answered_questions_count(case_log) |
||||
if total == answered |
||||
'<p class="govuk-body govuk-!-margin-bottom-7">You answered all the questions</p>'.html_safe |
||||
else |
||||
"<p class=\"govuk-body govuk-!-margin-bottom-7\">You answered #{answered} of #{total} questions</p> |
||||
#{create_next_missing_question_link(subsection, case_log)}".html_safe |
||||
end |
||||
form.next_page(page_name) |
||||
end |
||||
|
||||
def create_update_answer_link(question_title, question_info, case_log, form) |
||||
page = form.page_for_question(question_title) |
||||
link_name = if question_info["type"] == "checkbox" |
||||
question_info["answer_options"].keys.any? { |key| case_log[key] == "Yes" } ? "Change" : "Answer" |
||||
else |
||||
case_log[question_title].blank? ? "Answer" : "Change" |
||||
end |
||||
link_to(link_name, "/case_logs/#{case_log.id}/#{page}", class: "govuk-link").html_safe |
||||
end |
||||
private |
||||
|
||||
def create_next_missing_question_link(case_log_id, subsection, case_log, form) |
||||
pages_to_fill_in = [] |
||||
form.pages_for_subsection(subsection).each do |page_title, page_info| |
||||
page_info["questions"].any? { |question| case_log[question].blank? } |
||||
pages_to_fill_in << page_title |
||||
end |
||||
url = "/case_logs/#{case_log_id}/#{pages_to_fill_in.first}" |
||||
def create_next_missing_question_link(subsection, case_log) |
||||
pages_to_fill_in = subsection.unanswered_questions(case_log).map(&:page) |
||||
url = "/case_logs/#{case_log.id}/#{pages_to_fill_in.first.id}" |
||||
link_to("Answer the missing questions", url, class: "govuk-link").html_safe |
||||
end |
||||
|
||||
def display_answered_questions_summary(subsection, case_log, form) |
||||
if total_answered_questions(subsection, case_log, form) == total_number_of_questions(subsection, case_log, form) |
||||
'<p class="govuk-body govuk-!-margin-bottom-7">You answered all the questions</p>'.html_safe |
||||
else |
||||
"<p class=\"govuk-body govuk-!-margin-bottom-7\">You answered #{total_answered_questions(subsection, case_log, form)} of #{total_number_of_questions(subsection, case_log, form)} questions</p> |
||||
#{create_next_missing_question_link(case_log['id'], subsection, case_log, form)}".html_safe |
||||
end |
||||
end |
||||
end |
||||
|
||||
@ -1,11 +1,9 @@
|
||||
module ConditionalQuestionsHelper |
||||
def conditional_questions_for_page(page) |
||||
page["questions"].values.map { |question| |
||||
question["conditional_for"] |
||||
}.compact.map(&:keys).flatten |
||||
page.questions.map(&:conditional_for).compact.map(&:keys).flatten |
||||
end |
||||
|
||||
def display_question_key_div(page_info, question_key) |
||||
"style='display:none;'".html_safe if conditional_questions_for_page(page_info).include?(question_key) |
||||
def display_question_key_div(page, question) |
||||
"style='display:none;'".html_safe if conditional_questions_for_page(page).include?(question.id) |
||||
end |
||||
end |
||||
|
||||
@ -0,0 +1,5 @@
|
||||
class AdminUser < ApplicationRecord |
||||
# Include default devise modules. Others available are: |
||||
# :confirmable, :lockable, :timeoutable, :trackable and :omniauthable |
||||
devise :database_authenticatable, :recoverable, :rememberable, :validatable |
||||
end |
||||
@ -0,0 +1,30 @@
|
||||
class Form::Page |
||||
attr_accessor :id, :header, :description, :questions, :soft_validations, |
||||
:depends_on, :subsection |
||||
|
||||
def initialize(id, hsh, subsection) |
||||
@id = id |
||||
@header = hsh["header"] |
||||
@description = hsh["description"] |
||||
@questions = hsh["questions"].map { |q_id, q| Form::Question.new(q_id, q, self) } |
||||
@depends_on = hsh["depends_on"] |
||||
@soft_validations = hsh["soft_validations"]&.map { |v_id, s| Form::Question.new(v_id, s, self) } |
||||
@subsection = subsection |
||||
end |
||||
|
||||
def expected_responses |
||||
questions + (soft_validations || []) |
||||
end |
||||
|
||||
def has_soft_validations? |
||||
soft_validations.present? |
||||
end |
||||
|
||||
def routed_to?(case_log) |
||||
return true unless depends_on |
||||
|
||||
depends_on.all? do |question, value| |
||||
case_log[question].present? && case_log[question] == value |
||||
end |
||||
end |
||||
end |
||||
@ -0,0 +1,80 @@
|
||||
class Form::Question |
||||
attr_accessor :id, :header, :hint_text, :description, :questions, |
||||
:type, :min, :max, :step, :fields_to_add, :result_field, |
||||
:conditional_for, :readonly, :answer_options, :page, :check_answer_label |
||||
|
||||
def initialize(id, hsh, page) |
||||
@id = id |
||||
@check_answer_label = hsh["check_answer_label"] |
||||
@header = hsh["header"] |
||||
@hint_text = hsh["hint_text"] |
||||
@type = hsh["type"] |
||||
@min = hsh["min"] |
||||
@max = hsh["max"] |
||||
@step = hsh["step"] |
||||
@fields_to_add = hsh["fields-to-add"] |
||||
@result_field = hsh["result-field"] |
||||
@readonly = hsh["readonly"] |
||||
@answer_options = hsh["answer_options"] |
||||
@conditional_for = hsh["conditional_for"] |
||||
@page = page |
||||
end |
||||
|
||||
delegate :subsection, to: :page |
||||
delegate :form, to: :subsection |
||||
|
||||
def answer_label(case_log) |
||||
return checkbox_answer_label(case_log) if type == "checkbox" |
||||
|
||||
case_log[id].to_s |
||||
end |
||||
|
||||
def read_only? |
||||
!!readonly |
||||
end |
||||
|
||||
def conditional_on |
||||
@conditional_on ||= form.conditional_question_conditions.select do |condition| |
||||
condition[:to] == id |
||||
end |
||||
end |
||||
|
||||
def enabled?(case_log) |
||||
return true if conditional_on.blank? |
||||
|
||||
conditional_on.map { |condition| evaluate_condition(condition, case_log) }.all? |
||||
end |
||||
|
||||
def update_answer_link_name(case_log) |
||||
if type == "checkbox" |
||||
answer_options.keys.any? { |key| case_log[key] == "Yes" } ? "Change" : "Answer" |
||||
else |
||||
case_log[id].blank? ? "Answer" : "Change" |
||||
end |
||||
end |
||||
|
||||
private |
||||
|
||||
def checkbox_answer_label(case_log) |
||||
answer = [] |
||||
answer_options.each { |key, value| case_log[key] == "Yes" ? answer << value : nil } |
||||
answer.join(", ") |
||||
end |
||||
|
||||
def evaluate_condition(condition, case_log) |
||||
case page.questions.find { |q| q.id == condition[:from] }.type |
||||
when "numeric" |
||||
operator = condition[:cond][/[<>=]+/].to_sym |
||||
operand = condition[:cond][/\d+/].to_i |
||||
case_log[condition[:from]].present? && case_log[condition[:from]].send(operator, operand) |
||||
when "text" |
||||
case_log[condition[:from]].present? && condition[:cond].include?(case_log[condition[:from]]) |
||||
when "radio" |
||||
case_log[condition[:from]].present? && condition[:cond].include?(case_log[condition[:from]]) |
||||
when "select" |
||||
case_log[condition[:from]].present? && condition[:cond].include?(case_log[condition[:from]]) |
||||
else |
||||
raise "Not implemented yet" |
||||
end |
||||
end |
||||
end |
||||
@ -0,0 +1,10 @@
|
||||
class Form::Section |
||||
attr_accessor :id, :label, :subsections, :form |
||||
|
||||
def initialize(id, hsh, form) |
||||
@id = id |
||||
@label = hsh["label"] |
||||
@form = form |
||||
@subsections = hsh["subsections"].map { |s_id, s| Form::Subsection.new(s_id, s, self) } |
||||
end |
||||
end |
||||
@ -0,0 +1,65 @@
|
||||
class Form::Subsection |
||||
attr_accessor :id, :label, :section, :pages, :depends_on, :form |
||||
|
||||
def initialize(id, hsh, section) |
||||
@id = id |
||||
@label = hsh["label"] |
||||
@depends_on = hsh["depends_on"] |
||||
@pages = hsh["pages"].map { |s_id, p| Form::Page.new(s_id, p, self) } |
||||
@section = section |
||||
end |
||||
|
||||
delegate :form, to: :section |
||||
|
||||
def questions |
||||
@questions ||= pages.flat_map(&:questions) |
||||
end |
||||
|
||||
def enabled?(case_log) |
||||
return true unless depends_on |
||||
|
||||
depends_on.all? do |subsection_id, dependent_status| |
||||
form.get_subsection(subsection_id).status(case_log) == dependent_status.to_sym |
||||
end |
||||
end |
||||
|
||||
def status(case_log) |
||||
unless enabled?(case_log) |
||||
return :cannot_start_yet |
||||
end |
||||
|
||||
qs = applicable_questions(case_log) |
||||
return :not_started if qs.all? { |question| case_log[question.id].blank? } |
||||
return :completed if qs.all? { |question| case_log[question.id].present? } |
||||
|
||||
:in_progress |
||||
end |
||||
|
||||
def is_incomplete?(case_log) |
||||
%i[not_started in_progress].include?(status(case_log)) |
||||
end |
||||
|
||||
def is_started?(case_log) |
||||
%i[in_progress completed].include?(status(case_log)) |
||||
end |
||||
|
||||
def applicable_questions_count(case_log) |
||||
applicable_questions(case_log).count |
||||
end |
||||
|
||||
def answered_questions_count(case_log) |
||||
answered_questions(case_log).count |
||||
end |
||||
|
||||
def applicable_questions(case_log) |
||||
questions.select { |q| q.page.routed_to?(case_log) && q.enabled?(case_log) } |
||||
end |
||||
|
||||
def answered_questions(case_log) |
||||
applicable_questions(case_log).select { |question| case_log[question.id].present? } |
||||
end |
||||
|
||||
def unanswered_questions(case_log) |
||||
applicable_questions(case_log) - answered_questions(case_log) |
||||
end |
||||
end |
||||
@ -0,0 +1,5 @@
|
||||
class User < ApplicationRecord |
||||
# Include default devise modules. Others available are: |
||||
# :confirmable, :lockable, :timeoutable, :trackable and :omniauthable |
||||
devise :database_authenticatable, :recoverable, :rememberable, :validatable |
||||
end |
||||
@ -0,0 +1,16 @@
|
||||
<h2>Resend confirmation instructions</h2> |
||||
|
||||
<%= form_for(resource, as: resource_name, url: confirmation_path(resource_name), html: { method: :post }) do |f| %> |
||||
<%= render "devise/shared/error_messages", resource: resource %> |
||||
|
||||
<div class="field"> |
||||
<%= f.label :email %><br /> |
||||
<%= f.email_field :email, autofocus: true, autocomplete: "email", value: (resource.pending_reconfirmation? ? resource.unconfirmed_email : resource.email) %> |
||||
</div> |
||||
|
||||
<div class="actions"> |
||||
<%= f.submit "Resend confirmation instructions" %> |
||||
</div> |
||||
<% end %> |
||||
|
||||
<%= render "devise/shared/links" %> |
||||
@ -0,0 +1,8 @@
|
||||
<div class="govuk-grid-row"> |
||||
<div class="govuk-grid-column-two-thirds"> |
||||
<h1 class="govuk-heading-l"> Check your email</h1> |
||||
<p class="govuk-body">We’ve sent a link to reset your password to <strong><%= @email %></strong>.</p> |
||||
<p class="govuk-body">You’ll only this receive this link if your email address already exists in our system.</p> |
||||
<p class="govuk-body">If you don’t receive the email within 5 minutes, check your spam or junk folders. Try again if you still haven’t received the email.</p> |
||||
</div> |
||||
</div> |
||||
@ -0,0 +1,5 @@
|
||||
<p>Welcome <%= @email %>!</p> |
||||
|
||||
<p>You can confirm your account email through the link below:</p> |
||||
|
||||
<p><%= link_to 'Confirm my account', confirmation_url(@resource, confirmation_token: @token) %></p> |
||||
@ -0,0 +1,7 @@
|
||||
<p>Hello <%= @email %>!</p> |
||||
|
||||
<% if @resource.try(:unconfirmed_email?) %> |
||||
<p>We're contacting you to notify you that your email is being changed to <%= @resource.unconfirmed_email %>.</p> |
||||
<% else %> |
||||
<p>We're contacting you to notify you that your email has been changed to <%= @resource.email %>.</p> |
||||
<% end %> |
||||
@ -0,0 +1,3 @@
|
||||
<p>Hello <%= @resource.email %>!</p> |
||||
|
||||
<p>We're contacting you to notify you that your password has been changed.</p> |
||||
@ -0,0 +1,8 @@
|
||||
<p>Hello <%= @resource.email %>!</p> |
||||
|
||||
<p>Someone has requested a link to change your password. You can do this through the link below.</p> |
||||
|
||||
<p><%= link_to 'Change my password', edit_password_url(@resource, reset_password_token: @token) %></p> |
||||
|
||||
<p>If you didn't request this, please ignore this email.</p> |
||||
<p>Your password won't change until you access the link above and create a new one.</p> |
||||
@ -0,0 +1,7 @@
|
||||
<p>Hello <%= @resource.email %>!</p> |
||||
|
||||
<p>Your account has been locked due to an excessive number of unsuccessful sign in attempts.</p> |
||||
|
||||
<p>Click the link below to unlock your account:</p> |
||||
|
||||
<p><%= link_to 'Unlock my account', unlock_url(@resource, unlock_token: @token) %></p> |
||||
@ -0,0 +1,19 @@
|
||||
<%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :put }) do |f| %> |
||||
<div class="govuk-grid-row"> |
||||
<div class="govuk-grid-column-two-thirds"> |
||||
<h1 class="govuk-heading-l">Reset your password</h1> |
||||
<%= render "devise/shared/error_messages", resource: resource %> |
||||
<%= f.hidden_field :reset_password_token %> |
||||
|
||||
<div class="govuk-form-group"> |
||||
<%= f.label :password, "New password", class: "govuk-label" %> |
||||
<% if @minimum_password_length %> |
||||
<div class="govuk-hint">Your password must be at least 8 characters and hard to guess.</div> |
||||
<% end %> |
||||
<%= f.password_field :password, autofocus: true, autocomplete: "new-password", class: "govuk-input" %> |
||||
</div> |
||||
|
||||
<%= f.submit "Reset password", class: "govuk-button" %> |
||||
</div> |
||||
</div> |
||||
<% end %> |
||||
@ -0,0 +1,24 @@
|
||||
<% content_for :before_content do %> |
||||
<%= link_to 'Back', :back, class: "govuk-back-link" %> |
||||
<% end %> |
||||
|
||||
<%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :post }) do |f| %> |
||||
<div class="govuk-grid-row"> |
||||
<div class="govuk-grid-column-two-thirds"> |
||||
<h1 class="govuk-heading-l">Reset password</h1> |
||||
<%= render "devise/shared/error_messages", resource: resource %> |
||||
|
||||
<p class="govuk-body">Enter the email address you used to create your account.</p> |
||||
<p class="govuk-body">We’ll email you a link to reset your password. This link will expire in 3 hours.</p> |
||||
|
||||
<div class="govuk-form-group"> |
||||
<%= f.label :email, "Email address", class: "govuk-label" %> |
||||
<%= f.email_field :email, autofocus: true, autocomplete: "email", class: "govuk-input" %> |
||||
</div> |
||||
|
||||
<%= f.submit "Send email", class: "govuk-button" %> |
||||
</div> |
||||
</div> |
||||
<% end %> |
||||
|
||||
<%= render "devise/shared/links" %> |
||||
@ -0,0 +1,43 @@
|
||||
<h2>Edit <%= resource_name.to_s.humanize %></h2> |
||||
|
||||
<%= form_for(resource, as: resource_name, url: registration_path(resource_name), html: { method: :put }) do |f| %> |
||||
<%= render "devise/shared/error_messages", resource: resource %> |
||||
|
||||
<div class="field"> |
||||
<%= f.label :email %><br /> |
||||
<%= f.email_field :email, autofocus: true, autocomplete: "email" %> |
||||
</div> |
||||
|
||||
<% if devise_mapping.confirmable? && resource.pending_reconfirmation? %> |
||||
<div>Currently waiting confirmation for: <%= resource.unconfirmed_email %></div> |
||||
<% end %> |
||||
|
||||
<div class="field"> |
||||
<%= f.label :password %> <i>(leave blank if you don't want to change it)</i><br /> |
||||
<%= f.password_field :password, autocomplete: "new-password" %> |
||||
<% if @minimum_password_length %> |
||||
<br /> |
||||
<em><%= @minimum_password_length %> characters minimum</em> |
||||
<% end %> |
||||
</div> |
||||
|
||||
<div class="field"> |
||||
<%= f.label :password_confirmation %><br /> |
||||
<%= f.password_field :password_confirmation, autocomplete: "new-password" %> |
||||
</div> |
||||
|
||||
<div class="field"> |
||||
<%= f.label :current_password %> <i>(we need your current password to confirm your changes)</i><br /> |
||||
<%= f.password_field :current_password, autocomplete: "current-password" %> |
||||
</div> |
||||
|
||||
<div class="actions"> |
||||
<%= f.submit "Update" %> |
||||
</div> |
||||
<% end %> |
||||
|
||||
<h3>Cancel my account</h3> |
||||
|
||||
<p>Unhappy? <%= button_to "Cancel my account", registration_path(resource_name), data: { confirm: "Are you sure?" }, method: :delete %></p> |
||||
|
||||
<%= link_to "Back", :back %> |
||||
@ -0,0 +1,29 @@
|
||||
<h2>Sign up</h2> |
||||
|
||||
<%= form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f| %> |
||||
<%= render "devise/shared/error_messages", resource: resource %> |
||||
|
||||
<div class="field"> |
||||
<%= f.label :email %><br /> |
||||
<%= f.email_field :email, autofocus: true, autocomplete: "email" %> |
||||
</div> |
||||
|
||||
<div class="field"> |
||||
<%= f.label :password %> |
||||
<% if @minimum_password_length %> |
||||
<em>(<%= @minimum_password_length %> characters minimum)</em> |
||||
<% end %><br /> |
||||
<%= f.password_field :password, autocomplete: "new-password" %> |
||||
</div> |
||||
|
||||
<div class="field"> |
||||
<%= f.label :password_confirmation %><br /> |
||||
<%= f.password_field :password_confirmation, autocomplete: "new-password" %> |
||||
</div> |
||||
|
||||
<div class="actions"> |
||||
<%= f.submit "Sign up" %> |
||||
</div> |
||||
<% end %> |
||||
|
||||
<%= render "devise/shared/links" %> |
||||
@ -0,0 +1,21 @@
|
||||
<%= form_for(resource, as: resource_name, url: session_path(resource_name)) do |f| %> |
||||
<div class="govuk-grid-row"> |
||||
<div class="govuk-grid-column-two-thirds"> |
||||
<h1 class="govuk-heading-l">Sign in to your account to submit CORE data</h1> |
||||
|
||||
<div class="govuk-form-group"> |
||||
<%= f.label :email, "Email address", class: "govuk-label" %> |
||||
<%= f.email_field :email, autofocus: true, autocomplete: "email", class: "govuk-input" %> |
||||
</div> |
||||
|
||||
<div class="govuk-form-group"> |
||||
<%= f.label :password, class: "govuk-label" %> |
||||
<%= f.password_field :password, autocomplete: "current-password", class: "govuk-input" %> |
||||
</div> |
||||
|
||||
<%= f.submit "Sign in", class: "govuk-button" %> |
||||
</div> |
||||
</div> |
||||
<% end %> |
||||
|
||||
<%= render "devise/shared/links" %> |
||||
@ -0,0 +1,15 @@
|
||||
<% if resource.errors.any? %> |
||||
<div id="error_explanation"> |
||||
<h2> |
||||
<%= I18n.t("errors.messages.not_saved", |
||||
count: resource.errors.count, |
||||
resource: resource.class.model_name.human.downcase) |
||||
%> |
||||
</h2> |
||||
<ul> |
||||
<% resource.errors.full_messages.each do |message| %> |
||||
<li><%= message %></li> |
||||
<% end %> |
||||
</ul> |
||||
</div> |
||||
<% end %> |
||||
@ -0,0 +1,25 @@
|
||||
<%- if controller_name != 'sessions' %> |
||||
<p class="govuk-body">Already have an account? <%= link_to "Sign in", new_session_path(resource_name) %>.</p><br /> |
||||
<% end %> |
||||
|
||||
<%- if devise_mapping.registerable? && controller_name != 'registrations' %> |
||||
<%= link_to "Sign up", new_registration_path(resource_name) %><br /> |
||||
<% end %> |
||||
|
||||
<%- if devise_mapping.recoverable? && controller_name != 'passwords' && controller_name != 'registrations' %> |
||||
<p class="govuk-body"> You can <%= link_to "reset your password", new_password_path(resource_name) %> if you've forgotten it.<p><br /> |
||||
<% end %> |
||||
|
||||
<%- if devise_mapping.confirmable? && controller_name != 'confirmations' %> |
||||
<%= link_to "Didn't receive confirmation instructions?", new_confirmation_path(resource_name) %><br /> |
||||
<% end %> |
||||
|
||||
<%- if devise_mapping.lockable? && resource_class.unlock_strategy_enabled?(:email) && controller_name != 'unlocks' %> |
||||
<%= link_to "Didn't receive unlock instructions?", new_unlock_path(resource_name) %><br /> |
||||
<% end %> |
||||
|
||||
<%- if devise_mapping.omniauthable? %> |
||||
<%- resource_class.omniauth_providers.each do |provider| %> |
||||
<%= link_to "Sign in with #{OmniAuth::Utils.camelize(provider)}", omniauth_authorize_path(resource_name, provider), method: :post %><br /> |
||||
<% end %> |
||||
<% end %> |
||||
@ -0,0 +1,16 @@
|
||||
<h2>Resend unlock instructions</h2> |
||||
|
||||
<%= form_for(resource, as: resource_name, url: unlock_path(resource_name), html: { method: :post }) do |f| %> |
||||
<%= render "devise/shared/error_messages", resource: resource %> |
||||
|
||||
<div class="field"> |
||||
<%= f.label :email %><br /> |
||||
<%= f.email_field :email, autofocus: true, autocomplete: "email" %> |
||||
</div> |
||||
|
||||
<div class="actions"> |
||||
<%= f.submit "Resend unlock instructions" %> |
||||
</div> |
||||
<% end %> |
||||
|
||||
<%= render "devise/shared/links" %> |
||||
@ -1,11 +1,11 @@
|
||||
<div class="govuk-summary-list__row"> |
||||
<dt class="govuk-summary-list__key"> |
||||
<%= question_info["check_answer_label"].to_s.present? ? question_info["check_answer_label"].to_s : question_info["header"].to_s%> |
||||
<%= question.check_answer_label.to_s.present? ? question.check_answer_label.to_s : question.header.to_s %> |
||||
<dt> |
||||
<dd class="govuk-summary-list__value"> |
||||
<%= form.get_answer_label(@case_log, question_title) %> |
||||
<%= question.answer_label(@case_log) %> |
||||
</dd> |
||||
<dd class="govuk-summary-list__actions"> |
||||
<%= create_update_answer_link(question_title, question_info, @case_log, form) %> |
||||
<%= link_to(question.update_answer_link_name(@case_log), "/case_logs/#{@case_log.id}/#{question.page.id}", class: "govuk-link").html_safe %> |
||||
</dd> |
||||
</div> |
||||
|
||||
@ -1,6 +1,6 @@
|
||||
<%= f.govuk_date_field question_key, |
||||
hint: { text: question["hint_text"] }, |
||||
legend: { text: question["header"].html_safe, size: "l"}, |
||||
<%= f.govuk_date_field question.id.to_sym, |
||||
hint: { text: question.hint_text }, |
||||
legend: { text: question.header.html_safe, size: page_header.nil? ? "l" : "m", tag: page_header.nil? ? "h2" : "h1" }, |
||||
width: 20, |
||||
**stimulus_html_attributes(question) |
||||
%> |
||||
|
||||
@ -1,7 +1,7 @@
|
||||
<%= f.govuk_number_field question_key, |
||||
hint: { text: question["hint_text"] }, |
||||
label: { text: question["header"].html_safe, size: "l"}, |
||||
min: question["min"], max: question["max"], step: question["step"], |
||||
width: 20, :readonly => question["readonly"], |
||||
<%= f.govuk_number_field question.id.to_sym, |
||||
hint: { text: question.hint_text }, |
||||
label: { text: question.header.html_safe, size: page_header.nil? ? "l" : "m", tag: page_header.nil? ? "h2" : "h1" }, |
||||
min: question.min, max: question.max, step: question.step, |
||||
width: 20, :readonly => question.read_only?, |
||||
**stimulus_html_attributes(question) |
||||
%> |
||||
|
||||
@ -1,13 +1,13 @@
|
||||
<%= f.govuk_radio_buttons_fieldset question_key, |
||||
legend: { text: question["header"].html_safe, size: "l" }, |
||||
hint: { text: question["hint_text"] }, |
||||
small: (question["answer_options"].size > 5) do %> |
||||
<%= f.govuk_radio_buttons_fieldset question.id.to_sym, |
||||
legend: { text: question.header.html_safe, size: page_header.nil? ? "l" : "m", tag: page_header.nil? ? "h2" : "h1" }, |
||||
hint: { text: question.hint_text }, |
||||
small: (question.answer_options.size > 5) do %> |
||||
|
||||
<% question["answer_options"].map do |key, val| %> |
||||
<% question.answer_options.map do |key, val| %> |
||||
<% if key.starts_with?("divider") %> |
||||
<%= f.govuk_radio_divider %> |
||||
<% else %> |
||||
<%= f.govuk_radio_button question_key, val, label: { text: val }, **stimulus_html_attributes(question) %> |
||||
<%= f.govuk_radio_button question.id, val, label: { text: val }, **stimulus_html_attributes(question) %> |
||||
<% end %> |
||||
<% end %> |
||||
<% end %> |
||||
|
||||
@ -1,6 +1,6 @@
|
||||
<%= f.govuk_text_field question_key, |
||||
hint: { text: question["hint_text"] }, |
||||
label: { text: question["header"].html_safe, size: "l"}, |
||||
<%= f.govuk_text_field question.id.to_sym, |
||||
hint: { text: question.hint_text }, |
||||
label: { text: question.header.html_safe, size: page_header.nil? ? "l" : "m", tag: page_header.nil? ? "h2" : "h1" }, |
||||
width: 20, |
||||
**stimulus_html_attributes(question) |
||||
%> |
||||
|
||||
@ -0,0 +1,311 @@
|
||||
# frozen_string_literal: true |
||||
|
||||
# Assuming you have not yet modified this file, each configuration option below |
||||
# is set to its default value. Note that some are commented out while others |
||||
# are not: uncommented lines are intended to protect your configuration from |
||||
# breaking changes in upgrades (i.e., in the event that future versions of |
||||
# Devise change the default values for those options). |
||||
# |
||||
# Use this hook to configure devise mailer, warden hooks and so forth. |
||||
# Many of these configuration options can be set straight in your model. |
||||
Devise.setup do |config| |
||||
# The secret key used by Devise. Devise uses this key to generate |
||||
# random tokens. Changing this key will render invalid all existing |
||||
# confirmation, reset password and unlock tokens in the database. |
||||
# Devise will use the `secret_key_base` as its `secret_key` |
||||
# by default. You can change it below and use your own secret key. |
||||
# config.secret_key = '34fb13b209832f5c881689fa96eb14f27bff6e61657dfcf944205feaef9ee8d313573d9eabab816b737bffbacf1782d4d687d379d9559c195a4990df12a93785' |
||||
|
||||
# ==> Controller configuration |
||||
# Configure the parent class to the devise controllers. |
||||
# config.parent_controller = 'DeviseController' |
||||
|
||||
# ==> Mailer Configuration |
||||
# Configure the e-mail address which will be shown in Devise::Mailer, |
||||
# note that it will be overwritten if you use your own mailer class |
||||
# with default "from" parameter. |
||||
config.mailer_sender = ENV["CORE_EMAIL_USERNAME"] |
||||
|
||||
# Configure the class responsible to send e-mails. |
||||
# config.mailer = 'Devise::Mailer' |
||||
|
||||
# Configure the parent class responsible to send e-mails. |
||||
# config.parent_mailer = 'ActionMailer::Base' |
||||
|
||||
# ==> ORM configuration |
||||
# Load and configure the ORM. Supports :active_record (default) and |
||||
# :mongoid (bson_ext recommended) by default. Other ORMs may be |
||||
# available as additional gems. |
||||
require "devise/orm/active_record" |
||||
|
||||
# ==> Configuration for any authentication mechanism |
||||
# Configure which keys are used when authenticating a user. The default is |
||||
# just :email. You can configure it to use [:username, :subdomain], so for |
||||
# authenticating a user, both parameters are required. Remember that those |
||||
# parameters are used only when authenticating and not when retrieving from |
||||
# session. If you need permissions, you should implement that in a before filter. |
||||
# You can also supply a hash where the value is a boolean determining whether |
||||
# or not authentication should be aborted when the value is not present. |
||||
# config.authentication_keys = [:email] |
||||
|
||||
# Configure parameters from the request object used for authentication. Each entry |
||||
# given should be a request method and it will automatically be passed to the |
||||
# find_for_authentication method and considered in your model lookup. For instance, |
||||
# if you set :request_keys to [:subdomain], :subdomain will be used on authentication. |
||||
# The same considerations mentioned for authentication_keys also apply to request_keys. |
||||
# config.request_keys = [] |
||||
|
||||
# Configure which authentication keys should be case-insensitive. |
||||
# These keys will be downcased upon creating or modifying a user and when used |
||||
# to authenticate or find a user. Default is :email. |
||||
config.case_insensitive_keys = [:email] |
||||
|
||||
# Configure which authentication keys should have whitespace stripped. |
||||
# These keys will have whitespace before and after removed upon creating or |
||||
# modifying a user and when used to authenticate or find a user. Default is :email. |
||||
config.strip_whitespace_keys = [:email] |
||||
|
||||
# Tell if authentication through request.params is enabled. True by default. |
||||
# It can be set to an array that will enable params authentication only for the |
||||
# given strategies, for example, `config.params_authenticatable = [:database]` will |
||||
# enable it only for database (email + password) authentication. |
||||
# config.params_authenticatable = true |
||||
|
||||
# Tell if authentication through HTTP Auth is enabled. False by default. |
||||
# It can be set to an array that will enable http authentication only for the |
||||
# given strategies, for example, `config.http_authenticatable = [:database]` will |
||||
# enable it only for database authentication. |
||||
# For API-only applications to support authentication "out-of-the-box", you will likely want to |
||||
# enable this with :database unless you are using a custom strategy. |
||||
# The supported strategies are: |
||||
# :database = Support basic authentication with authentication key + password |
||||
# config.http_authenticatable = false |
||||
|
||||
# If 401 status code should be returned for AJAX requests. True by default. |
||||
# config.http_authenticatable_on_xhr = true |
||||
|
||||
# The realm used in Http Basic Authentication. 'Application' by default. |
||||
# config.http_authentication_realm = 'Application' |
||||
|
||||
# It will change confirmation, password recovery and other workflows |
||||
# to behave the same regardless if the e-mail provided was right or wrong. |
||||
# Does not affect registerable. |
||||
# config.paranoid = true |
||||
|
||||
# By default Devise will store the user in session. You can skip storage for |
||||
# particular strategies by setting this option. |
||||
# Notice that if you are skipping storage for all authentication paths, you |
||||
# may want to disable generating routes to Devise's sessions controller by |
||||
# passing skip: :sessions to `devise_for` in your config/routes.rb |
||||
config.skip_session_storage = [:http_auth] |
||||
|
||||
# By default, Devise cleans up the CSRF token on authentication to |
||||
# avoid CSRF token fixation attacks. This means that, when using AJAX |
||||
# requests for sign in and sign up, you need to get a new CSRF token |
||||
# from the server. You can disable this option at your own risk. |
||||
# config.clean_up_csrf_token_on_authentication = true |
||||
|
||||
# When false, Devise will not attempt to reload routes on eager load. |
||||
# This can reduce the time taken to boot the app but if your application |
||||
# requires the Devise mappings to be loaded during boot time the application |
||||
# won't boot properly. |
||||
# config.reload_routes = true |
||||
|
||||
# ==> Configuration for :database_authenticatable |
||||
# For bcrypt, this is the cost for hashing the password and defaults to 12. If |
||||
# using other algorithms, it sets how many times you want the password to be hashed. |
||||
# The number of stretches used for generating the hashed password are stored |
||||
# with the hashed password. This allows you to change the stretches without |
||||
# invalidating existing passwords. |
||||
# |
||||
# Limiting the stretches to just one in testing will increase the performance of |
||||
# your test suite dramatically. However, it is STRONGLY RECOMMENDED to not use |
||||
# a value less than 10 in other environments. Note that, for bcrypt (the default |
||||
# algorithm), the cost increases exponentially with the number of stretches (e.g. |
||||
# a value of 20 is already extremely slow: approx. 60 seconds for 1 calculation). |
||||
config.stretches = Rails.env.test? ? 1 : 12 |
||||
|
||||
# Set up a pepper to generate the hashed password. |
||||
# config.pepper = '1c69067fda44e12f0ea1e8573fcdb122e5ff7e51a28cc6944c2548af7b7cbfe1400739e2d71cdf0ab53a3b60305942301d7fd7f43ff3a51316e51438145d80ad' |
||||
|
||||
# Send a notification to the original email when the user's email is changed. |
||||
# config.send_email_changed_notification = false |
||||
|
||||
# Send a notification email when the user's password is changed. |
||||
# config.send_password_change_notification = false |
||||
|
||||
# ==> Configuration for :confirmable |
||||
# A period that the user is allowed to access the website even without |
||||
# confirming their account. For instance, if set to 2.days, the user will be |
||||
# able to access the website for two days without confirming their account, |
||||
# access will be blocked just in the third day. |
||||
# You can also set it to nil, which will allow the user to access the website |
||||
# without confirming their account. |
||||
# Default is 0.days, meaning the user cannot access the website without |
||||
# confirming their account. |
||||
# config.allow_unconfirmed_access_for = 2.days |
||||
|
||||
# A period that the user is allowed to confirm their account before their |
||||
# token becomes invalid. For example, if set to 3.days, the user can confirm |
||||
# their account within 3 days after the mail was sent, but on the fourth day |
||||
# their account can't be confirmed with the token any more. |
||||
# Default is nil, meaning there is no restriction on how long a user can take |
||||
# before confirming their account. |
||||
# config.confirm_within = 3.days |
||||
|
||||
# If true, requires any email changes to be confirmed (exactly the same way as |
||||
# initial account confirmation) to be applied. Requires additional unconfirmed_email |
||||
# db field (see migrations). Until confirmed, new email is stored in |
||||
# unconfirmed_email column, and copied to email column on successful confirmation. |
||||
config.reconfirmable = true |
||||
|
||||
# Defines which key will be used when confirming an account |
||||
# config.confirmation_keys = [:email] |
||||
|
||||
# ==> Configuration for :rememberable |
||||
# The time the user will be remembered without asking for credentials again. |
||||
# config.remember_for = 2.weeks |
||||
|
||||
# Invalidates all the remember me tokens when the user signs out. |
||||
config.expire_all_remember_me_on_sign_out = true |
||||
|
||||
# If true, extends the user's remember period when remembered via cookie. |
||||
# config.extend_remember_period = false |
||||
|
||||
# Options to be passed to the created cookie. For instance, you can set |
||||
# secure: true in order to force SSL only cookies. |
||||
# config.rememberable_options = {} |
||||
|
||||
# ==> Configuration for :validatable |
||||
# Range for password length. |
||||
config.password_length = 8..128 |
||||
|
||||
# Email regex used to validate email formats. It simply asserts that |
||||
# one (and only one) @ exists in the given string. This is mainly |
||||
# to give user feedback and not to assert the e-mail validity. |
||||
config.email_regexp = /\A[^@\s]+@[^@\s]+\z/ |
||||
|
||||
# ==> Configuration for :timeoutable |
||||
# The time you want to timeout the user session without activity. After this |
||||
# time the user will be asked for credentials again. Default is 30 minutes. |
||||
# config.timeout_in = 30.minutes |
||||
|
||||
# ==> Configuration for :lockable |
||||
# Defines which strategy will be used to lock an account. |
||||
# :failed_attempts = Locks an account after a number of failed attempts to sign in. |
||||
# :none = No lock strategy. You should handle locking by yourself. |
||||
# config.lock_strategy = :failed_attempts |
||||
|
||||
# Defines which key will be used when locking and unlocking an account |
||||
# config.unlock_keys = [:email] |
||||
|
||||
# Defines which strategy will be used to unlock an account. |
||||
# :email = Sends an unlock link to the user email |
||||
# :time = Re-enables login after a certain amount of time (see :unlock_in below) |
||||
# :both = Enables both strategies |
||||
# :none = No unlock strategy. You should handle unlocking by yourself. |
||||
# config.unlock_strategy = :both |
||||
|
||||
# Number of authentication tries before locking an account if lock_strategy |
||||
# is failed attempts. |
||||
# config.maximum_attempts = 20 |
||||
|
||||
# Time interval to unlock the account if :time is enabled as unlock_strategy. |
||||
# config.unlock_in = 1.hour |
||||
|
||||
# Warn on the last attempt before the account is locked. |
||||
# config.last_attempt_warning = true |
||||
|
||||
# ==> Configuration for :recoverable |
||||
# |
||||
# Defines which key will be used when recovering the password for an account |
||||
# config.reset_password_keys = [:email] |
||||
|
||||
# Time interval you can reset your password with a reset password key. |
||||
# Don't put a too small interval or your users won't have the time to |
||||
# change their passwords. |
||||
config.reset_password_within = 3.hours |
||||
|
||||
# When set to false, does not sign a user in automatically after their password is |
||||
# reset. Defaults to true, so a user is signed in automatically after a reset. |
||||
# config.sign_in_after_reset_password = true |
||||
|
||||
# ==> Configuration for :encryptable |
||||
# Allow you to use another hashing or encryption algorithm besides bcrypt (default). |
||||
# You can use :sha1, :sha512 or algorithms from others authentication tools as |
||||
# :clearance_sha1, :authlogic_sha512 (then you should set stretches above to 20 |
||||
# for default behavior) and :restful_authentication_sha1 (then you should set |
||||
# stretches to 10, and copy REST_AUTH_SITE_KEY to pepper). |
||||
# |
||||
# Require the `devise-encryptable` gem when using anything other than bcrypt |
||||
# config.encryptor = :sha512 |
||||
|
||||
# ==> Scopes configuration |
||||
# Turn scoped views on. Before rendering "sessions/new", it will first check for |
||||
# "users/sessions/new". It's turned off by default because it's slower if you |
||||
# are using only default views. |
||||
# config.scoped_views = false |
||||
|
||||
# Configure the default scope given to Warden. By default it's the first |
||||
# devise role declared in your routes (usually :user). |
||||
# config.default_scope = :user |
||||
|
||||
# Set this configuration to false if you want /users/sign_out to sign out |
||||
# only the current scope. By default, Devise signs out all scopes. |
||||
# config.sign_out_all_scopes = true |
||||
|
||||
# ==> Navigation configuration |
||||
# Lists the formats that should be treated as navigational. Formats like |
||||
# :html, should redirect to the sign in page when the user does not have |
||||
# access, but formats like :xml or :json, should return 401. |
||||
# |
||||
# If you have any extra navigational formats, like :iphone or :mobile, you |
||||
# should add them to the navigational formats lists. |
||||
# |
||||
# The "*/*" below is required to match Internet Explorer requests. |
||||
# config.navigational_formats = ['*/*', :html] |
||||
|
||||
# The default HTTP method used to sign out a resource. Default is :delete. |
||||
config.sign_out_via = :delete |
||||
|
||||
# ==> OmniAuth |
||||
# Add a new OmniAuth provider. Check the wiki for more information on setting |
||||
# up on your models and hooks. |
||||
# config.omniauth :github, 'APP_ID', 'APP_SECRET', scope: 'user,public_repo' |
||||
|
||||
# ==> Warden configuration |
||||
# If you want to use other strategies, that are not supported by Devise, or |
||||
# change the failure app, you can configure them inside the config.warden block. |
||||
# |
||||
# config.warden do |manager| |
||||
# manager.intercept_401 = false |
||||
# manager.default_strategies(scope: :user).unshift :some_external_strategy |
||||
# end |
||||
|
||||
# ==> Mountable engine configurations |
||||
# When using Devise inside an engine, let's call it `MyEngine`, and this engine |
||||
# is mountable, there are some extra configurations to be taken into account. |
||||
# The following options are available, assuming the engine is mounted as: |
||||
# |
||||
# mount MyEngine, at: '/my_engine' |
||||
# |
||||
# The router that invoked `devise_for`, in the example above, would be: |
||||
# config.router_name = :my_engine |
||||
# |
||||
# When using OmniAuth, Devise cannot automatically set OmniAuth path, |
||||
# so you need to do it manually. For the users scope, it would be: |
||||
# config.omniauth_path_prefix = '/my_engine/users/auth' |
||||
|
||||
# ==> Turbolinks configuration |
||||
# If your app is using Turbolinks, Turbolinks::Controller needs to be included to make redirection work correctly: |
||||
# |
||||
# ActiveSupport.on_load(:devise_failure_app) do |
||||
# include Turbolinks::Controller |
||||
# end |
||||
|
||||
# ==> Configuration for :registerable |
||||
|
||||
# When set to false, does not sign a user in automatically after their password is |
||||
# changed. Defaults to true, so a user is signed in automatically after changing a password. |
||||
# config.sign_in_after_change_password = true |
||||
end |
||||
@ -0,0 +1,65 @@
|
||||
# Additional translations at https://github.com/heartcombo/devise/wiki/I18n |
||||
|
||||
en: |
||||
devise: |
||||
confirmations: |
||||
confirmed: "Your email address has been successfully confirmed." |
||||
send_instructions: "You will receive an email with instructions for how to confirm your email address in a few minutes." |
||||
send_paranoid_instructions: "If your email address exists in our database, you will receive an email with instructions for how to confirm your email address in a few minutes." |
||||
failure: |
||||
already_authenticated: "You are already signed in." |
||||
inactive: "Your account is not activated yet." |
||||
invalid: "Invalid %{authentication_keys} or password." |
||||
locked: "Your account is locked." |
||||
last_attempt: "You have one more attempt before your account is locked." |
||||
not_found_in_database: "Invalid %{authentication_keys} or password." |
||||
timeout: "Your session expired. Please sign in again to continue." |
||||
unauthenticated: "You need to sign in or sign up before continuing." |
||||
unconfirmed: "You have to confirm your email address before continuing." |
||||
mailer: |
||||
confirmation_instructions: |
||||
subject: "Confirmation instructions" |
||||
reset_password_instructions: |
||||
subject: "Reset password instructions" |
||||
unlock_instructions: |
||||
subject: "Unlock instructions" |
||||
email_changed: |
||||
subject: "Email Changed" |
||||
password_change: |
||||
subject: "Password Changed" |
||||
omniauth_callbacks: |
||||
failure: "Could not authenticate you from %{kind} because \"%{reason}\"." |
||||
success: "Successfully authenticated from %{kind} account." |
||||
passwords: |
||||
no_token: "You can't access this page without coming from a password reset email. If you do come from a password reset email, please make sure you used the full URL provided." |
||||
send_instructions: "You will receive an email with instructions on how to reset your password in a few minutes." |
||||
send_paranoid_instructions: "If your email address exists in our database, you will receive a password recovery link at your email address in a few minutes." |
||||
updated: "Your password has been changed successfully. You are now signed in." |
||||
updated_not_active: "Your password has been changed successfully." |
||||
registrations: |
||||
destroyed: "Bye! Your account has been successfully cancelled. We hope to see you again soon." |
||||
signed_up: "Welcome! You have signed up successfully." |
||||
signed_up_but_inactive: "You have signed up successfully. However, we could not sign you in because your account is not yet activated." |
||||
signed_up_but_locked: "You have signed up successfully. However, we could not sign you in because your account is locked." |
||||
signed_up_but_unconfirmed: "A message with a confirmation link has been sent to your email address. Please follow the link to activate your account." |
||||
update_needs_confirmation: "You updated your account successfully, but we need to verify your new email address. Please check your email and follow the confirmation link to confirm your new email address." |
||||
updated: "Your account has been updated successfully." |
||||
updated_but_not_signed_in: "Your account has been updated successfully, but since your password was changed, you need to sign in again." |
||||
sessions: |
||||
signed_in: "Signed in successfully." |
||||
signed_out: "Signed out successfully." |
||||
already_signed_out: "Signed out successfully." |
||||
unlocks: |
||||
send_instructions: "You will receive an email with instructions for how to unlock your account in a few minutes." |
||||
send_paranoid_instructions: "If your account exists, you will receive an email with instructions for how to unlock it in a few minutes." |
||||
unlocked: "Your account has been unlocked successfully. Please sign in to continue." |
||||
errors: |
||||
messages: |
||||
already_confirmed: "was already confirmed, please try signing in" |
||||
confirmation_period_expired: "needs to be confirmed within %{period}, please request a new one" |
||||
expired: "has expired, please request a new one" |
||||
not_found: "not found" |
||||
not_locked: "was not locked" |
||||
not_saved: |
||||
one: "1 error prohibited this %{resource} from being saved:" |
||||
other: "%{count} errors prohibited this %{resource} from being saved:" |
||||
@ -0,0 +1,43 @@
|
||||
# frozen_string_literal: true |
||||
|
||||
class DeviseCreateUsers < ActiveRecord::Migration[6.1] |
||||
def change |
||||
create_table :users do |t| |
||||
## Database authenticatable |
||||
t.string :email, null: false, default: "" |
||||
t.string :encrypted_password, null: false, default: "" |
||||
|
||||
## Recoverable |
||||
t.string :reset_password_token |
||||
t.datetime :reset_password_sent_at |
||||
|
||||
## Rememberable |
||||
t.datetime :remember_created_at |
||||
|
||||
## Trackable |
||||
# t.integer :sign_in_count, default: 0, null: false |
||||
# t.datetime :current_sign_in_at |
||||
# t.datetime :last_sign_in_at |
||||
# t.string :current_sign_in_ip |
||||
# t.string :last_sign_in_ip |
||||
|
||||
## Confirmable |
||||
# t.string :confirmation_token |
||||
# t.datetime :confirmed_at |
||||
# t.datetime :confirmation_sent_at |
||||
# t.string :unconfirmed_email # Only if using reconfirmable |
||||
|
||||
## Lockable |
||||
# t.integer :failed_attempts, default: 0, null: false # Only if lock strategy is :failed_attempts |
||||
# t.string :unlock_token # Only if unlock strategy is :email or :both |
||||
# t.datetime :locked_at |
||||
|
||||
t.timestamps null: false |
||||
end |
||||
|
||||
add_index :users, :email, unique: true |
||||
add_index :users, :reset_password_token, unique: true |
||||
# add_index :users, :confirmation_token, unique: true |
||||
# add_index :users, :unlock_token, unique: true |
||||
end |
||||
end |
||||
@ -0,0 +1,17 @@
|
||||
class ChangeArmedForces < ActiveRecord::Migration[6.1] |
||||
def up |
||||
change_table :case_logs, bulk: true do |t| |
||||
t.remove :armed_forces |
||||
t.remove :armed_forces_partner |
||||
t.column :armedforces, :integer |
||||
end |
||||
end |
||||
|
||||
def down |
||||
change_table :case_logs, bulk: true do |t| |
||||
t.remove :armedforces |
||||
t.column :armed_forces, :string |
||||
t.column :armed_forces_partner, :string |
||||
end |
||||
end |
||||
end |
||||
@ -0,0 +1,18 @@
|
||||
class AddAdminUsers < ActiveRecord::Migration[6.1] |
||||
def change |
||||
create_table :admin_users do |t| |
||||
## Database authenticatable |
||||
t.string :email, null: false, default: "" |
||||
t.string :encrypted_password, null: false, default: "" |
||||
|
||||
## Recoverable |
||||
t.string :reset_password_token |
||||
t.datetime :reset_password_sent_at |
||||
|
||||
## Rememberable |
||||
t.datetime :remember_created_at |
||||
|
||||
t.timestamps null: false |
||||
end |
||||
end |
||||
end |
||||
@ -0,0 +1,9 @@
|
||||
### ADR - 010: Admin Users vs Users |
||||
|
||||
#### Why do we have 2 User classes, AdminUser and User? |
||||
|
||||
This is modelling a real life split. `AdminUsers` are internal DLUHC users or helpdesk employees. While `Users` are external users working at data providing organisations. So local authority/housing association's "admin" users, i.e. Data Co-ordinators are a type of the User class. They have the ability to add or remove other users to or from their organisation, and to update their organisation details etc, but only through the designed UI. They do not get direct access to ActiveAdmin. |
||||
|
||||
AdminUsers on the other hand get direct access to ActiveAdmin. From there they can download entire datasets (via CSV, XML, JSON), view any log from any organisation, and add or remove users of any type including other Admin users. This means TDA will likely also require more stringent authentication for them using MFA (which users will likely not require). So the class split also helps there. |
||||
|
||||
A potential downside to this approach is that it does not currently allow for `AdminUsers` to sign into the application UI itself with their Admin credentials. However, we need to see if there's an actual use case for this and what it would be (since they aren't part of an organisation to be uploading data for, but could add or amend data or user or org details through ActiveAdmin anyway). If there is a strong use case for it this could be work around by either: providing them with two sets of credentials, or modifying the `authenticate_user` method to also check `AdminUser` credentials. |
||||
@ -0,0 +1,10 @@
|
||||
### ADR - 011: Splitting the form parsing into objects |
||||
|
||||
Initially a single "Form" class handled the parsing of the form definition JSON as well as a lot of the logic around what different sections meant. This works fine but led to a lot of places in code where we're passing around arguments to determine whether a page or section should or shouldn't do something rather than being able to ask it directly. Refactoring this into smaller form domain object classes has several benefits: |
||||
|
||||
- It's easier to compare the form definition JSON to the code classes and reason about what fields can be passed and what effect they'll have |
||||
- It moves business logic out of the helpers and keeps them to just dealing with display logic |
||||
- It makes it easier to unit test form functionality, and group that into smaller chunks |
||||
- It allows for less passing of arguments. e.g. `page.routed_to?(case_log)` vs `form.was_page_routed_to?(page, case_log)` |
||||
|
||||
This abstraction is likely still not the best (the form vs case log split) but this seems like an improvement that can be iterated on. |
||||
@ -0,0 +1,9 @@
|
||||
FactoryBot.define do |
||||
factory :user do |
||||
sequence(:id) { |i| i } |
||||
email { "test@example.com" } |
||||
password { "pAssword1" } |
||||
created_at { Time.zone.now } |
||||
updated_at { Time.zone.now } |
||||
end |
||||
end |
||||
@ -0,0 +1,53 @@
|
||||
require "rails_helper" |
||||
RSpec.describe "User Features" do |
||||
let!(:user) { FactoryBot.create(:user) } |
||||
context "A user navigating to case logs" do |
||||
it " is required to log in" do |
||||
visit("/case_logs") |
||||
expect(page).to have_current_path("/users/sign_in") |
||||
end |
||||
|
||||
it " is redirected to case logs after signing in" do |
||||
visit("/case_logs") |
||||
fill_in("user_email", with: "test@example.com") |
||||
fill_in("user_password", with: "pAssword1") |
||||
click_button("Sign in") |
||||
expect(page).to have_current_path("/case_logs") |
||||
end |
||||
end |
||||
|
||||
context "A user who has forgotten their password" do |
||||
it " is redirected to the reset password page when they click the reset password link" do |
||||
visit("/case_logs") |
||||
click_link("reset your password") |
||||
expect(page).to have_current_path("/users/password/new") |
||||
end |
||||
|
||||
it " is redirected to check your email page after submitting an email on the reset password page" do |
||||
visit("/users/password/new") |
||||
fill_in("user_email", with: "test@example.com") |
||||
click_button("Send email") |
||||
expect(page).to have_content("Check your email") |
||||
end |
||||
|
||||
it " is shown their email on the password reset confirmation page" do |
||||
visit("/users/password/new") |
||||
fill_in("user_email", with: "test@example.com") |
||||
click_button("Send email") |
||||
expect(page).to have_content("test@example.com") |
||||
end |
||||
|
||||
it " is shown the reset password confirmation page even if their email doesn't exist in the system" do |
||||
visit("/users/password/new") |
||||
fill_in("user_email", with: "idontexist@example.com") |
||||
click_button("Send email") |
||||
expect(page).to have_current_path("/confirmations/reset?email=idontexist%40example.com") |
||||
end |
||||
|
||||
it " is sent a reset password email" do |
||||
visit("/users/password/new") |
||||
fill_in("user_email", with: "test@example.com") |
||||
expect { click_button("Send email") }.to change { ActionMailer::Base.deliveries.count }.by(1) |
||||
end |
||||
end |
||||
end |
||||
@ -0,0 +1,66 @@
|
||||
require "rails_helper" |
||||
|
||||
RSpec.describe Form::Page, type: :model do |
||||
let(:form) { FormHandler.instance.get_form("test_form") } |
||||
let(:section_id) { "rent_and_charges" } |
||||
let(:section_definition) { form.form_definition["sections"][section_id] } |
||||
let(:section) { Form::Section.new(section_id, section_definition, form) } |
||||
let(:subsection_id) { "income_and_benefits" } |
||||
let(:subsection_definition) { section_definition["subsections"][subsection_id] } |
||||
let(:subsection) { Form::Subsection.new(subsection_id, subsection_definition, section) } |
||||
let(:page_id) { "net_income" } |
||||
let(:page_definition) { subsection_definition["pages"][page_id] } |
||||
subject { Form::Page.new(page_id, page_definition, subsection) } |
||||
|
||||
it "has an id" do |
||||
expect(subject.id).to eq(page_id) |
||||
end |
||||
|
||||
it "has a header" do |
||||
expect(subject.header).to eq("Test header") |
||||
end |
||||
|
||||
it "has a description" do |
||||
expect(subject.description).to eq("Some extra text for the page") |
||||
end |
||||
|
||||
it "has questions" do |
||||
expected_questions = %w[earnings incfreq] |
||||
expect(subject.questions.map(&:id)).to eq(expected_questions) |
||||
end |
||||
|
||||
it "has soft validations" do |
||||
expected_soft_validations = %w[override_net_income_validation] |
||||
expect(subject.soft_validations.map(&:id)).to eq(expected_soft_validations) |
||||
end |
||||
|
||||
it "has a soft_validation helper" do |
||||
expect(subject.has_soft_validations?).to be true |
||||
end |
||||
|
||||
it "has expected form responses" do |
||||
expected_responses = %w[earnings incfreq override_net_income_validation] |
||||
expect(subject.expected_responses.map(&:id)).to eq(expected_responses) |
||||
end |
||||
|
||||
context "for a given case log" do |
||||
let(:case_log) { FactoryBot.build(:case_log, :in_progress) } |
||||
|
||||
it "knows if it's been routed to" do |
||||
expect(subject.routed_to?(case_log)).to be true |
||||
end |
||||
|
||||
context "given routing conditions" do |
||||
let(:page_id) { "dependent_page" } |
||||
|
||||
it "evaluates not met conditions correctly" do |
||||
expect(subject.routed_to?(case_log)).to be false |
||||
end |
||||
|
||||
it "evaluates not conditions correctly" do |
||||
case_log.incfreq = "Weekly" |
||||
expect(subject.routed_to?(case_log)).to be true |
||||
end |
||||
end |
||||
end |
||||
end |
||||
@ -0,0 +1,140 @@
|
||||
require "rails_helper" |
||||
|
||||
RSpec.describe Form::Question, type: :model do |
||||
let(:form) { FormHandler.instance.get_form("test_form") } |
||||
let(:section_id) { "rent_and_charges" } |
||||
let(:section_definition) { form.form_definition["sections"][section_id] } |
||||
let(:section) { Form::Section.new(section_id, section_definition, form) } |
||||
let(:subsection_id) { "income_and_benefits" } |
||||
let(:subsection_definition) { section_definition["subsections"][subsection_id] } |
||||
let(:subsection) { Form::Subsection.new(subsection_id, subsection_definition, section) } |
||||
let(:page_id) { "net_income" } |
||||
let(:page_definition) { subsection_definition["pages"][page_id] } |
||||
let(:page) { Form::Page.new(page_id, page_definition, subsection) } |
||||
let(:question_id) { "earnings" } |
||||
let(:question_definition) { page_definition["questions"][question_id] } |
||||
subject { Form::Question.new(question_id, question_definition, page) } |
||||
|
||||
it "has an id" do |
||||
expect(subject.id).to eq(question_id) |
||||
end |
||||
|
||||
it "has a header" do |
||||
expect(subject.header).to eq("What is the tenant’s /and partner’s combined income after tax?") |
||||
end |
||||
|
||||
it "has a check answers label" do |
||||
expect(subject.check_answer_label).to eq("Income") |
||||
end |
||||
|
||||
it "has a question type" do |
||||
expect(subject.type).to eq("numeric") |
||||
end |
||||
|
||||
it "belongs to a page" do |
||||
expect(subject.page).to eq(page) |
||||
end |
||||
|
||||
it "belongs to a subsection" do |
||||
expect(subject.subsection).to eq(subsection) |
||||
end |
||||
|
||||
it "has a read only helper" do |
||||
expect(subject.read_only?).to be false |
||||
end |
||||
|
||||
context "when type is numeric" do |
||||
it "has a min value" do |
||||
expect(subject.min).to eq(0) |
||||
end |
||||
|
||||
it "has a step value" do |
||||
expect(subject.step).to eq(1) |
||||
end |
||||
end |
||||
|
||||
context "when type is radio" do |
||||
let(:question_id) { "incfreq" } |
||||
|
||||
it "has answer options" do |
||||
expected_answer_options = { "0" => "Weekly", "1" => "Monthly", "2" => "Yearly" } |
||||
expect(subject.answer_options).to eq(expected_answer_options) |
||||
end |
||||
end |
||||
|
||||
context "when type is checkbox" do |
||||
let(:page_id) { "dependent_page" } |
||||
let(:question_id) { "dependent_question" } |
||||
|
||||
it "has answer options" do |
||||
expected_answer_options = { "0" => "Option A", "1" => "Option B" } |
||||
expect(subject.answer_options).to eq(expected_answer_options) |
||||
end |
||||
end |
||||
|
||||
context "when the question is read only" do |
||||
let(:subsection_id) { "rent" } |
||||
let(:page_id) { "rent" } |
||||
let(:question_id) { "tcharge" } |
||||
|
||||
it "has a read only helper" do |
||||
expect(subject.read_only?).to be true |
||||
end |
||||
|
||||
context "when the answer is part of a sum" do |
||||
let(:question_id) { "pscharge" } |
||||
|
||||
it "has a result_field" do |
||||
expect(subject.result_field).to eq("tcharge") |
||||
end |
||||
|
||||
it "has fields to sum" do |
||||
expected_fields_to_sum = %w[brent scharge pscharge supcharg] |
||||
expect(subject.fields_to_add).to eq(expected_fields_to_sum) |
||||
end |
||||
end |
||||
end |
||||
|
||||
context "for a given case log" do |
||||
let(:case_log) { FactoryBot.build(:case_log, :in_progress) } |
||||
|
||||
it "has an answer label" do |
||||
case_log.earnings = 100 |
||||
expect(subject.answer_label(case_log)).to eq("100") |
||||
end |
||||
|
||||
it "has an update answer link text helper" do |
||||
expect(subject.update_answer_link_name(case_log)).to eq("Answer") |
||||
case_log[question_id] = 5 |
||||
expect(subject.update_answer_link_name(case_log)).to eq("Change") |
||||
end |
||||
|
||||
context "when type is checkbox" do |
||||
let(:section_id) { "household" } |
||||
let(:subsection_id) { "household_needs" } |
||||
let(:page_id) { "accessibility_requirements" } |
||||
let(:question_id) { "accessibility_requirements" } |
||||
|
||||
it "has a joined answers label" do |
||||
case_log.housingneeds_a = 1 |
||||
case_log.housingneeds_c = 1 |
||||
expected_answer_label = "Fully wheelchair accessible housing, Level access housing" |
||||
expect(subject.answer_label(case_log)).to eq(expected_answer_label) |
||||
end |
||||
end |
||||
|
||||
context "when a condition is present" do |
||||
let(:page_id) { "housing_benefit" } |
||||
let(:question_id) { "conditional_question" } |
||||
|
||||
it "knows whether it is enabled or not for unmet conditions" do |
||||
expect(subject.enabled?(case_log)).to be false |
||||
end |
||||
|
||||
it "knows whether it is enabled or not for met conditions" do |
||||
case_log.hb = "Housing Benefit, but not Universal Credit" |
||||
expect(subject.enabled?(case_log)).to be true |
||||
end |
||||
end |
||||
end |
||||
end |
||||
@ -0,0 +1,21 @@
|
||||
require "rails_helper" |
||||
|
||||
RSpec.describe Form::Section, type: :model do |
||||
let(:form) { FormHandler.instance.get_form("test_form") } |
||||
let(:section_id) { "household" } |
||||
let(:section_definition) { form.form_definition["sections"][section_id] } |
||||
subject { Form::Section.new(section_id, section_definition, form) } |
||||
|
||||
it "has an id" do |
||||
expect(subject.id).to eq(section_id) |
||||
end |
||||
|
||||
it "has a label" do |
||||
expect(subject.label).to eq("About the household") |
||||
end |
||||
|
||||
it "has subsections" do |
||||
expected_subsections = %w[household_characteristics household_needs] |
||||
expect(subject.subsections.map(&:id)).to eq(expected_subsections) |
||||
end |
||||
end |
||||
@ -0,0 +1,72 @@
|
||||
require "rails_helper" |
||||
|
||||
RSpec.describe Form::Subsection, type: :model do |
||||
let(:form) { FormHandler.instance.get_form("test_form") } |
||||
let(:section_id) { "household" } |
||||
let(:section_definition) { form.form_definition["sections"][section_id] } |
||||
let(:section) { Form::Section.new(section_id, section_definition, form) } |
||||
let(:subsection_id) { "household_characteristics" } |
||||
let(:subsection_definition) { section_definition["subsections"][subsection_id] } |
||||
subject { Form::Subsection.new(subsection_id, subsection_definition, section) } |
||||
|
||||
it "has an id" do |
||||
expect(subject.id).to eq(subsection_id) |
||||
end |
||||
|
||||
it "has a label" do |
||||
expect(subject.label).to eq("Household characteristics") |
||||
end |
||||
|
||||
it "has pages" do |
||||
expected_pages = %w[tenant_code person_1_age person_1_gender household_number_of_other_members] |
||||
expect(subject.pages.map(&:id)).to eq(expected_pages) |
||||
end |
||||
|
||||
it "has questions" do |
||||
expected_questions = %w[tenant_code age1 sex1 other_hhmemb relat2 age2 sex2 ecstat2] |
||||
expect(subject.questions.map(&:id)).to eq(expected_questions) |
||||
end |
||||
|
||||
context "for a given in progress case log" do |
||||
let(:case_log) { FactoryBot.build(:case_log, :in_progress) } |
||||
|
||||
it "has a status" do |
||||
expect(subject.status(case_log)).to eq(:in_progress) |
||||
end |
||||
|
||||
it "has status helpers" do |
||||
expect(subject.is_incomplete?(case_log)).to be(true) |
||||
expect(subject.is_started?(case_log)).to be(true) |
||||
end |
||||
|
||||
it "has question helpers for the number of applicable questions" do |
||||
expected_questions = %w[tenant_code age1 sex1 other_hhmemb] |
||||
expect(subject.applicable_questions(case_log).map(&:id)).to eq(expected_questions) |
||||
expect(subject.applicable_questions_count(case_log)).to eq(4) |
||||
end |
||||
|
||||
it "has question helpers for the number of answered questions" do |
||||
expected_questions = %w[tenant_code age1] |
||||
expect(subject.answered_questions(case_log).map(&:id)).to eq(expected_questions) |
||||
expect(subject.answered_questions_count(case_log)).to eq(2) |
||||
end |
||||
|
||||
it "has a question helpers for the unanswered questions" do |
||||
expected_questions = %w[sex1 other_hhmemb] |
||||
expect(subject.unanswered_questions(case_log).map(&:id)).to eq(expected_questions) |
||||
end |
||||
end |
||||
|
||||
context "for a given completed case log" do |
||||
let(:case_log) { FactoryBot.build(:case_log, :completed) } |
||||
|
||||
it "has a status" do |
||||
expect(subject.status(case_log)).to eq(:completed) |
||||
end |
||||
|
||||
it "has status helpers" do |
||||
expect(subject.is_incomplete?(case_log)).to be(false) |
||||
expect(subject.is_started?(case_log)).to be(true) |
||||
end |
||||
end |
||||
end |
||||
@ -0,0 +1,46 @@
|
||||
require "rails_helper" |
||||
require_relative "../../support/devise" |
||||
|
||||
RSpec.describe Users::PasswordsController, type: :request do |
||||
let(:params) { { user: { email: email } } } |
||||
|
||||
context "when a password reset is requested for a valid email" do |
||||
let(:user) { FactoryBot.create(:user) } |
||||
let(:email) { user.email } |
||||
|
||||
it "redirects to the email sent page anyway" do |
||||
post "/users/password", params: params |
||||
expect(response).to have_http_status(:redirect) |
||||
follow_redirect! |
||||
expect(response.body).to match(/Check your email/) |
||||
end |
||||
end |
||||
|
||||
context "when a password reset is requested with an email that doesn't exist in the system" do |
||||
before do |
||||
allow_any_instance_of(Users::PasswordsController).to receive(:is_navigational_format?).and_return(false) |
||||
end |
||||
|
||||
let(:email) { "madeup_email@test.com" } |
||||
|
||||
it "redirects to the email sent page anyway" do |
||||
post "/users/password", params: params |
||||
expect(response).to have_http_status(:redirect) |
||||
follow_redirect! |
||||
expect(response.body).to match(/Check your email/) |
||||
end |
||||
end |
||||
|
||||
context "when a password reset is requested the email" do |
||||
let(:user) { FactoryBot.create(:user) } |
||||
let(:email) { user.email } |
||||
|
||||
it "should contain the correct email" do |
||||
post "/users/password", params: params |
||||
follow_redirect! |
||||
email_ascii_content = ActionMailer::Base.deliveries.last.body.raw_source |
||||
email_content = email_ascii_content.encode("ASCII", "UTF-8", undef: :replace) |
||||
expect(email_content).to match(email) |
||||
end |
||||
end |
||||
end |
||||
@ -0,0 +1,16 @@
|
||||
module ControllerMacros |
||||
# def login_admin |
||||
# before(:each) do |
||||
# @request.env["devise.mapping"] = Devise.mappings[:admin] |
||||
# sign_in FactoryBot.create(:admin) # Using factory bot as an example |
||||
# end |
||||
# end |
||||
|
||||
def login_user |
||||
before(:each) do |
||||
@request.env["devise.mapping"] = Devise.mappings[:user] |
||||
user = FactoryBot.create(:user) |
||||
sign_in user |
||||
end |
||||
end |
||||
end |
||||
Loading…
Reference in new issue