= ? AND end_at <= ?', start_date, end_date)
- @availabilities = @availabilities.where.not(available_type: 'event') unless Rails.application.secrets.events_in_calendar
+ @availabilities = @availabilities.where.not(available_type: 'event') unless Setting.get('events_in_calendar')
- @availabilities = @availabilities.where.not(available_type: 'space') if fablab_spaces_deactivated?
+ @availabilities = @availabilities.where.not(available_type: 'space') unless Setting.get('spaces_module')
end
def public
@@ -193,7 +191,7 @@ class API::AvailabilitiesController < API::ApiController
end
def define_max_visibility
- @visi_max_year = Setting.find_by(name: 'visibility_yearly').value.to_i.months.since
- @visi_max_other = Setting.find_by(name: 'visibility_others').value.to_i.months.since
+ @visi_max_year = Setting.get('visibility_yearly').to_i.months.since
+ @visi_max_other = Setting.get('visibility_others').to_i.months.since
end
end
diff --git a/app/controllers/api/files_controller.rb b/app/controllers/api/files_controller.rb
new file mode 100644
index 000000000..70c274146
--- /dev/null
+++ b/app/controllers/api/files_controller.rb
@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+# API Controller for handling special actions on files
+class API::FilesController < API::ApiController
+ before_action :authenticate_user!
+
+ # test the mime type of the uploaded file
+ def mime
+ authorize :file
+
+ content_type = Marcel::MimeType.for Pathname.new(file_params.path)
+ render json: { type: content_type }
+ end
+
+ private
+
+ def file_params
+ params.require(:attachment)
+ end
+end
diff --git a/app/controllers/api/machines_controller.rb b/app/controllers/api/machines_controller.rb
index edcb6fb1e..c2c50a58d 100644
--- a/app/controllers/api/machines_controller.rb
+++ b/app/controllers/api/machines_controller.rb
@@ -7,7 +7,7 @@ class API::MachinesController < API::ApiController
respond_to :json
def index
- sort_by = Setting.find_by(name: 'machines_sort_by').value || 'default'
+ sort_by = Setting.get('machines_sort_by') || 'default'
@machines = if sort_by == 'default'
Machine.includes(:machine_image, :plans)
else
diff --git a/app/controllers/api/members_controller.rb b/app/controllers/api/members_controller.rb
index a8a25a3e5..7bdd65947 100644
--- a/app/controllers/api/members_controller.rb
+++ b/app/controllers/api/members_controller.rb
@@ -56,7 +56,7 @@ class API::MembersController < API::ApiController
if members_service.update(user_params)
# Update password without logging out
- sign_in(@member, bypass: true) unless current_user.id != params[:id].to_i
+ bypass_sign_in(@member) unless current_user.id != params[:id].to_i
render :show, status: :ok, location: member_path(@member)
else
render json: @member.errors, status: :unprocessable_entity
@@ -192,7 +192,7 @@ class API::MembersController < API::ApiController
def complete_tour
authorize @member
- if Rails.application.secrets.feature_tour_display == 'session'
+ if Setting.get('feature_tour_display') == 'session'
render json: { tours: [params[:tour]] }
else
tours = "#{@member.profile.tours} #{params[:tour]}"
diff --git a/app/controllers/api/openlab_projects_controller.rb b/app/controllers/api/openlab_projects_controller.rb
index 7d36f0fea..d117725c6 100644
--- a/app/controllers/api/openlab_projects_controller.rb
+++ b/app/controllers/api/openlab_projects_controller.rb
@@ -3,11 +3,18 @@
# API Controller for resources of type Openlab::Projects
# Openlab::Projects are Projects shared between different instances
class API::OpenlabProjectsController < API::ApiController
- PROJECTS = Openlab::Projects.new
+ before_action :init_openlab
def index
- render json: PROJECTS.search(params[:q], page: params[:page], per_page: params[:per_page]).response.body
+ render json: @projets.search(params[:q], page: params[:page], per_page: params[:per_page]).response.body
rescue StandardError
render json: { errors: ['service unavailable'] }
end
+
+ private
+
+ def init_openlab
+ client = Openlab::Client.new(app_secret: Setting.get('openlab_app_secret'))
+ @projets = Openlab::Projects.new(client)
+ end
end
diff --git a/app/controllers/api/payments_controller.rb b/app/controllers/api/payments_controller.rb
index 11b4a7582..3c5353efe 100644
--- a/app/controllers/api/payments_controller.rb
+++ b/app/controllers/api/payments_controller.rb
@@ -10,7 +10,7 @@ class API::PaymentsController < API::ApiController
# was successfully made. After the payment was made, the reservation/subscription will be created
##
def confirm_payment
- render(json: { error: 'Online payment is disabled' }, status: :unauthorized) and return if Rails.application.secrets.fablab_without_online_payments
+ render(json: { error: 'Online payment is disabled' }, status: :unauthorized) and return unless Setting.get('online_payment_module')
amount = nil # will contains the amount and the details of each invoice lines
intent = nil # stripe's payment intent
@@ -24,15 +24,17 @@ class API::PaymentsController < API::ApiController
# Create the PaymentIntent
intent = Stripe::PaymentIntent.create(
- payment_method: params[:payment_method_id],
- amount: amount[:amount],
- currency: Rails.application.secrets.stripe_currency,
- confirmation_method: 'manual',
- confirm: true,
- customer: current_user.stp_customer_id
+ {
+ payment_method: params[:payment_method_id],
+ amount: amount[:amount],
+ currency: Setting.get('stripe_currency'),
+ confirmation_method: 'manual',
+ confirm: true,
+ customer: current_user.stp_customer_id
+ }, { api_key: Setting.get('stripe_secret_key') }
)
elsif params[:payment_intent_id].present?
- intent = Stripe::PaymentIntent.confirm(params[:payment_intent_id])
+ intent = Stripe::PaymentIntent.confirm(params[:payment_intent_id], api_key: Setting.get('stripe_secret_key'))
end
rescue Stripe::CardError => e
# Display error on client
@@ -54,6 +56,16 @@ class API::PaymentsController < API::ApiController
render generate_payment_response(intent, res)
end
+ def online_payment_status
+ authorize :payment
+
+ key = Setting.get('stripe_secret_key')
+ render json: { status: false } and return unless key
+
+ charges = Stripe::Charge.list({ limit: 1 }, { api_key: key })
+ render json: { status: charges.data.length.positive? }
+ end
+
private
def on_reservation_success(intent, details)
@@ -62,7 +74,8 @@ class API::PaymentsController < API::ApiController
.pay_and_save(@reservation, payment_details: details, payment_intent_id: intent.id)
Stripe::PaymentIntent.update(
intent.id,
- description: "Invoice reference: #{@reservation.invoice.reference}"
+ { description: "Invoice reference: #{@reservation.invoice.reference}" },
+ { api_key: Setting.get('stripe_secret_key') }
)
if is_reserve
@@ -81,7 +94,8 @@ class API::PaymentsController < API::ApiController
Stripe::PaymentIntent.update(
intent.id,
- description: "Invoice reference: #{@subscription.invoices.first.reference}"
+ { description: "Invoice reference: #{@subscription.invoices.first.reference}" },
+ { api_key: Setting.get('stripe_secret_key') }
)
if is_subscribe
diff --git a/app/controllers/api/projects_controller.rb b/app/controllers/api/projects_controller.rb
index adf27a948..b83f44154 100644
--- a/app/controllers/api/projects_controller.rb
+++ b/app/controllers/api/projects_controller.rb
@@ -60,10 +60,6 @@ class API::ProjectsController < API::ApiController
render :index
end
- def allowed_extensions
- render json: ENV['ALLOWED_EXTENSIONS'].split(' '), status: :ok
- end
-
private
def set_project
diff --git a/app/controllers/api/settings_controller.rb b/app/controllers/api/settings_controller.rb
index 5b1604157..0ce7598f1 100644
--- a/app/controllers/api/settings_controller.rb
+++ b/app/controllers/api/settings_controller.rb
@@ -5,16 +5,17 @@ class API::SettingsController < API::ApiController
before_action :authenticate_user!, only: %i[update bulk_update reset]
def index
- @settings = Setting.where(name: names_as_string_to_array)
+ @settings = policy_scope(Setting.where(name: names_as_string_to_array))
end
def update
authorize Setting
@setting = Setting.find_or_initialize_by(name: params[:name])
render status: :not_modified and return if setting_params[:value] == @setting.value
+ render status: :locked, json: { error: 'locked setting' } and return unless SettingService.before_update(@setting)
if @setting.save && @setting.history_values.create(value: setting_params[:value], invoicing_profile: current_user.invoicing_profile)
- SettingService.new.after_update(@setting)
+ SettingService.after_update(@setting)
render status: :ok
else
render json: @setting.errors.full_messages, status: :unprocessable_entity
@@ -29,26 +30,40 @@ class API::SettingsController < API::ApiController
next if !setting[:name] || !setting[:value]
db_setting = Setting.find_or_initialize_by(name: setting[:name])
+ next unless SettingService.before_update(db_setting)
+
db_setting.save && db_setting.history_values.create(value: setting[:value], invoicing_profile: current_user.invoicing_profile)
+ SettingService.after_update(db_setting)
@settings.push db_setting
end
end
def show
+ authorize SettingContext.new(params[:name])
+
@setting = Setting.find_or_create_by(name: params[:name])
@show_history = params[:history] == 'true' && current_user.admin?
end
+ def test_present
+ authorize SettingContext.new(params[:name])
+
+ @setting = Setting.get(params[:name])
+ end
+
def reset
authorize Setting
setting = Setting.find_or_create_by(name: params[:name])
+ render status: :locked, json: { error: 'locked setting' } and return unless SettingService.before_update(setting)
+
first_val = setting.history_values.order(created_at: :asc).limit(1).first
new_val = HistoryValue.create!(
setting_id: setting.id,
value: first_val.value,
invoicing_profile_id: current_user.invoicing_profile.id
)
+ SettingService.after_update(setting)
render json: new_val, status: :ok
end
diff --git a/app/controllers/api/slots_controller.rb b/app/controllers/api/slots_controller.rb
index f3d4a52ea..e901efb2a 100644
--- a/app/controllers/api/slots_controller.rb
+++ b/app/controllers/api/slots_controller.rb
@@ -2,7 +2,7 @@
# API Controller for resources of type Slot
# Slots are used to cut Availabilities into reservable slots. The duration of these slots is configured per
-# availability by Availability.slot_duration, or otherwise globally by ApplicationHelper::SLOT_DURATION minutes
+# availability by Availability.slot_duration, or otherwise globally by Setting.get('slot_duration')
class API::SlotsController < API::ApiController
before_action :authenticate_user!
before_action :set_slot, only: %i[update cancel]
diff --git a/app/controllers/api/version_controller.rb b/app/controllers/api/version_controller.rb
index 41a616fe3..9c44c7c9c 100644
--- a/app/controllers/api/version_controller.rb
+++ b/app/controllers/api/version_controller.rb
@@ -15,7 +15,7 @@ class API::VersionController < API::ApiController
origin.save!
end
# get the last version
- update_status = Setting.find_by(name: 'hub_last_version')&.value || '{}'
+ update_status = Setting.get('hub_last_version') || '{}'
json = JSON.parse(update_status)
json['current'] = Version.current
diff --git a/app/controllers/api/wallet_controller.rb b/app/controllers/api/wallet_controller.rb
index 5842ece51..75e450e55 100644
--- a/app/controllers/api/wallet_controller.rb
+++ b/app/controllers/api/wallet_controller.rb
@@ -18,7 +18,7 @@ class API::WalletController < API::ApiController
end
def credit
- return head 422 if Rails.application.secrets.fablab_without_wallet == 'true'
+ return head 422 unless Setting.get('wallet_module')
@wallet = Wallet.find(credit_params[:id])
authorize @wallet
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 1beb5c21e..181777e43 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -50,7 +50,10 @@ class ApplicationController < ActionController::Base
end
def default_url_options
- { host: Rails.application.secrets.default_host, protocol: Rails.application.secrets.default_protocol }
+ {
+ host: Rails.application.secrets.default_host,
+ protocol: Rails.application.secrets.default_protocol
+ }
end
def permission_denied
diff --git a/app/controllers/concerns/.keep b/app/controllers/concerns/.keep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/app/controllers/concerns/fablab_configuration.rb b/app/controllers/concerns/fablab_configuration.rb
deleted file mode 100644
index 6a647b6cd..000000000
--- a/app/controllers/concerns/fablab_configuration.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-module FablabConfiguration
- def fablab_plans_deactivated?
- Rails.application.secrets.fablab_without_plans
- end
-
- def fablab_spaces_deactivated?
- Rails.application.secrets.fablab_without_spaces
- end
-end
diff --git a/app/controllers/health_controller.rb b/app/controllers/health_controller.rb
index e3de9c028..004566f98 100644
--- a/app/controllers/health_controller.rb
+++ b/app/controllers/health_controller.rb
@@ -20,7 +20,8 @@ class HealthController < ActionController::Base
version: Version.up_to_date?
},
stats: HealthService.stats,
- tagline: 'The platform to manage your fablab or your coworking space.'
+ tagline: 'The platform to manage your fablab or your coworking space.',
+ url: 'https://www.fab-manager.com'
}
end
end
diff --git a/app/controllers/rss/events_controller.rb b/app/controllers/rss/events_controller.rb
index 63ea6a657..0986c490c 100644
--- a/app/controllers/rss/events_controller.rb
+++ b/app/controllers/rss/events_controller.rb
@@ -7,6 +7,6 @@ class Rss::EventsController < Rss::RssController
@events = Event.includes(:event_image, :event_files, :availability, :category)
.where('availabilities.start_at >= ?', DateTime.current)
.order('availabilities.start_at ASC').references(:availabilities).limit(10)
- @fab_name = Setting.find_by(name: 'fablab_name').value
+ @fab_name = Setting.get('fablab_name')
end
end
diff --git a/app/controllers/rss/projects_controller.rb b/app/controllers/rss/projects_controller.rb
index 75a9736ea..88603e70c 100644
--- a/app/controllers/rss/projects_controller.rb
+++ b/app/controllers/rss/projects_controller.rb
@@ -2,6 +2,6 @@ class Rss::ProjectsController < Rss::RssController
def index
@projects = Project.includes(:project_image, :users).published.order('created_at desc').limit(10)
- @fab_name = Setting.find_by(name: 'fablab_name').value
+ @fab_name = Setting.get('fablab_name')
end
end
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 4513e0d63..7f28ad931 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -4,9 +4,6 @@
module ApplicationHelper
require 'message_format'
- ## machine/spaces availabilities are divided in multiple slots of 60 minutes
- SLOT_DURATION ||= Rails.application.secrets.slot_duration || 60
-
##
# Verify if the provided attribute is in the provided attributes array, whatever it exists or not
# @param attributes {Array|nil}
@@ -16,7 +13,7 @@ module ApplicationHelper
attributes.try(:include?, attribute)
end
- def bootstrap_class_for flash_type
+ def bootstrap_class_for(flash_type)
{ flash: 'alert-success', alert: 'alert-danger', notice: 'alert-info' }[flash_type.to_sym] || flash_type.to_s
end
@@ -60,6 +57,10 @@ module ApplicationHelper
bool ? :true : :false # rubocop:disable Lint/BooleanSymbol
end
+ def str_to_bool(str, default = 'true')
+ str.to_s.casecmp(default).zero?
+ end
+
def amount_to_f(amount)
amount / 100.00
end
diff --git a/app/mailers/base_mailer.rb b/app/mailers/base_mailer.rb
index 353ba556c..7f6714930 100644
--- a/app/mailers/base_mailer.rb
+++ b/app/mailers/base_mailer.rb
@@ -2,7 +2,7 @@
# Mailer configuration
class BaseMailer < ActionMailer::Base
- default from: ENV['DEFAULT_MAIL_FROM']
+ default from: ->(*) { Setting.get('email_from') }
layout 'notifications_mailer'
helper :application
diff --git a/app/mailers/notifications_mailer.rb b/app/mailers/notifications_mailer.rb
index 8ec5f7a89..837a91395 100644
--- a/app/mailers/notifications_mailer.rb
+++ b/app/mailers/notifications_mailer.rb
@@ -2,7 +2,7 @@
# Handle most of the emails sent by the platform. Triggered by notifications
class NotificationsMailer < NotifyWith::NotificationsMailer
- default from: ENV['DEFAULT_MAIL_FROM']
+ default from: ->(*) { Setting.get('email_from') }
layout 'notifications_mailer'
helper :application
diff --git a/app/mailers/overwritten_devise_mailer.rb b/app/mailers/overwritten_devise_mailer.rb
new file mode 100644
index 000000000..f9ed4c8c7
--- /dev/null
+++ b/app/mailers/overwritten_devise_mailer.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+# Override the default Devise settings for emails notifications
+class OverwrittenDeviseMailer < Devise::Mailer
+ helper :application
+ include Devise::Controllers::UrlHelpers
+ default template_path: 'devise/mailer'
+ default from: ->(*) { Setting.get('email_from') }
+end
diff --git a/app/models/availability.rb b/app/models/availability.rb
index 6cc51bfe3..06b077a38 100644
--- a/app/models/availability.rb
+++ b/app/models/availability.rb
@@ -89,7 +89,7 @@ class Availability < ApplicationRecord
def available_space_places
return unless available_type == 'space'
- duration = slot_duration || ApplicationHelper::SLOT_DURATION
+ duration = slot_duration || Setting.get('slot_duration').to_i
((end_at - start_at) / duration.minutes).to_i * nb_total_places
end
@@ -162,7 +162,7 @@ class Availability < ApplicationRecord
def length_must_be_slot_multiple
return unless available_type == 'machines' || available_type == 'space'
- duration = slot_duration || ApplicationHelper::SLOT_DURATION
+ duration = slot_duration || Setting.get('slot_duration').to_i
return unless end_at < (start_at + duration.minutes)
errors.add(:end_at, I18n.t('availabilities.length_must_be_slot_multiple', MIN: duration))
diff --git a/app/models/import.rb b/app/models/import.rb
index e70297926..a0cf83923 100644
--- a/app/models/import.rb
+++ b/app/models/import.rb
@@ -10,7 +10,6 @@ class Import < ApplicationRecord
belongs_to :user
validates :attachment, file_size: { maximum: Rails.application.secrets.max_import_size&.to_i || 5.megabytes.to_i }
- validates :attachment, file_mime_type: { content_type: %w[text/csv text/comma-separated-values application/vnd.ms-excel] }
after_commit :proceed_import, on: [:create]
diff --git a/app/models/invoice.rb b/app/models/invoice.rb
index 732393c5e..49374aa77 100644
--- a/app/models/invoice.rb
+++ b/app/models/invoice.rb
@@ -40,7 +40,13 @@ class Invoice < ApplicationRecord
end
def filename
- "#{ENV['INVOICE_PREFIX']}-#{id}_#{created_at.strftime('%d%m%Y')}.pdf"
+ prefix = Setting.find_by(name: 'invoice_prefix').history_values.order(created_at: :desc).where('created_at <= ?', created_at).limit(1).first
+ prefix ||= if created_at < Setting.find_by(name: 'invoice_prefix').history_values.order(created_at: :asc).limit(1).first.created_at
+ Setting.find_by(name: 'invoice_prefix').history_values.order(created_at: :asc).limit(1).first
+ else
+ Setting.find_by(name: 'invoice_prefix')..history_values.order(created_at: :desc).limit(1).first
+ end
+ "#{prefix.value}-#{id}_#{created_at.strftime('%d%m%Y')}.pdf"
end
def user
@@ -188,7 +194,7 @@ class Invoice < ApplicationRecord
private
def generate_and_send_invoice
- return if Rails.application.secrets.fablab_without_invoices == 'true'
+ return unless Setting.get('invoicing_module')
unless Rails.env.test?
puts "Creating an InvoiceWorker job to generate the following invoice: id(#{id}), invoiced_id(#{invoiced_id}), " \
diff --git a/app/models/notification_type.rb b/app/models/notification_type.rb
index ba6a20ba6..619c51a47 100644
--- a/app/models/notification_type.rb
+++ b/app/models/notification_type.rb
@@ -53,6 +53,7 @@ class NotificationType
notify_admin_refund_created
notify_admins_role_update
notify_user_role_update
+ notify_admin_members_stripe_sync
]
# deprecated:
# - notify_member_subscribed_plan_is_changed
diff --git a/app/models/open_api/calls_count_tracing.rb b/app/models/open_api/calls_count_tracing.rb
index 4b6a3a79b..c54338a12 100644
--- a/app/models/open_api/calls_count_tracing.rb
+++ b/app/models/open_api/calls_count_tracing.rb
@@ -1,4 +1,4 @@
class OpenAPI::CallsCountTracing < ApplicationRecord
- belongs_to :client, foreign_key: :open_api_client_id
- validates :client, :at, presence: true
+ belongs_to :projets, foreign_key: :open_api_client_id
+ validates :projets, :at, presence: true
end
diff --git a/app/models/open_api/client.rb b/app/models/open_api/client.rb
index 2dc2bf231..a9815eaf7 100644
--- a/app/models/open_api/client.rb
+++ b/app/models/open_api/client.rb
@@ -1,9 +1,29 @@
+# frozen_string_literal: true
+
+# OpenAPI::Client keeps track of the authorized accesses to the 3-rd party API (aka. OpenAPI)
class OpenAPI::Client < ApplicationRecord
has_many :calls_count_tracings, foreign_key: :open_api_client_id, dependent: :destroy
- has_secure_token
+
validates :name, presence: true
+ validates_uniqueness_of :token
+
+ before_create :set_initial_token
def increment_calls_count
update_column(:calls_count, calls_count+1)
end
+
+ def regenerate_token
+ update_attributes(token: generate_unique_secure_token)
+ end
+
+ private
+
+ def set_initial_token
+ self.token = generate_unique_secure_token
+ end
+
+ def generate_unique_secure_token
+ SecureRandom.base58(24)
+ end
end
diff --git a/app/models/profile.rb b/app/models/profile.rb
index bea552509..e09cb8278 100644
--- a/app/models/profile.rb
+++ b/app/models/profile.rb
@@ -10,7 +10,7 @@ class Profile < ApplicationRecord
validates :first_name, presence: true, length: { maximum: 30 }
validates :last_name, presence: true, length: { maximum: 30 }
- validates_numericality_of :phone, only_integer: true, allow_blank: false, if: -> { Rails.application.secrets.phone_required }
+ validates_numericality_of :phone, only_integer: true, allow_blank: false, if: -> { Setting.get('phone_required') }
after_commit :update_invoicing_profile, if: :invoicing_data_was_modified?, on: [:update]
diff --git a/app/models/project/openlab_sync.rb b/app/models/project/openlab_sync.rb
index 3dffcde7b..66ee04370 100644
--- a/app/models/project/openlab_sync.rb
+++ b/app/models/project/openlab_sync.rb
@@ -59,7 +59,7 @@ module Project::OpenlabSync
class_methods do
def openlab_sync_active?
- Rails.application.secrets.openlab_app_secret.present?
+ Setting.get('openlab_app_secret').present?
end
end
end
diff --git a/app/models/project_cao.rb b/app/models/project_cao.rb
index 0878d3d77..e558648f5 100644
--- a/app/models/project_cao.rb
+++ b/app/models/project_cao.rb
@@ -5,5 +5,4 @@ class ProjectCao < Asset
mount_uploader :attachment, ProjectCaoUploader
validates :attachment, file_size: { maximum: Rails.application.secrets.max_cao_size&.to_i || 5.megabytes.to_i }
- validates :attachment, file_mime_type: { content_type: ENV['ALLOWED_MIME_TYPES'].split(' ') }
end
diff --git a/app/models/project_image.rb b/app/models/project_image.rb
index f9d548e2c..c0d4873d5 100644
--- a/app/models/project_image.rb
+++ b/app/models/project_image.rb
@@ -4,6 +4,4 @@
class ProjectImage < Asset
include ImageValidatorConcern
mount_uploader :attachment, ProjectImageUploader
-
- validates :attachment, file_mime_type: { content_type: /image/ }
end
diff --git a/app/models/project_step_image.rb b/app/models/project_step_image.rb
index 871708c13..d2b7832bf 100644
--- a/app/models/project_step_image.rb
+++ b/app/models/project_step_image.rb
@@ -4,6 +4,4 @@
class ProjectStepImage < Asset
include ImageValidatorConcern
mount_uploader :attachment, ProjectImageUploader
-
- validates :attachment, file_mime_type: { content_type: /image/ }
end
diff --git a/app/models/reservation.rb b/app/models/reservation.rb
index bbf9c7bcf..eec8cf95a 100644
--- a/app/models/reservation.rb
+++ b/app/models/reservation.rb
@@ -112,7 +112,10 @@ class Reservation < ApplicationRecord
end
def clean_pending_strip_invoice_items
- pending_invoice_items = Stripe::InvoiceItem.list(customer: user.stp_customer_id, limit: 100).data.select { |ii| ii.invoice.nil? }
+ pending_invoice_items = Stripe::InvoiceItem.list(
+ { customer: user.stp_customer_id, limit: 100 },
+ { api_key: Setting.get('stripe_secret_key') }
+ ).data.select { |ii| ii.invoice.nil? }
pending_invoice_items.each(&:delete)
end
diff --git a/app/models/setting.rb b/app/models/setting.rb
index 7327f4451..4496fc4ff 100644
--- a/app/models/setting.rb
+++ b/app/models/setting.rb
@@ -6,6 +6,8 @@
# after_update callback is handled by SettingService
class Setting < ApplicationRecord
has_many :history_values
+ # The following list contains all the settings that can be customized from the Fab-manager's UI.
+ # A few of them that are system settings, that should not be updated manually (uuid, origin).
validates :name, inclusion:
{ in: %w[about_title
about_body
@@ -75,7 +77,36 @@ class Setting < ApplicationRecord
home_content
home_css
origin
- uuid] }
+ uuid
+ phone_required
+ tracking_id
+ book_overlapping_slots
+ slot_duration
+ events_in_calendar
+ spaces_module
+ plans_module
+ invoicing_module
+ facebook_app_id
+ twitter_analytics
+ recaptcha_site_key
+ recaptcha_secret_key
+ feature_tour_display
+ email_from
+ disqus_shortname
+ allowed_cad_extensions
+ allowed_cad_mime_types
+ openlab_app_id
+ openlab_app_secret
+ openlab_default
+ online_payment_module
+ stripe_public_key
+ stripe_secret_key
+ stripe_currency
+ invoice_prefix
+ confirmation_required
+ wallet_module] }
+ # WARNING: when adding a new key, you may also want to add it in app/policies/setting_policy.rb#public_whitelist
+
def value
last_value = history_values.order(HistoryValue.arel_table['created_at'].desc).first
last_value&.value
@@ -90,4 +121,30 @@ class Setting < ApplicationRecord
admin = User.admins.first
save && history_values.create(invoicing_profile: admin.invoicing_profile, value: val)
end
+
+ ##
+ # Return the value of the requested setting, if any.
+ # Usage: Setting.get('my_setting')
+ # @return {String}
+ ##
+ def self.get(name)
+ res = find_by(name: name)&.value
+
+ # handle boolean values
+ return true if res == 'true'
+ return false if res == 'false'
+
+ res
+ end
+
+ ##
+ # Create or update the provided setting with the given value
+ # Usage: Setting.set('my_setting', true)
+ # Optionally (but recommended when possible), the user updating the value can be provided as the third parameter
+ # Eg.: Setting.set('my_setting', true, User.find_by(slug: 'admin'))
+ ##
+ def self.set(name, value, user = User.admins.first)
+ setting = find_or_initialize_by(name: name)
+ setting.save && setting.history_values.create(invoicing_profile: user.invoicing_profile, value: value.to_s)
+ end
end
diff --git a/app/models/slot.rb b/app/models/slot.rb
index 9341d52ea..3af13f833 100644
--- a/app/models/slot.rb
+++ b/app/models/slot.rb
@@ -1,7 +1,7 @@
# frozen_string_literal: true
# Time range, slicing an Availability.
-# Its duration is defined by globally by ApplicationHelper::SLOT_DURATION but can be overridden per availability
+# Its duration is defined by globally by Setting.get('slot_duration') but can be overridden per availability
# During a slot a Reservation is possible
# Only reserved slots are persisted in DB, others are instantiated on the fly
class Slot < ApplicationRecord
diff --git a/app/models/stylesheet.rb b/app/models/stylesheet.rb
index 6f9f9ecf2..3e634ad4a 100644
--- a/app/models/stylesheet.rb
+++ b/app/models/stylesheet.rb
@@ -34,11 +34,11 @@ class Stylesheet < ApplicationRecord
end
def self.primary
- Setting.find_by(name: 'main_color')&.value
+ Setting.get('main_color')
end
def self.secondary
- Setting.find_by(name: 'secondary_color')&.value
+ Setting.get('secondary_color')
end
def self.primary_light
@@ -124,7 +124,7 @@ class Stylesheet < ApplicationRecord
## ===== HOME PAGE =====
def self.home_style
- style = Setting.find_by(name: 'home_css')&.value
+ style = Setting.get('home_css')
".home-page { #{style} }"
end
diff --git a/app/models/user.rb b/app/models/user.rb
index 9be269857..23372aa39 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -178,7 +178,7 @@ class User < ApplicationRecord
end
def stripe_customer
- Stripe::Customer.retrieve stp_customer_id
+ Stripe::Customer.retrieve(stp_customer_id, api_key: Setting.get('stripe_secret_key'))
end
def active_for_authentication?
@@ -203,7 +203,7 @@ class User < ApplicationRecord
def need_completion?
statistic_profile.gender.nil? || profile.first_name.blank? || profile.last_name.blank? || username.blank? ||
email.blank? || encrypted_password.blank? || group_id.nil? || statistic_profile.birthday.blank? ||
- (Rails.application.secrets.phone_required && profile.phone.blank?)
+ (Setting.get('phone_required') && profile.phone.blank?)
end
## Retrieve the requested data in the User and user's Profile tables
@@ -319,6 +319,16 @@ class User < ApplicationRecord
.delete_if { |col| blacklist.include?(col[0]) }
end
+ # will update the statistic_profile after a group switch or a role update
+ def update_statistic_profile
+ raise NoProfileError if statistic_profile.nil? || statistic_profile.id.nil?
+
+ statistic_profile.update_attributes(
+ group_id: group_id,
+ role_id: roles.first.id
+ )
+ end
+
protected
# remove projects drafts that are not linked to another user
@@ -331,7 +341,7 @@ class User < ApplicationRecord
end
def confirmation_required?
- Rails.application.secrets.user_confirmation_needed_to_sign_in ? super : false
+ Setting.get('confirmation_required') ? super : false
end
private
@@ -430,13 +440,4 @@ class User < ApplicationRecord
email: email
)
end
-
- # will update the statistic_profile after a group switch. Updating the role is not supported
- def update_statistic_profile
- raise NoProfileError if statistic_profile.nil?
-
- statistic_profile.update_attributes(
- group_id: group_id
- )
- end
end
diff --git a/app/pdfs/pdf/invoice.rb b/app/pdfs/pdf/invoice.rb
index 5d0f8a5cc..b559cc293 100644
--- a/app/pdfs/pdf/invoice.rb
+++ b/app/pdfs/pdf/invoice.rb
@@ -41,8 +41,8 @@ class PDF::Invoice < Prawn::Document
else
text I18n.t('invoices.invoice_reference', REF: invoice.reference), leading: 3
end
- if Setting.find_by(name: 'invoice_code-active').value == 'true'
- text I18n.t('invoices.code', CODE: Setting.find_by(name: 'invoice_code-value').value), leading: 3
+ if Setting.get('invoice_code-active')
+ text I18n.t('invoices.code', CODE: Setting.get('invoice_code-value')), leading: 3
end
if invoice.invoiced_type != WalletTransaction.name
if invoice.is_a?(Avoir)
@@ -251,7 +251,7 @@ class PDF::Invoice < Prawn::Document
row(0).font_style = :bold
column(1).style align: :right
- if Setting.find_by(name: 'invoice_VAT-active').value == 'true'
+ if Setting.get('invoice_VAT-active')
# Total incl. taxes
row(-1).style align: :right
row(-1).background_color = 'E4E4E4'
@@ -332,7 +332,7 @@ class PDF::Invoice < Prawn::Document
# important information
move_down 40
- txt = parse_html(Setting.find_by(name: 'invoice_text').value)
+ txt = parse_html(Setting.get('invoice_text'))
txt.each_line do |line|
text line, style: :bold, inline_format: true
end
@@ -340,7 +340,7 @@ class PDF::Invoice < Prawn::Document
# address and legals information
move_down 40
- txt = parse_html(Setting.find_by(name: 'invoice_legals').value)
+ txt = parse_html(Setting.get('invoice_legals'))
txt.each_line do |line|
text line, align: :right, leading: 4, inline_format: true
end
diff --git a/app/policies/file_policy.rb b/app/policies/file_policy.rb
new file mode 100644
index 000000000..84ae0c2a3
--- /dev/null
+++ b/app/policies/file_policy.rb
@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+# Check the access policies for API::FilesController
+class FilePolicy < ApplicationPolicy
+ def mime?
+ user.admin?
+ end
+end
diff --git a/app/policies/payment_policy.rb b/app/policies/payment_policy.rb
new file mode 100644
index 000000000..43bceab32
--- /dev/null
+++ b/app/policies/payment_policy.rb
@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+# Check the access policies for API::PaymentsController
+class PaymentPolicy < ApplicationPolicy
+ def online_payment_status?
+ user.admin? || user.manager?
+ end
+end
diff --git a/app/policies/setting_context.rb b/app/policies/setting_context.rb
new file mode 100644
index 000000000..8b183f253
--- /dev/null
+++ b/app/policies/setting_context.rb
@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+# Pundit Additional context to authorize getting a parameter
+class SettingContext
+ attr_reader :name
+
+ def initialize(name)
+ @name = name
+ end
+
+ def policy_class
+ SettingPolicy
+ end
+end
diff --git a/app/policies/setting_policy.rb b/app/policies/setting_policy.rb
index a2c47fc45..a59466210 100644
--- a/app/policies/setting_policy.rb
+++ b/app/policies/setting_policy.rb
@@ -2,9 +2,51 @@
# Check the access policies for API::SettingsController
class SettingPolicy < ApplicationPolicy
+ # Defines the scope of the settings index, depending on the role of the current user
+ class Scope < Scope
+ def resolve
+ if user.nil? || (user && !user.admin?)
+ scope.where.not(name: SettingPolicy.public_blacklist)
+ else
+ scope
+ end
+ end
+ end
+
%w[update bulk_update reset].each do |action|
define_method "#{action}?" do
user.admin?
end
end
+
+ def show?
+ user&.admin? || SettingPolicy.public_whitelist.include?(record.name)
+ end
+
+ def test_present?
+ user&.admin? || SettingPolicy.public_whitelist.concat(%w[openlab_app_secret stripe_secret_key]).include?(record.name)
+ end
+
+ ##
+ # Every settings that anyone can read. The other settings are restricted for admins.
+ # This list must be manually updated if a new setting should be world-readable
+ ##
+ def self.public_whitelist
+ %w[about_title about_body about_contacts privacy_body privacy_dpo twitter_name home_blogpost machine_explications_alert
+ training_explications_alert training_information_message subscription_explications_alert booking_window_start
+ booking_window_end booking_slot_duration booking_move_enable booking_move_delay booking_cancel_enable booking_cancel_delay
+ fablab_name name_genre event_explications_alert space_explications_alert link_name home_content phone_required
+ tracking_id book_overlapping_slots slot_duration events_in_calendar spaces_module plans_module invoicing_module
+ recaptcha_site_key feature_tour_display disqus_shortname allowed_cad_extensions openlab_app_id openlab_default
+ online_payment_module stripe_public_key confirmation_required]
+ end
+
+ ##
+ # Every settings that only admins can read.
+ # This blacklist is automatically generated from the public_whitelist above.
+ ##
+ def self.public_blacklist
+ Setting.validators.detect { |v| v.class == ActiveModel::Validations::InclusionValidator && v.attributes.include?(:name) }
+ .options[:in] - SettingPolicy.public_whitelist
+ end
end
diff --git a/app/policies/slot_policy.rb b/app/policies/slot_policy.rb
index a7240c230..315ec317b 100644
--- a/app/policies/slot_policy.rb
+++ b/app/policies/slot_policy.rb
@@ -4,8 +4,8 @@
class SlotPolicy < ApplicationPolicy
def update?
# check that the update is allowed and the prevention delay has not expired
- delay = Setting.find_by(name: 'booking_move_delay').value.to_i
- enabled = (Setting.find_by(name: 'booking_move_enable').value == 'true')
+ delay = Setting.get('booking_move_delay').to_i
+ enabled = Setting.get('booking_move_enable')
# these condition does not apply to admins
user.admin? || user.manager? ||
diff --git a/app/policies/subscription_policy.rb b/app/policies/subscription_policy.rb
index e556189a0..968304d17 100644
--- a/app/policies/subscription_policy.rb
+++ b/app/policies/subscription_policy.rb
@@ -2,9 +2,8 @@
# Check the access policies for API::SubscriptionsController
class SubscriptionPolicy < ApplicationPolicy
- include FablabConfiguration
def create?
- !fablab_plans_deactivated? && (user.admin? || (user.manager? && record.user_id != user.id) || record.price.zero?)
+ Setting.get('plans_module') && (user.admin? || (user.manager? && record.user_id != user.id) || record.price.zero?)
end
def show?
diff --git a/app/services/accounting_export_service.rb b/app/services/accounting_export_service.rb
index abe8791bb..f3986f75a 100644
--- a/app/services/accounting_export_service.rb
+++ b/app/services/accounting_export_service.rb
@@ -15,7 +15,7 @@ class AccountingExportService
@date_format = '%d/%m/%Y'
@label_max_length = 50
@export_zeros = false
- @journal_code = Setting.find_by(name: 'accounting_journal_code')&.value || ''
+ @journal_code = Setting.get('accounting_journal_code') || ''
@date_format = date_format
@columns = columns
end
@@ -79,8 +79,8 @@ class AccountingExportService
invoice.payment_means.each do |details|
rows << row(
invoice,
- account(invoice, :client, means: details[:means]),
- account(invoice, :client, means: details[:means], type: :label),
+ account(invoice, :projets, means: details[:means]),
+ account(invoice, :projets, means: details[:means], type: :label),
details[:amount] / 100.00,
line_label: label(invoice),
debit_method: :debit_client,
@@ -179,7 +179,7 @@ class AccountingExportService
# Get the account code (or label) for the given invoice and the specified line type (client, vat, subscription or reservation)
def account(invoice, account, type: :code, means: :other)
case account
- when :client
+ when :projets
Setting.find_by(name: "accounting_#{means}_client_#{type}")&.value
when :vat
Setting.find_by(name: "accounting_VAT_#{type}")&.value
diff --git a/app/services/availabilities/availabilities_service.rb b/app/services/availabilities/availabilities_service.rb
index 9c4b77696..5d4662c91 100644
--- a/app/services/availabilities/availabilities_service.rb
+++ b/app/services/availabilities/availabilities_service.rb
@@ -6,7 +6,7 @@ class Availabilities::AvailabilitiesService
def initialize(current_user, maximum_visibility = {})
@current_user = current_user
@maximum_visibility = maximum_visibility
- @service = Availabilities::StatusService.new(current_user.admin? ? 'admin' : 'user')
+ @service = Availabilities::StatusService.new(current_user.role)
end
# list all slots for the given machine, with reservations info, relatives to the given user
@@ -17,7 +17,7 @@ class Availabilities::AvailabilitiesService
slots = []
availabilities.each do |a|
- slot_duration = a.slot_duration || ApplicationHelper::SLOT_DURATION
+ slot_duration = a.slot_duration || Setting.get('slot_duration').to_i
((a.end_at - a.start_at) / slot_duration.minutes).to_i.times do |i|
next unless (a.start_at + (i * slot_duration).minutes) > DateTime.current || user.admin?
@@ -44,7 +44,7 @@ class Availabilities::AvailabilitiesService
slots = []
availabilities.each do |a|
- slot_duration = a.slot_duration || ApplicationHelper::SLOT_DURATION
+ slot_duration = a.slot_duration || Setting.get('slot_duration').to_i
((a.end_at - a.start_at) / slot_duration.minutes).to_i.times do |i|
next unless (a.start_at + (i * slot_duration).minutes) > DateTime.current || user.admin?
diff --git a/app/services/availabilities/create_availabilities_service.rb b/app/services/availabilities/create_availabilities_service.rb
index 2afd49e11..da8891642 100644
--- a/app/services/availabilities/create_availabilities_service.rb
+++ b/app/services/availabilities/create_availabilities_service.rb
@@ -21,7 +21,8 @@ class Availabilities::CreateAvailabilitiesService
training_ids: availability.training_ids,
space_ids: availability.space_ids,
tag_ids: availability.tag_ids,
- nb_total_places: availability.nb_total_places
+ nb_total_places: availability.nb_total_places,
+ slot_duration: availability.slot_duration
).save!
end
end
diff --git a/app/services/availabilities/public_availabilities_service.rb b/app/services/availabilities/public_availabilities_service.rb
index 1f55330ff..efee253c7 100644
--- a/app/services/availabilities/public_availabilities_service.rb
+++ b/app/services/availabilities/public_availabilities_service.rb
@@ -4,7 +4,7 @@
class Availabilities::PublicAvailabilitiesService
def initialize(current_user)
@current_user = current_user
- @service = Availabilities::StatusService.new('')
+ @service = Availabilities::StatusService.new('public')
end
# provides a list of slots and availabilities for the machines, between the given dates
@@ -15,7 +15,7 @@ class Availabilities::PublicAvailabilitiesService
.where(lock: false)
slots = []
availabilities.each do |a|
- slot_duration = a.slot_duration || ApplicationHelper::SLOT_DURATION
+ slot_duration = a.slot_duration || Setting.get('slot_duration').to_i
a.machines.each do |machine|
next unless machine_ids&.include?(machine.id.to_s)
@@ -46,7 +46,7 @@ class Availabilities::PublicAvailabilitiesService
slots = []
availabilities.each do |a|
- slot_duration = a.slot_duration || ApplicationHelper::SLOT_DURATION
+ slot_duration = a.slot_duration || Setting.get('slot_duration').to_i
space = a.spaces.first
((a.end_at - a.start_at) / slot_duration.minutes).to_i.times do |i|
next unless (a.start_at + (i * slot_duration).minutes) > DateTime.current
diff --git a/app/services/availabilities/status_service.rb b/app/services/availabilities/status_service.rb
index 1e71c2aa3..5735466ab 100644
--- a/app/services/availabilities/status_service.rb
+++ b/app/services/availabilities/status_service.rb
@@ -4,7 +4,7 @@
class Availabilities::StatusService
def initialize(current_user_role)
@current_user_role = current_user_role
- @show_name = (@current_user_role == 'admin' || Setting.find_by(name: 'display_name_enable').value == 'true')
+ @show_name = (%w[admin manager].include?(@current_user_role) || Setting.get('display_name_enable'))
end
# check that the provided machine slot is reserved or not and modify it accordingly
@@ -19,7 +19,7 @@ class Availabilities::StatusService
slot.id = s.id
slot.is_reserved = true
slot.title = "#{slot.machine.name} - #{@show_name ? r.user&.profile&.full_name : I18n.t('availabilities.not_available')}"
- slot.can_modify = true if @current_user_role == 'admin'
+ slot.can_modify = true if %w[admin manager].include?(@current_user_role)
slot.reservations.push r
next unless r.statistic_profile_id == statistic_profile_id
@@ -41,7 +41,7 @@ class Availabilities::StatusService
next unless s.start_at == slot.start_at && s.canceled_at.nil?
- slot.can_modify = true if @current_user_role == 'admin'
+ slot.can_modify = true if %w[admin manager].include?(@current_user_role)
slot.reservations.push r
next unless r.statistic_profile_id == statistic_profile_id
diff --git a/app/services/health_service.rb b/app/services/health_service.rb
index 4339b525c..5926e6a4f 100644
--- a/app/services/health_service.rb
+++ b/app/services/health_service.rb
@@ -39,16 +39,16 @@ class HealthService
admins: User.admins.count,
availabilities: last_week_availabilities,
reservations: last_week_new_reservations,
- plans: !Rails.application.secrets.fablab_without_plans,
- spaces: !Rails.application.secrets.fablab_without_spaces,
- online_payment: !Rails.application.secrets.fablab_without_online_payments,
- invoices: !Rails.application.secrets.fablab_without_invoices,
- openlab: Rails.application.secrets.openlab_app_secret.present?
+ plans: Setting.get('plans_module'),
+ spaces: Setting.get('spaces_module'),
+ online_payment: Setting.get('online_payment_module'),
+ invoices: Setting.get('invoicing_module'),
+ openlab: Setting.get('openlab_app_secret').present?
}
end
def self.stats
- enable = Setting.find_by(name: 'fab_analytics')&.value
+ enable = Setting.get('fab_analytics')
return false if enable == 'false'
require 'openssl'
@@ -56,7 +56,7 @@ class HealthService
row_stats.to_json.to_s
- key = Setting.find_by(name: 'hub_public_key')&.value
+ key = Setting.get('hub_public_key')
return false unless key
public_key = OpenSSL::PKey::RSA.new(key)
diff --git a/app/services/invoice_reference_service.rb b/app/services/invoice_reference_service.rb
index 966a76b15..7e77c992e 100644
--- a/app/services/invoice_reference_service.rb
+++ b/app/services/invoice_reference_service.rb
@@ -4,7 +4,7 @@
class InvoiceReferenceService
class << self
def generate_reference(invoice, date: DateTime.current, avoir: false)
- pattern = Setting.find_by(name: 'invoice_reference').value
+ pattern = Setting.get('invoice_reference')
reference = replace_invoice_number_pattern(pattern, invoice)
reference = replace_date_pattern(reference, date)
@@ -31,7 +31,7 @@ class InvoiceReferenceService
end
def generate_order_number(invoice)
- pattern = Setting.find_by(name: 'invoice_order-nb').value
+ pattern = Setting.get('invoice_order-nb')
# global invoice number (nn..nn)
reference = pattern.gsub(/n+(?![^\[]*\])/) do |match|
diff --git a/app/services/members/import_service.rb b/app/services/members/import_service.rb
index 305610750..d087cfc4b 100644
--- a/app/services/members/import_service.rb
+++ b/app/services/members/import_service.rb
@@ -7,8 +7,7 @@ class Members::ImportService
require 'csv'
log = []
begin
- CSV.foreach(import.attachment.url, headers: true, col_sep: ';') do |row|
- begin
+ CSV.foreach(import.attachment.url, headers: true, col_sep: ';') do |row|
password = hide_password(row)
log << { row: row.to_hash }
@@ -31,7 +30,6 @@ class Members::ImportService
puts e
puts e.backtrace
end
- end
rescue ArgumentError => e
log << e.to_s
puts e
diff --git a/app/services/members/members_service.rb b/app/services/members/members_service.rb
index 991a192a9..df90b1d4d 100644
--- a/app/services/members/members_service.rb
+++ b/app/services/members/members_service.rb
@@ -41,13 +41,16 @@ class Members::MembersService
@member.statistic_profile.group_id = params[:group_id]
@member.statistic_profile.role_id = Role.find_or_create_by!(name: 'member').id
- if @member.save
- @member.generate_subscription_invoice(current_user.id)
- @member.send_confirmation_instructions
- UsersMailer.delay.notify_user_account_created(@member, @member.password)
- true
- else
- false
+ ActiveRecord::Base.transaction do
+ if @member.save
+ @member.update_statistic_profile
+ @member.generate_subscription_invoice(current_user.id)
+ @member.send_confirmation_instructions
+ UsersMailer.delay.notify_user_account_created(@member, @member.password)
+ true
+ else
+ false
+ end
end
end
diff --git a/app/services/recaptcha_service.rb b/app/services/recaptcha_service.rb
index f3cda912e..e282d6c24 100644
--- a/app/services/recaptcha_service.rb
+++ b/app/services/recaptcha_service.rb
@@ -21,11 +21,11 @@ class RecaptchaService
end
def secret_key
- Rails.application.secrets.recaptcha_secret_key
+ Setting.get('recaptcha_secret_key')
end
def site_key
- Rails.application.secrets.recaptcha_site_key
+ Setting.get('recaptcha_site_key')
end
end
-end
\ No newline at end of file
+end
diff --git a/app/services/setting_service.rb b/app/services/setting_service.rb
index 9e54bc04b..6a8e1c3d0 100644
--- a/app/services/setting_service.rb
+++ b/app/services/setting_service.rb
@@ -4,12 +4,21 @@
# Due to the way the controller updates the settings, we cannot safely use ActiveRecord's callbacks (eg. after_update, after_commit...)
# so this service provides a wrapper around these operations.
class SettingService
- def after_update(setting)
+ def self.before_update(setting)
+ return false if Rails.application.secrets.locked_settings.include? setting.name
+
+ true
+ end
+
+ def self.after_update(setting)
# update the stylesheet
Stylesheet.theme&.rebuild! if %w[main_color secondary_color].include? setting.name
Stylesheet.home_page&.rebuild! if setting.name == 'home_css'
# notify about a change in privacy policy
NotifyPrivacyUpdateWorker.perform_async(id) if setting.name == 'privacy_body'
+
+ # sync all users on stripe
+ SyncMembersOnStripeWorker.perform_async(setting.history_values.last&.invoicing_profile&.user&.id) if setting.name == 'stripe_secret_key'
end
end
diff --git a/app/uploaders/custom_assets_uploader.rb b/app/uploaders/custom_assets_uploader.rb
index e81e8a2f4..eaf71585f 100644
--- a/app/uploaders/custom_assets_uploader.rb
+++ b/app/uploaders/custom_assets_uploader.rb
@@ -1,5 +1,7 @@
-# encoding: utf-8
+# frozen_string_literal: true
+# CarrierWave uploader for CustomAssets (Admin defined assets).
+# This file defines the parameters for these uploads.
class CustomAssetsUploader < CarrierWave::Uploader::Base
# Include RMagick or MiniMagick support:
@@ -45,8 +47,12 @@ class CustomAssetsUploader < CarrierWave::Uploader::Base
# Add a white list of extensions which are allowed to be uploaded.
# For images you might use something like this:
- def extension_white_list
- %w(pdf png jpeg jpg ico)
+ def extension_whitelist
+ %w[pdf png jpeg jpg ico]
+ end
+
+ def content_type_whitelist
+ [%r{image/}, 'application/pdf']
end
# Override the filename of the uploaded files:
diff --git a/app/uploaders/event_file_uploader.rb b/app/uploaders/event_file_uploader.rb
index d794464e1..a3ee56493 100644
--- a/app/uploaders/event_file_uploader.rb
+++ b/app/uploaders/event_file_uploader.rb
@@ -40,10 +40,15 @@ class EventFileUploader < CarrierWave::Uploader::Base
# Add a white list of extensions which are allowed to be uploaded.
# For images you might use something like this:
- def extension_white_list
+ def extension_whitelist
%w[pdf]
end
+ def content_type_whitelist
+ %w[application/pdf]
+ end
+
+
# Override the filename of the uploaded files:
# Avoid using model.id or version_name here, see uploader/store.rb for details.
# def filename
diff --git a/app/uploaders/event_image_uploader.rb b/app/uploaders/event_image_uploader.rb
index 26a3b8529..fc9a07104 100644
--- a/app/uploaders/event_image_uploader.rb
+++ b/app/uploaders/event_image_uploader.rb
@@ -1,3 +1,7 @@
+# frozen_string_literal: true
+
+# CarrierWave uploader for images illustrating the Events.
+# This file defines the parameters for these uploads.
class EventImageUploader < CarrierWave::Uploader::Base
# Include RMagick or MiniMagick support:
# include CarrierWave::RMagick
@@ -41,23 +45,28 @@ class EventImageUploader < CarrierWave::Uploader::Base
# end
version :large do
- process :resize_to_fit => [1000, 700]
+ process resize_to_fit: [1000, 700]
end
version :medium do
- process :resize_to_fit => [700, 400]
+ process resize_to_fit: [700, 400]
end
version :small do
- process :resize_to_fit => [260, 260]
+ process resize_to_fit: [260, 260]
end
# Add a white list of extensions which are allowed to be uploaded.
# For images you might use something like this:
- def extension_white_list
- %w(jpg jpeg gif png)
+ def extension_whitelist
+ %w[jpg jpeg gif png]
end
+ def content_type_whitelist
+ [%r{image/}]
+ end
+
+
# Override the filename of the uploaded files:
# Avoid using model.id or version_name here, see uploader/store.rb for details.
def filename
diff --git a/app/uploaders/import_uploader.rb b/app/uploaders/import_uploader.rb
index 2969411c0..34a7cbd73 100644
--- a/app/uploaders/import_uploader.rb
+++ b/app/uploaders/import_uploader.rb
@@ -22,7 +22,12 @@ class ImportUploader < CarrierWave::Uploader::Base
# Add a white list of extensions which are allowed to be uploaded.
# For images you might use something like this:
- def extension_white_list
- ['csv']
+ def extension_whitelist
+ %w[csv]
end
+
+ def content_type_whitelist
+ %w[text/csv]
+ end
+
end
diff --git a/app/uploaders/machine_file_uploader.rb b/app/uploaders/machine_file_uploader.rb
index 3c3b46653..2f58bc1ff 100644
--- a/app/uploaders/machine_file_uploader.rb
+++ b/app/uploaders/machine_file_uploader.rb
@@ -1,7 +1,10 @@
+# frozen_string_literal: true
+
+# CarrierWave uploader for Machine attachments
class MachineFileUploader < CarrierWave::Uploader::Base
# Include RMagick or MiniMagick support:
# include CarrierWave::RMagick
- #include CarrierWave::MiniMagick
+ # include CarrierWave::MiniMagick
include UploadHelper
# Choose what kind of storage to use for this uploader:
@@ -37,13 +40,18 @@ class MachineFileUploader < CarrierWave::Uploader::Base
# Add a white list of extensions which are allowed to be uploaded.
# For images you might use something like this:
- def extension_white_list
- %w(pdf)
+ def extension_whitelist
+ %w[pdf]
end
+ def content_type_whitelist
+ %w[application/pdf]
+ end
+
+
# Override the filename of the uploaded files:
# Avoid using model.id or version_name here, see uploader/store.rb for details.
- #def filename
- #"avatar.#{file.extension}" if original_filename
- #end
+ # def filename
+ # "avatar.#{file.extension}" if original_filename
+ # end
end
diff --git a/app/uploaders/machine_image_uploader.rb b/app/uploaders/machine_image_uploader.rb
index e43239d9e..a4243da35 100644
--- a/app/uploaders/machine_image_uploader.rb
+++ b/app/uploaders/machine_image_uploader.rb
@@ -1,3 +1,7 @@
+# frozen_string_literal: true
+
+# CarrierWave uploader for images illustrating the Machines.
+# This file defines the parameters for these uploads.
class MachineImageUploader < CarrierWave::Uploader::Base
# Include RMagick or MiniMagick support:
# include CarrierWave::RMagick
@@ -37,17 +41,21 @@ class MachineImageUploader < CarrierWave::Uploader::Base
# Create different versions of your uploaded files:
version :large do
- process :resize_to_fit => [1000, 700]
+ process resize_to_fit: [1000, 700]
end
version :medium do
- process :resize_to_fit => [700, 400]
+ process resize_to_fit: [700, 400]
end
# Add a white list of extensions which are allowed to be uploaded.
# For images you might use something like this:
- def extension_white_list
- %w(jpg jpeg gif png)
+ def extension_whitelist
+ %w[jpg jpeg gif png]
+ end
+
+ def content_type_whitelist
+ [%r{image/}]
end
# Override the filename of the uploaded files:
diff --git a/app/uploaders/plan_file_uploader.rb b/app/uploaders/plan_file_uploader.rb
index de0c8c5d1..77f834ac6 100644
--- a/app/uploaders/plan_file_uploader.rb
+++ b/app/uploaders/plan_file_uploader.rb
@@ -1,7 +1,10 @@
+# frozen_string_literal: true
+
+# CarrierWave uploader for the description file of the Plans
class PlanFileUploader < CarrierWave::Uploader::Base
# Include RMagick or MiniMagick support:
# include CarrierWave::RMagick
- #include CarrierWave::MiniMagick
+ # include CarrierWave::MiniMagick
include UploadHelper
# Choose what kind of storage to use for this uploader:
@@ -37,13 +40,17 @@ class PlanFileUploader < CarrierWave::Uploader::Base
# Add a white list of extensions which are allowed to be uploaded.
# For images you might use something like this:
- def extension_white_list
- %w(pdf png jpeg jpg)
+ def extension_whitelist
+ %w[pdf png jpeg jpg]
+ end
+
+ def content_type_whitelist
+ [%r{image/}, 'application/pdf']
end
# Override the filename of the uploaded files:
# Avoid using model.id or version_name here, see uploader/store.rb for details.
- #def filename
- #"avatar.#{file.extension}" if original_filename
- #end
+ # def filename
+ # "avatar.#{file.extension}" if original_filename
+ # end
end
diff --git a/app/uploaders/profil_image_uploader.rb b/app/uploaders/profil_image_uploader.rb
index 78d9e5af5..bc14af25a 100644
--- a/app/uploaders/profil_image_uploader.rb
+++ b/app/uploaders/profil_image_uploader.rb
@@ -1,3 +1,7 @@
+# frozen_string_literal: true
+
+# CarrierWave uploader for user's avatar.
+# This file defines the parameters for these uploads.
class ProfilImageUploader < CarrierWave::Uploader::Base
# Include RMagick or MiniMagick support:
# include CarrierWave::RMagick
@@ -37,21 +41,25 @@ class ProfilImageUploader < CarrierWave::Uploader::Base
# Create different versions of your uploaded files:
version :normal do
- process :resize_to_fit => [140, 140]
+ process resize_to_fit: [140, 140]
end
version :small do
- process :resize_to_fit => [80, 80]
+ process resize_to_fit: [80, 80]
end
version :tiny do
- process :resize_to_fit => [40, 40]
+ process resize_to_fit: [40, 40]
end
# Add a white list of extensions which are allowed to be uploaded.
# For images you might use something like this:
- def extension_white_list
- %w(jpg jpeg gif png)
+ def extension_whitelist
+ %w[jpg jpeg gif png]
+ end
+
+ def content_type_whitelist
+ [%r{image/}]
end
# Override the filename of the uploaded files:
diff --git a/app/uploaders/project_cao_uploader.rb b/app/uploaders/project_cao_uploader.rb
index bb06a27bc..3ad2ea3fa 100644
--- a/app/uploaders/project_cao_uploader.rb
+++ b/app/uploaders/project_cao_uploader.rb
@@ -22,7 +22,31 @@ class ProjectCaoUploader < CarrierWave::Uploader::Base
# Add a white list of extensions which are allowed to be uploaded.
# For images you might use something like this:
- def extension_white_list
- ENV['ALLOWED_EXTENSIONS'].split(' ')
+ def extension_whitelist
+ Setting.get('allowed_cad_extensions').split(' ')
+ end
+
+ def content_type_whitelist
+ Setting.get('allowed_cad_mime_types').split(' ')
+ end
+
+ private
+
+ def check_content_type_whitelist!(new_file)
+ content_type = Marcel::MimeType.for Pathname.new(new_file.file)
+
+ if content_type_whitelist && content_type && !whitelisted_content_type?(content_type)
+ raise CarrierWave::IntegrityError,
+ I18n.translate(:'errors.messages.content_type_whitelist_error',
+ content_type: content_type,
+ allowed_types: Array(content_type_whitelist).join(', '))
+ end
+ end
+
+ def whitelisted_content_type?(content_type)
+ Array(content_type_whitelist).any? do |item|
+ item = Regexp.quote(item) if item.class != Regexp
+ content_type =~ /#{item}/
+ end
end
end
diff --git a/app/uploaders/project_image_uploader.rb b/app/uploaders/project_image_uploader.rb
index 729ebe9a9..d013b112b 100644
--- a/app/uploaders/project_image_uploader.rb
+++ b/app/uploaders/project_image_uploader.rb
@@ -28,10 +28,14 @@ class ProjectImageUploader < CarrierWave::Uploader::Base
# Add a white list of extensions which are allowed to be uploaded.
# For images you might use something like this:
- def extension_white_list
+ def extension_whitelist
%w[jpg jpeg gif png]
end
+ def content_type_whitelist
+ [%r{image/}]
+ end
+
# Override the filename of the uploaded files:
# Avoid using model.id or version_name here, see uploader/store.rb for details.
def filename
diff --git a/app/uploaders/space_file_uploader.rb b/app/uploaders/space_file_uploader.rb
index ab47b6b6c..ba732df9a 100644
--- a/app/uploaders/space_file_uploader.rb
+++ b/app/uploaders/space_file_uploader.rb
@@ -1,7 +1,10 @@
+# frozen_string_literal: true
+
+# CarrierWave uploader for Space attachments
class SpaceFileUploader < CarrierWave::Uploader::Base
# Include RMagick or MiniMagick support:
# include CarrierWave::RMagick
- #include CarrierWave::MiniMagick
+ # include CarrierWave::MiniMagick
include UploadHelper
# Choose what kind of storage to use for this uploader:
@@ -37,13 +40,18 @@ class SpaceFileUploader < CarrierWave::Uploader::Base
# Add a white list of extensions which are allowed to be uploaded.
# For images you might use something like this:
- def extension_white_list
- %w(pdf)
+ def extension_whitelist
+ %w[pdf]
end
+ def content_type_whitelist
+ %w[application/pdf]
+ end
+
+
# Override the filename of the uploaded files:
# Avoid using model.id or version_name here, see uploader/store.rb for details.
- #def filename
- #"avatar.#{file.extension}" if original_filename
- #end
+ # def filename
+ # "avatar.#{file.extension}" if original_filename
+ # end
end
diff --git a/app/uploaders/space_image_uploader.rb b/app/uploaders/space_image_uploader.rb
index 7ee1a6076..dd77c38fc 100644
--- a/app/uploaders/space_image_uploader.rb
+++ b/app/uploaders/space_image_uploader.rb
@@ -1,3 +1,7 @@
+# frozen_string_literal: true
+
+# CarrierWave uploader for images illustrating the Spaces.
+# This file defines the parameters for these uploads.
class SpaceImageUploader < CarrierWave::Uploader::Base
# Include RMagick or MiniMagick support:
# include CarrierWave::RMagick
@@ -37,17 +41,21 @@ class SpaceImageUploader < CarrierWave::Uploader::Base
# Create different versions of your uploaded files:
version :large do
- process :resize_to_fit => [1000, 700]
+ process resize_to_fit: [1000, 700]
end
version :medium do
- process :resize_to_fit => [700, 400]
+ process resize_to_fit: [700, 400]
end
# Add a white list of extensions which are allowed to be uploaded.
# For images you might use something like this:
- def extension_white_list
- %w(jpg jpeg gif png)
+ def extension_whitelist
+ %w[jpg jpeg gif png]
+ end
+
+ def content_type_whitelist
+ [%r{image/}]
end
# Override the filename of the uploaded files:
diff --git a/app/uploaders/training_image_uploader.rb b/app/uploaders/training_image_uploader.rb
index 652523e48..9e06ab500 100644
--- a/app/uploaders/training_image_uploader.rb
+++ b/app/uploaders/training_image_uploader.rb
@@ -1,3 +1,7 @@
+# frozen_string_literal: true
+
+# CarrierWave uploader for images illustrating the Trainings.
+# This file defines the parameters for these uploads.
class TrainingImageUploader < CarrierWave::Uploader::Base
# Include RMagick or MiniMagick support:
# include CarrierWave::RMagick
@@ -37,17 +41,21 @@ class TrainingImageUploader < CarrierWave::Uploader::Base
# Create different versions of your uploaded files:
version :large do
- process :resize_to_fit => [1000, 700]
+ process resize_to_fit: [1000, 700]
end
version :medium do
- process :resize_to_fit => [700, 400]
+ process resize_to_fit: [700, 400]
end
# Add a white list of extensions which are allowed to be uploaded.
# For images you might use something like this:
- def extension_white_list
- %w(jpg jpeg gif png)
+ def extension_whitelist
+ %w[jpg jpeg gif png]
+ end
+
+ def content_type_whitelist
+ [%r{image/}]
end
# Override the filename of the uploaded files:
diff --git a/app/validators/file_mime_type_validator.rb b/app/validators/file_mime_type_validator.rb
deleted file mode 100644
index 7e25e2562..000000000
--- a/app/validators/file_mime_type_validator.rb
+++ /dev/null
@@ -1,79 +0,0 @@
-# frozen_string_literal: true
-
-# Based on: https://gist.github.com/1298417
-class FileMimeTypeValidator < ActiveModel::EachValidator
- MESSAGES = { content_type: :wrong_content_type }.freeze
- CHECKS = [:content_type].freeze
-
- DEFAULT_TOKENIZER = ->(value) { value.split(//) }
- RESERVED_OPTIONS = %i[content_type tokenizer].freeze
-
- def initialize(options)
- super
-
- end
-
- def check_validity!
- keys = CHECKS & options.keys
- raise ArgumentError, 'Patterns unspecified. Specify the :content_type option.' if keys.empty?
-
- keys.each do |key|
- value = options[key]
- raise ArgumentError, ":#{key} must be a String or a Regexp or an Array" unless valid_content_type_option?(value)
-
- next unless key.is_a?(Array) && key == :content_type
-
- options[key].each do |val|
- raise ArgumentError, "#{val} must be a String or a Regexp" unless val.is_a?(String) || val.is_a?(Regexp)
- end
- end
- end
-
- def validate_each(record, attribute, value)
- raise(ArgumentError, 'A CarrierWave::Uploader::Base object was expected') unless value.is_a? CarrierWave::Uploader::Base
-
- value = (options[:tokenizer] || DEFAULT_TOKENIZER).call(value) if value.is_a?(String)
- return if value.length.zero?
-
- CHECKS.each do |key|
- next unless check_value = options[key]
-
- do_validation(value, check_value, key, record, attribute) if key == :content_type
- end
- end
-
- def help
- Helper.instance
- end
-
- class Helper
- include Singleton
- include ActionView::Helpers::NumberHelper
- end
-
- private
-
- def valid_content_type_option?(content_type)
- return true if %w[Array String Regexp].include?(content_type.class.to_s)
-
- false
- end
-
- def do_validation(value, pattern, key, record, attribute)
- if pattern.is_a?(String) || pattern.is_a?(Regexp)
- return if value.file.content_type.send((pattern.is_a?(String) ? '==' : '=~'), pattern)
- else
- valid_list = pattern.map do |p|
- value.file.content_type.send((p.is_a?(String) ? '==' : '=~'), p)
- end
- return if valid_list.include?(true)
- end
-
- errors_options = options.except(*RESERVED_OPTIONS)
-
- default_message = options[MESSAGES[key]]
- errors_options[:message] ||= default_message if default_message
-
- record.errors.add(attribute, MESSAGES[key], errors_options)
- end
-end
diff --git a/app/validators/stripe_card_token_validator.rb b/app/validators/stripe_card_token_validator.rb
index 1d7a78165..89f160e89 100644
--- a/app/validators/stripe_card_token_validator.rb
+++ b/app/validators/stripe_card_token_validator.rb
@@ -1,15 +1,15 @@
+# frozen_string_literal: true
+# validates the given card token through the Stripe API
class StripeCardTokenValidator
def validate(record)
- if options[:token]
- begin
- res = Stripe::Token.retrieve(options[:token])
- if res[:id] != options[:token]
- record.errors[:card_token] << "A problem occurred while retrieving the card with the specified token: #{res.id}"
- end
- rescue Stripe::InvalidRequestError => e
- record.errors[:card_token] << e
- end
+ return unless options[:token]
+
+ res = Stripe::Token.retrieve(options[:token], api_key: Setting.get('stripe_secret_key'))
+ if res[:id] != options[:token]
+ record.errors[:card_token] << "A problem occurred while retrieving the card with the specified token: #{res.id}"
end
+ rescue Stripe::InvalidRequestError => e
+ record.errors[:card_token] << e
end
-end
\ No newline at end of file
+end
diff --git a/app/views/api/components/index.json.jbuilder b/app/views/api/components/index.json.jbuilder
index ecdfe44c0..2d87cea3e 100644
--- a/app/views/api/components/index.json.jbuilder
+++ b/app/views/api/components/index.json.jbuilder
@@ -1,4 +1,4 @@
json.array!(@components) do |component|
json.extract! component, :id, :name
- json.url component_url(component, format: :json)
+
end
diff --git a/app/views/api/credits/index.json.jbuilder b/app/views/api/credits/index.json.jbuilder
index 2216ae3f1..628077e2d 100644
--- a/app/views/api/credits/index.json.jbuilder
+++ b/app/views/api/credits/index.json.jbuilder
@@ -4,5 +4,5 @@ json.array!(@credits) do |credit|
json.id credit.creditable.id
json.name credit.creditable.name
end if credit.creditable.present?
- json.url credit_url(credit, format: :json)
+
end
diff --git a/app/views/api/events/index.json.jbuilder b/app/views/api/events/index.json.jbuilder
index 8512897bd..bd5dfc0a1 100644
--- a/app/views/api/events/index.json.jbuilder
+++ b/app/views/api/events/index.json.jbuilder
@@ -3,6 +3,6 @@ total = @events.except(:offset, :limit, :order).count
json.array!(@events) do |event|
json.partial! 'api/events/event', event: event
json.event_image_small event.event_image.attachment.small.url if event.event_image
- json.url event_url(event, format: :json)
+
json.nb_total_events total
end
diff --git a/app/views/api/events/upcoming.json.jbuilder b/app/views/api/events/upcoming.json.jbuilder
index 3a12b9481..b162e1c79 100644
--- a/app/views/api/events/upcoming.json.jbuilder
+++ b/app/views/api/events/upcoming.json.jbuilder
@@ -1,5 +1,5 @@
json.array!(@events) do |event|
json.partial! 'api/events/event', event: event
json.event_image_medium event.event_image.attachment.medium.url if event.event_image
- json.url event_url(event, format: :json)
+
end
diff --git a/app/views/api/invoices/index.json.jbuilder b/app/views/api/invoices/index.json.jbuilder
index ffda598af..800754720 100644
--- a/app/views/api/invoices/index.json.jbuilder
+++ b/app/views/api/invoices/index.json.jbuilder
@@ -1,7 +1,7 @@
json.array!(@invoices) do |invoice|
json.extract! invoice, :id, :created_at, :reference, :invoiced_type, :user_id, :avoir_date
json.total (invoice.total / 100.00)
- json.url invoice_url(invoice, format: :json)
+
json.name invoice.user.profile.full_name
json.has_avoir invoice.refunded?
json.is_avoir invoice.is_a?(Avoir)
diff --git a/app/views/api/invoices/list.json.jbuilder b/app/views/api/invoices/list.json.jbuilder
index d2b2f72dd..7ad530b1a 100644
--- a/app/views/api/invoices/list.json.jbuilder
+++ b/app/views/api/invoices/list.json.jbuilder
@@ -7,7 +7,7 @@ json.array!(@invoices) do |invoice|
json.extract! invoice, :id, :created_at, :reference, :invoiced_type, :avoir_date
json.user_id invoice.invoicing_profile.user_id
json.total invoice.total / 100.00
- json.url invoice_url(invoice, format: :json)
+
json.name invoice.invoicing_profile.full_name
json.has_avoir invoice.refunded?
json.is_avoir invoice.is_a?(Avoir)
diff --git a/app/views/api/licences/index.json.jbuilder b/app/views/api/licences/index.json.jbuilder
index e03f1570e..845ba1b24 100644
--- a/app/views/api/licences/index.json.jbuilder
+++ b/app/views/api/licences/index.json.jbuilder
@@ -1,4 +1,4 @@
json.array!(@licences) do |licence|
json.extract! licence, :id, :name, :description
- json.url licence_url(licence, format: :json)
+
end
diff --git a/app/views/api/machines/index.json.jbuilder b/app/views/api/machines/index.json.jbuilder
index 2ce82759c..ae1c6bea9 100644
--- a/app/views/api/machines/index.json.jbuilder
+++ b/app/views/api/machines/index.json.jbuilder
@@ -1,5 +1,5 @@
json.array!(@machines) do |machine|
json.extract! machine, :id, :name, :description, :spec, :slug, :disabled
- json.url machine_url(machine, format: :json)
+
json.machine_image machine.machine_image.attachment.medium.url if machine.machine_image
end
diff --git a/app/views/api/members/_member.json.jbuilder b/app/views/api/members/_member.json.jbuilder
index 6064bea22..84d4d4380 100644
--- a/app/views/api/members/_member.json.jbuilder
+++ b/app/views/api/members/_member.json.jbuilder
@@ -10,7 +10,7 @@ json.profile do
if member.profile.user_avatar
json.user_avatar do
json.id member.profile.user_avatar.id
- json.attachment_url member.profile.user_avatar.attachment_url
+ json.attachment_url "#{member.profile.user_avatar.attachment_url}?#{member.profile.user_avatar.updated_at.to_i}"
end
end
json.first_name member.profile.first_name
diff --git a/app/views/api/members/mapping.json.jbuilder b/app/views/api/members/mapping.json.jbuilder
index ffbc0da97..265942937 100644
--- a/app/views/api/members/mapping.json.jbuilder
+++ b/app/views/api/members/mapping.json.jbuilder
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
@members.each do |member|
- json.set! member.id, member.profile.full_name
+ json.set! member.id, member&.profile&.full_name
end
\ No newline at end of file
diff --git a/app/views/api/members/show.json.jbuilder b/app/views/api/members/show.json.jbuilder
index eca6a2c07..edcc2e53c 100644
--- a/app/views/api/members/show.json.jbuilder
+++ b/app/views/api/members/show.json.jbuilder
@@ -40,7 +40,7 @@ json.all_projects @member.all_projects do |project|
if requested_current || project.state == 'published'
json.extract! project, :id, :name, :description, :licence_id, :slug, :state
json.author_id project.author.user_id
- json.url project_url(project, format: :json)
+
json.project_image project.project_image.attachment.large.url if project.project_image
json.machine_ids project.machine_ids
json.machines project.machines do |m|
diff --git a/app/views/api/notifications/_notify_admin_abuse_reported.json.jbuilder b/app/views/api/notifications/_notify_admin_abuse_reported.json.jbuilder
index 61be992b8..46f4db0fc 100644
--- a/app/views/api/notifications/_notify_admin_abuse_reported.json.jbuilder
+++ b/app/views/api/notifications/_notify_admin_abuse_reported.json.jbuilder
@@ -3,4 +3,3 @@ json.description t('.an_abuse_was_reported_on_TYPE_ID_NAME_html',
TYPE: notification.attached_object.signaled_type,
ID: notification.attached_object.signaled_id,
NAME: (notification.attached_object.signaled.name ? notification.attached_object.signaled.name : ''))
-json.url notification_url(notification, format: :json)
\ No newline at end of file
diff --git a/app/views/api/notifications/_notify_admin_archive_complete.json.jbuilder b/app/views/api/notifications/_notify_admin_archive_complete.json.jbuilder
index aa1677d2d..7d48b6401 100644
--- a/app/views/api/notifications/_notify_admin_archive_complete.json.jbuilder
+++ b/app/views/api/notifications/_notify_admin_archive_complete.json.jbuilder
@@ -4,4 +4,4 @@ json.description t('.archive_complete',
END: notification.attached_object.end_at,
ID: notification.attached_object.id
)
-json.url notification_url(notification, format: :json)
+
diff --git a/app/views/api/notifications/_notify_admin_close_period_reminder.json.jbuilder b/app/views/api/notifications/_notify_admin_close_period_reminder.json.jbuilder
index 3f8bde945..0887add51 100644
--- a/app/views/api/notifications/_notify_admin_close_period_reminder.json.jbuilder
+++ b/app/views/api/notifications/_notify_admin_close_period_reminder.json.jbuilder
@@ -4,4 +4,4 @@ if notification.attached_object.class.name == AccountingPeriod.name
else
json.description t('.warning_no_closed_periods', FIRST_DATE: notification.attached_object.created_at.to_date)
end
-json.url notification_url(notification, format: :json)
+
diff --git a/app/views/api/notifications/_notify_admin_export_complete.json.jbuilder b/app/views/api/notifications/_notify_admin_export_complete.json.jbuilder
index 02f24df29..0b234e323 100644
--- a/app/views/api/notifications/_notify_admin_export_complete.json.jbuilder
+++ b/app/views/api/notifications/_notify_admin_export_complete.json.jbuilder
@@ -3,4 +3,3 @@ json.description t('.export')+' '+
t(".#{notification.attached_object.category}_#{notification.attached_object.export_type}")+' '+
t('.is_over')+' '+
link_to( t('.download_here'), "api/exports/#{notification.attached_object.id}/download" )+'.'
-json.url notification_url(notification, format: :json)
\ No newline at end of file
diff --git a/app/views/api/notifications/_notify_admin_free_disk_space.json.jbuilder b/app/views/api/notifications/_notify_admin_free_disk_space.json.jbuilder
index bf275289d..1a83a7d34 100644
--- a/app/views/api/notifications/_notify_admin_free_disk_space.json.jbuilder
+++ b/app/views/api/notifications/_notify_admin_free_disk_space.json.jbuilder
@@ -1,3 +1,3 @@
json.title notification.notification_type
json.description t('.warning_free_disk_space', AVAILABLE: number_with_delimiter(notification.meta_data['mb_available']))
-json.url notification_url(notification, format: :json)
+
diff --git a/app/views/api/notifications/_notify_admin_import_complete.json.jbuilder b/app/views/api/notifications/_notify_admin_import_complete.json.jbuilder
index 14bb88fbd..a45a4c15d 100644
--- a/app/views/api/notifications/_notify_admin_import_complete.json.jbuilder
+++ b/app/views/api/notifications/_notify_admin_import_complete.json.jbuilder
@@ -3,4 +3,3 @@
json.title notification.notification_type
json.description t('.import_over', CATEGORY: t(".#{notification.attached_object.category}")) +
link_to(t('.view_results'), "#!/admin/members/import/#{notification.attached_object.id}/results")
-json.url notification_url(notification, format: :json)
diff --git a/app/views/api/notifications/_notify_admin_invoicing_changed.json.jbuilder b/app/views/api/notifications/_notify_admin_invoicing_changed.json.jbuilder
index 71908b6a7..e4dd3631f 100644
--- a/app/views/api/notifications/_notify_admin_invoicing_changed.json.jbuilder
+++ b/app/views/api/notifications/_notify_admin_invoicing_changed.json.jbuilder
@@ -6,4 +6,4 @@ json.title notification.notification_type
json.description _t('.invoices_generation_was_STATUS_for_user_NAME_html',
STATUS: notification.attached_object.invoicing_disabled.to_s,
NAME: notification.attached_object&.profile&.full_name || t('api.notifications.deleted_user')) # messageFormat
-json.url notification_url(notification, format: :json)
+
diff --git a/app/views/api/notifications/_notify_admin_member_create_reservation.json.jbuilder b/app/views/api/notifications/_notify_admin_member_create_reservation.json.jbuilder
index 3388895bd..5488d620f 100644
--- a/app/views/api/notifications/_notify_admin_member_create_reservation.json.jbuilder
+++ b/app/views/api/notifications/_notify_admin_member_create_reservation.json.jbuilder
@@ -2,4 +2,4 @@ json.title notification.notification_type
json.description t('.a_RESERVABLE_reservation_was_made_by_USER_html',
RESERVABLE: notification.attached_object.reservable.name,
USER: notification.attached_object.user&.profile&.full_name || t('api.notifications.deleted_user'))
-json.url notification_url(notification, format: :json)
+
diff --git a/app/views/api/notifications/_notify_admin_members_stripe_sync.json.jbuilder b/app/views/api/notifications/_notify_admin_members_stripe_sync.json.jbuilder
new file mode 100644
index 000000000..75a5823b4
--- /dev/null
+++ b/app/views/api/notifications/_notify_admin_members_stripe_sync.json.jbuilder
@@ -0,0 +1,2 @@
+json.title notification.notification_type
+json.description t('.all_members_sync')
diff --git a/app/views/api/notifications/_notify_admin_profile_complete.json.jbuilder b/app/views/api/notifications/_notify_admin_profile_complete.json.jbuilder
index d82ef7a54..6b5499c5c 100644
--- a/app/views/api/notifications/_notify_admin_profile_complete.json.jbuilder
+++ b/app/views/api/notifications/_notify_admin_profile_complete.json.jbuilder
@@ -5,4 +5,4 @@ json.title notification.notification_type
json.description t('.account_imported_from_PROVIDER_UID_has_completed_its_information_html',
PROVIDER: notification.attached_object.provider || default_provider,
UID: notification.attached_object.uid || notification.attached_object.id)
-json.url notification_url(notification, format: :json)
+
diff --git a/app/views/api/notifications/_notify_admin_refund_created.json.jbuilder b/app/views/api/notifications/_notify_admin_refund_created.json.jbuilder
index 17b8588de..596e9441f 100644
--- a/app/views/api/notifications/_notify_admin_refund_created.json.jbuilder
+++ b/app/views/api/notifications/_notify_admin_refund_created.json.jbuilder
@@ -2,4 +2,4 @@ json.title notification.notification_type
json.description t('.refund_created',
AMOUNT: number_to_currency(notification.attached_object.total / 100.00),
USER: notification.attached_object.invoicing_profile&.full_name)
-json.url notification_url(notification, format: :json)
+
diff --git a/app/views/api/notifications/_notify_admin_slot_is_canceled.json.jbuilder b/app/views/api/notifications/_notify_admin_slot_is_canceled.json.jbuilder
index f0ba93614..9abfcaf65 100644
--- a/app/views/api/notifications/_notify_admin_slot_is_canceled.json.jbuilder
+++ b/app/views/api/notifications/_notify_admin_slot_is_canceled.json.jbuilder
@@ -2,4 +2,4 @@ json.title notification.notification_type
json.description t('.USER_s_reservation_on_the_DATE_was_cancelled_remember_to_generate_a_refund_invoice_if_applicable_html',
USER: notification.attached_object.reservation.user&.profile&.full_name || t('api.notifications.deleted_user'),
DATE: I18n.l(notification.attached_object.start_at, format: :long))
-json.url notification_url(notification, format: :json)
+
diff --git a/app/views/api/notifications/_notify_admin_slot_is_modified.json.jbuilder b/app/views/api/notifications/_notify_admin_slot_is_modified.json.jbuilder
index 1a68f054f..1248c4057 100644
--- a/app/views/api/notifications/_notify_admin_slot_is_modified.json.jbuilder
+++ b/app/views/api/notifications/_notify_admin_slot_is_modified.json.jbuilder
@@ -1,3 +1,3 @@
json.title notification.notification_type
json.description t('.a_booking_slot_was_modified')
-json.url notification_url(notification, format: :json)
+
diff --git a/app/views/api/notifications/_notify_admin_subscribed_plan.json.jbuilder b/app/views/api/notifications/_notify_admin_subscribed_plan.json.jbuilder
index a97356b58..0cdd145ec 100644
--- a/app/views/api/notifications/_notify_admin_subscribed_plan.json.jbuilder
+++ b/app/views/api/notifications/_notify_admin_subscribed_plan.json.jbuilder
@@ -2,4 +2,4 @@ json.title notification.notification_type
json.description t('.subscription_PLAN_has_been_subscribed_by_USER_html',
PLAN: notification.attached_object.plan.name,
USER: notification.attached_object.user&.profile&.full_name || t('api.notifications.deleted_user'))
-json.url notification_url(notification, format: :json)
+
diff --git a/app/views/api/notifications/_notify_admin_subscription_canceled.json.jbuilder b/app/views/api/notifications/_notify_admin_subscription_canceled.json.jbuilder
index 8ec26407b..1f6bad73c 100644
--- a/app/views/api/notifications/_notify_admin_subscription_canceled.json.jbuilder
+++ b/app/views/api/notifications/_notify_admin_subscription_canceled.json.jbuilder
@@ -1,4 +1,4 @@
json.title notification.notification_type
json.description t('.USER_s_subscription_has_been_cancelled',
USER: notification.attached_object.user&.profile&.full_name || t('api.notifications.deleted_user'))
-json.url notification_url(notification, format: :json)
+
diff --git a/app/views/api/notifications/_notify_admin_subscription_extended.json.jbuilder b/app/views/api/notifications/_notify_admin_subscription_extended.json.jbuilder
index a7e5a401c..19dae0ab9 100644
--- a/app/views/api/notifications/_notify_admin_subscription_extended.json.jbuilder
+++ b/app/views/api/notifications/_notify_admin_subscription_extended.json.jbuilder
@@ -6,4 +6,4 @@ json.description _t('.subscription_PLAN_of_the_member_USER_has_been_extended_FRE
FREE: notification.get_meta_data(:free_days).to_s,
DATE: I18n.l(notification.attached_object.expired_at.to_date)
}) # messageFormat
-json.url notification_url(notification, format: :json)
+
diff --git a/app/views/api/notifications/_notify_admin_subscription_is_expired.json.jbuilder b/app/views/api/notifications/_notify_admin_subscription_is_expired.json.jbuilder
index 06f1c9da1..1b35da2fc 100644
--- a/app/views/api/notifications/_notify_admin_subscription_is_expired.json.jbuilder
+++ b/app/views/api/notifications/_notify_admin_subscription_is_expired.json.jbuilder
@@ -1,4 +1,4 @@
json.title notification.notification_type
json.description t('.USER_s_subscription_has_expired',
USER:notification.attached_object.user&.profile&.full_name || t('api.notifications.deleted_user'))
-json.url notification_url(notification, format: :json)
+
diff --git a/app/views/api/notifications/_notify_admin_subscription_will_expire_in_7_days.json.jbuilder b/app/views/api/notifications/_notify_admin_subscription_will_expire_in_7_days.json.jbuilder
index 966aecdf4..da3b7258d 100644
--- a/app/views/api/notifications/_notify_admin_subscription_will_expire_in_7_days.json.jbuilder
+++ b/app/views/api/notifications/_notify_admin_subscription_will_expire_in_7_days.json.jbuilder
@@ -1,4 +1,4 @@
json.title notification.notification_type
json.description t('.USER_s_subscription_will_expire_in_7_days',
USER: notification.attached_object.user&.profile&.full_name || t('api.notifications.deleted_user'))
-json.url notification_url(notification, format: :json)
+
diff --git a/app/views/api/notifications/_notify_admin_user_group_changed.json.jbuilder b/app/views/api/notifications/_notify_admin_user_group_changed.json.jbuilder
index d1b573bbb..f2da1f267 100644
--- a/app/views/api/notifications/_notify_admin_user_group_changed.json.jbuilder
+++ b/app/views/api/notifications/_notify_admin_user_group_changed.json.jbuilder
@@ -4,4 +4,4 @@ json.description _t('.user_NAME_changed_his_group_html',
NAME: notification.attached_object&.profile&.full_name || t('api.notifications.deleted_user'),
GENDER: bool_to_sym(notification.attached_object&.statistic_profile&.gender)
}) # messageFormat
-json.url notification_url(notification, format: :json)
+
diff --git a/app/views/api/notifications/_notify_admin_user_merged.json.jbuilder b/app/views/api/notifications/_notify_admin_user_merged.json.jbuilder
index d4d138969..32b2e4bbd 100644
--- a/app/views/api/notifications/_notify_admin_user_merged.json.jbuilder
+++ b/app/views/api/notifications/_notify_admin_user_merged.json.jbuilder
@@ -6,4 +6,4 @@ json.description _t('.user_NAME_has_merged_his_account_with_the_one_imported_fro
PROVIDER: notification.attached_object&.provider,
UID: notification.attached_object&.uid
}) # messageFormat
-json.url notification_url(notification, format: :json)
+
diff --git a/app/views/api/notifications/_notify_admin_user_wallet_is_credited.json.jbuilder b/app/views/api/notifications/_notify_admin_user_wallet_is_credited.json.jbuilder
index 5b8ca2c3d..c79d7afdc 100644
--- a/app/views/api/notifications/_notify_admin_user_wallet_is_credited.json.jbuilder
+++ b/app/views/api/notifications/_notify_admin_user_wallet_is_credited.json.jbuilder
@@ -4,4 +4,4 @@ json.description t('.wallet_is_credited',
AMOUNT: number_to_currency(amount),
USER: notification.attached_object.wallet.user&.profile&.full_name || t('api.notifications.deleted_user'),
ADMIN: notification.attached_object.user&.profile&.full_name || t('api.notifications.deleted_user'))
-json.url notification_url(notification, format: :json)
+
diff --git a/app/views/api/notifications/_notify_admin_when_project_published.json.jbuilder b/app/views/api/notifications/_notify_admin_when_project_published.json.jbuilder
index 63bee71e1..529ef6d14 100644
--- a/app/views/api/notifications/_notify_admin_when_project_published.json.jbuilder
+++ b/app/views/api/notifications/_notify_admin_when_project_published.json.jbuilder
@@ -2,4 +2,4 @@ json.title notification.notification_type
json.description t('.project_NAME_has_been_published_html',
ID: notification.attached_object.slug,
NAME: notification.attached_object.name)
-json.url notification_url(notification, format: :json)
+
diff --git a/app/views/api/notifications/_notify_admin_when_user_is_created.json.jbuilder b/app/views/api/notifications/_notify_admin_when_user_is_created.json.jbuilder
index 117fb9e09..f11a7f3df 100644
--- a/app/views/api/notifications/_notify_admin_when_user_is_created.json.jbuilder
+++ b/app/views/api/notifications/_notify_admin_when_user_is_created.json.jbuilder
@@ -2,4 +2,4 @@ json.title notification.notification_type
json.description t('.a_new_user_account_has_been_created_NAME_EMAIL_html',
NAME: notification.attached_object&.profile&.full_name || t('api.notifications.deleted_user'),
EMAIL: notification.attached_object&.email)
-json.url notification_url(notification, format: :json)
+
diff --git a/app/views/api/notifications/_notify_admin_when_user_is_imported.json.jbuilder b/app/views/api/notifications/_notify_admin_when_user_is_imported.json.jbuilder
index 472827725..5ef754baa 100644
--- a/app/views/api/notifications/_notify_admin_when_user_is_imported.json.jbuilder
+++ b/app/views/api/notifications/_notify_admin_when_user_is_imported.json.jbuilder
@@ -2,4 +2,4 @@ json.title notification.notification_type
json.description t('.a_new_user_account_has_been_imported_from_PROVIDER_UID_html',
PROVIDER: notification.attached_object.provider,
UID: notification.attached_object.uid)
-json.url notification_url(notification, format: :json)
+
diff --git a/app/views/api/notifications/_notify_admins_role_update.json.jbuilder b/app/views/api/notifications/_notify_admins_role_update.json.jbuilder
index dbfbddaf6..5bca811a1 100644
--- a/app/views/api/notifications/_notify_admins_role_update.json.jbuilder
+++ b/app/views/api/notifications/_notify_admins_role_update.json.jbuilder
@@ -4,4 +4,4 @@ json.title notification.notification_type
json.description t('.user_NAME_changed_ROLE_html',
NAME: notification.attached_object&.profile&.full_name || t('api.notifications.deleted_user'),
ROLE: t("roles.#{notification.attached_object&.role}"))
-json.url notification_url(notification, format: :json)
+
diff --git a/app/views/api/notifications/_notify_member_about_coupon.json.jbuilder b/app/views/api/notifications/_notify_member_about_coupon.json.jbuilder
index dc761bd64..a683b60d5 100644
--- a/app/views/api/notifications/_notify_member_about_coupon.json.jbuilder
+++ b/app/views/api/notifications/_notify_member_about_coupon.json.jbuilder
@@ -8,4 +8,4 @@ else
AMOUNT: number_to_currency(notification.attached_object.amount_off / 100.00),
CODE: notification.attached_object.code)
end
-json.url notification_url(notification, format: :json)
+
diff --git a/app/views/api/notifications/_notify_member_create_reservation.json.jbuilder b/app/views/api/notifications/_notify_member_create_reservation.json.jbuilder
index 23ca76840..14009adc7 100644
--- a/app/views/api/notifications/_notify_member_create_reservation.json.jbuilder
+++ b/app/views/api/notifications/_notify_member_create_reservation.json.jbuilder
@@ -1,4 +1,4 @@
json.title notification.notification_type
json.description t('.your_reservation_RESERVABLE_was_successfully_saved_html',
RESERVABLE: notification.attached_object.reservable.name)
-json.url notification_url(notification, format: :json)
+
diff --git a/app/views/api/notifications/_notify_member_reservation_reminder.json.jbuilder b/app/views/api/notifications/_notify_member_reservation_reminder.json.jbuilder
index dffc4e533..3c1ebd1bb 100644
--- a/app/views/api/notifications/_notify_member_reservation_reminder.json.jbuilder
+++ b/app/views/api/notifications/_notify_member_reservation_reminder.json.jbuilder
@@ -2,4 +2,4 @@ json.title notification.notification_type
json.description t('.reminder_you_have_a_reservation_RESERVABLE_to_be_held_on_DATE_html',
RESERVABLE: notification.attached_object.reservable.name,
DATE: I18n.l(notification.attached_object.slots.order(:start_at).first.start_at, format: :long))
-json.url notification_url(notification, format: :json)
+
diff --git a/app/views/api/notifications/_notify_member_slot_is_canceled.json.jbuilder b/app/views/api/notifications/_notify_member_slot_is_canceled.json.jbuilder
index 9572765a5..5535af43c 100644
--- a/app/views/api/notifications/_notify_member_slot_is_canceled.json.jbuilder
+++ b/app/views/api/notifications/_notify_member_slot_is_canceled.json.jbuilder
@@ -2,4 +2,4 @@ json.title notification.notification_type
json.description t('.your_reservation_RESERVABLE_of_DATE_was_successfully_cancelled',
RESERVABLE: notification.attached_object.reservation.reservable.name,
DATE: I18n.l(notification.attached_object.start_at, format: :long))
-json.url notification_url(notification, format: :json)
+
diff --git a/app/views/api/notifications/_notify_member_slot_is_modified.json.jbuilder b/app/views/api/notifications/_notify_member_slot_is_modified.json.jbuilder
index 076e36e55..dba8056ec 100644
--- a/app/views/api/notifications/_notify_member_slot_is_modified.json.jbuilder
+++ b/app/views/api/notifications/_notify_member_slot_is_modified.json.jbuilder
@@ -1,3 +1,3 @@
json.title notification.notification_type
json.description t('.your_reservation_slot_was_successfully_changed')
-json.url notification_url(notification, format: :json)
+
diff --git a/app/views/api/notifications/_notify_member_subscribed_plan.json.jbuilder b/app/views/api/notifications/_notify_member_subscribed_plan.json.jbuilder
index 2c51ad989..359ed650c 100644
--- a/app/views/api/notifications/_notify_member_subscribed_plan.json.jbuilder
+++ b/app/views/api/notifications/_notify_member_subscribed_plan.json.jbuilder
@@ -1,4 +1,4 @@
json.title notification.notification_type
json.description t('.you_have_subscribed_to_PLAN_html',
PLAN: notification.attached_object.plan.name)
-json.url notification_url(notification, format: :json)
+
diff --git a/app/views/api/notifications/_notify_member_subscribed_plan_is_changed.json.jbuilder b/app/views/api/notifications/_notify_member_subscribed_plan_is_changed.json.jbuilder
index 08a17c2a5..60c761a55 100644
--- a/app/views/api/notifications/_notify_member_subscribed_plan_is_changed.json.jbuilder
+++ b/app/views/api/notifications/_notify_member_subscribed_plan_is_changed.json.jbuilder
@@ -5,4 +5,4 @@
json.title notification.notification_type
json.description t('.you_have_changed_your_subscription_to_PLAN_html',
PLAN: notification.attached_object.plan.name)
-json.url notification_url(notification, format: :json)
+
diff --git a/app/views/api/notifications/_notify_member_subscription_canceled.json.jbuilder b/app/views/api/notifications/_notify_member_subscription_canceled.json.jbuilder
index ff6700965..32b3caadd 100644
--- a/app/views/api/notifications/_notify_member_subscription_canceled.json.jbuilder
+++ b/app/views/api/notifications/_notify_member_subscription_canceled.json.jbuilder
@@ -1,4 +1,4 @@
json.title notification.notification_type
json.description t('.your_subscription_PLAN_was_successfully_cancelled_html',
PLAN: notification.attached_object.plan.name)
-json.url notification_url(notification, format: :json)
+
diff --git a/app/views/api/notifications/_notify_member_subscription_extended.json.jbuilder b/app/views/api/notifications/_notify_member_subscription_extended.json.jbuilder
index 7c6b0f225..43c9fd2cc 100644
--- a/app/views/api/notifications/_notify_member_subscription_extended.json.jbuilder
+++ b/app/views/api/notifications/_notify_member_subscription_extended.json.jbuilder
@@ -5,4 +5,4 @@ json.description _t('.your_subscription_PLAN_has_been_extended_FREE_until_DATE_h
FREE: notification.get_meta_data(:free_days).to_s,
DATE: I18n.l(notification.attached_object.expired_at.to_date)
}) # messageFormat
-json.url notification_url(notification, format: :json)
+
diff --git a/app/views/api/notifications/_notify_member_subscription_is_expired.json.jbuilder b/app/views/api/notifications/_notify_member_subscription_is_expired.json.jbuilder
index 3e6be1f42..4c0bc5c46 100644
--- a/app/views/api/notifications/_notify_member_subscription_is_expired.json.jbuilder
+++ b/app/views/api/notifications/_notify_member_subscription_is_expired.json.jbuilder
@@ -1,3 +1,3 @@
json.title notification.notification_type
json.description t('.your_subscription_has_expired')
-json.url notification_url(notification, format: :json)
+
diff --git a/app/views/api/notifications/_notify_member_subscription_will_expire_in_7_days.json.jbuilder b/app/views/api/notifications/_notify_member_subscription_will_expire_in_7_days.json.jbuilder
index 873bab323..b3f733fd3 100644
--- a/app/views/api/notifications/_notify_member_subscription_will_expire_in_7_days.json.jbuilder
+++ b/app/views/api/notifications/_notify_member_subscription_will_expire_in_7_days.json.jbuilder
@@ -1,3 +1,3 @@
json.title notification.notification_type
json.description t('.your_subscription_will_expire_in_7_days')
-json.url notification_url(notification, format: :json)
+
diff --git a/app/views/api/notifications/_notify_partner_subscribed_plan.json.jbuilder b/app/views/api/notifications/_notify_partner_subscribed_plan.json.jbuilder
index a7e5099ff..985e15baf 100644
--- a/app/views/api/notifications/_notify_partner_subscribed_plan.json.jbuilder
+++ b/app/views/api/notifications/_notify_partner_subscribed_plan.json.jbuilder
@@ -4,4 +4,4 @@ json.description t('.subscription_partner_PLAN_has_been_subscribed_by_USER_html'
PLAN: notification.attached_object.plan.name,
USER: notification.attached_object.user&.profile&.full_name || t('api.notifications.deleted_user')
}) # messageFormat
-json.url notification_url(notification, format: :json)
+
diff --git a/app/views/api/notifications/_notify_privacy_policy_changed.json.jbuilder b/app/views/api/notifications/_notify_privacy_policy_changed.json.jbuilder
index 3f73f7bc8..a43c0f7ec 100644
--- a/app/views/api/notifications/_notify_privacy_policy_changed.json.jbuilder
+++ b/app/views/api/notifications/_notify_privacy_policy_changed.json.jbuilder
@@ -1,4 +1,4 @@
json.title notification.notification_type
json.description t('.policy_updated') +
"
."
-json.url notification_url(notification, format: :json)
+
diff --git a/app/views/api/notifications/_notify_project_author_when_collaborator_valid.json.jbuilder b/app/views/api/notifications/_notify_project_author_when_collaborator_valid.json.jbuilder
index fd2e105dc..d5b1c897c 100644
--- a/app/views/api/notifications/_notify_project_author_when_collaborator_valid.json.jbuilder
+++ b/app/views/api/notifications/_notify_project_author_when_collaborator_valid.json.jbuilder
@@ -2,4 +2,4 @@ json.title notification.notification_type
json.description t('.USER_became_collaborator_of_your_project',
USER: notification.attached_object.user&.profile&.full_name || t('api.notifications.deleted_user')) +
" #{notification.attached_object.project.name}."
-json.url notification_url(notification, format: :json)
+
diff --git a/app/views/api/notifications/_notify_project_collaborator_to_valid.json.jbuilder b/app/views/api/notifications/_notify_project_collaborator_to_valid.json.jbuilder
index 2615f16c6..74fa3e863 100644
--- a/app/views/api/notifications/_notify_project_collaborator_to_valid.json.jbuilder
+++ b/app/views/api/notifications/_notify_project_collaborator_to_valid.json.jbuilder
@@ -1,4 +1,4 @@
json.title notification.notification_type
json.description t('.you_are_invited_to_collaborate_on_the_project') +
"
#{notification.attached_object.project.name}."
-json.url notification_url(notification, format: :json)
+
diff --git a/app/views/api/notifications/_notify_user_auth_migration.json.jbuilder b/app/views/api/notifications/_notify_user_auth_migration.json.jbuilder
index d1fb253d9..d3b92f1e4 100644
--- a/app/views/api/notifications/_notify_user_auth_migration.json.jbuilder
+++ b/app/views/api/notifications/_notify_user_auth_migration.json.jbuilder
@@ -1,3 +1,3 @@
json.title notification.notification_type
json.description t('.your_account_was_migrated')
-json.url notification_url(notification, format: :json)
+
diff --git a/app/views/api/notifications/_notify_user_profile_complete.json.jbuilder b/app/views/api/notifications/_notify_user_profile_complete.json.jbuilder
index 1eba5b35d..1e3232a58 100644
--- a/app/views/api/notifications/_notify_user_profile_complete.json.jbuilder
+++ b/app/views/api/notifications/_notify_user_profile_complete.json.jbuilder
@@ -1,3 +1,3 @@
json.title notification.notification_type
json.description t('.your_profile_was_completed')
-json.url notification_url(notification, format: :json)
+
diff --git a/app/views/api/notifications/_notify_user_role_update.json.jbuilder b/app/views/api/notifications/_notify_user_role_update.json.jbuilder
index 2ed0413dc..ecf8281a0 100644
--- a/app/views/api/notifications/_notify_user_role_update.json.jbuilder
+++ b/app/views/api/notifications/_notify_user_role_update.json.jbuilder
@@ -2,4 +2,4 @@
json.title notification.notification_type
json.description t('.your_role_is_ROLE', ROLE: t("roles.#{notification.attached_object&.role}"))
-json.url notification_url(notification, format: :json)
+
diff --git a/app/views/api/notifications/_notify_user_training_valid.json.jbuilder b/app/views/api/notifications/_notify_user_training_valid.json.jbuilder
index af7fc64b3..827c2f521 100644
--- a/app/views/api/notifications/_notify_user_training_valid.json.jbuilder
+++ b/app/views/api/notifications/_notify_user_training_valid.json.jbuilder
@@ -1,4 +1,4 @@
json.title notification.notification_type
json.description t('.your_TRAINING_was_validated_html',
TRAINING: notification.attached_object.training.name)
-json.url notification_url(notification, format: :json)
+
diff --git a/app/views/api/notifications/_notify_user_user_group_changed.json.jbuilder b/app/views/api/notifications/_notify_user_user_group_changed.json.jbuilder
index 6da7e4efa..4b6ef69dd 100644
--- a/app/views/api/notifications/_notify_user_user_group_changed.json.jbuilder
+++ b/app/views/api/notifications/_notify_user_user_group_changed.json.jbuilder
@@ -1,3 +1,3 @@
json.title notification.notification_type
json.description t('.your_group_has_changed')
-json.url notification_url(notification, format: :json)
+
diff --git a/app/views/api/notifications/_notify_user_wallet_is_credited.json.jbuilder b/app/views/api/notifications/_notify_user_wallet_is_credited.json.jbuilder
index 836492cf5..4030bf1cb 100644
--- a/app/views/api/notifications/_notify_user_wallet_is_credited.json.jbuilder
+++ b/app/views/api/notifications/_notify_user_wallet_is_credited.json.jbuilder
@@ -2,4 +2,4 @@ json.title notification.notification_type
amount = notification.attached_object.amount
json.description t('.your_wallet_is_credited',
AMOUNT: number_to_currency(amount))
-json.url notification_url(notification, format: :json)
+
diff --git a/app/views/api/notifications/_notify_user_when_avoir_ready.json.jbuilder b/app/views/api/notifications/_notify_user_when_avoir_ready.json.jbuilder
index 48e3de107..0c7c08e27 100644
--- a/app/views/api/notifications/_notify_user_when_avoir_ready.json.jbuilder
+++ b/app/views/api/notifications/_notify_user_when_avoir_ready.json.jbuilder
@@ -4,4 +4,4 @@ json.description t('.your_avoir_is_ready_html',
REFERENCE: notification.attached_object.reference,
AMOUNT: number_to_currency(amount),
INVOICE_ID: notification.attached_object.id)
-json.url notification_url(notification, format: :json)
+
diff --git a/app/views/api/notifications/_notify_user_when_invoice_ready.json.jbuilder b/app/views/api/notifications/_notify_user_when_invoice_ready.json.jbuilder
index 8367110c3..3f24395df 100644
--- a/app/views/api/notifications/_notify_user_when_invoice_ready.json.jbuilder
+++ b/app/views/api/notifications/_notify_user_when_invoice_ready.json.jbuilder
@@ -4,4 +4,4 @@ json.description t('.your_invoice_is_ready_html',
REFERENCE: notification.attached_object.reference,
AMOUNT: number_to_currency(amount),
INVOICE_ID: notification.attached_object.id)
-json.url notification_url(notification, format: :json)
+
diff --git a/app/views/api/notifications/_undefined_notification.json.jbuilder b/app/views/api/notifications/_undefined_notification.json.jbuilder
index a469ac4f8..8249b95db 100644
--- a/app/views/api/notifications/_undefined_notification.json.jbuilder
+++ b/app/views/api/notifications/_undefined_notification.json.jbuilder
@@ -2,4 +2,4 @@ json.title t('.unknown_notification')
json.description t('.notification_ID_wrong_type_TYPE_unknown',
ID: notification.id,
TYPE: notification.notification_type_id)
-json.url notification_url(notification, format: :json)
+
diff --git a/app/views/api/notifications/show.json.jbuilder b/app/views/api/notifications/show.json.jbuilder
index 73566944f..a7240074f 100644
--- a/app/views/api/notifications/show.json.jbuilder
+++ b/app/views/api/notifications/show.json.jbuilder
@@ -3,4 +3,3 @@ json.attached_object @notification.attached_object
json.message do
json.partial! "/api/notifications/#{@notification.notification_type}", notification: @notification
end
-json.url notification_url(@notification, format: :json)
diff --git a/app/views/api/open_api_clients/_client.json.jbuilder b/app/views/api/open_api_clients/_client.json.jbuilder
index d074fe8cb..9f26bfe35 100644
--- a/app/views/api/open_api_clients/_client.json.jbuilder
+++ b/app/views/api/open_api_clients/_client.json.jbuilder
@@ -1 +1,3 @@
+# frozen_string_literal: true
+
json.extract! client, :id, :name, :calls_count, :token, :created_at
diff --git a/app/views/api/open_api_clients/create.json.jbuilder b/app/views/api/open_api_clients/create.json.jbuilder
index 467fb8a7a..0c679a1a4 100644
--- a/app/views/api/open_api_clients/create.json.jbuilder
+++ b/app/views/api/open_api_clients/create.json.jbuilder
@@ -1 +1,3 @@
+# frozen_string_literal: true
+
json.partial! 'api/open_api_clients/client', client: @client
diff --git a/app/views/api/projects/index.json.jbuilder b/app/views/api/projects/index.json.jbuilder
index 6be508e95..6f787dfcc 100644
--- a/app/views/api/projects/index.json.jbuilder
+++ b/app/views/api/projects/index.json.jbuilder
@@ -3,7 +3,7 @@
json.projects @projects do |project|
json.extract! project, :id, :name, :description, :licence_id, :slug, :state
json.author_id project.author.user_id
- json.url project_url(project, format: :json)
+
json.project_image project.project_image.attachment.medium.url if project.project_image
json.user_ids project.user_ids
end
diff --git a/app/views/api/projects/last_published.json.jbuilder b/app/views/api/projects/last_published.json.jbuilder
index 97199d440..1f80d7b48 100644
--- a/app/views/api/projects/last_published.json.jbuilder
+++ b/app/views/api/projects/last_published.json.jbuilder
@@ -2,6 +2,6 @@
json.array!(@projects) do |project|
json.extract! project, :id, :name, :description, :slug
- json.url project_url(project, format: :json)
+
json.project_image project.project_image.attachment.large.url if project.project_image
end
diff --git a/app/views/api/reservations/index.json.jbuilder b/app/views/api/reservations/index.json.jbuilder
index c3f05fa56..e46167742 100644
--- a/app/views/api/reservations/index.json.jbuilder
+++ b/app/views/api/reservations/index.json.jbuilder
@@ -1,4 +1,4 @@
json.array!(@reservations) do |r|
json.partial! 'api/reservations/reservation', reservation: r
- json.url reservation_url(r, format: :json)
+
end
diff --git a/app/views/api/settings/test_present.json.jbuilder b/app/views/api/settings/test_present.json.jbuilder
new file mode 100644
index 000000000..661b3b928
--- /dev/null
+++ b/app/views/api/settings/test_present.json.jbuilder
@@ -0,0 +1 @@
+json.isPresent @setting.present?
diff --git a/app/views/api/themes/index.json.jbuilder b/app/views/api/themes/index.json.jbuilder
index 61a4139cc..8b09f6793 100644
--- a/app/views/api/themes/index.json.jbuilder
+++ b/app/views/api/themes/index.json.jbuilder
@@ -1,4 +1,4 @@
json.array!(@themes) do |theme|
json.extract! theme, :id, :name
- json.url theme_url(theme, format: :json)
+
end
diff --git a/app/views/application/index.html.erb b/app/views/application/index.html.erb
index 4350be3b4..b69219f14 100644
--- a/app/views/application/index.html.erb
+++ b/app/views/application/index.html.erb
@@ -7,7 +7,7 @@
-
<%=Setting.find_by(name: 'fablab_name').value%>
+
<%=Setting.get('fablab_name')%>
@@ -23,19 +23,11 @@