shilpa20 1.1.8 → 1.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 944b0fc0f82d53a9c8b9cfe031dab2bbb0ecd88a89d797178470aac52356b5d6
-  data.tar.gz: b8ae014067125c0b0cf3fcbc8c85fe48cdf7976397a1be137752695468a87ef9
+  metadata.gz: 3b4bb38d8e5bb9efcfc4af44b86e3cfe62be372770ac89a6c02f280dae19e862
+  data.tar.gz: 86468e67737f4e981f036a4752df1d4ed60513b533bc78de3250d8f7749db242
 SHA512:
-  metadata.gz: ce533f13849ed11de8af97fbf093664a1dc0394851bacd7da5672147d33917360fbebe4b7956ad6835a7585a5f8e4197c55bf9eee7d7bf59e7311dc10c396f58
-  data.tar.gz: 000a943257ee93cad00b9057af800b76cf022602146b69f68389f9b8298fd6681c20776d94cae9a5b3a18d93a3c862576687d8cd63bb88ab530957314a777c1a
+  metadata.gz: d045085bbe04a3fe0f104d4db8eba24eec4565eec192d2f3fba04cd2c32e467862901d2a190a9cef733169d3a02c605021e02cbb0a39b3792b0ee13119322023
+  data.tar.gz: a4ad031ca7f8febf344da1fdd07cdd5533542ffc68c0630b4b45212f848c24f54447a8598f9e1f7c80e9296de9a8da484b5478a93f604b99d464be3c19de3b51

data/lib/domain/client_info_base.rb

@@ -4,10 +4,6 @@ class ClientInfoBase
     attr_accessor  :client_secret
     attr_accessor  :user
 
-  def initialize
-   # @user = []
-  end
-
   def to_json(*a)
     { 
       client_id: @client_id, client_secret: @client_secret, user: @user

data/lib/domain/widget_base.rb

@@ -7,6 +7,7 @@ class WidgetBase
         widget: @widget
     }.to_json(*a)
   end
+  
   def self.json_create(o)
     a_from_json = new
     a_from_json.widget = o['widget']

data/lib/shilpa20/user_service.rb

@@ -2,6 +2,7 @@ require 'rest-client'
 require 'json'
 require_relative '../domain/client_info_base.rb'
 require_relative '../domain/user.rb'
+require_relative '../domain/application_config.rb'
 require_relative 'authentication_service'
 
 class UserService
@@ -13,33 +14,35 @@ class UserService
     @@show_logged_in_user_url = 'https://showoff-rails-react-production.herokuapp.com/api/v1/users/me'
     @@show_user_id_url = 'https://showoff-rails-react-production.herokuapp.com/api/v1/users/'
 
-    def self.create_user(user_with_client_info)
+    def self.create_user(user)
+        user_with_client_info = get_user_with_client_info(user)
         create_user_payload = User.get_payload(user_with_client_info)
         return RestClient::Request.execute(method: :post, url: @@create_user_url,
             payload: create_user_payload, headers: {'Content-Type': 'application/json'})
     end
 
-    def self.update_user(user_with_client_info, bearer_token)
-        update_user_payload = User.get_payload(user_with_client_info)        
+    def self.update_user(user, bearer_token)
+        update_user_payload = User.get_payload(user)        
         return RestClient::Request.execute(method: :put, url: @@create_update_url,
             payload: update_user_payload,
             headers: {'Content-Type': 'application/json', 'Authorization':'Bearer '+ bearer_token})
     end
 
-    def self.check_email(user_with_client_info)
+    def self.check_email(user)
         return RestClient::Request.execute(method: :get, url: @@check_email_url, 
-            headers: {'Content-Type': 'application/json', params: {:email => user_with_client_info.user.email , :client_id => user_with_client_info.client_id, :client_secret => user_with_client_info.client_secret}})
+            headers: {'Content-Type': 'application/json', params: {:email => user.email , :client_id => ApplicationConfig.get_client_id, :client_secret => ApplicationConfig.get_client_secret}})
     end
 
