scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-20 14:45:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1439 from okriuchykhin/ok_SCI_2888

Browse source 
Rename CORE_API_V1_PREVIEW env. variable to CORE_API_V1_ENABLED [SCI-2888]
This commit is contained in:
Alex Kriuchykhin 2019-01-10 11:05:07 +01:00 committed by GitHub
parent 8ea37c541b 6a64b23f90
commit c2b38af91e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/services/api.rb
View file

@ -16,7 +16,7 @@ module Api
attr_accessor :core_api_token_ttl
attr_accessor :core_api_token_iss
attr_accessor :azure_ad_apps
attr_accessor :core_api_v1_preview
attr_accessor :core_api_v1_enabled
attr_accessor :core_api_rate_limit
def initialize
@ -24,7 +24,7 @@ module Api
@core_api_token_ttl = 30.minutes
@core_api_token_iss = 'SciNote'
@azure_ad_apps = {}
@core_api_v1_preview = false
@core_api_v1_enabled = false
@core_api_rate_limit = 1000
end
end

4
config/initializers/api.rb
View file

@ -12,9 +12,9 @@ Api.configure do |config|
config.core_api_rate_limit =
ENV['CORE_API_RATE_LIMIT'] ? ENV['CORE_API_RATE_LIMIT'].to_i : 1000
config.core_api_v1_preview = true if ENV['CORE_API_V1_PREVIEW']
config.core_api_v1_enabled = true if ENV['CORE_API_V1_ENABLED']
Paperclip::DataUriAdapter.register if ENV['CORE_API_V1_PREVIEW']
Paperclip::DataUriAdapter.register if ENV['CORE_API_V1_ENABLED']
vars = ENV.select { |name, _| name =~ /^[[:alnum:]]*_AZURE_AD_APP_ID/ }
vars.each do |name, value|

2
config/routes.rb
View file

@ -561,7 +561,7 @@ Rails.application.routes.draw do
namespace :api, defaults: { format: 'json' } do
get 'health', to: 'api#health'
get 'status', to: 'api#status'
if Api.configuration.core_api_v1_preview
if Api.configuration.core_api_v1_enabled
namespace :v1 do
resources :teams, only: %i(index show) do
resources :inventories,

2
spec/rails_helper.rb
View file

@ -6,7 +6,7 @@ require 'devise'
require_relative 'support/controller_macros'
ENV['RAILS_ENV'] = 'test'
ENV['CORE_API_V1_PREVIEW'] = 'true'
ENV['CORE_API_V1_ENABLED'] = 'true'
require File.expand_path('../../config/environment', __FILE__)
# Prevent database truncation if the environment is production