killbill 9.3.0 → 9.3.1

data/lib/killbill/gen/api/security_api.rb

@@ -181,15 +181,19 @@ module Killbill
 
       # conversion for tenantContext [type = org.killbill.billing.util.callcontext.TenantContext]
       tenantContext = tenantContext.to_java unless tenantContext.nil?
-      res = @real_java_api.get_user_roles(username, tenantContext)
-      # conversion for res [type = java.util.List]
-      tmp = []
-      (res || []).each do |m|
-        # conversion for m [type = java.lang.String]
-        tmp << m
+      begin
+        res = @real_java_api.get_user_roles(username, tenantContext)
+        # conversion for res [type = java.util.List]
+        tmp = []
+        (res || []).each do |m|
+          # conversion for m [type = java.lang.String]
+          tmp << m
+        end
+        res = tmp
+        return res
+      rescue Java::org.killbill.billing.security.SecurityApiException => e
+        raise Killbill::Plugin::Model::SecurityApiException.new.to_ruby(e)
       end
-      res = tmp
-      return res
     end
 
     java_signature 'Java::void addRoleDefinition(Java::java.lang.String, Java::java.util.List, Java::org.killbill.billing.util.callcontext.CallContext)'

data/lib/killbill/gen/api/tag_user_api.rb

@@ -324,6 +324,52 @@ module Killbill
           res = tmp
           return res
         end
+
+        java_signature 'Java::java.util.List getTagAuditLogsWithHistoryForId(Java::java.util.UUID, Java::org.killbill.billing.util.api.AuditLevel, Java::org.killbill.billing.util.callcontext.TenantContext)'
+        def get_tag_audit_logs_with_history_for_id(tagId, auditLevel, context)
+
+          # conversion for tagId [type = java.util.UUID]
+          tagId = java.util.UUID.fromString(tagId.to_s) unless tagId.nil?
+
+          # conversion for auditLevel [type = org.killbill.billing.util.api.AuditLevel]
+          auditLevel = Java::org.killbill.billing.util.api.AuditLevel.value_of( auditLevel.to_s ) unless auditLevel.nil?
+
+          # conversion for context [type = org.killbill.billing.util.callcontext.TenantContext]
+          context = context.to_java unless context.nil?
+          res = @real_java_api.get_tag_audit_logs_with_history_for_id(tagId, auditLevel, context)
+          # conversion for res [type = java.util.List]
+          tmp = []
+          (res || []).each do |m|
+            # conversion for m [type = org.killbill.billing.util.audit.AuditLogWithHistory]
+            m = Killbill::Plugin::Model::AuditLogWithHistory.new.to_ruby(m) unless m.nil?
+            tmp << m
+          end
+          res = tmp
+          return res
+        end
+
+        java_signature 'Java::java.util.List getTagDefinitionAuditLogsWithHistoryForId(Java::java.util.UUID, Java::org.killbill.billing.util.api.AuditLevel, Java::org.killbill.billing.util.callcontext.TenantContext)'
+        def get_tag_definition_audit_logs_with_history_for_id(tagDefinitionId, auditLevel, context)
+
+          # conversion for tagDefinitionId [type = java.util.UUID]
+          tagDefinitionId = java.util.UUID.fromString(tagDefinitionId.to_s) unless tagDefinitionId.nil?
+
+          # conversion for auditLevel [type = org.killbill.billing.util.api.AuditLevel]
+          auditLevel = Java::org.killbill.billing.util.api.AuditLevel.value_of( auditLevel.to_s ) unless auditLevel.nil?
+
+          # conversion for context [type = org.killbill.billing.util.callcontext.TenantContext]
+          context = context.to_java unless context.nil?
+          res = @real_java_api.get_tag_definition_audit_logs_with_history_for_id(tagDefinitionId, auditLevel, context)
+          # conversion for res [type = java.util.List]
+          tmp = []
+          (res || []).each do |m|
+            # conversion for m [type = org.killbill.billing.util.audit.AuditLogWithHistory]
+            m = Killbill::Plugin::Model::AuditLogWithHistory.new.to_ruby(m) unless m.nil?
+            tmp << m
+          end
+          res = tmp
+          return res
+        end
       end
     end
   end

data/lib/killbill/gen/plugin-api/invoice_notification_metadata.rb