-    def self.reset_password(user_with_client_info)
+    def self.reset_password(user)
+        user_with_client_info = get_user_with_client_info(user)
         reset_password_payload = User.get_payload(user_with_client_info)  
         return RestClient::Request.execute(method: :post, url: @@reset_password_url,
             payload: reset_password_payload,
             headers: {'Content-Type': 'application/json'})
     end
 
-    def self.change_password(user_with_client_info, bearer_token)
-        change_password_payload = User.get_payload(user_with_client_info)
+    def self.change_password(user, bearer_token)
+        change_password_payload = User.get_payload(user)
         return RestClient::Request.execute(method: :post, url: @@change_password_url,
             payload: change_password_payload,
             headers: {'Content-Type': 'application/json', 'Authorization':'Bearer '+ bearer_token})
@@ -56,6 +59,14 @@ class UserService
         headers: {'Content-Type': 'application/json', 'Authorization':'Bearer '+ bearer_token})
     end
 
+    def self.get_user_with_client_info(user)
+        user_with_client_info = ClientInfoBase.new
+        user_with_client_info.client_id = ApplicationConfig.get_client_id
+        user_with_client_info.client_secret = ApplicationConfig.get_client_secret
+        user_with_client_info.user = user 
+        return user_with_client_info
+    end   
+
     # to remove once tested
     def self.create_user_with_client_info
         user = User.new
@@ -65,18 +76,19 @@ class UserService
         user.current_password = "password"
         user.new_password = "password123"
         user.date_of_birth = 1464083530
-        user.email = "sachinmurthy101@gmail.com"
+        user.email = "sachinmurthy901@gmail.com"
         user.image_url = "https://static.thenounproject.com/png/961-200.png"
     
-        user_with_client_info = ClientInfoBase.new
-        user_with_client_info.client_id = "277ef29692f9a70d511415dc60592daf4cf2c6f6552d3e1b769924b2f2e2e6fe"
-        user_with_client_info.client_secret = "d6106f26e8ff5b749a606a1fba557f44eb3dca8f48596847770beb9b643ea352"
-        user_with_client_info.user = user
-        return user_with_client_info
+        #user_with_client_info = ClientInfoBase.new
+        #user_with_client_info.client_id = "277ef29692f9a70d511415dc60592daf4cf2c6f6552d3e1b769924b2f2e2e6fe"
+        #user_with_client_info.client_secret = "d6106f26e8ff5b749a606a1fba557f44eb3dca8f48596847770beb9b643ea352"
+        #user_with_client_info.user = user
+        return user
     end
 
 end
 
 # to remove once tested
+#ApplicationConfig.set_config("277ef29692f9a70d511415dc60592daf4cf2c6f6552d3e1b769924b2f2e2e6fe", "d6106f26e8ff5b749a606a1fba557f44eb3dca8f48596847770beb9b643ea352")
 #userWithClientIfno = UserService.create_user_with_client_info
-#puts UserService.show_user_id(382)
+#puts UserService.create_user(userWithClientIfno)

data/lib/shilpa20/user_widget_service.rb

@@ -2,34 +2,37 @@ require 'rest-client'
 require 'json'
 require_relative 'authentication_service'
 require_relative 'user_service'
+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
       
-       def self.get_private_widgets(user_with_client_info, bearer_token)
+       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 => user_with_client_info.client_id, :client_secret => user_with_client_info.client_secret}, 
+            headers: {'Content-Type': 'application/json', params: {:client_id => @@client_id, :client_secret => @@client_secret}, 
             'Authorization':'Bearer '+ bearer_token})
         end
 
-        def self.get_private_widgets_with_search_term(user_with_client_info, search_term, bearer_token)
+        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 => user_with_client_info.client_id, :client_secret => user_with_client_info.client_secret, :term => search_term}, 
+               headers: {'Content-Type': 'application/json', params: {:client_id => @@client_id, :client_secret => @@client_secret, :term => search_term}, 
                'Authorization':'Bearer '+ bearer_token})
         end
 
-        def self.get_widgets_by_user_id(user_with_client_info, user_id, bearer_token)
+        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 => user_with_client_info.client_id, :client_secret => user_with_client_info.client_secret}, 
+               headers: {'Content-Type': 'application/json', params: {:client_id => @@client_id, :client_secret => @@client_secret}, 
                'Authorization':'Bearer '+ bearer_token})
         end
 
