widgets_api_client 0.2.0.2 → 0.2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b8a33b70b243fa7d2421fb28b4cf5b2c774ce7d3
-  data.tar.gz: 218218f461ba3096a5e1445e53b24408033c41e8
+  metadata.gz: 89b50c0f3e061c4b200839f78c429666389ab3b2
+  data.tar.gz: 508dbede320fee45134eea74cb53aadb3e8ef245
 SHA512:
-  metadata.gz: 58153cf80012217ffefcac576d76a2ebabb4136199d91820e08797bdcafd8e31eed3aa4842b9ae3bb1acdb8995f0b46c49f4dc5301c5aaaeecddbac8e26e6e9c
-  data.tar.gz: 5bcab61761acf1bb84671b8a43fa6672e8da88771eb645e94be4e8991a16410382649b0d6697494ac8d597a81033e658a196d5951017cae9d3fe59c8f4d405c3
+  metadata.gz: 7372c62b61ca82f1bde5e5f33b4021d2b78d652f9a44a62d5d898ade2c87e852b86b9ecb8f6c7d78975cc2305ca0283f3bf02b2f3726b5e5162047b6708655cf
+  data.tar.gz: '085521c804f2e104a4dfd56cfdf58c7e3fcce2634a8d904ed1965b2d05bc2b5b1ecc2ff570debb6911d4b6c5a062b5972575415af12caa3273d660b199ce6023'

data/lib/domain/authentication.rb

@@ -5,8 +5,6 @@ require 'json'
 #
 class Authentication
   attr_accessor :grant_type
-  attr_accessor :client_id
-  attr_accessor :client_secret
   attr_accessor :username
   attr_accessor :password
   attr_accessor :token
@@ -16,45 +14,32 @@ class Authentication
   # Inialise the authentication model
   #
   # @param [String] grant_type Token grant type
-  # @param [String] client_id
-  # @param [String] client_secret
   # @param [String] username
   # @param [String] password
   # @param [String] token Bearer token
   # @param [String] refresh_token Refresh token
   #
-  def initialize(grant_type: nil, client_id: nil, client_secret: nil,
-                 username: nil, password: nil, token: nil, refresh_token: nil)
+  def initialize(grant_type: nil, username: nil, password: nil, token: nil, refresh_token: nil)
     self.grant_type = grant_type
-    self.client_id = client_id
-    self.client_secret = client_secret
     self.username = username
     self.password = password
     self.token = token
     self.refresh_token = refresh_token
   end
 
-  #
-  # Converts Authentication object to Json object
-  #
-  # @param [Refrence] *data authentication object refrence
-  #
-  # @return [Json] Json represenatation of authentication object
-  #
-  def to_json(*data)
-    hash = {
+  def as_json(options={})
+    hash_data = {
       grant_type: @grant_type,
-      client_id: @client_id,
-      client_secret: @client_secret,
       username: @username,
       password: @password,
       token: @token,
       refresh_token: @refresh_token
-    }
-    hash.delete_if { |k, v| v.nil? || v.empty? }
-    hash.to_json(*data)
-  end
-
+     }
+     
+     hash.delete_if { |k, v| v.nil? || v.empty? }
+     hash_data
+   end
+ 
   #
   # Gets Json represenatation of authentication object
   #
@@ -63,6 +48,10 @@ class Authentication
   # @return [Json] Json represenatation of authentication object
   #
   def self.get_payload(auth_data)
-    auth_data.to_json
+    user.as_json.to_json
+  end
+
+  def self.get_payload_with_client_info(auth_data)
+    auth_data.as_json.merge!({'client_id' => ApplicationConfig.client_id, 'client_secret' => ApplicationConfig.client_secret}).to_json
   end
 end

data/lib/domain/user.rb

@@ -69,6 +69,6 @@ class User
   end
 
   def self.get_payload_with_client_info(user)
-      user.as_json.merge({'client_id' => ApplicationConfig.client_id, 'client_secret' => ApplicationConfig.client_secret}).to_json
+      user.as_json.merge!({'client_id' => ApplicationConfig.client_id, 'client_secret' => ApplicationConfig.client_secret}).to_json
   end
 end

data/lib/services/authentication_service.rb

@@ -1,7 +1,6 @@
 require 'rest-client'
 require 'json'
 require_relative '../domain/authentication.rb'
-require_relative '../domain/application_config.rb'
 
 #
 # Authentication Service for token activies
@@ -15,8 +14,7 @@ class AuthenticationService
   # @return [Json] Response with brearer and refresh token
   #
   def self.create_authentication(auth_data)
-    auth_data = get_auth_with_client_info(auth_data)
-    auth_payload = Authentication.get_payload(auth_data)
+    auth_payload = Authentication.get_payload_with_client_info(auth_data)
     RestClient::Request.execute(method: :post,
                                 url: ApplicationConfig.get_url('create_authentication_path'),
                                 payload: auth_payload,
@@ -32,8 +30,7 @@ class AuthenticationService
   # @return [Json] Response with brearer and refresh token
   #
   def self.refresh_authentication_token(auth_data, bearer_token)
-    auth_data = get_auth_with_client_info(auth_data)
-    auth_payload = Authentication.get_payload(auth_data)
+    auth_payload = Authentication.get_payload_with_client_info(auth_data)
     RestClient::Request.execute(method: :post,
                                 url: ApplicationConfig.get_url('create_authentication_path'),
                                 payload: auth_payload,
@@ -57,17 +54,4 @@ class AuthenticationService
                                 headers: { 'Content-Type': 'application/json',
                                            'Authorization': bearer_token })
   end
-
-  #
-  # Sets Client id and secrets to Authentication object
-  #
-  # @param [Object] auth_data Authentication object
-  #
-  # @return [Object] Authentication object
-  #
-  def self.get_auth_with_client_info(auth_data)
-    auth_data.client_id = ApplicationConfig.client_id
-    auth_data.client_secret = ApplicationConfig.client_secret
-    auth_data
-  end
 end

data/lib/services/user_service.rb

@@ -1,6 +1,5 @@
 require 'rest-client'
 require 'json'
-require_relative '../domain/application_config.rb'
 require_relative '../domain/user.rb'
 
 #

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: widgets_api_client
 version: !ruby/object:Gem::Version
-  version: 0.2.0.2
+  version: 0.2.0.3
 platform: ruby
 authors:
 - Sachin Murthy