shilpa20 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3f3dadf7fdb26c4c174030b626080b6d6d4864dfb3519a01fae8cb049b68655e
-  data.tar.gz: 7ad7b99f84f17109537bee66e7c0320b331348516ed8b5d37486701288f3098e
+  metadata.gz: e51f4c2b9eedfeb74b5dd4478035004463fa2fbe735208945e76ae97ef0dec70
+  data.tar.gz: 3fc932e5ee469ca0610f692564af3c805d9388d03c7d0f4728da41dc9e6ff368
 SHA512:
-  metadata.gz: 52bd2e06400559133f4a040d80bae582f8cd220bdfac44f0a9b5b32cae27991b68d48ec0d63b5a4cf81217f823d4fbe8f0958f14ce0b1536952fb13d8f175e50
-  data.tar.gz: 91a71dddbe786f58e0d082f66696f56fc79f2c8d8416f3a3319474cf96757376c3a9e27e208656e72af4a28b570539f19ce2fd1f542ab847e3d2cced97bb7bc5
+  metadata.gz: 6d06006dc5651a897b6ffe0bae204c4a3602dc60600d29db77b44fa8039e89c08aa17bd01dc30eba9e60a9d867e987dda84224a21dbe243abd05c16e39cd5785
+  data.tar.gz: e85ba746f27e326c7df15b0cc426582b80324cb5c141ea5a70818d0cf752598acef93b4464ece458599b6a8893a018d27a4743e4efd1f2d558dbd4c158fb9bbe

data/lib/domain/application_config.rb

@@ -1,6 +1,6 @@
 class ApplicationConfig
-    @@client_id
-    @@client_secret
+    @@client_id =""
+    @@client_secret =""
 
     def self.set_config(client_id, client_secret)
         @@client_id = client_id

data/lib/domain/authentication.rb

@@ -5,11 +5,12 @@ class Authentication
     attr_accessor  :client_secret
     attr_accessor  :username
     attr_accessor  :password
+    attr_accessor  :token
     attr_accessor   :refresh_token
 
-  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
+  def initialize grant_type: nil, client_id: nil, client_secret: nil, username: nil, password: nil, token:nil, refresh_token:nil
+    self.grant_type, self.client_id, self.client_secret, self.username, self.password, self.token, self.refresh_token =
+    grant_type, client_id, client_secret, username, password, token, refresh_token
    end
 
   
@@ -20,6 +21,7 @@ class Authentication
       client_secret: @client_secret,
       username: @username,
       password: @password,
+      token: @token,
       refresh_token: @refresh_token
     }.to_json(*a)
   end
@@ -31,6 +33,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.token = o['token']
     b_from_json.refresh_token = o['refresh_token']
     b_from_json
   end 

data/lib/shilpa20/authentication_service.rb

@@ -5,8 +5,9 @@ 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
+    @@revoke_url = 'https://showoff-rails-react-production.herokuapp.com/oauth/revoke'
+#    @@client_id = ApplicationConfig.get_client_id
+ #   @@client_secret = ApplicationConfig.get_client_secret
 
     def self.create_authentication(auth_data)
         auth_data = get_auth_with_client_info(auth_data)
@@ -15,13 +16,25 @@ class AuthenticationService
             payload: auth_payload, headers: {'Content-Type': 'application/json'})
     end
 
-    def self.refresh_token(auth_data, bearer_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)
         return RestClient::Request.execute(method: :post, url: @@authentication_url,
             payload: auth_payload, headers: {'Content-Type': 'application/json', 'Authorization':'Bearer '+ bearer_token})
     end
 
+    def self.revoke_authentication_token(auth_data, bearer_token)
+        auth_payload = Authentication.get_payload(auth_data)
+        return RestClient::Request.execute(method: :post, url: @@revoke_url,
+            payload: auth_payload, headers: {'Content-Type': 'application/json', 'Authorization':'Bearer '+ bearer_token})
+    end
+
+    def self.get_auth_with_client_info(auth_data)
+        auth_data.client_id = ApplicationConfig.get_client_id
+        auth_data.client_secret = ApplicationConfig.get_client_secret
+        return auth_data
+    end  
+
     # to remove once tested
     def self.create_auth_data
         auth = Authentication.new
@@ -41,11 +54,7 @@ class AuthenticationService
     #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

data/lib/shilpa20/user_widget_service.rb

@@ -7,32 +7,32 @@ require_relative '../domain/application_config.rb'
 class UserWidgetService
     @@own_widgets_url = 'https://showoff-rails-react-production.herokuapp.com/api/v1/users/me/widgets'
     @@widgets_by_user_id_url ='https://showoff-rails-react-production.herokuapp.com/api/v1/users/'
