fix MR comments

.env.sample

@@ -16,10 +16,9 @@ REDIS_URL=
 # Required for Zoom.us integration
 ZOOM_API_KEY=
 ZOOM_API_SECRET=
-ZOOM_ACCOUNT_NUMBER=
 ZOOM_PRO_USERS_LIMIT= # defaults to 3
 ZOOM_USER_TYPE= # 'pro' / 'basic'
-ZOOM_ENABLE_RECORDINGS= # true / false (default: false)
+ZOOM_ENABLE_RECORDINGS=0 # 0 / 1
 # Token for webhooks authorization
 ZOOM_VERIFICATION_TOKEN=
 
@@ -28,3 +27,6 @@ MUX_TOKEN_ID=
 MUX_TOKEN_SECRET=
 MUX_BROADCAST_SERVER_URL=rtmp://global-live.mux.com:5222/app
 MUX_TEST_MODE_DISABLED=
+
+# Required for creating user through API
+CUSTOM_API_TOKEN=

Gemfile

@@ -139,10 +139,6 @@ gem 'rack-cors'
 # Ruby wrappers for the HubSpot REST API
 gem "hubspot-ruby"
 
-# authenticate via Microsoft 
-# gem 'omniauth-microsoft_graph', git: 'https://github.com/m4c3/omniauth-microsoft_graph'
-gem 'omniauth-microsoft_graph'
-
 group :development, :test, :review do
   # Call "byebug" anywhere in the code to stop execution and get a debugger console
   gem "byebug", "~> 11.0.1", platforms: [:mri, :mingw, :x64_mingw]

Gemfile.lock

@@ -220,7 +220,6 @@ GEM
       activesupport (>= 4.2.0)
     hashdiff (1.0.1)
     hashery (2.1.2)
-    hashie (4.1.0)
     hexapdf (0.9.3)
       cmdparse (~> 3.0, >= 3.0.3)
       geom2d (~> 0.2)
@@ -298,7 +297,6 @@ GEM
       money (~> 6.13.2)
       railties (>= 3.0)
     msgpack (1.3.1)
-    multi_json (1.15.0)
     multi_xml (0.6.0)
     multipart-post (2.1.1)
     nio4r (2.5.2)
@@ -310,21 +308,6 @@ GEM
       warden
     oath-generators (1.0.1)
       oath (>= 0.0.12)
-    oauth2 (1.4.4)
-      faraday (>= 0.8, < 2.0)
-      jwt (>= 1.0, < 3.0)
-      multi_json (~> 1.3)
-      multi_xml (~> 0.5)
-      rack (>= 1.2, < 3)
-    omniauth (1.9.1)
-      hashie (>= 3.4.6)
-      rack (>= 1.6.2, < 3)
-    omniauth-microsoft_graph (0.3.3)
-      omniauth (~> 1.1, >= 1.1.1)
-      omniauth-oauth2 (~> 1.6)
-    omniauth-oauth2 (1.6.0)
-      oauth2 (~> 1.1)
-      omniauth (~> 1.9)
     parallel (1.19.1)
     parity (3.2.0)
     parser (2.6.5.0)
@@ -569,7 +552,6 @@ DEPENDENCIES
   mux_ruby!
   oath (~> 1.1.0)
   oath-generators (~> 1.0.1)
-  omniauth-microsoft_graph
   parity (~> 3.2.0)
   pdf-reader (~> 2.1.0)
   pdfkit (~> 0.8.2)

app/assets/javascripts/directory_files_input.js

@@ -0,0 +1,9 @@
+$(document).on("turbolinks:load", function() {
+    $("#upload_directory_files").on('click', function(e){
+        const newFilesCount = $('input[name = "directory[files][]"][type = "hidden"]').length;
+
+        if (newFilesCount === 0){
+            e.preventDefault();
+        }
+    });
+});

app/controllers/api/users_controller.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+class Api::UsersController < Api::ApiController
+  skip_before_action :authenticate_user
+  before_action :verify_custom_token, only: :create
+
+  def create
+    if user_params[:email].nil? || user_params[:password].nil?
+      raise ActionController::ParameterMissing.new 'Missing email or password'
+    end
+
+    user = Oath::Services::SignUp.new(user_params).perform
+    render json: user.slice(:email, :created_at, :first_name, :last_name)
+  end
+
+  private
+
+  def user_params
+    params.require(:user).permit(%i[
+                                   email
+                                   password
+                                   first_name
+                                   last_name
+                                 ])
+  end
+
+  def verify_custom_token
+    if token.blank? || token != ENV['CUSTOM_API_TOKEN']
+      unauthorized_entity(:user)
+    end
+  end
+
+end

app/controllers/callbacks_controller.rb

@@ -1,10 +0,0 @@
-class CallbacksController < ApplicationController
-  skip_before_action :require_login
-  skip_after_action :verify_authorized, except: :index
-  skip_after_action :verify_policy_scoped, only: :index
-  skip_before_action :verify_authenticity_token
-
-  def create
-    render plain: params.inspect
-  end
-end

app/controllers/material_releases_controller.rb

@@ -50,11 +50,58 @@ class MaterialReleasesController < ApplicationController
 
   private
 
+  def person_params
+    %i[
+      person_first_name
+      person_last_name
+      person_phone
+      person_company
+      person_email
+      person_title
+      person_address_street1
+      person_address_street2
+      person_address_city
+      person_address_state
+      person_address_zip
+      person_address_country
+    ]
+  end
+
+  def guardian_params
+    %i[
+      guardian_first_name
+      guardian_last_name
+      guardian_phone
+      guardian_email
+      guardian_photo
+      guardian_address_street1
+      guardian_address_street2
+      guardian_address_city
+      guardian_address_state
+      guardian_address_zip
+      guardian_address_country
+    ]
+  end
+
+  def second_guardian_params
+    %i[
+      guardian_2_first_name
+      guardian_2_last_name
+      guardian_2_phone
+      guardian_2_email
+      guardian_2_photo
+      guardian_2_address_street1
+      guardian_2_address_street2
+      guardian_2_address_city
+      guardian_2_address_state
+      guardian_2_address_zip
+      guardian_2_address_country
+    ]
+  end
+
   def material_release_params