@@ -0,0 +1,81 @@
+#############################################################################################
+#                                                                                           #
+#                   Copyright 2010-2013 Ning, Inc.                                          #
+#                   Copyright 2014 Groupon, Inc.                                            #
+#                   Copyright 2014 The Billing Project, LLC                                 #
+#                                                                                           #
+#      The Billing Project licenses this file to you under the Apache License, version 2.0  #
+#      (the "License"); you may not use this file except in compliance with the             #
+#      License.  You may obtain a copy of the License at:                                   #
+#                                                                                           #
+#          http://www.apache.org/licenses/LICENSE-2.0                                       #
+#                                                                                           #
+#      Unless required by applicable law or agreed to in writing, software                  #
+#      distributed under the License is distributed on an "AS IS" BASIS, WITHOUT            #
+#      WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the            #
+#      License for the specific language governing permissions and limitations              #
+#      under the License.                                                                   #
+#                                                                                           #
+#############################################################################################
+
+
+#
+#                       DO NOT EDIT!!!
+#    File automatically generated by killbill-java-parser (git@github.com:killbill/killbill-java-parser.git)
+#
+
+
+module Killbill
+  module Plugin
+    module Model
+
+      class InvoiceNotificationMetadata
+
+
+        attr_accessor :target_date, :amount_owed, :currency
+
+        def initialize()
+        end
+
+        def to_java()
+          # conversion for target_date [type = org.joda.time.DateTime]
+          if !@target_date.nil?
+            @target_date =  (@target_date.kind_of? Time) ? DateTime.parse(@target_date.to_s) : @target_date
+            @target_date = Java::org.joda.time.DateTime.new(@target_date.to_s, Java::org.joda.time.DateTimeZone::UTC)
+          end
+
+          # conversion for amount_owed [type = java.math.BigDecimal]
+          if @amount_owed.nil?
+            @amount_owed = java.math.BigDecimal::ZERO
+          else
+            @amount_owed = java.math.BigDecimal.new(@amount_owed.to_s)
+          end
+
+          # conversion for currency [type = org.killbill.billing.catalog.api.Currency]
+          @currency = Java::org.killbill.billing.catalog.api.Currency.value_of( @currency.to_s ) unless @currency.nil?
+          Java::org.killbill.billing.notification.plugin.api.InvoiceNotificationMetadata.new(@target_date, @amount_owed, @currency)
+        end
+
+        def to_ruby(j_obj)
+          # conversion for target_date [type = org.joda.time.DateTime]
+          @target_date = j_obj.target_date
+          if !@target_date.nil?
+            fmt = Java::org.joda.time.format.ISODateTimeFormat.date_time_no_millis # See https://github.com/killbill/killbill-java-parser/issues/3
+            str = fmt.print(@target_date)
+            @target_date = DateTime.iso8601(str)
+          end
+
+          # conversion for amount_owed [type = java.math.BigDecimal]
+          @amount_owed = j_obj.amount_owed
+          @amount_owed = @amount_owed.nil? ? 0 : BigDecimal.new(@amount_owed.to_s)
+
+          # conversion for currency [type = org.killbill.billing.catalog.api.Currency]
+          @currency = j_obj.currency
+          @currency = @currency.to_s.to_sym unless @currency.nil?
+          self
+        end
+
+      end
+    end
+  end
+end

data/lib/killbill/gen/plugin-api/require_gen.rb

@@ -31,6 +31,7 @@ require 'killbill/gen/plugin-api/payment_plugin_api_exception'
 require 'killbill/gen/plugin-api/blocking_state_metadata'
 require 'killbill/gen/plugin-api/broadcast_metadata'
 require 'killbill/gen/plugin-api/ext_bus_event'
+require 'killbill/gen/plugin-api/invoice_notification_metadata'
 require 'killbill/gen/plugin-api/invoice_payment_metadata'
 require 'killbill/gen/plugin-api/notification_plugin_api'
 require 'killbill/gen/plugin-api/notification_plugin_api_retry_exception'

data/lib/killbill/helpers/active_merchant/active_record/models/response.rb

@@ -22,6 +22,7 @@ module Killbill
             # But regardless, for performance reasons, we want to set these timestamps ourselves
             # See ActiveRecord::Timestamp
             current_time = Time.now.utc
+            remove_sensitive_data_and_compact(extra_params)
             model.new({
                           :api_call                     => api_call,
                           :kb_account_id                => kb_account_id,
@@ -43,7 +44,7 @@ module Killbill
                           :success                      => response.success?,
                           :created_at                   => current_time,
                           :updated_at                   => current_time
-                      }.merge!(extra_params.compact)) # Don't override with nil values
+                      }.merge!(extra_params))
           end
 
           def self.create_response_and_transaction(identifier, transaction_model, api_call, kb_account_id, kb_payment_id, kb_payment_transaction_id, transaction_type, payment_processor_account_id, kb_tenant_id, gw_response, amount_in_cents, currency, extra_params = {}, model = Response)