-    @@client_id = ApplicationConfig.get_client_id
-    @@client_secret = ApplicationConfig.get_client_secret
+   # @@client_id = ApplicationConfig.get_client_id
+    #@@client_secret = ApplicationConfig.get_client_secret
       
        def self.get_private_widgets(bearer_token)
          return RestClient::Request.execute(method: :get, url: @@own_widgets_url, 
-            headers: {'Content-Type': 'application/json', params: {:client_id => @@client_id, :client_secret => @@client_secret}, 
+            headers: {'Content-Type': 'application/json', params: {:client_id => ApplicationConfig.get_client_id, :client_secret => ApplicationConfig.get_client_secret}, 
             'Authorization':'Bearer '+ bearer_token})
         end
 
         def self.get_private_widgets_with_search_term(search_term, bearer_token)
             return RestClient::Request.execute(method: :get, url: @@own_widgets_url, 
-               headers: {'Content-Type': 'application/json', params: {:client_id => @@client_id, :client_secret => @@client_secret, :term => search_term}, 
+               headers: {'Content-Type': 'application/json', params: {:client_id => ApplicationConfig.get_client_id, :client_secret => ApplicationConfig.get_client_secret, :term => search_term}, 
                'Authorization':'Bearer '+ bearer_token})
         end
 
         def self.get_widgets_by_user_id(user_id, bearer_token)
             url_with_id = @@widgets_by_user_id_url + "#{user_id}" + "/widgets"
             return RestClient::Request.execute(method: :get, url: url_with_id, 
-               headers: {'Content-Type': 'application/json', params: {:client_id => @@client_id, :client_secret => @@client_secret}, 
+               headers: {'Content-Type': 'application/json', params: {:client_id => ApplicationConfig.get_client_id, :client_secret => ApplicationConfig.get_client_secret}, 
                'Authorization':'Bearer '+ bearer_token})
         end
 
         def self.get_widgets_by_user_id_with_search_term(user_id, search_term, bearer_token)
             url_with_id = @@widgets_by_user_id_url + "#{user_id}" + "/widgets"
             return RestClient::Request.execute(method: :get, url: url_with_id, 
-               headers: {'Content-Type': 'application/json', params: {:client_id => @@client_id, :client_secret => @@client_secret, :term => search_term}, 
+               headers: {'Content-Type': 'application/json', params: {:client_id => ApplicationConfig.get_client_id, :client_secret => ApplicationConfig.get_client_secret, :term => search_term}, 
                'Authorization':'Bearer '+ bearer_token})
         end
 

data/lib/shilpa20.rb

@@ -1,7 +1,4 @@
 require 'rest-client'
-#require './authentication_service'
-#require './user_service'
-#require './user_widget_service'
 
 require File.dirname(__FILE__) + '/shilpa20/authentication_service'
 require File.dirname(__FILE__) + '/shilpa20/user_service'
@@ -11,8 +8,8 @@ require File.dirname(__FILE__) + '/domain/application_config'
 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("277ef29692f9a70d511415dc60592daf4cf2c6f6552d3e1b769924b2f2e2e6fe", "d6106f26e8ff5b749a606a1fba557f44eb3dca8f48596847770beb9b643ea352")
+       ApplicationConfig.set_config(client_id, client_secret)
     end
    
    
@@ -21,11 +18,17 @@ 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)
+    #Refresh authentication token
+    def self.refresh_authentication_token(auth_data, bearer_token)
+        return AuthenticationService.refresh_authentication_token(auth_data, bearer_token)
     end
 
+    #Revoke authentication token
+    def self.revoke_authentication_token(auth_data, bearer_token)
+        return AuthenticationService.revoke_authentication_token(auth_data, bearer_token)
+    end
+    
+
     #Create user
     def self.create_user(user_data)
         return UserService.create_user(user_data) 
@@ -118,9 +121,10 @@ class Shilpa20
     
 end
 
+
 #puts " Inside shilpa 20"
-#ApplicationConfig.set_config("277ef29692f9a70d511415dc60592daf4cf2c6f6552d3e1b769924b2f2e2e6fe", "d6106f26e8ff5b749a606a1fba557f44eb3dca8f48596847770beb9b643ea352")
-#puts Shilpa20.create_authentication_token(AuthenticationService.create_auth_data)
+#Shilpa20.set_config("277ef29692f9a70d511415dc60592daf4cf2c6f6552d3e1b769924b2f2e2e6fe", "d6106f26e8ff5b749a606a1fba557f44eb3dca8f48596847770beb9b643ea352")
+#puts Shilpa20.refresh_authentication_token(AuthenticationService.create_auth_data)
 #Shilpa20.set_config("cid1","csecret1")
 #Shilpa20.getConfig
 #puts  "Hi"

metadata

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