-    params.require(:material_release).permit(
+    params.require(:material_release).permit(person_params, guardian_params, second_guardian_params, :minor,
       :name, :address_street1, :address_street2, :address_city, :address_state, :address_zip, :address_country,
-      :person_first_name, :person_last_name, :person_title, :person_company, :person_phone, :person_email,
-      :person_address_street1, :person_address_street2, :person_address_city, :person_address_state, :person_address_zip, :person_address_country,
       :applicable_medium_id, :applicable_medium_text,
       :territory_id, :territory_text,
       :term_id, :term_text,

app/controllers/public/material_releases_controller.rb

@@ -39,11 +39,59 @@ class Public::MaterialReleasesController < Public::BaseController
     authorize material_releases.build(params)
   end
 
+  def person_params
+    %i[
+      person_first_name
+      person_last_name
+      person_phone
+      person_email
+      person_title
+      person_company
+      person_address_street1
+      person_address_street2
+      person_address_city
+      person_address_state
+      person_address_zip
+      person_address_country
+    ]
+  end
+
+  def guardian_params
+    %i[
+      guardian_first_name
+      guardian_last_name
+      guardian_phone
+      guardian_email
+      guardian_photo
+      guardian_address_street1
+      guardian_address_street2
+      guardian_address_city
+      guardian_address_state
+      guardian_address_zip
+      guardian_address_country
+    ]
+  end
+
+  def second_guardian_params
+    %i[
+      guardian_2_first_name
+      guardian_2_last_name
+      guardian_2_phone
+      guardian_2_email
+      guardian_2_photo
+      guardian_2_address_street1
+      guardian_2_address_street2
+      guardian_2_address_city
+      guardian_2_address_state
+      guardian_2_address_zip
+      guardian_2_address_country
+    ]
+  end
+
+
   def material_release_params
-    params.require(:material_release).permit(
+    params.require(:material_release).permit(person_params, guardian_params, second_guardian_params, :minor,
       :name, :address_street1, :address_street2, :address_city, :address_state, :address_zip, :address_country,
-      :person_first_name, :person_last_name, :person_title, :person_company, :person_phone, :person_email,
-      :person_address_street1, :person_address_street2, :person_address_city, :person_address_state, :person_address_zip, :person_address_country,
       :signature_base64,
       :locale, :contract_template, :description, photos: []
     )

app/models/app_host.rb

@@ -15,7 +15,7 @@ class AppHost
   end
 
   def domain_with_port
-    [domain, port].reject(&:blank?).compact.join(":")
+    [domain, port].compact.join(":")
   end
 
   def protocol

app/models/material_release.rb

@@ -12,6 +12,11 @@ class MaterialRelease < ApplicationRecord
   include PersonName
   include CsvExportable
   include Approvable
+  include GuardianPhotoable
+  include SecondGuardianPhotoable
+  include GuardianName
+  include SecondGuardianName
+
 
   class << self
     def custom_csv_exportable_headers
@@ -30,6 +35,39 @@ class MaterialRelease < ApplicationRecord
                 %w(person_address_country country)
               ]
 
+  composed_of :guardian_address,
+              class_name: 'Address',
+              mapping: [
+                  %w[guardian_address_street1 street1],
+                  %w[guardian_address_street2 street2],
+                  %w[guardian_address_city city],
+                  %w[guardian_address_state state],
+                  %w[guardian_address_zip zip],
+                  %w[guardian_address_country country]
+              ]
+
+  composed_of :guardian_2_address,
+              class_name: 'Address',
+              mapping: [
+                  %w[guardian_2_address_street1 street1],
+                  %w[guardian_2_address_street2 street2],
+                  %w[guardian_2_address_city city],
+                  %w[guardian_2_address_state state],
+                  %w[guardian_2_address_zip zip],
+                  %w[guardian_2_address_country country]
+              ]
+
+  # We don't care for the argument but method WILL receive option name
+  # when called from inside with_option block, hence * argument
+  def self.face_photo_acceptable_content_types(*)
+    ['image/png', 'image/jpeg']
+  end
+
+  def self.acceptable_import_file_extensions
+    ['.png', '.jpeg', '.jpg', '.pdf']
+  end
+
+
   validates :name, presence: true
   validates :person_email, email: true, allow_blank: true
 
@@ -47,8 +85,8 @@ class MaterialRelease < ApplicationRecord
     @contact_person ||= Contact.new(person_name, person_address, person_email, person_phone)
   end
 
-  def minor?
-    false
+  def second_guardian_present?
+    guardian_2_first_name.present?
   end
 
   def uses_edl?

app/views/contract_templates/_form.html.erb

@@ -2,7 +2,7 @@
   <%= field_set_tag content_tag(:span, t(".release_info.heading"), class: "h6 text-muted text-uppercase") do %>
     <div class="form-row">
       <%= form.text_field :name, wrapper_class: "col-sm-6" %>
-      <%= form.select :release_type, options_for_release_type_select(project, @release_type), { wrapper_class: "col-sm-6" }, data: { toggle: "collapse-select", target_show_values_mapping: { "#guardian_clause": %w(acquired_media appearance talent misc medical), "#fee_field": %w(appearance talent location material acquired_media), "#exploitable_rights_fields": %w(appearance talent location material acquired_media), "#custom_fields": %w(medical misc), "#amendment_clause": %w(location) } }, class: "form-control custom-select" %>
+      <%= form.select :release_type, options_for_release_type_select(project, @release_type), { wrapper_class: "col-sm-6" }, data: { toggle: "collapse-select", target_show_values_mapping: { "#guardian_clause": %w(acquired_media appearance talent material misc medical), "#fee_field": %w(appearance talent location material acquired_media), "#exploitable_rights_fields": %w(appearance talent location material acquired_media), "#custom_fields": %w(medical misc), "#amendment_clause": %w(location) } }, class: "form-control custom-select" %>
     </div>
     <div class="form-row mb-3">
       <%= form.radio_button :accessibility, :public_template, label: "Public", wrapper_class: "mr-3" %>

app/views/directories/_file_form.html.erb

@@ -3,6 +3,6 @@
     <%= render "shared/files_dropzone_fields", form: form, directory: directory %>
   <% end %>
   <div class="pt-3">
-    <%= form.submit t(".submit"), class: "btn btn-block btn-success", data: { disable_with: t("shared.disable_with") } %>
+    <%= form.submit t(".submit"), id: "upload_directory_files", class: "btn btn-block btn-success", data: { disable_with: t("shared.disable_with") } %>
   </div>
 <% end %>

app/views/location_releases/index.html.erb

@@ -33,7 +33,7 @@
         <th><%= t(".table_headers.notes") %></th>
         <th><%= t(".table_headers.tags") %></th>
         <th><%= t(".table_headers.signed_at") %></th>
-        <th></th>
+        <th><%= t(".table_headers.amendment_signed") %></th>
         <th></th>
       </tr>
     </thead>

app/views/material_releases/_form.html.erb

@@ -12,6 +12,9 @@
   <hr>
 
   <%= field_set_tag content_tag(:span, t(".signer_details.heading"), class: "h6 text-muted text-uppercase") do %>
+    <%= form.form_group :minor do %>
+      <%= form.check_box :minor, label: t("helpers.label.material_release.minor"), data: { target: "[data-ujs-target=guardian-fields]", toggle: "collapse" } %>
+    <% end %>
     <div class="form-row">
       <%= form.text_field :person_first_name, wrapper_class: "col-sm-6" %>
       <%= form.text_field :person_last_name, wrapper_class: "col-sm-6" %>
@@ -21,6 +24,28 @@
       <%= form.text_field :person_title, wrapper_class: "col-sm-6" %>
     </div>
     <%= render "shared/address_fields", form: form, subject: "person" %>
+
+    <div class="<%= class_string("collapse" => !material_release.minor?) %>" data-ujs-target="guardian-fields">
+      <%= card_field_set_tag t(".guardian_info.heading") do %>
+        <div class="form-row">
+          <%= form.text_field :guardian_first_name, required: material_release.minor?, wrapper_class: "col-sm-3" %>
+          <%= form.text_field :guardian_last_name, required: material_release.minor?, wrapper_class: "col-sm-3" %>
+          <%= form.phone_field :guardian_phone, wrapper_class: "col-sm-6" %>
+          <%= form.text_field :guardian_email, wrapper_class: "col-sm-6" %>
+        </div>
+        <%= render "shared/address_fields", form: form, subject: "guardian" %>
+      <% end %>
+
+      <%= card_field_set_tag t(".guardian_2_info.heading") do %>
+        <div class="form-row">
+          <%= form.text_field :guardian_2_first_name, wrapper_class: "col-sm-3" %>
+          <%= form.text_field :guardian_2_last_name, wrapper_class: "col-sm-3" %>
+          <%= form.phone_field :guardian_2_phone, wrapper_class: "col-sm-6" %>
+          <%= form.text_field :guardian_2_email, wrapper_class: "col-sm-6" %>
+        </div>
+        <%= render "shared/address_fields", form: form, subject: "guardian_2" %>
+      <% end %>
+    </div>
   <% end %>
 
   <hr>
@@ -34,6 +59,44 @@
 
   <%= field_set_tag content_tag(:span, t(".photos.heading"), class: "h6 text-muted text-uppercase") do %>
     <%= render "shared/photos_dropzone_fields", form: form, release: material_release %>
+
+    <div class="<%= class_string("collapse" => !material_release.minor?) %>" data-ujs-target="guardian-fields">
+      <br>
+      <div class="text-left">
+        <p><%= t(".photos.guardian_photo.heading") %></p>
+        <div id="guardian-photo-preview" class="d-inline-block mb-2" data-behavior="guardian-photo-preview" data-file-input="[data-ujs-target=guardian-photo-input]">
+          <div class="align-items-center d-flex photo-preview img-thumbnail justify-content-center">
+            <span>No photo yet</span>
+          </div>
+        </div>
+        <% if material_release.guardian_photo.attached? %>
+          <%= javascript_tag nonce: true do %>
+            App.PhotoPreview.set("#guardian-photo-preview", "<%= url_for(material_release.guardian_photo.variant(auto_orient: true, resize: '200x200')) %>");
+          <% end %>
+        <% end %>
+        <div class="d-inline-block">
+          <%= form.hidden_field :guardian_photo, value: form.object.guardian_photo.signed_id if material_release.guardian_photo.attached?%>
+          <%= form.file_field :guardian_photo, hide_label: true, data: { ujs_target: "guardian-photo-input" }, help: "PNG or JPG only", accept: material_release.class.face_photo_acceptable_content_types.join(",") %>
+        </div>
+
+        <p><%= t(".photos.guardian_2_photo.heading") %></p>
+        <div id="guardian-2-photo-preview" class="d-inline-block mb-2" data-behavior="guardian-photo-preview" data-file-input="[data-ujs-target=guardian-2-photo-input]">
+          <div class="align-items-center d-flex photo-preview img-thumbnail justify-content-center">
+            <span>No photo yet</span>
+          </div>
+        </div>
+        <% if material_release.guardian_2_photo.attached? %>
+          <%= javascript_tag nonce: true do %>
+            App.PhotoPreview.set("#guardian-2-photo-preview", "<%= url_for(material_release.guardian_2_photo.variant(auto_orient: true, resize: '200x200')) %>");
+          <% end %>
+        <% end %>
+        <div class="d-inline-block">
+          <%= form.hidden_field :guardian_2_photo, value: form.object.guardian_2_photo.signed_id if material_release.guardian_2_photo.attached?%>
+          <%= form.file_field :guardian_2_photo, hide_label: true, data: { ujs_target: "guardian-2-photo-input" }, help: "PNG or JPG only", accept: material_release.class.face_photo_acceptable_content_types.join(",") %>
+        </div>
+      </div>
+      <hr>
+    </div>
   <% end %>
 
   <div class="row align-items-center text-center mt-4">

app/views/profiles/show.html.erb

@@ -17,7 +17,6 @@
                 <%= @user.role_for(Current.account).to_s.titleize %>
             <% end %>
             </p>
-            <%= link_to 'Auth to Microsoft', '/auth/microsoft_graph', class: "btn btn-primary" %>
           </div>
 
           <div class="mt-3">

app/views/public/material_releases/new.html.erb

@@ -13,6 +13,17 @@
 
       <hr>
 
+      <% unless @contract_template.guardian_clause.blank? %>
+        <%= form.form_group :minor do %>
+          <%= form.check_box :minor, label: t("helpers.label.appearance_release.minor"), data: { behavior: "update-required-status", target: "[data-ujs-target=guardian-fields]", toggle: "collapse" } %>
+        <% end %>
+
+        <%= card_field_set_tag t(".guardian_clause.heading") do %>
+          <p><%= @contract_template.guardian_clause %></p>
+        <% end %>
+        <hr>
+      <% end %>
+
       <%= card_field_set_tag t(".release_info.heading") do %>
         <div class="form-row">
           <%= form.text_field :name, required: true, wrapper_class: "col-12" %>
@@ -40,6 +51,91 @@
 
       <hr>
 
+      <% unless @contract_template.guardian_clause.blank? %>
+        <div class="<%= class_string("collapse" => !@material_release.minor?) %>" data-ujs-target="guardian-fields">
+          <%= card_field_set_tag t(".guardian_info.heading") do %>
+            <div class="form-row">
+              <%= form.text_field :guardian_first_name, required: @material_release.minor?, wrapper_class: "col-sm-3", data: { required_tag: "guardian" } %>
+              <%= form.text_field :guardian_last_name, required: @material_release.minor?, wrapper_class: "col-sm-3", data: { required_tag: "guardian" } %>
+              <%= form.phone_field :guardian_phone, required: @material_release.minor?, wrapper_class: "col-sm-6", data: { required_tag: "guardian" } %>
+              <%= form.text_field :guardian_email, required: @material_release.minor?, wrapper_class: "col-sm-6", data: { required_tag: "guardian" } %>
+            </div>
+            <%= render "shared/address_fields", form: form, subject: "guardian", required: @material_release.minor?, data: { required_tag: "guardian" } %>
+          <% end %>
+
+          <hr>
+
+          <%= card_field_set_tag t(".guardian_photo.heading") do %>
+            <div class="alert alert-warning font-weight-bold"><%= t ".guardian_photo.instructions" %></div>
+            <div class="text-center">
+              <div class="d-inline-block mb-2" data-behavior="guardian-photo-preview" data-file-input="[data-ujs-target=guardian-photo-input]">
+                <div class="align-items-center d-flex photo-preview img-thumbnail justify-content-center">
+                  <span><%= t ".photo.no_photo" %></span>
+                </div>
+              </div>
+              <div class="d-inline-block text-left">
+                <% if @material_release.guardian_photo.attached? %>
+                  <%= javascript_tag nonce: true do %>
+                    App.PhotoPreview.set("[data-behavior=guardian-photo-preview]", "<%= url_for(@material_release.guardian_photo.variant(auto_orient: true, resize: '200x200')) %>");
+                  <% end %>
+                <% end %>
+                <div class="hidden-file-input">
+                  <%= form.hidden_field :guardian_photo, value: form.object.guardian_photo.signed_id if @material_release.guardian_photo.attached? %>
+                  <%= form.file_field :guardian_photo, required: @material_release.minor?, hide_label: true, data: { ujs_target: "guardian-photo-input" }, accept: @material_release.class.face_photo_acceptable_content_types.join(","), direct_upload: true %>
+                </div>
+                <%= button_tag t(".photo.take_photo"), type: "button", class: "btn btn-lg btn-primary take-photo-button", data: { behavior: "trigger-click", target: "[data-ujs-target=guardian-photo-input]" } %>
+              </div>
+              <p class="p-2 font-weight-bold">
+                <small class="text-muted"><%= t ".photo.warning" %></small>
+              </p>
+            </div>
+          <% end %>
+
+          <hr>
+
+          <%= card_field_set_tag t(".guardian_2_info.heading") do %>
+            <div class="form-row">
+              <%= form.text_field :guardian_2_first_name, wrapper_class: "col-sm-3" %>
+              <%= form.text_field :guardian_2_last_name, wrapper_class: "col-sm-3" %>
+              <%= form.phone_field :guardian_2_phone, wrapper_class: "col-sm-6" %>
+              <%= form.text_field :guardian_2_email, wrapper_class: "col-sm-6" %>
+            </div>
+            <%= render "shared/address_fields", form: form, subject: "guardian_2" %>
+          <% end %>
+
+          <hr>
+
+          <%= card_field_set_tag t(".guardian_2_photo.heading") do %>
+            <div class="alert alert-warning font-weight-bold"><%= t ".guardian_2_photo.instructions" %></div>
+            <div class="text-center">
+              <div class="d-inline-block mb-2" data-behavior="guardian-photo-preview" data-file-input="[data-ujs-target=guardian-2-photo-input]">
+                <div class="align-items-center d-flex photo-preview img-thumbnail justify-content-center">
+                  <span><%= t ".photo.no_photo" %></span>
+                </div>
+              </div>
+              <div class="d-inline-block text-left">
+                <% if @material_release.guardian_2_photo.attached? %>
+                  <%= javascript_tag nonce: true do %>
+                    App.PhotoPreview.set("[data-behavior=guardian-photo-preview]", "<%= url_for(@material_release.guardian_2_photo.variant(auto_orient: true, resize: '200x200')) %>");
+                  <% end %>
+                <% end %>
+                <div class="hidden-file-input">
+                  <%= form.hidden_field :guardian_2_photo, value: form.object.guardian_2_photo.signed_id if @material_release.guardian_2_photo.attached? %>
+                  <%= form.file_field :guardian_2_photo, hide_label: true, data: { ujs_target: "guardian-2-photo-input" }, accept: @material_release.class.face_photo_acceptable_content_types.join(","), direct_upload: true %>
+                </div>
+                <%= button_tag t(".photo.take_photo"), type: "button", class: "btn btn-lg btn-primary take-photo-button", data: { behavior: "trigger-click", target: "[data-ujs-target=guardian-2-photo-input]" } %>
+              </div>
+              <p class="p-2 font-weight-bold">
+                <small class="text-muted"><%= t ".photo.warning" %></small>
+              </p>
+            </div>
+          <% end %>
+
+          <hr>
+
+        </div>
+      <% end %>
+
       <%= card_field_set_tag t(".signature.heading") do %>
         <%= render "shared/signature_fields", form: form, instruction: 'For Owner or Authorized Signatory', signature_legal_text: @contract_template.signature_legal_text %>
       <% end %>

config/initializers/omniauth.rb

@@ -1,20 +0,0 @@
-ENV['AZURE_CLIENT_ID'] = 'c45b93ae-ef07-415d-b13a-ab566b877c1c'
-ENV['AZURE_CLIENT_SECRET'] = 'XVboF2sRaS_H2oK6I9R56.A_exnRhiv~Xt'
-ENV['AZURE_TENANT_ID'] = '1e33d1c7-dfb4-4df1-86da-62770313bcb0'
-ENV['AZURE_EXTENSIONS'] = ''
-
-# Rails.application.config.middleware.use OmniAuth::Builder do
-#   provider :microsoft_graph,{
-#     client_id: ENV['AZURE_CLIENT_ID'],
-#     client_secret: ENV['AZURE_CLIENT_SECRET'],
-#     tenant_id: ENV['AZURE_TENANT_ID'],
-#     extensions: ENV['AZURE_EXTENSIONS'],
-#     redirect_uri: 'https://517e57c6cd6c.ngrok.io/auth/microsoft_graph/callback',
-#     scope: 'openid email profile User.Read'
-#   }
-# end
-
-Rails.application.config.middleware.use OmniAuth::Builder do
-  provider :microsoft_graph, ENV['AZURE_CLIENT_ID'], ENV['AZURE_CLIENT_SECRET'], scope: 'openid email profile User.Read'
-end
-

config/locales/en.yml

@@ -531,6 +531,27 @@ en:
         person_last_name: Owner last name
       material_release:
         description: Description of licensed material
+        guardian_2_address_city: Guardian 2 city
+        guardian_2_address_country: Guardian 2 country
+        guardian_2_address_state: Guardian 2 state
+        guardian_2_address_street1: Guardian 2 address
+        guardian_2_address_street2: Guardian 2 address (Line 2)
+        guardian_2_address_zip: Guardian 2 zip code
+        guardian_2_email: Guardian 2 email
+        guardian_2_first_name: Guardian 2 first name
+        guardian_2_last_name: Guardian 2 last name
+        guardian_2_phone: Guardian 2 phone
+        guardian_address_city: Guardian city
+        guardian_address_country: Guardian country
+        guardian_address_state: Guardian state
+        guardian_address_street1: Guardian address
+        guardian_address_street2: Guardian address (Line 2)
+        guardian_address_zip: Guardian zip code
+        guardian_email: Guardian email
+        guardian_first_name: Guardian first name
+        guardian_last_name: Guardian last name
+        guardian_phone: Guardian phone
+        minor: Is the person a minor?
         name: Name of licensed material
         person_address: Address
         person_address_city: City
@@ -821,6 +842,7 @@ en:
       empty: Location Releases will appear here
       table_headers:
         address: Address
+        amendment_signed: Amendment
         approved: Approved
         name: Location Name
         notes: Notes
@@ -850,10 +872,18 @@ en:
     form:
       contract_and_rights:
         heading: 3 of 4 Contract & Exploitable Rights
+      guardian_2_info:
+        heading: Second Guardian Information (if company requires)
+      guardian_info:
+        heading: Guardian Information
       material_details:
         heading: 1 of 3 Material Details
       photos:
         dropzone_label: Tap to take a photo of Licensed Material (optional)
+        guardian_2_photo:
+          heading: Second Guardian Photo
+        guardian_photo:
+          heading: Guardian Photo
         heading: 4 of 4 Photos
       signer_details:
         heading: 2 of 4 Licensor/Owner Details
@@ -1181,10 +1211,27 @@ en:
         cancel: Cancel
         contact_info:
           heading: Licensor/Owner Contact Information
+        guardian_2_info:
+          heading: Second Guardian Information (if company requires)
+        guardian_2_photo:
+          heading: Second Guardian Photo
+          instructions: >
+            Lastly, it's time for second guardian to take a selfie photo! Please remove your hat and sunglasses (regular eyewear is ok), make sure that you are the only person in the photo, look straight into the camera, and say Cheese!
+        guardian_clause:
+          heading: Guardian Clause
+        guardian_info:
+          heading: Guardian Information
+        guardian_photo:
+          heading: Guardian Photo
+          instructions: >
+            Lastly, it's time for guardian to take a selfie photo! Please remove your hat and sunglasses (regular eyewear is ok), make sure that you are the only person in the photo, look straight into the camera, and say Cheese!
         legal:
           heading: Legal
         photo:
           heading: Photos
+          no_photo: No photo yet
+          take_photo: Take Photo
+          warning: If your photo appears sideways, it will be autocorrected when you submit your release.
         release_info:
           heading: Release Information
         signature:

config/locales/es.yml

@@ -285,6 +285,29 @@ es:
         person_email: Dirección de correo electrónico
         person_name: Nómbre
         person_phone: Número de teléfono
+      material_release:
+        guardian_2_address_city: Guardian 2 city (ES)
+        guardian_2_address_country: Guardian 2 country (ES)
+        guardian_2_address_state: Guardian 2 state (ES)
+        guardian_2_address_street1: Guardian 2 address (ES)
+        guardian_2_address_street2: Guardian 2 address (Line 2) (ES)
+        guardian_2_address_zip: Guardian 2 zip code (ES)
+        guardian_2_email: Guardian 2 email (ES)
+        guardian_2_first_name: Guardian 2 first name (ES)
+        guardian_2_last_name: Guardian 2 last name (ES)
+        guardian_2_phone: Guardian 2 phone (ES)
+        guardian_address_city: Guardian city (ES)
+        guardian_address_country: Guardian country (ES)
+        guardian_address_state: Guardian state (ES)
+        guardian_address_street1: Dirección del tutor legal
+        guardian_address_street2: Dirección del tutor legal (Línea 2)
+        guardian_address_zip: Guardian zip code (ES)
+        guardian_email: Guardian email (ES)
+        guardian_first_name: Guardian first name (ES)
+        guardian_last_name: Guardian last name (ES)
+        guardian_name: Nómbre del tutor legal
+        guardian_phone: Número de teléfono del tutor legal
+        minor: El firmante es un menor
       medical_release:
         guardian_2_address_city: Guardian 2 city (ES)
         guardian_2_address_country: Guardian 2 country (ES)
@@ -373,6 +396,8 @@ es:
       contract_template:
         update: Save changes (ES)
       create: 'Crear %{model}'
+      material_release:
+        create: Import Release (ES)
       medical_release:
         update: Approve (ES)
       update: 'Actualizar %{model}'
@@ -383,6 +408,7 @@ es:
     index:
       table_headers:
         address: Address (ES)
+        amendment_signed: Amendment (ES)
         notes: Notes (ES)
         signed_at: Date Signed (ES)
         tags: Tags (ES)
@@ -393,9 +419,19 @@ es:
         amendment_not_signed_tooltip: Amendment not yet signed (ES)
         amendment_signed_tooltip: Amendment Signed (ES)
   material_releases:
+    create:
+      notice: The acquired media release has been created (ES)
     form:
+      guardian_2_info:
+        heading: Guardian Information (if company requires) [ES]
+      guardian_info:
+        heading: Guardian Information (ES)
       photos:
         dropzone_label: Tap to take a photo of Licensed Material (optional) (ES)
+        guardian_2_photo:
+          heading: Second Guardian Photo
+        guardian_photo:
+          heading: Guardian Photo
     index:
       table_headers:
         name: Name (ES)
@@ -507,8 +543,25 @@ es:
           heading: Photos (ES)
     material_releases:
       new:
+        guardian_2_info:
+          heading: Second Guardian Information (if company requires) [ES]
+        guardian_2_photo:
+          heading: Second Guardian Photo (ES)
+          instructions: >
+            (ES) Lastly, it's time for second guardian to take a selfie photo! Please remove your hat and sunglasses (regular eyewear is ok), make sure that you are the only person in the photo, look straight into the camera, and say Cheese! (ES)
+        guardian_clause:
+          heading: Guardian Clause (ES)
+        guardian_info:
+          heading: Guardian Information (ES)
+        guardian_photo:
+          heading: Guardian Photo (ES)
+          instructions: >
+            (ES) Lastly, it's time for guardian to take a selfie photo! Please remove your hat and sunglasses (regular eyewear is ok), make sure that you are the only person in the photo, look straight into the camera, and say Cheese! (ES)
         photo:
           heading: Photos (ES)
+          no_photo: No photo yet (ES)
+          take_photo: Take Photo (ES)
+          warning: If your photo appears sideways, it will be autocorrected when you submit your release. (ES)
     medical_releases:
       new:
         guardian_2_info:

config/routes.rb

@@ -4,8 +4,6 @@ require 'sidekiq/web'
 Rails.application.routes.draw do
   AVAILABLE_LOCALES_REGEX = /#{I18n.available_locales.join("|")}/.freeze
 
-  get 'auth/microsoft_graph/callback', to: 'callbacks#create'
-
   concern :confirmable do
     resources :video_release_confirmations, only: [:new, :create, :destroy]
   end
@@ -160,6 +158,7 @@ Rails.application.routes.draw do
       scope 'v1' do
         get 'sync' => 'sync#index'
         post 'user_token' => 'user_token#create'
+        post 'users' => 'users#create'
         resource :profiles, only: [:show]
         resources :projects, only: [:index] do
           resources :broadcasts, only: [:index, :show, :update]

db/migrate/20200727143209_add_guardians_fields_to_material_releases.rb

@@ -0,0 +1,25 @@
+class AddGuardiansFieldsToMaterialReleases < ActiveRecord::Migration[6.0]
+  def change
+    add_column :material_releases, :minor, :boolean, default: false
+    add_column :material_releases, :guardian_first_name, :string
+    add_column :material_releases, :guardian_last_name, :string
+    add_column :material_releases, :guardian_email, :string
+    add_column :material_releases, :guardian_phone, :string
+    add_column :material_releases, :guardian_address_street1, :string
+    add_column :material_releases, :guardian_address_street2, :string
+    add_column :material_releases, :guardian_address_city, :string
+    add_column :material_releases, :guardian_address_state, :string
+    add_column :material_releases, :guardian_address_zip, :string
+    add_column :material_releases, :guardian_address_country, :string
+    add_column :material_releases, :guardian_2_first_name, :string
+    add_column :material_releases, :guardian_2_last_name, :string
+    add_column :material_releases, :guardian_2_email, :string
+    add_column :material_releases, :guardian_2_phone, :string
+    add_column :material_releases, :guardian_2_address_street1, :string
+    add_column :material_releases, :guardian_2_address_street2, :string
+    add_column :material_releases, :guardian_2_address_city, :string
+    add_column :material_releases, :guardian_2_address_state, :string
+    add_column :material_releases, :guardian_2_address_zip, :string
+    add_column :material_releases, :guardian_2_address_country, :string
+  end
+end

db/structure.sql

@@ -1002,7 +1002,28 @@ CREATE TABLE public.material_releases (
     person_last_name character varying,
     approved_by_user_name text,
     approved_by_user_email text,
-    approved_at timestamp without time zone
+    approved_at timestamp without time zone,
+    minor boolean DEFAULT false,
+    guardian_first_name character varying,
+    guardian_last_name character varying,
+    guardian_email character varying,
+    guardian_phone character varying,
+    guardian_address_street1 character varying,
+    guardian_address_street2 character varying,
+    guardian_address_city character varying,
+    guardian_address_state character varying,
+    guardian_address_zip character varying,
+    guardian_address_country character varying,
+    guardian_2_first_name character varying,
+    guardian_2_last_name character varying,
+    guardian_2_email character varying,
+    guardian_2_phone character varying,
+    guardian_2_address_street1 character varying,
+    guardian_2_address_street2 character varying,
+    guardian_2_address_city character varying,
+    guardian_2_address_state character varying,
+    guardian_2_address_zip character varying,
+    guardian_2_address_country character varying
 );
 
 
@@ -3966,6 +3987,7 @@ INSERT INTO "schema_migrations" (version) VALUES
 ('20200720051634'),
 ('20200720131309'),
 ('20200721140821'),
-('20200725231419');
+('20200725231419'),
+('20200727143209');
 
 

spec/controllers/api/sync_controller_spec.rb

@@ -94,7 +94,7 @@ RSpec.describe Api::SyncController, type: :controller do
       expect(appearance_releases.first).to include('guardian_photo')
       expect(talent_releases.first).to include('guardian_photo')
       expect(location_releases.first).not_to include('guardian_photo')
-      expect(material_releases.first).not_to include('guardian_photo')
+      expect(material_releases.first).to include('guardian_photo')
     end
 
     it 'guardian photo has same format as other photos' do

spec/controllers/api/users_controller_spec.rb

@@ -0,0 +1,78 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe Api::UsersController, type: :controller do
+  before do
+    ENV['CUSTOM_API_TOKEN'] = "custom_token"
+  end
+  describe '#create' do
+    context 'Invalid token' do
+      it 'Returns 401 (Unauthorized) status if token is not valid' do
+
+        post :create
+
+        expect(response).not_to be_successful
+        expect(response).to have_http_status(401)
+      end
+    end
+
+    context 'Valid token' do
+      before :each do
+        controller.request.env['HTTP_AUTHORIZATION'] = 'Bearer custom_token'
+      end
+
+      it 'Returns Server error if user param is missing' do
+        user_count = User.all.count
+
+        expect do
+          post :create
+        end.to raise_exception ActionController::ParameterMissing
+
+        expect(User.all.count).to eq user_count
+      end
+
+      it 'Returns Server Error if email or password is missing' do
+        user_count = User.all.count
+
+        expect do
+          post :create, params: { user: { email: "a@b.com" } }
+        end.to raise_exception ActionController::ParameterMissing
+
+        expect do
+          post :create, params: { user: { password: "123" } }
+        end.to raise_exception ActionController::ParameterMissing
+
+        expect(User.all.count).to eq user_count
+      end
+
+      it 'Returns Server Error if body contains not permitted params' do
+        user_count = User.all.count
+
+        expect do
+          post :create, params: { user: { email: "a@b.com", password: "123", admin: true } }
+        end.to raise_exception ActionController::UnpermittedParameters
+
+        expect(User.all.count).to eq user_count
+      end
+
+      it 'Creates user if body contains correct params' do
+        expect do
+          post :create, params: { user: { email: "a@b.com", password: "123" } }
+        end.to change(User, :count).by(1)
+
+        expect(response).to be_successful
+      end
+
+      it 'Nothing changes if existing email is used' do
+        create(:user, email: "a@b.com")
+
+        expect do
+          post :create, params: { user: { email: "a@b.com", password: "123" } }
+        end.not_to change(User, :count)
+
+        expect(response).to be_successful
+      end
+    end
+  end
+end

spec/factories/material_releases.rb

@@ -15,6 +15,16 @@ FactoryBot.define do
       end
     end
 
+    trait :minor do
+      minor true
+      guardian_first_name "Guardian1"
+      guardian_last_name "First"
+      guardian_2_first_name "Guardian2"
+      guardian_2_last_name "Second"
+      guardian_phone "1111"
+      guardian_2_phone "2222"
+    end
+
     trait :with_photo do
       photos do
         path = Rails.root.join("spec", "fixtures", "files", "material_photo.png")

spec/features/user_manages_contract_templates_spec.rb

@@ -178,7 +178,7 @@ RSpec.feature 'User manages contract templates', type: :feature do
     expect(content_disposition).to include('inline')
     expect(pdf_body).to have_content('PREVIEW ONLY')
     expect(pdf_body).to have_content('Material Release')
-    expect(pdf_body).not_to have_content('Guardian')
+    expect(pdf_body).to have_content('Guardian')
   end
 
   context 'preventing creation of release template with wrong fee value' do

spec/features/user_manages_project_directories_spec.rb

@@ -51,6 +51,13 @@ RSpec.feature "User manages project custom folders", type: :feature do
 
     expect(page).to have_content("UPLOAD NEW FILES")
 
+    expect do
+      click_button "Upload Files"
+    end.not_to raise_exception
+
+    expect(page).to have_content("UPLOAD NEW FILES")
+    expect(page).not_to have_content("The folder has been updated")
+
     drop_file Rails.root.join(file_fixture("person_photo.png")), type: :dropzone
 
     click_button "Upload Files"

spec/features/user_managing_location_releases_spec.rb

@@ -127,6 +127,14 @@ feature "User managing location releases" do
       sign_in current_user
     end
 
+    scenario "listing all releases, table have correct headers", js:true do
+      ct = create(:contract_template, :with_amendment_clause, project: project)
+      create(:location_release, :native, project: project, contract_template: ct)
+      visit project_location_releases_path(project)
+
+      table_headers.each { |s| expect(page).to have_content s }
+    end
+
     scenario "creating a release", js: true do
       visit new_project_location_release_path(project)
 
@@ -729,4 +737,16 @@ feature "User managing location releases" do
   def amendment_signature_label
     t 'contracts.amendment_page.description_labels.amendment_signature'
   end
+
+  def table_headers
+    [
+      t('location_releases.index.table_headers.approved'),
+      t('location_releases.index.table_headers.name'),
+      t('location_releases.index.table_headers.address'),
+      t('location_releases.index.table_headers.notes'),
+      t('location_releases.index.table_headers.tags'),
+      t('location_releases.index.table_headers.signed_at'),
+      t('location_releases.index.table_headers.amendment_signed')
+    ]
+  end
 end

spec/features/user_managing_material_releases_spec.rb

@@ -40,6 +40,93 @@ feature "User managing material releases" do
       expect(MaterialRelease.last.photos.attached?).to eq true
     end
 
+    scenario "creating a release for a minor - guardian fields are required when minor checkbox is checked", js: true do
+      contract_template = create(:contract_template, project: project)
+
+      visit new_account_project_contract_template_material_release_path(project.account, project, contract_template)
+
+      all('input[data-required-tag="guardian"]').each do |field|
+        expect(field['required']).to eq 'false'
+        expect(field).not_to be_visible
+      end
+
+      page.check person_is_minor_checkbox
+
+      all('input[data-required-tag="guardian"]').each do |field|
+        expect(field['required']).to eq 'true'
+        expect(field).to be_visible
+      end
+    end
+
+    scenario 'creating a release for a minor', js: true do
+      project = create(:project, members: current_user, account: current_user.primary_account)
+      contract_template = create(:contract_template, project: project)
+
+      visit new_account_project_contract_template_material_release_path(project.account, project, contract_template)
+
+      expect(page).not_to have_content guardian_information_heading.upcase
+      expect(page).not_to have_content guardian_photo_heading.upcase
+
+      page.check person_is_minor_checkbox
+
+      expect(page).to have_content guardian_information_heading.upcase
+      expect(page).to have_content guardian_photo_heading.upcase
+      expect(page).to have_content guardian_email_field.titleize
+
+      fill_all_fields
+
+      fill_in guardian_first_name_field, with: 'Guardian'
+      fill_in guardian_last_name_field, with: 'Name'
+      fill_in guardian_phone_field, with: '001101'
+      fill_in guardian_email_field, with: 'valid@email.com'
+      attach_file guardian_photo_field, file_fixture('hemsworth.jpeg'), visible: :all
+      fill_in_guardian_address_fields
+
+      draw_signature file_fixture("signature.png"), signature_field
+
+      click_button submit_release_button
+
+      expect(page).to have_content(successful_submission_message)
+    end
+
+    scenario 'creating a release for a minor with two guardians', js: true do
+      project = create(:project, members: current_user, account: current_user.primary_account)
+      contract_template = create(:contract_template, project: project)
+
+      visit new_account_project_contract_template_material_release_path(project.account, project, contract_template)
+
+      expect(page).not_to have_content guardian_2_information_heading.upcase
+      expect(page).not_to have_content guardian_2_photo_heading.upcase
+
+      page.check person_is_minor_checkbox
+      expect(page).to have_content guardian_information_heading.upcase
+      expect(page).to have_content guardian_photo_heading.upcase
+      expect(page).to have_content guardian_email_field.titleize
+
+      expect(page).to have_content guardian_2_information_heading.upcase
+      expect(page).to have_content guardian_2_photo_heading.upcase
+      expect(page).to have_content guardian_2_phone_field.titleize
+
+      fill_all_fields
+
+      fill_in guardian_first_name_field, with: 'Guardian'
+      fill_in guardian_last_name_field, with: 'Name'
+      fill_in guardian_phone_field, with: '001101'
+      fill_in guardian_email_field, with: 'valid@email.com'
+      attach_file guardian_photo_field, file_fixture('hemsworth.jpeg'), visible: :all
+      fill_in_guardian_address_fields
+      draw_signature file_fixture("signature.png"), signature_field
+
+      fill_in guardian_2_first_name_field, with: 'Second'
+      fill_in guardian_2_last_name_field, with: 'Guardian'
+      fill_in guardian_2_phone_field, with: '999'
+
+      click_button submit_release_button
+
+      expect(page).to have_content(successful_submission_message)
+      expect(MaterialRelease.last.guardian_2_first_name).to eq 'Second'
+    end
+
     scenario "creating release is possible only after filling all fields", js: true do
       contract_template = create(:contract_template, project: project)
 
@@ -98,7 +185,7 @@ feature "User managing material releases" do
       sign_in current_user
     end
 
-    scenario "creating a release", js: true do
+    scenario "creating a release for and adult", js: true do
       visit new_project_material_release_path(project)
 
       by "attaching only a contract" do
@@ -120,13 +207,94 @@ feature "User managing material releases" do
         click_button create_release_button
 
         expect(page).to have_content(create_release_notice)
-        expect(page).to have_photo("material_photo.png")
+        expect(page).to have_photo("material_photo.png", visible: :all)
 
         click_on "Manage"
         expect(page).to have_link("Download")
       end
     end
 
+    scenario "creating a release for a minor - guardian fields are required when minor checkbox is checked", js: true do
+      visit new_project_material_release_path(project)
+
+      all('input[data-required-tag="guardian"]').each do |field|
+        expect(field['required']).to eq 'false'
+        expect(field).not_to be_visible
+      end
+
+      page.check person_is_minor_checkbox
+
+      all('input[data-required-tag="guardian"]').each do |field|
+        expect(field['required']).to eq 'true'
+        expect(field).to be_visible
+      end
+    end
+
+    scenario "creating a release for a minor", js: true do
+      visit new_project_material_release_path(project)
+
+      expect(page).not_to have_content guardian_information_heading.upcase
+      expect(page).not_to have_content guardian_photo_heading
+
+      page.check person_is_minor_checkbox
+
+      expect(page).to have_content guardian_information_heading.upcase
+      expect(page).to have_content guardian_photo_heading
+      expect(page).to have_content guardian_email_field.titleize
+
+      fill_in_release_fields name: "Apple Laptop"
+      attach_file contract_field, Rails.root.join(file_fixture("contract.pdf")), visible: false
+
+      fill_in guardian_first_name_field, with: 'Guardian'
+      fill_in guardian_last_name_field, with: 'Name'
+      fill_in guardian_phone_field, with: '001101'
+      fill_in guardian_email_field, with: 'valid@email.com'
+      attach_file guardian_photo_field, file_fixture('hemsworth.jpeg'), visible: :all
+      fill_in_guardian_address_fields
+
+      click_button import_release_button
+
+      expect(page).to have_content successful_import_message
+      expect(MaterialRelease.last.guardian_first_name).to eq 'Guardian'
+    end
+
+    scenario "creating a release for a minor with two guardians", js: true do
+      visit new_project_material_release_path(project)
+
+      expect(page).not_to have_content guardian_2_information_heading.upcase
+      expect(page).not_to have_content guardian_2_photo_heading
+
+      page.check person_is_minor_checkbox
+
+      expect(page).to have_content guardian_information_heading.upcase
+      expect(page).to have_content guardian_photo_heading
+      expect(page).to have_content guardian_email_field.titleize
+
+      expect(page).to have_content guardian_2_information_heading.upcase
+      expect(page).to have_content guardian_2_photo_heading
+      expect(page).to have_content guardian_2_phone_field.titleize
+
+      fill_in_release_fields name: "Apple Laptop"
+      attach_file contract_field, Rails.root.join(file_fixture("contract.pdf")), visible: false
+
+      fill_in guardian_first_name_field, with: 'Guardian'
+      fill_in guardian_last_name_field, with: 'Name'
+      fill_in guardian_phone_field, with: '001101'
+      fill_in guardian_email_field, with: 'valid@email.com'
+      attach_file guardian_photo_field, file_fixture('hemsworth.jpeg'), visible: :all
+      fill_in_guardian_address_fields
+
+      fill_in guardian_2_first_name_field, with: 'Second'
+      fill_in guardian_2_last_name_field, with: 'Guardian'
+      fill_in guardian_2_phone_field, with: '999'
+
+      click_button import_release_button
+
+      expect(page).to have_content successful_import_message
+      expect(MaterialRelease.last.guardian_first_name).to eq 'Guardian'
+      expect(MaterialRelease.last.guardian_2_first_name).to eq 'Second'
+    end
+
     scenario "updating an existing release", js: true do
       material_release = create(:material_release, :non_native, project: project)
 
@@ -190,7 +358,7 @@ feature "User managing material releases" do
       click_on "Save Changes"
 
       expect(page).to have_content("The release has been updated")
-      expect(page).to have_photo("material_photo.png")
+      expect(page).to have_photo("material_photo.png", visible: :all)
     end
 
     scenario "viewing the contract PDF" do
@@ -419,8 +587,8 @@ feature "User managing material releases" do
     "material_release[person_address_zip]"
   end
 
-  def have_photo(filename)
-    have_selector("img[src*='#{filename}']")
+  def have_photo(filename, visible: true)
+    have_selector("img[src*='#{filename}']", visible: visible)
   end
 
   def import_material_release_link(project)
@@ -542,4 +710,107 @@ feature "User managing material releases" do
   def date_issued
     t 'contracts.for_office_use_only.description_labels.date_issued'
   end
+
+  def person_is_minor_checkbox
+    'material_release_minor'
+  end
+
+  def guardian_2_first_name_field
+    t 'helpers.label.material_release.guardian_2_first_name'
+  end
+
+  def guardian_2_last_name_field
+    t 'helpers.label.material_release.guardian_2_last_name'
+  end
+
+  def guardian_2_phone_field
+    t 'helpers.label.material_release.guardian_2_phone'
+  end
+
+  def guardian_first_name_field
+    t 'helpers.label.material_release.guardian_first_name'
+  end
+
+  def guardian_last_name_field
+    t 'helpers.label.material_release.guardian_last_name'
+  end
+
+  def guardian_phone_field
+    t 'helpers.label.material_release.guardian_phone'
+  end
+
+  def guardian_email_field
+    t 'helpers.label.material_release.guardian_email'
+  end
+
+  def guardian_address_street1_field
+    t('helpers.label.material_release.guardian_address_street1')
+  end
+
+  def guardian_address_city_field
+    t('helpers.label.material_release.guardian_address_city')
+  end
+
+  def guardian_address_state_field
+    t('helpers.label.material_release.guardian_address_state')
+  end
+
+  def guardian_address_zip_field
+    t('helpers.label.material_release.guardian_address_zip')
+  end
+
+  def guardian_photo_field
+    'material_release[guardian_photo]'
+  end
+
+  def guardian_2_photo_field
+    'material_release[guardian_2_photo]'
+  end
+
+  def fill_in_guardian_address_fields
+    fill_in guardian_address_street1_field, with: "124 Test Lane"
+    fill_in guardian_address_city_field, with: "New York"
+    fill_in guardian_address_state_field, with: "NY"
+    fill_in guardian_address_zip_field, with: '1000'
+  end
+
+  def submit_release_button
+    'I have read and agree to the above'
+  end
+
+  def successful_submission_message
+    'Your release was successfully submitted. Thank you.'
+  end
+
+  def guardian_information_heading
+    t 'public.material_releases.new.guardian_info.heading'
+  end
+
+  def guardian_photo_heading
+    t 'public.material_releases.new.guardian_photo.heading'
+  end
+
+  def guardian_2_information_heading
+    t 'public.material_releases.new.guardian_2_info.heading'
+  end
+
+  def guardian_2_photo_heading
+    t 'public.material_releases.new.guardian_2_photo.heading'
+  end
+
+  def contract_field
+    'material_release[contract]'
+  end
+
+  def import_release_button
+    t 'helpers.submit.material_release.create'
+  end
+
+  def successful_import_message
+    t 'material_releases.create.notice'
+  end
+
+  def signature_field
+    'material_release_signature_base64'
+  end
 end