ruby-lokalise-api 4.5.1 → 5.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e3db69f1caef4a81c8cb7da9cafb25e68dc4d98abcf7c5806fb748370cd5a335
-  data.tar.gz: 22e61446ba7bb1b9e0a446c2a0411e1f0fa27ef7615d78fc1eb50f4da9b63411
+  metadata.gz: b99a57388157ac9dea3e17b78cf19b27ada718b172b9b5e91230e4b0772073f2
+  data.tar.gz: fff194faef3d317f122987fc866c9358f3169dbf8d5a1d52fdf5d810bff0cb84
 SHA512:
-  metadata.gz: 03b8381002e892638238ecd2fcd50f3052f7f18e454dab05e3962fbfe61d36b17be3488ce9af3eaaf64733684e25c7f888a24a350601672f3bfc493ac6670c22
-  data.tar.gz: 0dc3679409dd32bf1eeac182a17b21114b2233bc7b9dc33d0e74bae48f9361557d067c576cba49f90b773dd74b304157b54d58e8e2e67550511fd275c22944e6
+  metadata.gz: 478a91cc6130208809c783ac145270d89d3a059d76d9b011133a2e62b8b82bee8d9011004945cfb02b9cd950699f45d6354522281904aaf61b885935aee28dca
+  data.tar.gz: 15b10938bcfd13534fbcbea1f7f705b74b39e9f9c02895d413f9c859246a389b020ca4abd1d35c59078388564c7c22995bd558b47aad52b5e233229f34e4bec3

data/README.md