@@ -159,9 +160,9 @@ module Killbill
           def self.search_where_clause(t, search_key)
             # Exact matches only
             where_clause = t[:kb_payment_id].eq(search_key)
-                       .or(t[:kb_payment_transaction_id].eq(search_key))
-                       .or(t[:message].eq(search_key))
-                       .or(t[:authorization].eq(search_key))
+                                            .or(t[:kb_payment_transaction_id].eq(search_key))
+                                            .or(t[:message].eq(search_key))
+                                            .or(t[:authorization].eq(search_key))
 
             # Only search successful payments and refunds
             where_clause = where_clause.and(t[:success].eq(true))
@@ -207,6 +208,16 @@ module Killbill
             pagination
           end
 
+          def self.remove_sensitive_data_and_compact(extra_params)
+            extra_params.compact!
+            extra_params.delete_if { |k, _| sensitive_fields.include?(k) }
+          end
+
+          # Override in your plugin if needed
+          def self.sensitive_fields
+            []
+          end
+
           # Override in your plugin if needed
           def txn_id
             authorization
@@ -289,4 +300,4 @@ module Killbill
       end
     end
   end
-end
+end

data/lib/killbill/version.rb

@@ -1,3 +1,3 @@
 module Killbill
-  VERSION = '9.3.0'
+  VERSION = '9.3.1'
 end

data/spec/killbill/helpers/response_spec.rb

@@ -135,6 +135,13 @@ describe Killbill::Plugin::ActiveMerchant::ActiveRecord::Response do
     ::Killbill::Test::TestResponse.from_kb_payment_id(::Killbill::Test::TestTransaction, kb_payment_id3, kb_tenant_id).size == 0
   end
 
+  it 'should filter out sensitive parameter if specified' do
+    extra_params = {:email => "test.test", :payer_id => "test"}
+    ::Killbill::Test::TestResponse.send(:remove_sensitive_data_and_compact, extra_params)
+    extra_params[:email].should be_nil
+    extra_params[:payer_id].should == "test"
+  end
+
   it 'should generate the right SQL query' do
     # Check count query (search query numeric)
     expected_query = "SELECT COUNT(DISTINCT #{q('test_responses')}.#{q('id')}) FROM #{q('test_responses')}  WHERE (((#{q('test_responses')}.#{q('kb_payment_id')} = '1234' OR #{q('test_responses')}.#{q('kb_payment_transaction_id')} = '1234') OR #{q('test_responses')}.#{q('message')} = '1234') OR #{q('test_responses')}.#{q('authorization')} = '1234') AND #{q('test_responses')}.#{q('success')} = #{qtrue} AND #{q('test_responses')}.#{q('kb_tenant_id')} = '11-22-33'"

data/spec/killbill/helpers/test_response.rb

@@ -6,6 +6,10 @@ module Killbill #:nodoc:
 
       has_one :test_transaction
 
+      def self.sensitive_fields
+        [:email]
+      end
+
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: killbill
 version: !ruby/object:Gem::Version
-  version: 9.3.0
+  version: 9.3.1
 platform: ruby
 authors:
 - Kill Bill core team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-04-21 00:00:00.000000000 Z
+date: 2018-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -317,8 +317,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".circleci/config.yml"
 - ".gitignore"
-- ".travis.yml"
 - Gemfile
 - Gemfile.head
 - Gemfile.lock
@@ -376,6 +376,7 @@ files:
 - lib/killbill/gen/api/account_user_api.rb
 - lib/killbill/gen/api/admin_payment_api.rb
 - lib/killbill/gen/api/audit_log.rb
+- lib/killbill/gen/api/audit_log_with_history.rb
 - lib/killbill/gen/api/audit_user_api.rb
 - lib/killbill/gen/api/base_entitlement_with_add_ons_specifier.rb
 - lib/killbill/gen/api/billing_exception_base.rb
@@ -420,6 +421,8 @@ files:
 - lib/killbill/gen/api/entity.rb
 - lib/killbill/gen/api/enumerator_iterator.rb
 - lib/killbill/gen/api/fixed.rb
+- lib/killbill/gen/api/health_status.rb
+- lib/killbill/gen/api/healthcheck.rb
 - lib/killbill/gen/api/illegal_plan_change.rb
 - lib/killbill/gen/api/immutable_account_data.rb
 - lib/killbill/gen/api/international_price.rb
@@ -472,6 +475,7 @@ files:
 - lib/killbill/gen/api/plan_phase_specifier.rb
 - lib/killbill/gen/api/plan_rules.rb
 - lib/killbill/gen/api/plan_specifier.rb
