shilpa20 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1570a1cbb5fca548133cc359a8af604b9f093eb2ac2f926374630311cf5ae32e
-  data.tar.gz: d7c1c62cc19e813b16911e609cf9c78ea56c2bd0657b2f179934abee83c138be
+  metadata.gz: 3f3dadf7fdb26c4c174030b626080b6d6d4864dfb3519a01fae8cb049b68655e
+  data.tar.gz: 7ad7b99f84f17109537bee66e7c0320b331348516ed8b5d37486701288f3098e
 SHA512:
-  metadata.gz: c02b61acd9ddb9aba9a6b63a0e0abe87ded9f64314ff29c48384d3707bc7f4c6d083812645745dbefe63c8977275f9e145d5f2db3d632c2eb469b5266b52d869
-  data.tar.gz: fe1777173ac5bab079b4cc2ead0d5e00686144868204f735b6433b7e46128f826fc2e1e929d78f6d7e6351f5ca679f2b03fda886acf7368785ecabab9b7d3412
+  metadata.gz: 52bd2e06400559133f4a040d80bae582f8cd220bdfac44f0a9b5b32cae27991b68d48ec0d63b5a4cf81217f823d4fbe8f0958f14ce0b1536952fb13d8f175e50
+  data.tar.gz: 91a71dddbe786f58e0d082f66696f56fc79f2c8d8416f3a3319474cf96757376c3a9e27e208656e72af4a28b570539f19ce2fd1f542ab847e3d2cced97bb7bc5

data/lib/domain/authentication.rb

@@ -5,10 +5,11 @@ class Authentication
     attr_accessor  :client_secret
     attr_accessor  :username
     attr_accessor  :password
+    attr_accessor   :refresh_token
 
-  def initialize grant_type: nil, client_id: nil, client_secret: nil, username: nil, password: nil
-    self.grant_type, self.client_id, self.client_secret, self.username, self.password =
-    grant_type, client_id, client_secret, username, password
+  def initialize grant_type: nil, client_id: nil, client_secret: nil, username: nil, password: nil, refresh_token:nil
+    self.grant_type, self.client_id, self.client_secret, self.username, self.password, self.refresh_token =
+    grant_type, client_id, client_secret, username, password, refresh_token
    end
 
   
@@ -18,7 +19,8 @@ class Authentication
       client_id: @client_id,
       client_secret: @client_secret,
       username: @username,
-      password: @password
+      password: @password,
+      refresh_token: @refresh_token
     }.to_json(*a)
   end
 
@@ -29,6 +31,7 @@ class Authentication
     b_from_json.client_secret = o['client_secret']
     b_from_json.username = o['username']
     b_from_json.password = o['password']
+    b_from_json.refresh_token = o['refresh_token']
     b_from_json
   end 
 

data/lib/shilpa20/authentication_service.rb

@@ -5,15 +5,23 @@ require_relative '../domain/application_config.rb'
 
 class AuthenticationService
     @@authentication_url = 'https://showoff-rails-react-production.herokuapp.com/oauth/token'
+    @@client_id = ApplicationConfig.get_client_id
+    @@client_secret = ApplicationConfig.get_client_secret
 
     def self.create_authentication(auth_data)
-        auth_data.client_id = ApplicationConfig.get_client_id
-        auth_data.client_secret = ApplicationConfig.get_client_secret
+        auth_data = get_auth_with_client_info(auth_data)
         auth_payload = Authentication.get_payload(auth_data)
         return RestClient::Request.execute(method: :post, url: @@authentication_url,
             payload: auth_payload, headers: {'Content-Type': 'application/json'})
     end
 
+    def self.refresh_token(auth_data, bearer_token)
+        auth_data = get_auth_with_client_info(auth_data)
+        auth_payload = Authentication.get_payload(auth_data)
+        return RestClient::Request.execute(method: :post, url: @@authentication_url,
+            payload: auth_payload, headers: {'Content-Type': 'application/json', 'Authorization':'Bearer '+ bearer_token})
+    end
+
     # to remove once tested
     def self.create_auth_data
         auth = Authentication.new
@@ -25,12 +33,21 @@ class AuthenticationService
         return auth
     end
 
-    def self.refresh_token(refresh_data)
-        refresh_payload = Authentication.get_payload(refresh_data)
-        return RestClient::Request.execute(method: :post, url: @@authentication_url,
-            payload: refresh_payload, headers: {'Content-Type': 'application/json'})
-    end
+    
+    #def self.refresh_token(refresh_data)
+     #   refresh_payload = Authentication.get_payload(refresh_data)
+      #  return RestClient::Request.execute(method: :post, url: @@authentication_url,
+       #     payload: refresh_payload, headers: {'Content-Type': 'application/json'})
+    #end
+    
+
+    def self.get_auth_with_client_info(auth_data)
+        auth_data.client_id = @@client_id
+        auth_data.client_secret = @@client_secret
+        return auth_data
+    end  
 
+    #remove once tested
     def self.get_access_token
         auth_data = AuthenticationService.create_auth_data
         authJson = AuthenticationService.create_authentication(auth_data)

data/lib/shilpa20.rb

@@ -12,7 +12,7 @@ class Shilpa20
 
     def self.set_config(client_id, client_secret)
         #ApplicationConfig.set_config("277ef29692f9a70d511415dc60592daf4cf2c6f6552d3e1b769924b2f2e2e6fe", "d6106f26e8ff5b749a606a1fba557f44eb3dca8f48596847770beb9b643ea352")
-        ApplicationConfig.set_config(client_id, client_secret)
+    ApplicationConfig.set_config(client_id, client_secret)
     end
    
    
@@ -21,6 +21,11 @@ class Shilpa20
        return AuthenticationService.create_authentication(auth_data) 
     end
 
+    #Create authentication token
+    def self.refresh_token(auth_data, bearer_token)
+        return AuthenticationService.refresh_token(auth_data, bearer_token)
+    end
+
     #Create user
     def self.create_user(user_data)
         return UserService.create_user(user_data) 
@@ -114,6 +119,7 @@ class Shilpa20
 end
 
 #puts " Inside shilpa 20"
+#ApplicationConfig.set_config("277ef29692f9a70d511415dc60592daf4cf2c6f6552d3e1b769924b2f2e2e6fe", "d6106f26e8ff5b749a606a1fba557f44eb3dca8f48596847770beb9b643ea352")
 #puts Shilpa20.create_authentication_token(AuthenticationService.create_auth_data)
 #Shilpa20.set_config("cid1","csecret1")
 #Shilpa20.getConfig

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shilpa20
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Sachin Murthy