@@ -42,7 +42,7 @@ process.status
 Alternatively instantiate your client with an [OAuth2 token](http://docs.lokalise.com/en/articles/5574713-oauth-2):
 
 ```ruby
-@client = Lokalise.oauth_client 'YOUR_OAUTH_TOKEN_HERE'
+@client = Lokalise.oauth2_client 'YOUR_OAUTH2_TOKEN_HERE'
 ```
 
 ## Usage

data/lib/ruby-lokalise-api/base_request.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module Lokalise
+  module BaseRequest
+    include Lokalise::JsonHandler
+
+    private
+
+    # Get rid of double slashes in the `path`, leading and trailing slash
+    def prepare(path)
+      path.delete_prefix('/').gsub(%r{//}, '/').gsub(%r{/+\z}, '')
+    end
+
+    def raise_on_error!(status, body)
+      respond_with_error(status, body) if status.between?(400, 599) || (body.respond_to?(:has_key?) && body.key?('error'))
+    end
+
+    def respond_with_error(code, body)
+      raise(Lokalise::Error, body['error'] || body) unless Lokalise::Error::ERRORS.key? code
+
+      raise Lokalise::Error::ERRORS[code].from_response(body)
+    end
+  end
+end

data/lib/ruby-lokalise-api/client.rb

@@ -26,13 +26,12 @@ require 'ruby-lokalise-api/rest/team_user_billing_details'
 module Lokalise
   class Client
     attr_reader :token, :token_header
-    attr_accessor :timeout, :open_timeout, :enable_compression
+    attr_accessor :timeout, :open_timeout
 
     def initialize(token, params = {})
       @token = token
       @timeout = params.fetch(:timeout, nil)
       @open_timeout = params.fetch(:open_timeout, nil)
-      @enable_compression = params.fetch(:enable_compression, false)
       @token_header = 'x-api-token'
     end
 

data/lib/ruby-lokalise-api/connection.rb

@@ -6,8 +6,8 @@ module Lokalise
 
     def connection(client)
       Faraday.new(options(client), request_params_for(client)) do |faraday|
-        faraday.use(:gzip) if client.enable_compression
         faraday.adapter Faraday.default_adapter
+        faraday.request :gzip
       end
     end
 
@@ -18,6 +18,7 @@ module Lokalise
         headers: {
           accept: 'application/json',
           user_agent: "ruby-lokalise-api gem/#{Lokalise::VERSION}",
+          accept_encoding: 'gzip,deflate,br',
           client.token_header => client.token
         },
         url: BASE_URL

data/lib/ruby-lokalise-api/oauth2/auth.rb

@@ -0,0 +1,62 @@
+# frozen_string_literal: true
+
+module Lokalise
+  module OAuth2
+    class Auth
+      include Lokalise::OAuth2::Request
+
+      attr_reader :client_id, :client_secret
+
+      def initialize(client_id, client_secret)
+        @client_id = client_id
+        @client_secret = client_secret
+      end
+
+      def auth(scope:, redirect_uri: nil, state: nil)
+        scope = scope.join(' ') if scope.is_a?(Array)
+
+        params = {
+          client_id: client_id,
+          scope: scope
+        }
+        params[:state] = state unless state.nil?
+        params[:redirect_uri] = redirect_uri unless redirect_uri.nil?
+
+        _build_url_from params
+      end
+
+      def token(code)
+        params = base_params.merge({
+                                     code: code,
+                                     grant_type: 'authorization_code'
+                                   })
+        post 'token', params
+      end
+
+      def refresh(token)
+        params = base_params.merge({
+                                     refresh_token: token,
+                                     grant_type: 'refresh_token'
+                                   })
+        post 'token', params
+      end
+
+      private
+
+      def base_params
+        {
+          client_id: client_id,
+          client_secret: client_secret
+        }
+      end
+
+      def _build_url_from(params)
+        URI::HTTPS.build(
+          host: BASE_URL.host,
+          path: "#{BASE_URL.path}auth",
+          query: URI.encode_www_form(params)
+        ).to_s
+      end
+    end
+  end
+end

data/lib/ruby-lokalise-api/oauth2/connection.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module Lokalise
+  module OAuth2
+    module Connection
+      BASE_URL = URI('https://app.lokalise.com/oauth2/')
+
+      def connection
+        Faraday.new(options) { |f| f.adapter Faraday.default_adapter }
+      end
+
+      private
+
+      def options
+        {
+          headers: {
+            accept: 'application/json',
+            user_agent: "ruby-lokalise-api gem/#{Lokalise::VERSION}"
+          },
+          url: BASE_URL.to_s
+        }
+      end
+    end
+  end
+end

data/lib/ruby-lokalise-api/oauth2/request.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module Lokalise
+  module OAuth2
+    module Request
+      include Lokalise::BaseRequest
+      include Lokalise::OAuth2::Connection
+
+      def post(path, params = {})
+        respond_with connection.post(prepare(path), custom_dump(params))
+      end
+
+      private
+
+      def respond_with(response)
+        body = custom_load response.body
+        status = response.status
+        raise_on_error! status, body
+        body
+      end
+    end
+  end
+end

data/lib/ruby-lokalise-api/{oauth_client.rb → oauth2_client.rb}

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Lokalise
-  class OAuthClient < Client
+  class OAuth2Client < Client
     def initialize(token, params = {})
       super(token, params)
       @token_header = 'Authorization'

data/lib/ruby-lokalise-api/request.rb

@@ -2,8 +2,8 @@
 
 module Lokalise
   module Request
+    include Lokalise::BaseRequest
     include Lokalise::Connection
-    include Lokalise::JsonHandler
 
     # Lokalise returns pagination info in special headers
     PAGINATION_HEADERS = %w[x-pagination-total-count x-pagination-page-count x-pagination-limit x-pagination-page].freeze
@@ -50,34 +50,23 @@ module Lokalise
 
     private
 
-    # Get rid of double slashes in the `path`, leading and trailing slash
-    def prepare(path)
-      path.delete_prefix('/').gsub(%r{//}, '/').gsub(%r{/+\z}, '')
-    end
-
     def respond_with(response, client)
       body = custom_load response.body
       uri = Addressable::URI.parse response.env.url
       status = response.status
-      respond_with_error status, body if status.between?(400, 599) || (body.respond_to?(:has_key?) && body.key?('error'))
+      raise_on_error! status, body
       extract_headers_from(response).
         merge('content' => body,
               'client' => client,
               'path' => uri.path.gsub(%r{/api2/}, ''))
     end
 
-    # Get only pagination headers
+    # Keep only pagination headers
     def extract_headers_from(response)
       response.
         headers.
         to_h.
         keep_if { |k, _v| PAGINATION_HEADERS.include?(k) }
     end
-
-    def respond_with_error(code, body)
-      raise(Lokalise::Error, body['error'] || body) unless Lokalise::Error::ERRORS.key? code
-
-      raise Lokalise::Error::ERRORS[code].from_response(body)
-    end
   end
 end

data/lib/ruby-lokalise-api/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Lokalise
-  VERSION = '4.5.1'
+  VERSION = '5.0.0'
 end

data/lib/ruby-lokalise-api.rb

@@ -1,19 +1,23 @@
 # frozen_string_literal: true
 
 require 'faraday'
-require 'faraday_middleware'
+require 'faraday/gzip'
 require 'yaml'
 require 'addressable'
 
 require 'ruby-lokalise-api/version'
 require 'ruby-lokalise-api/json_handler'
 require 'ruby-lokalise-api/connection'
+require 'ruby-lokalise-api/base_request'
 require 'ruby-lokalise-api/request'
 require 'ruby-lokalise-api/error'
 require 'ruby-lokalise-api/utils/string_utils'
 require 'ruby-lokalise-api/utils/attribute_helpers'
 require 'ruby-lokalise-api/utils/endpoint_helpers'
 
+require 'ruby-lokalise-api/oauth2/connection'
+require 'ruby-lokalise-api/oauth2/request'
+
 require 'ruby-lokalise-api/resources/base'
 require 'ruby-lokalise-api/resources/branch'
 require 'ruby-lokalise-api/resources/project'
@@ -66,7 +70,9 @@ require 'ruby-lokalise-api/collections/webhook'
 require 'ruby-lokalise-api/collections/segment'
 
 require 'ruby-lokalise-api/client'
-require 'ruby-lokalise-api/oauth_client'
+require 'ruby-lokalise-api/oauth2_client'
+
+require 'ruby-lokalise-api/oauth2/auth'
 
 module Lokalise
   class << self
@@ -84,18 +90,22 @@ module Lokalise
       @client = nil
     end
 
-    # Initializes a new OAuthClient object
+    # Initializes a new OAuth2Client object
     #
-    # @return [Lokalise::OAuthClient]
+    # @return [Lokalise::OAuth2Client]
     # @param token [String]
     # @param params [Hash]
-    def oauth_client(token, params = {})
-      @oauth_client = Lokalise::OAuthClient.new token, params
+    def oauth2_client(token, params = {})
+      @oauth2_client = Lokalise::OAuth2Client.new token, params
+    end
+
+    # Reset the currently set OAuth2 client
+    def reset_oauth2_client!
+      @oauth2_client = nil
     end
 
-    # Reset the currently set OAuth client
-    def reset_oauth_client!
-      @oauth_client = nil
+    def auth_client(client_id, client_secret)
+      Lokalise::OAuth2::Auth.new client_id, client_secret
     end
   end
 end

data/ruby-lokalise-api.gemspec

@@ -23,8 +23,8 @@ Gem::Specification.new do |spec|
   spec.require_paths    = ['lib']
 
   spec.add_dependency 'addressable',                     '~> 2.5'
-  spec.add_dependency 'faraday',                         '~> 1.0'
-  spec.add_dependency 'faraday_middleware',              '~> 1.0'
+  spec.add_dependency 'faraday',                         '~> 2.0'
+  spec.add_dependency 'faraday-gzip',                    '~> 0.1'
   spec.add_dependency 'json',                            '>= 1.8.0'
 
   spec.add_development_dependency 'codecov',             '~> 0.1'

data/spec/lib/ruby-lokalise-api/connection_spec.rb

@@ -1,89 +1,68 @@
 # frozen_string_literal: true
 
 RSpec.describe Lokalise::Connection do
-  include described_class
+  let(:dummy) { Class.new { include Lokalise::Connection }.new }
 
   let(:project_id) { '803826145ba90b42d5d860.46800099' }
   let(:key_id) { 44_596_059 }
 
   before { Lokalise.reset_client! }
 
-  after do
-    Lokalise.reset_client!
-    Faraday.default_adapter = :net_http
-  end
+  after { Lokalise.reset_client! }
 
-  it 'Authorization header must be present for OAuth client' do
-    conn = connection test_oauth_client
-    expect(conn.headers['Authorization']).to eq("Bearer #{test_client.token}")
+  it 'Authorization header must be present for OAuth2 client' do
+    conn = dummy.connection test_oauth2_client
+    expect(conn.headers['Authorization']).to eq(test_oauth2_client.token)
     expect(conn.headers['X-api-token']).to be_nil
   end
 
-  it 'timeouts and compression should not be set by default but the token must be present' do
-    conn = connection test_client
+  it 'timeouts are not be set by default but the token must be present' do
+    conn = dummy.connection test_client
     expect(conn.options.timeout).to be_nil
     expect(conn.options.open_timeout).to be_nil
     expect(conn.headers['X-api-token']).to eq(test_client.token)
-    expect(conn.builder.handlers).not_to include(FaradayMiddleware::Gzip)
   end
 
   it 'allows to customize timeouts' do
     custom_client = Lokalise.client(ENV['LOKALISE_API_TOKEN'],
                                     open_timeout: 100, timeout: 500)
-    conn = connection custom_client
+    conn = dummy.connection custom_client
     expect(conn.options.timeout).to eq(500)
     expect(conn.options.open_timeout).to eq(100)
     expect(conn.headers['X-api-token']).to eq(custom_client.token)
 
     custom_client.timeout = 300
     custom_client.open_timeout = 200
-    another_conn = connection custom_client
+    another_conn = dummy.connection custom_client
     expect(another_conn.options.timeout).to eq(300)
     expect(another_conn.options.open_timeout).to eq(200)
   end
 
-  it 'is possible to customize adapter' do
-    conn = connection test_client
-    expect(conn.builder.adapter).to eq(Faraday::Adapter::NetHttp)
-
-    Faraday.default_adapter = :excon
-
-    another_conn = connection test_client
-    expect(another_conn.builder.adapter).to eq(Faraday::Adapter::Excon)
-    expect(conn.builder.adapter).to eq(Faraday::Adapter::NetHttp)
-  end
-
-  it 'allows to customize compression' do
-    custom_client = Lokalise.client(ENV['LOKALISE_API_TOKEN'], enable_compression: true)
-    conn = connection custom_client
-    expect(conn.headers['X-api-token']).to eq(custom_client.token)
-    expect(conn.builder.handlers).to include(FaradayMiddleware::Gzip)
-  end
-
-  it 'is possible to enable gzip compression' do
-    gzip_client = Lokalise.client(ENV['LOKALISE_API_TOKEN'], enable_compression: true)
+  it 'works with gzip compression' do
+    gzip_client = Lokalise.client(ENV['LOKALISE_API_TOKEN'])
     keys = VCR.use_cassette('all_keys_gzip') do
-      gzip_client.keys project_id
+      gzip_client.keys project_id, limit: 30
     end.collection
 
     expect(keys.first.key_id).to eq(key_id)
   end
 
-  it 'is possible to disable gzip compression' do
-    no_gzip_client = Lokalise.client(ENV['LOKALISE_API_TOKEN'], enable_compression: false)
-    keys = VCR.use_cassette('all_keys_no_gzip') do
-      no_gzip_client.keys project_id
-    end.collection
-
-    expect(keys.first.key_id).to eq(key_id)
+  it 'gzip compression is on by default' do
+    custom_client = Lokalise.client(ENV['LOKALISE_API_TOKEN'])
+    conn = dummy.connection custom_client
+    expect(conn.headers['X-api-token']).to eq(custom_client.token)
+    expect(conn.builder.handlers).to include(Faraday::Gzip::Middleware)
   end
 
-  it 'gzip compression is off by default' do
-    default_gzip_client = Lokalise.client(ENV['LOKALISE_API_TOKEN'])
-    keys = VCR.use_cassette('all_keys_default_gzip') do
-      default_gzip_client.keys project_id
-    end.collection
+  it 'is possible to customize adapter' do
+    conn = dummy.connection test_client
+    expect(conn.builder.adapter).to eq(Faraday::Adapter::NetHttp)
 
-    expect(keys.first.key_id).to eq(key_id)
+    Faraday.default_adapter = :test
+
+    another_conn = dummy.connection test_client
+
+    expect(another_conn.builder.adapter).to eq(Faraday::Adapter::Test)
+    expect(conn.builder.adapter).to eq(Faraday::Adapter::NetHttp)
   end
 end

data/spec/lib/ruby-lokalise-api/oauth2/auth_spec.rb

@@ -0,0 +1,73 @@
+# frozen_string_literal: true
+
+RSpec.describe Lokalise::OAuth2::Auth do
+  describe '#auth' do
+    it 'returns auth code' do
+      uri = auth_client.auth scope: 'read_projects'
+      expect(uri).to include(described_class::BASE_URL.to_s)
+      expect(uri).to include('auth?client_id=')
+      expect(uri).to include('&scope=read_projects')
+    end
+
+    it 'allows to pass an array of scopes' do
+      scopes = %w[write_projects write_team_groups write_tasks]
+      uri = auth_client.auth scope: scopes
+      expect(uri).to include(described_class::BASE_URL.to_s)
+      expect(uri).to include('auth?client_id=')
+      expect(uri).to include("&scope=#{scopes.join('+')}")
+    end
+
+    it 'allows to set redirect_uri' do
+      uri = auth_client.auth scope: 'read_projects', redirect_uri: 'http://example.com/callback'
+      expect(uri).to include(described_class::BASE_URL.to_s)
+      expect(uri).to include('example.com%2Fcallback')
+    end
+
+    it 'allows to set state' do
+      state = '123abc'
+      uri = auth_client.auth scope: 'read_projects', state: state
+      expect(uri).to include(described_class::BASE_URL.to_s)
+      expect(uri).to include(state)
+    end
+  end
+
+  describe '#token' do
+    it 'returns an OAuth2 token' do
+      resp = VCR.use_cassette('oauth2/token') do
+        auth_client.token ENV['OAUTH2_CODE']
+      end
+      expect(resp['access_token']).not_to be_nil
+      expect(resp['refresh_token']).not_to be_nil
+      expect(resp['expires_in']).to eq(3600)
+      expect(resp['token_type']).to eq('Bearer')
+    end
+
+    it 'raises an error when the code is invalid' do
+      expect do
+        VCR.use_cassette('oauth2/token_error') do
+          auth_client.token 'incorrect_code'
+        end
+      end.to raise_error(Lokalise::Error::BadRequest)
+    end
+  end
+
+  describe '#refresh' do
+    it 'returns a refreshed OAuth2 token' do
+      resp = VCR.use_cassette('oauth2/refresh') do
+        auth_client.refresh ENV['OAUTH2_REFRESH_TOKEN']
+      end
+      expect(resp['access_token']).not_to be_nil
+      expect(resp['refresh_token']).to be_nil
+      expect(resp['expires_in']).to eq(3600)
+      expect(resp['token_type']).to eq('Bearer')
+    end
+
+    it 'raises an error when the token is invalid' do
+      expect do
+        VCR.use_cassette('oauth2/refresh_error') do
+          auth_client.refresh 'incorrect_token'
+        end
+      end.to raise_error(Lokalise::Error::BadRequest)
+    end
+  end
+end

data/spec/lib/ruby-lokalise-api/rest/branches_spec.rb

@@ -10,20 +10,20 @@ RSpec.describe Lokalise::Client do
         test_client.branches project_id
       end.collection
 
-      expect(branches.count).to eq(1)
+      expect(branches.count).to eq(4)
     end
 
     it 'supports pagination' do
       branches = VCR.use_cassette('all_branches_pagination') do
-        test_client.branches project_id, limit: 1, page: 1
+        test_client.branches project_id, limit: 2, page: 2
       end
 
-      expect(branches.collection.count).to eq(1)
-      expect(branches.total_results).to eq(1)
-      expect(branches.total_pages).to eq(1)
-      expect(branches.results_per_page).to eq(1)
-      expect(branches.current_page).to eq(1)
-      expect(branches.collection.first.name).to eq('ruby-branch')
+      expect(branches.collection.count).to eq(2)
+      expect(branches.total_results).to eq(4)
+      expect(branches.total_pages).to eq(2)
+      expect(branches.results_per_page).to eq(2)
+      expect(branches.current_page).to eq(2)
+      expect(branches.collection.first.name).to eq('merge-me')
     end
   end
 

data/spec/lib/ruby-lokalise-api/rest/projects_spec.rb

@@ -73,6 +73,19 @@ RSpec.describe Lokalise::Client do
     expect(project.team_id).to eq(176_692)
   end
 
+  context 'with OAuth 2 token' do
+    it 'creates a project' do
+      name = 'OAuth 2 project'
+      description = 'Via OAuth 2'
+      project = VCR.use_cassette('oauth2/new_project') do
+        test_oauth2_client.create_project name: name, description: description
+      end
+
+      expect(project.name).to eq(name)
+      expect(project.description).to eq(description)
+    end
+  end
+
   specify '#update_project' do
     project = VCR.use_cassette('update_project') do
       test_client.update_project new_project_id,

data/spec/lib/ruby-lokalise-api_spec.rb

@@ -6,7 +6,6 @@ RSpec.describe Lokalise do
     expect(test_client.token).to eq(ENV['LOKALISE_API_TOKEN'])
     expect(test_client.timeout).to be_nil
     expect(test_client.open_timeout).to be_nil
-    expect(test_client.enable_compression).to be false
   end
 
   specify '.reset_client!' do
@@ -16,18 +15,17 @@ RSpec.describe Lokalise do
     expect(current_client).to be_nil
   end
 
-  specify '.oauth_client' do
-    expect(test_oauth_client).to be_an_instance_of(Lokalise::OAuthClient)
-    expect(test_oauth_client.token).to eq("Bearer #{ENV['LOKALISE_API_TOKEN']}")
-    expect(test_oauth_client.timeout).to be_nil
-    expect(test_oauth_client.open_timeout).to be_nil
-    expect(test_oauth_client.enable_compression).to be false
+  specify '.oauth2_client' do
+    expect(test_oauth2_client).to be_an_instance_of(Lokalise::OAuth2Client)
+    expect(test_oauth2_client.token).to eq("Bearer #{ENV['OAUTH2_TOKEN']}")
+    expect(test_oauth2_client.timeout).to be_nil
+    expect(test_oauth2_client.open_timeout).to be_nil
   end
 
-  specify '.reset_oauth_client!' do
-    expect(test_oauth_client).to be_an_instance_of(Lokalise::OAuthClient)
-    described_class.reset_oauth_client!
-    current_oauth_client = described_class.instance_variable_get :@oauth_client
+  specify '.reset_oauth2_client!' do
+    expect(test_oauth2_client).to be_an_instance_of(Lokalise::OAuth2Client)
+    described_class.reset_oauth2_client!
+    current_oauth_client = described_class.instance_variable_get :@oauth2_client
     expect(current_oauth_client).to be_nil
   end
 
@@ -45,10 +43,5 @@ RSpec.describe Lokalise do
       custom_client = described_class.client(ENV['LOKALISE_API_TOKEN'], open_timeout: 100)
       expect(custom_client.open_timeout).to eq(100)
     end
-
-    it 'is possible to customize compression' do
-      custom_client = described_class.client(ENV['LOKALISE_API_TOKEN'], enable_compression: true)
-      expect(custom_client.enable_compression).to be true
-    end
   end
 end

data/spec/support/test_client.rb

@@ -5,7 +5,11 @@ module TestClient
     Lokalise.client(token || ENV['LOKALISE_API_TOKEN'], params)
   end
 
-  def test_oauth_client(token = nil, params = {})
-    Lokalise.oauth_client(token || ENV['LOKALISE_API_TOKEN'], params)
+  def test_oauth2_client(token = nil, params = {})
+    Lokalise.oauth2_client(token || ENV['OAUTH2_TOKEN'], params)
+  end
+
+  def auth_client
+    Lokalise.auth_client(ENV['OAUTH2_CLIENT_ID'], ENV['OAUTH2_CLIENT_SECRET'])
   end
 end

data/spec/support/vcr.rb

@@ -7,4 +7,9 @@ VCR.configure do |c|
   c.hook_into :faraday
   c.cassette_library_dir = File.join(File.dirname(__FILE__), '..', 'fixtures', 'vcr_cassettes')
   c.filter_sensitive_data('<LOKALISE_TOKEN>') { ENV.fetch('LOKALISE_API_TOKEN') }
+  c.filter_sensitive_data('<OAUTH2_CLIENT_ID>') { ENV.fetch('OAUTH2_CLIENT_ID') }
+  c.filter_sensitive_data('<OAUTH2_CLIENT_SECRET>') { ENV.fetch('OAUTH2_CLIENT_SECRET') }
+  c.filter_sensitive_data('<OAUTH2_TOKEN>') { ENV.fetch('OAUTH2_TOKEN') }
+  c.filter_sensitive_data('<OAUTH2_CODE>') { ENV.fetch('OAUTH2_CODE') }
+  c.filter_sensitive_data('<OAUTH2_REFRESH_TOKEN>') { ENV.fetch('OAUTH2_REFRESH_TOKEN') }
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-lokalise-api
 version: !ruby/object:Gem::Version
-  version: 4.5.1
+  version: 5.0.0
 platform: ruby
 authors:
 - Ilya Bodrov-Krukowski
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-27 00:00:00.000000000 Z
+date: 2022-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -30,28 +30,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: faraday_middleware
+  name: faraday-gzip
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -224,6 +224,7 @@ files:
 - README.md
 - Rakefile
 - lib/ruby-lokalise-api.rb
+- lib/ruby-lokalise-api/base_request.rb
 - lib/ruby-lokalise-api/client.rb
 - lib/ruby-lokalise-api/collections/base.rb
 - lib/ruby-lokalise-api/collections/branch.rb
@@ -253,7 +254,10 @@ files:
 - lib/ruby-lokalise-api/data/attributes.json
 - lib/ruby-lokalise-api/error.rb
 - lib/ruby-lokalise-api/json_handler.rb
-- lib/ruby-lokalise-api/oauth_client.rb
+- lib/ruby-lokalise-api/oauth2/auth.rb
+- lib/ruby-lokalise-api/oauth2/connection.rb
+- lib/ruby-lokalise-api/oauth2/request.rb
+- lib/ruby-lokalise-api/oauth2_client.rb
 - lib/ruby-lokalise-api/request.rb
 - lib/ruby-lokalise-api/resources/base.rb
 - lib/ruby-lokalise-api/resources/branch.rb
@@ -310,6 +314,7 @@ files:
 - spec/lib/ruby-lokalise-api/connection_spec.rb
 - spec/lib/ruby-lokalise-api/custom_json_parser_spec.rb
 - spec/lib/ruby-lokalise-api/error_spec.rb
+- spec/lib/ruby-lokalise-api/oauth2/auth_spec.rb
 - spec/lib/ruby-lokalise-api/rest/branches_spec.rb
 - spec/lib/ruby-lokalise-api/rest/comments_spec.rb
 - spec/lib/ruby-lokalise-api/rest/contributors_spec.rb
@@ -364,6 +369,7 @@ test_files:
 - spec/lib/ruby-lokalise-api/connection_spec.rb
 - spec/lib/ruby-lokalise-api/custom_json_parser_spec.rb
 - spec/lib/ruby-lokalise-api/error_spec.rb
+- spec/lib/ruby-lokalise-api/oauth2/auth_spec.rb
 - spec/lib/ruby-lokalise-api/rest/branches_spec.rb
 - spec/lib/ruby-lokalise-api/rest/comments_spec.rb
 - spec/lib/ruby-lokalise-api/rest/contributors_spec.rb