angus-remote 0.0.10 → 0.0.11

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MmE1OGJhNmE2OTA2NDc5YjgwMWQ2ODhmNzExN2ZjYzhjMmI5YWRiOA==
+    MGVjNThjODQ3NDQ5YjQyOTU2NTYzZTQxYjAwMzU2YjViYTdjNjAwNw==
   data.tar.gz: !binary |-
-    ZGVlNjc5Y2JhNThiYWQzNTkzYTA4Yjc0MGVkYzUxZDRmN2IyMzgxNQ==
+    YjMxNGVmZGM0YzdjOGI2M2NhNjQ0OWQ1ZmU3YWI2OTI2NDAwZWQ0Zg==
 SHA512:
   metadata.gz: !binary |-
-    ZDQ3NzUyZGMxOTI3NGM4ZWQ3Y2YzYWNhYzM5NGIzYTA3ZTNhZDFjNzVlNTRi
-    MjY4MGM2N2NiNzkzMGU1YzRiNTdiM2ZkMzBjZTIwZjhiNjc2MmZhOWQ3ZDc1
-    MGMyMjljNzRmODA0NzViNDhmNjhhOWIzYjA3MDYwZWZkZjJmNGY=
+    Njc4NjE5MjU1ODU4M2M3MGIwZTM5NzFiYjBmOWQwMWQ4MTIzMzY0ZTBiNmQ5
+    NzY0MTNiNWUxMGZmOWI4N2FkN2U2OWI4ZWY0NjlmOWJjOGNjMjhhNDI3MDEw
+    MDBlNzI1NDY5N2NjNzc3MjUzMDllNGFiOTFlOTQ0Y2I0NmI2ZTU=
   data.tar.gz: !binary |-
-    OGE2NjNlMjdhYTJkMzhhMWViMjU5ODkyNjk1NjIwYzMwMDIxYTk1NDFjM2Fm
-    YjlkOGQ1ZjNjZDI2M2Y5ODhlMjZjYjA5NDAxMDIyZTgzNjg0MDQyZTJkMzZi
-    NmZlOWJkMjdjN2ZhYWQ5YTk1ODJiMWJjYTkzNjE3YjU5Nzk4ZTc=
+    NDg3NDY5YTg1MDRmNDUwYWRjMmNlNjI5N2Y4MWE3NTVkYzI2ZmFkOGNlZDNh
+    M2Q1YTAzMzVhZDNmZDVjODRkNWY5YWNjOGFjOWEyMjdhNTdlZTc4NzExM2M4
+    MDA5MmM0MzRjYTY4MzIzNmQwODdlNWY4NGRkYTVkZTEyYjFhYTY=

data/lib/angus/authentication/client.rb

@@ -6,21 +6,28 @@ module Angus
   module Authentication
     class Client
 
-      DEFAULT_PUBLIC_KEY = '1234567'
-      DEFAULT_PRIVATE_KEY = 'CHANGE ME!!'
-
       AUTHENTICATION_HEADER = 'AUTHORIZATION'
       BAAS_AUTHENTICATION_HEADER = 'X-BAAS-AUTH'
       BAAS_SESSION_HEADER = 'X-Baas-Session-Seed'
       DATE_HEADER = 'DATE'
 
       def initialize(settings)
-        @public_key = settings[:public_key] || DEFAULT_PUBLIC_KEY
-        @private_key = settings[:private_key] || DEFAULT_PRIVATE_KEY
+        unless settings[:public_key] && settings[:private_key]
+          warn "No authentication info provided, angus-authentication has been disabled for: #{settings[:service_id]}"
+          @enabled = false
+          return
+        end
+
+        @enabled = true
+        @public_key = settings[:public_key]
+        @private_key = settings[:private_key]
+
         @store = RedisClient.new(settings[:store] || {})
       end
 
       def prepare_request(request, http_method, script_name)
+        return unless @enabled
+
         date = Date.today
 
         auth_token = generate_auth_token(date, http_method, script_name)
@@ -32,6 +39,8 @@ module Angus
       end
 
       def store_session_private_key(response)
+        return unless @enabled
+
         session_key_seed = extract_session_key_seed(response)
         return unless session_key_seed
 

data/lib/angus/remote/client.rb

@@ -31,6 +31,7 @@ module Angus
         store_namespace = "#{options['code_name']}.#{options['version']}"
         client_settings = { :public_key => options['public_key'],
                             :private_key => options['private_key'],
+                            :service_id => store_namespace,
                             :store => Settings.redis.merge({ :namespace =>  store_namespace }) }
 
         @authentication_client = Authentication::Client.new(client_settings)

data/lib/angus/remote/proxy_client.rb

@@ -53,4 +53,4 @@ module Angus
     end
 
   end
-end
+end

data/lib/angus/remote/response/builder.rb

@@ -42,6 +42,12 @@ module Angus
             service_code_name, version
           )
 
+          self.build_from_definition(status_code, body, service_definition, operation_namespace,
+                                     operation_code_name)
+        end
+
+        def self.build_from_definition(status_code, body, service_definition, operation_namespace,
+                                       operation_code_name)
           representations = service_definition.representations
           glossary = service_definition.glossary
 
@@ -57,8 +63,8 @@ module Angus
           # TODO use constants
           response[:status_code] = status_code
           response[:body] = body
-          response[:service_code_name] = service_code_name
-          response[:service_version] = version
+          response[:service_code_name] = service_definition.code_name
+          response[:service_version] = service_definition.version
           response[:operation_namespace] = operation_namespace
           response[:operation_code_name] = operation_code_name
 

data/lib/angus/remote/service_directory.rb

@@ -217,6 +217,7 @@ module Angus
 
           settings = { :public_key => service_settings['public_key'],
                        :private_key => service_settings['private_key'],
+                       :service_id => "#{code_name}.#{version}",
                        :store => Settings.redis.merge({ :namespace => "#{code_name}.#{version}" }) }
 
           @authentication_clients[[code_name, version]] = Angus::Authentication::Client.new(settings)

data/lib/angus/remote/version.rb

@@ -1,7 +1,7 @@
 module Angus
   module Remote
 
-    VERSION = '0.0.10'
+    VERSION = '0.0.11'
 
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: angus-remote
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors:
 - Adrian Gomez