Compare commits
2 Commits
allow-api-
...
add-main-l
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
8410eaee07 | ||
|
|
3c16effbe1 |
@@ -27,6 +27,3 @@ MUX_TOKEN_ID=
|
|||||||
MUX_TOKEN_SECRET=
|
MUX_TOKEN_SECRET=
|
||||||
MUX_BROADCAST_SERVER_URL=rtmp://global-live.mux.com:5222/app
|
MUX_BROADCAST_SERVER_URL=rtmp://global-live.mux.com:5222/app
|
||||||
MUX_TEST_MODE_DISABLED=
|
MUX_TEST_MODE_DISABLED=
|
||||||
|
|
||||||
# Required for creating user through API
|
|
||||||
CUSTOM_API_TOKEN=
|
|
||||||
@@ -1,33 +0,0 @@
|
|||||||
# 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
|
|
||||||
@@ -8,6 +8,10 @@
|
|||||||
<div class="card-body">
|
<div class="card-body">
|
||||||
<%= errors_summary_for @release %>
|
<%= errors_summary_for @release %>
|
||||||
<%= bootstrap_form_with model: @release, method: :post, url: public_send("account_project_contract_template_#{@contract_template.release_type}_release_amendments_path"), local: true do |form| %>
|
<%= bootstrap_form_with model: @release, method: :post, url: public_send("account_project_contract_template_#{@contract_template.release_type}_release_amendments_path"), local: true do |form| %>
|
||||||
|
<%= card_field_set_tag t('.signed_contract_preview') do %>
|
||||||
|
<embed class="embeded-contract-preview" type="application/pdf" src="<%= url_for([@release, :contracts, format: "pdf"]) %>" width="80%" height="1200" />
|
||||||
|
<% end %>
|
||||||
|
|
||||||
<%= card_field_set_tag t(".amendment.heading") do %>
|
<%= card_field_set_tag t(".amendment.heading") do %>
|
||||||
<p><%= @contract_template.amendment_clause %></p>
|
<p><%= @contract_template.amendment_clause %></p>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|||||||
@@ -1138,6 +1138,7 @@ en:
|
|||||||
copy_url: Copy sign amendment URL
|
copy_url: Copy sign amendment URL
|
||||||
signature:
|
signature:
|
||||||
heading: Signature
|
heading: Signature
|
||||||
|
signed_contract_preview: Signed Contract Preview
|
||||||
appearance_releases:
|
appearance_releases:
|
||||||
create:
|
create:
|
||||||
notice: Your release has been signed. Thank you!
|
notice: Your release has been signed. Thank you!
|
||||||
|
|||||||
@@ -504,6 +504,7 @@ es:
|
|||||||
copy_url: Copy sign amendment URL (ES)
|
copy_url: Copy sign amendment URL (ES)
|
||||||
signature:
|
signature:
|
||||||
heading: Signature (ES)
|
heading: Signature (ES)
|
||||||
|
signed_contract_preview: Signed Contract Preview (ES)
|
||||||
appearance_releases:
|
appearance_releases:
|
||||||
create:
|
create:
|
||||||
notice: La autorización está firmada. ¡Gracias!
|
notice: La autorización está firmada. ¡Gracias!
|
||||||
|
|||||||
@@ -158,7 +158,6 @@ Rails.application.routes.draw do
|
|||||||
scope 'v1' do
|
scope 'v1' do
|
||||||
get 'sync' => 'sync#index'
|
get 'sync' => 'sync#index'
|
||||||
post 'user_token' => 'user_token#create'
|
post 'user_token' => 'user_token#create'
|
||||||
post 'users' => 'users#create'
|
|
||||||
resource :profiles, only: [:show]
|
resource :profiles, only: [:show]
|
||||||
resources :projects, only: [:index] do
|
resources :projects, only: [:index] do
|
||||||
resources :broadcasts, only: [:index, :show, :update]
|
resources :broadcasts, only: [:index, :show, :update]
|
||||||
|
|||||||
@@ -1,78 +0,0 @@
|
|||||||
# 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
|
|
||||||
@@ -251,6 +251,9 @@ feature "User managing location releases" do
|
|||||||
new_window = window_opened_by { click_link sign_amendment_link }
|
new_window = window_opened_by { click_link sign_amendment_link }
|
||||||
within_window new_window do
|
within_window new_window do
|
||||||
expect(page).to have_content amendments_heading
|
expect(page).to have_content amendments_heading
|
||||||
|
expect(page).to have_content signed_contract_preview.upcase
|
||||||
|
|
||||||
|
expect(page).to have_selector 'embed'
|
||||||
|
|
||||||
fill_in amendment_signer_name_field, with: 'Big Signer'
|
fill_in amendment_signer_name_field, with: 'Big Signer'
|
||||||
draw_signature file_fixture("signature.png"), amendment_signature_field
|
draw_signature file_fixture("signature.png"), amendment_signature_field
|
||||||
@@ -690,6 +693,10 @@ feature "User managing location releases" do
|
|||||||
t 'public.amendments.new.amendment.heading'
|
t 'public.amendments.new.amendment.heading'
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def signed_contract_preview
|
||||||
|
t 'public.amendments.new.signed_contract_preview'
|
||||||
|
end
|
||||||
|
|
||||||
def amendment_signer_name_field
|
def amendment_signer_name_field
|
||||||
'location_release[amendment_signer_name]'
|
'location_release[amendment_signer_name]'
|
||||||
end
|
end
|
||||||
|
|||||||
Reference in New Issue
Block a user