-        def self.get_widgets_by_user_id_with_search_term(user_with_client_info, user_id, search_term, bearer_token)
+        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 => user_with_client_info.client_id, :client_secret => user_with_client_info.client_secret, :term => search_term}, 
+               headers: {'Content-Type': 'application/json', params: {:client_id => @@client_id, :client_secret => @@client_secret, :term => search_term}, 
                'Authorization':'Bearer '+ bearer_token})
         end
 

data/lib/shilpa20/widget_service.rb

@@ -4,24 +4,25 @@ require_relative '../domain/widget_base.rb'
 require_relative '../domain/widget.rb'
 require_relative 'authentication_service'
 require_relative 'user_service'
+require_relative '../domain/application_config.rb'
 
 class WidgetService
     @@create_widget_url = 'https://showoff-rails-react-production.herokuapp.com/api/v1/widgets'
     @@update_destroy_widget_url = 'https://showoff-rails-react-production.herokuapp.com/api/v1/widgets/'
     @@list_widget_url = 'https://showoff-rails-react-production.herokuapp.com/api/v1/widgets/visible'
+    @@client_id = ApplicationConfig.get_client_id
+    @@client_secret = ApplicationConfig.get_client_secret
 
-    def self.create_widget(widget_post_data, bearer_token)
-        create_widget_payload = Widget.get_payload(widget_post_data)
-        puts "widgets create payload : " +  create_widget_payload
+    def self.create_widget(widget_data, bearer_token)
+        create_widget_payload = Widget.get_payload(widget_data)
         return RestClient::Request.execute(method: :post, url: @@create_widget_url,
             payload: create_widget_payload,
             headers: {'Content-Type': 'application/json', 'Authorization':'Bearer '+ bearer_token})
     end
 
-    def self.update_widget(widget_post_data, widget_id, bearer_token)
+    def self.update_widget(widget_data, widget_id, bearer_token)
         update_url_with_widget_id = @@update_destroy_widget_url + "#{widget_id}"
-        update_widget_payload = Widget.get_payload(widget_post_data)
-        puts "widgets update payload : " +  update_widget_payload
+        update_widget_payload = Widget.get_payload(widget_data)
         return RestClient::Request.execute(method: :put, url: update_url_with_widget_id,
             payload: update_widget_payload,
             headers: {'Content-Type': 'application/json', 'Authorization':'Bearer '+ bearer_token})
@@ -38,15 +39,15 @@ class WidgetService
             headers: {'Content-Type': 'application/json', 'Authorization':'Bearer '+ bearer_token})
     end
 
-    def self.get_public_widgets(user_with_client_info, bearer_token)
+    def self.get_public_widgets(bearer_token)
         return RestClient::Request.execute(method: :get, url: @@list_widget_url, 
-            headers: {'Content-Type': 'application/json', params: {:client_id => user_with_client_info.client_id, :client_secret => user_with_client_info.client_secret}, 
+            headers: {'Content-Type': 'application/json', params: {:client_id => @@client_id, :client_secret => @@client_secret}, 
             'Authorization':'Bearer '+ bearer_token})
     end
 
-    def self.get_public_widgets_with_search_term(user_with_client_info, search_term, bearer_token)
+    def self.get_public_widgets_with_search_term(search_term, bearer_token)
         return RestClient::Request.execute(method: :get, url: @@list_widget_url, 
-            headers: {'Content-Type': 'application/json', params: {:client_id => user_with_client_info.client_id, :client_secret => user_with_client_info.client_secret, :term => search_term}, 
+            headers: {'Content-Type': 'application/json', params: {:client_id => @@client_id, :client_secret => @@client_secret, :term => search_term}, 
             'Authorization':'Bearer '+ bearer_token})
     end
 
@@ -66,5 +67,5 @@ end
 
 # to remove once tested
 #widget_json = WidgetService.create_widget_data
-userWithClientIfno = UserService.create_user_with_client_info
-puts WidgetService.search_list_widget(userWithClientIfno, "widget one")
+#userWithClientIfno = UserService.create_user_with_client_info
+#puts WidgetService.search_list_widget(userWithClientIfno, "widget one")

metadata

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