libis-services 0.1.13 → 0.1.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dd75c079899e08571582664c3c087ef2ff54f0e1
-  data.tar.gz: 9ebb2a369af921f3bfc12ed9aa5581b9dbefd375
+  metadata.gz: 7db38a4eb15196da5b842234c33bef90de3a7cd4
+  data.tar.gz: 0c490da8e73129303e3da02979bbbb5df12c0e36
 SHA512:
-  metadata.gz: 26cfe9bf38251f9bc4b2d0e734ee0d034d24123973be61e30151123b26e4dcd2babd3cd6fc6892ff56260d0353adf3e4b4f8751d593f278e92481cf4c5238a9c
-  data.tar.gz: b9074b9884c100fb78caaceb7ea8093228be2c15742298b039f75f4109a7a8f43fce76117a26323064e2e8cb68787b6df3c05deb14a3fd80f7cc11c3c0e7d341
+  metadata.gz: cbd5bc933be2b7ff6b44575f363be498c6d3ebcb28968c34b12384500721a0f6b3b8e92733d3b1d32d8eb7770aeb30c5551eb00dbc4d69e13dd5b650f7ff3134
+  data.tar.gz: f19c32dc6ca5e041c6e4a8e1c237e2e9ad2793803e65c88099e6979ce94b42012584e69d3fe7f14a9d5163b0972baadcac3a6a475067979dfb918188b38808ba

data/lib/libis/services/rosetta/client.rb

@@ -19,6 +19,13 @@ module Libis
         include ::Libis::Tools::Logger
 
         def initialize(section, service, options = {})
+          basic_auth = options.delete(:basic_auth)
+          if basic_auth
+            options[:basic_auth] = [
+                "#{basic_auth[:user]}-institutionCode-#{basic_auth[:institution]}",
+                basic_auth[:password]
+            ]
+          end
           opts = {strip_namespaces: true, logger: ::Libis::Tools::Config.logger}.merge options
           base_url = opts.delete(:url) || 'http://depot.lias.be'
           configure "#{base_url}/dpsws/#{section}/#{service}?wsdl", opts
@@ -29,7 +36,8 @@ module Libis
         end
 
         def authenticate(user, password, institution)
-          @basic_auth = Base64.encode64 "#{user}-institutionCode-#{institution}:#{password}"
+          code = Base64.encode64("#{user}-institutionCode-#{institution}:#{password}").gsub("\n", '')
+          @auth = "Basic #{code}"
         end
 
         def get_heart_bit
@@ -39,8 +47,8 @@ module Libis
         protected
 
         def call_raw(operation, args = {})
-          data = if @basic_auth
-                   request operation.to_s.to_sym, args, headers: ['Authenticate', @basic_auth]
+          data = if @auth
+                   request operation.to_s.to_sym, args, headers: {'Authorization' => @auth}
                  else
                    request operation.to_s.to_sym, args
                  end
@@ -65,7 +73,7 @@ module Libis
                 empty_tag_value: nil,
                 delete_namespace_attributes: true,
                 strip_namespaces: true,
-                convert_tags_to: lambda { |tag| tag.to_sym }
+                convert_tags_to: lambda {|tag| tag.to_sym}
             )
             data = xml_data unless xml_data.empty?
           end
@@ -108,7 +116,7 @@ module Libis
 
         def request_object_array(method, klass, args = {})
           data = request_array(method, args)
-          data.map { |x| klass.new(x) }
+          data.map {|x| klass.new(x)}
         end
 
       end

data/lib/libis/services/version.rb

@@ -1,5 +1,5 @@
 module Libis
   module Services
-    VERSION = '0.1.13'
+    VERSION = '0.1.14'
   end
 end

data/spec/rosetta_auth_spec.rb

@@ -9,6 +9,19 @@ require 'libis/services/rosetta/producer_handler'
 
 describe 'Rosetta Services' do
 
+  def protected_call(handler, producer_id, producer_name)
+    result = handler.producer(producer_id)
+    expect(result.authoritative_name).to eq producer_name
+  end
+
+  def failed_protected_call(handler, producer_id)
+    expect {handler.producer(producer_id)}.to raise_error(Libis::Services::ServiceError, /^Incorrect username or password/)
+  end
+
+  def invalid_protected_call(handler, producer_id)
+    expect {handler.producer(producer_id)}.to raise_error(Libis::Services::ServiceError)
+  end
+
   let!(:credentials) {Libis::Tools::ConfigFile.new File.join(File.dirname(__FILE__), 'credentials-test.yml')}
 
   # noinspection RubyResolve