+- lib/killbill/gen/api/plugin_config.rb
 - lib/killbill/gen/api/plugin_config_service_api.rb
 - lib/killbill/gen/api/plugin_info.rb
 - lib/killbill/gen/api/plugin_node_command_metadata.rb
@@ -533,6 +537,7 @@ files:
 - lib/killbill/gen/plugin-api/gateway_notification.rb
 - lib/killbill/gen/plugin-api/hosted_payment_page_form_descriptor.rb
 - lib/killbill/gen/plugin-api/invoice_context.rb
+- lib/killbill/gen/plugin-api/invoice_notification_metadata.rb
 - lib/killbill/gen/plugin-api/invoice_payment_metadata.rb
 - lib/killbill/gen/plugin-api/invoice_plugin_api.rb
 - lib/killbill/gen/plugin-api/invoice_plugin_api_retry_exception.rb
@@ -649,36 +654,4 @@ rubygems_version: 2.4.8
 signing_key:
 specification_version: 4
 summary: Framework to write Kill Bill plugins in Ruby.
-test_files:
-- spec/killbill/base_plugin_spec.rb
-- spec/killbill/config_test.ru
-- spec/killbill/gen_conversions_spec.rb
-- spec/killbill/helpers/configuration_spec.rb
-- spec/killbill/helpers/connection_spec.rb
-- spec/killbill/helpers/killbill_spec_helper_spec.rb
-- spec/killbill/helpers/payment_method_spec.rb
-- spec/killbill/helpers/payment_plugin_spec.rb
-- spec/killbill/helpers/private_payment_plugin_spec.rb
-- spec/killbill/helpers/response_spec.rb
-- spec/killbill/helpers/streamy_result_set_spec.rb
-- spec/killbill/helpers/test_payment_method.rb
-- spec/killbill/helpers/test_response.rb
-- spec/killbill/helpers/test_schema.rb
-- spec/killbill/helpers/test_transaction.rb
-- spec/killbill/helpers/transaction_spec.rb
-- spec/killbill/helpers/utils_spec.rb
-- spec/killbill/invoice_plugin_api_spec.rb
-- spec/killbill/invoice_plugin_spec.rb
-- spec/killbill/invoice_test.rb
-- spec/killbill/killbill_integration_spec.rb
-- spec/killbill/killbill_logger_spec.rb
-- spec/killbill/killbillapi_spec.rb
-- spec/killbill/notification_plugin_api_spec.rb
-- spec/killbill/notification_plugin_spec.rb
-- spec/killbill/notification_test.rb
-- spec/killbill/payment_plugin_api_spec.rb
-- spec/killbill/payment_plugin_spec.rb
-- spec/killbill/payment_test.rb
-- spec/killbill/rack_handler_spec.rb
-- spec/killbill/remote/active_merchant_typhoeus_connection_spec.rb
-- spec/spec_helper.rb
+test_files: []

data/.travis.yml

@@ -1,51 +0,0 @@
-language: ruby
-
-sudo: false
-cache:
-  bundler: true
-  directories:
-    - $HOME/.m2
-
-services:
-  - mysql
-  - postgresql
-
-before_script:
-  - bundle exec jbundle install
-  - mysql -uroot -e 'create database killbill_test;'
-  - psql -c 'create database killbill_test;' -U postgres
-
-notifications:
-  email:
-    - kill-bill-commits@googlegroups.com
-
-env:
-  global:
-    - JRUBY_OPTS='-J-Xmx1024M'
-  matrix:
-    # Need MySQL 5.6 - see https://github.com/travis-ci/travis-ci/issues/1986
-    #- AR_ADAPTER='mariadb' AR_USERNAME='root' AR_PASSWORD='' AR_DATABASE='killbill_test'
-    - AR_ADAPTER='postgresql' AR_USERNAME='postgres' AR_DATABASE='killbill_test'
-    - AR_ADAPTER='sqlite3' AR_DATABASE='test.db'
-
-rvm:
-  - jruby-1.7.20
-  - jruby-20mode # latest 1.7.x
-  - jruby-head
-
-gemfile:
-  - Gemfile
-  - Gemfile.head
-
-jdk:
-  - openjdk7
-  - oraclejdk7
-  - oraclejdk8
-
-matrix:
-  allow_failures:
-    - rvm: jruby-head
-    - rvm: jruby-20mode # Gemfile.lock bug with --deployment?
-    - jdk: oraclejdk8
-    - gemfile: Gemfile.head
-  fast_finish: true