mirror of
https://github.com/rickbarrette/redmine_qbo.git
synced 2026-11-20 18:40:37 -05:00
Limit estimate and invoice PDFs by permission; clean up
Any logged-in user could open any estimate or invoice PDF by id. Now: - estimates: View customers or Write estimates, or an estimate attached to an issue the user can see (the issue page links to it); users without the permission don't trigger a sync of uncached estimates - invoices: View customers, Write invoices, View/Receive payments or Issue refunds, or invoices attached to issues the user can see - share-link customers are unchanged (their own issue's documents) - the sidebar's estimate search only shows to those who can use it The issue PDF merges an estimate PDF with optional content, as it already did for the issue's own PDF, instead of failing. Removed dead code: the JSON branches of CustomersController#create (Redmine refuses JSON there) and the scaffold views for qbo#authenticate, #oauth_callback and #webhook, which those actions never render. An invalid customer now shows the form with a 422. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
1 parent
17f24f9641
commit
b829593bc2
14 files changed
+174
-99
No files matched your search
@@ -47,27 +47,16 @@ class CustomersController < ApplicationController
|
||||
def create
|
||||
@customer = Customer.new(allowed_params)
|
||||
|
||||
respond_to do |format|
|
||||
if @customer.save
|
||||
log "Customer ##{@customer.id} created successfully."
|
||||
format.html { redirect_to @customer, notice: l(:notice_successful_create) }
|
||||
format.json { render json: { id: @customer.id, name: @customer.name }, status: :created }
|
||||
else
|
||||
format.html { render :new }
|
||||
format.json { render json: { errors: @customer.errors.full_messages }, status: :unprocessable_entity }
|
||||
end
|
||||
if @customer.save
|
||||
log "Customer ##{@customer.id} created successfully."
|
||||
redirect_to @customer, notice: l(:notice_successful_create)
|
||||
else
|
||||
render :new, status: :unprocessable_entity
|
||||
end
|
||||
rescue => e
|
||||
log "Failed to create customer: #{e.message}"
|
||||
respond_to do |format|
|
||||
format.html {
|
||||
flash[:error] = e.message
|
||||
redirect_to new_customer_path
|
||||
}
|
||||
format.json {
|
||||
render json: { errors: [e.message] }, status: :internal_server_error
|
||||
}
|
||||
end
|
||||
flash[:error] = e.message
|
||||
redirect_to new_customer_path
|
||||
end
|
||||
|
||||
def edit
|
||||
|
||||
@@ -10,7 +10,8 @@
|
||||
class EstimatesController < ApplicationController
|
||||
include AuthHelper
|
||||
|
||||
# PDFs: logged-in users, or a customer with a share link (limited to their issue's estimate).
|
||||
# PDFs: logged-in users with View customers or Write estimates, other logged-in users for the estimates on
|
||||
# issues they can see, and share-link customers for their issue's estimate.
|
||||
# Redmine's own login check is replaced by require_login_or_customer_token for these actions.
|
||||
skip_before_action :check_if_login_required, only: [:show, :doc]
|
||||
before_action :require_login_or_customer_token, only: [:show, :doc]
|
||||
@@ -42,6 +43,7 @@ class EstimatesController < ApplicationController
|
||||
|
||||
# Share-link customers may only open the estimate attached to their issue (checked before any sync)
|
||||
return load_customer_estimate if customer_token_only?
|
||||
return load_issue_estimate unless RedmineQboBilling.estimate_viewer?
|
||||
|
||||
@estimate = find_estimate || sync_and_find_estimate
|
||||
|
||||
@@ -65,6 +67,15 @@ class EstimatesController < ApplicationController
|
||||
@estimate = estimate
|
||||
end
|
||||
|
||||
# For logged-in users without a billing permission: only an estimate attached to an issue they can see,
|
||||
# which is always cached locally (no sync from QuickBooks)
|
||||
def load_issue_estimate
|
||||
estimate = find_estimate
|
||||
return render_403 unless estimate && estimate_pdf_allowed?(estimate)
|
||||
|
||||
@estimate = estimate
|
||||
end
|
||||
|
||||
# Attempts to find the estimate locally by ID or doc number.
|
||||
def find_estimate
|
||||
return Estimate.find_by(doc_number: params[:search]) if params[:search].present?
|
||||
|
||||
@@ -10,11 +10,13 @@
|
||||
class InvoicesController < ApplicationController
|
||||
include AuthHelper
|
||||
|
||||
# PDFs: logged-in users, or a customer with a share link (limited to their issue's invoices).
|
||||
# PDFs: logged-in users with a billing permission (RedmineQboBilling.invoice_viewer?), other logged-in users for
|
||||
# the invoices on issues they can see, and share-link customers for their issue's invoices.
|
||||
# Redmine's own login check is replaced by require_login_or_customer_token for this action.
|
||||
skip_before_action :check_if_login_required, only: :show
|
||||
before_action :require_login_or_customer_token, only: :show
|
||||
before_action :authorize_customer_invoices, only: :show
|
||||
before_action :authorize_user_invoices, only: :show
|
||||
|
||||
# Syncing is admin-only
|
||||
before_action :require_admin, only: :sync
|
||||
@@ -51,6 +53,13 @@ class InvoicesController < ApplicationController
|
||||
render_403 if invoice_ids.empty? || (invoice_ids - allowed).any?
|
||||
end
|
||||
|
||||
# Logged-in users: a billing permission, or invoices attached to issues they can see
|
||||
def authorize_user_invoices
|
||||
return true unless User.current.logged?
|
||||
|
||||
render_403 unless invoice_pdfs_allowed?(invoice_ids)
|
||||
end
|
||||
|
||||
# Logs messages with a consistent prefix for easier debugging.
|
||||
def log(msg)
|
||||
Rails.logger.info "[InvoiceController] #{msg}"
|
||||
|
||||
@@ -31,6 +31,21 @@ module AuthHelper
|
||||
require_login
|
||||
end
|
||||
|
||||
# A logged-in user may open the estimate's PDF with a billing permission (RedmineQboBilling.estimate_viewer?),
|
||||
# or when it's attached to an issue they can see (the issue page links to it)
|
||||
def estimate_pdf_allowed?(estimate)
|
||||
RedmineQboBilling.estimate_viewer? || Issue.visible.where(estimate_id: estimate.id).exists?
|
||||
end
|
||||
|
||||
# The same for invoices: every one of them must be attached to an issue the user can see
|
||||
def invoice_pdfs_allowed?(invoice_ids)
|
||||
return true if RedmineQboBilling.invoice_viewer?
|
||||
|
||||
ids = Array(invoice_ids).map(&:to_s).uniq
|
||||
visible = Invoice.joins(:issues).merge(Issue.visible).where(id: ids).distinct.pluck(:id).map(&:to_s)
|
||||
ids.any? && (ids - visible).empty?
|
||||
end
|
||||
|
||||
def global_check_permission(permission)
|
||||
if !globaly_allowed_to?(permission)
|
||||
flash[:error] = t :notice_forbidden
|
||||
|
||||
@@ -4,6 +4,7 @@
|
||||
<%= render partial: 'customers/sidebar' %>
|
||||
<% end %>
|
||||
|
||||
<%= render partial: 'estimates/sidebar' %>
|
||||
<%# Finding an estimate by number needs View customers or Write estimates %>
|
||||
<%= render partial: 'estimates/sidebar' if RedmineQboBilling.estimate_viewer? %>
|
||||
|
||||
<% end %>
|
||||
@@ -1,32 +0,0 @@
|
||||
<!--
|
||||
The MIT License (MIT)
|
||||
|
||||
Copyright (c) 2016 - 2026 rick barrette
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
|
||||
|
||||
The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
-->
|
||||
|
||||
<h2>QboController#authenticate</h2>
|
||||
<body>
|
||||
<!-- REPLACE THE BODY of the default application.html.erb with this -->
|
||||
|
||||
<% unless session[:token] %>
|
||||
<ipp:connectToIntuit></ipp:connectToIntuit>
|
||||
<% end %>
|
||||
|
||||
<% if notice %>
|
||||
<div style="padding: 10px;background: gainsboro;font-weight: 900;width: 50%;"><%= notice %></div>
|
||||
<% end %>
|
||||
|
||||
<%= yield %>
|
||||
|
||||
<script type="text/javascript" src="https://appcenter.intuit.com/Content/IA/intuit.ipp.anywhere.js"></script>
|
||||
|
||||
<script>
|
||||
intuit.ipp.anywhere.setup({menuProxy: '/path/to/blue-dot', grantUrl: '<%= authenticate_vendors_url %>'});
|
||||
</script>
|
||||
</body>
|
||||
@@ -1,13 +0,0 @@
|
||||
<!--
|
||||
The MIT License (MIT)
|
||||
|
||||
Copyright (c) 2016 - 2026 rick barrette
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
|
||||
|
||||
The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
-->
|
||||
|
||||
<h2>QboController#oauth_callback</h2>
|
||||
@@ -1,13 +0,0 @@
|
||||
<!--
|
||||
The MIT License (MIT)
|
||||
|
||||
Copyright (c) 2016 - 2026 rick barrette
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
|
||||
|
||||
The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
-->
|
||||
|
||||
<h2>QboController#webhook</h2>
|
||||
Reference in new issue
Block a user