@@ -24,51 +37,61 @@ describe 'Rosetta Services' do
 
   let(:bad_cred) { 'deadbeaf' }
 
-  let(:handler) do
-    # noinspection RubyResolve
-    handler = Libis::Services::Rosetta::ProducerHandler.new(
-        credentials.rosetta_url,
-        log: credentials.debug,
-        log_level: credentials.debug_level
-    )
-    handler
-  end
-
   describe 'basic authentication' do
 
+    let(:handler) do
+      # noinspection RubyResolve
+      handler = Libis::Services::Rosetta::ProducerHandler.new(
+          credentials.rosetta_url,
+          # log: credentials.debug,
+          # log_level: credentials.debug_level
+      )
+      handler
+    end
+
     let(:user_name) {admin_usr}
     let(:user_id) {admin_uid}
+    let(:producer_id) {credentials.producer.id}
+    let(:producer_name) {credentials.producer.data.authoritative_name}
 
     it 'should allow protected call with correct login' do
       handler.authenticate(admin_usr, admin_pwd, admin_ins)
-      result = handler.user_id(user_name)
-      expect(result).to eq user_id
+      protected_call(handler, producer_id, producer_name)
     end
 
     it 'should fail protected call with wrong password' do
       handler.authenticate(admin_usr, bad_cred, admin_ins)
-      result = handler.user_id(user_name)
-      expect(result).to eq user_id
+      failed_protected_call(handler, producer_id)
     end
 
     it 'should fail protected call with wrong institution' do
       handler.authenticate(admin_usr, admin_pwd, bad_cred)
-      result = handler.user_id(user_name)
-      expect(result).to eq user_id
+      failed_protected_call(handler, producer_id)
     end
 
     it 'should fail protected call with wrong user name' do
       handler.authenticate(bad_cred, admin_pwd, admin_ins)
-      result = handler.user_id(user_name)
-      expect(result).to eq user_id
+      failed_protected_call(handler, producer_id)
     end
 
   end
 
   describe 'PDS authentication' do
 
+    let(:handler) do
+      # noinspection RubyResolve
+      handler = Libis::Services::Rosetta::ProducerHandler.new(
+          credentials.rosetta_url,
+          # log: credentials.debug,
+          # log_level: credentials.debug_level
+      )
+      handler
+    end
+
     let(:user_name) {admin_usr}
     let(:user_id) {admin_uid}
+    let(:producer_id) {credentials.producer.id}
+    let(:producer_name) {credentials.producer.data.authoritative_name}
 
     let!(:pds_handler) do
       # noinspection RubyResolve
@@ -92,8 +115,7 @@ describe 'Rosetta Services' do
 
       it 'should allow protected call' do
         handler.pds_handle = handle
-        result = handler.user_id(user_name)
-        expect(result).to eq user_id
+        protected_call(handler, producer_id, producer_name)
       end
 
       it 'should logout using a valid handle' do
@@ -111,8 +133,7 @@ describe 'Rosetta Services' do
 
       it 'should fail protected call' do
         handler.pds_handle = handle
-        result = handler.user_id(user_name)
-        expect(result).to eq user_id
+        invalid_protected_call(handler, producer_id)
       end
 
       it 'should logout using a invalid handle' do
@@ -130,8 +151,7 @@ describe 'Rosetta Services' do
 
       it 'should fail protected call' do
         handler.pds_handle = handle
-        result = handler.user_id(user_name)
-        expect(result).to eq user_id
+        invalid_protected_call(handler, producer_id)
       end
 
       it 'should logout using a invalid handle' do
@@ -150,8 +170,7 @@ describe 'Rosetta Services' do
 
       it 'should fail protected call' do
         handler.pds_handle = handle
-        result = handler.user_id(user_name)
-        expect(result).to eq user_id
+        invalid_protected_call(handler, producer_id)
       end
 
       it 'should logout using a invalid handle' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: libis-services
 version: !ruby/object:Gem::Version
-  version: 0.1.13
+  version: 0.1.14
 platform: ruby
 authors:
 - Kris Dekeyser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-23 00:00:00.000000000 Z
+date: 2018-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler