shilpa20 1.2.4 → 1.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 885e0522ea5f14f2b7589ae9ad2464e5f6f5f5efe59dd9a46a436ad0e1e0147e
-  data.tar.gz: f066611e281e3318dcdc81a08e6796a83054b67781f555ef5aec5ac8b6071d53
+  metadata.gz: 5c6986d45b58b2660143acc5de5807253198e6981314c40d9d081db6f52de9df
+  data.tar.gz: ea96ab114a0aa4a2cc211d658352e10b257f1f53db4018f23d947fa3fa091179
 SHA512:
-  metadata.gz: 928bfd5df60e6f0395c6e3e24faa3d60ece1fe53e60da2516d15765526505b59adb91b6b84e1965838705273c0e8d0814493ff8a7e5602f6f6b7b9322bf6398c
-  data.tar.gz: 8020813cd3b9ec1be7ddca57a9e9089a3d556ac503abe9d9ec12e721bb09b681d4dac2d4e839b81ac14585b9d634e5c7e93a795242ba8e77e748ba07889e0ecb
+  metadata.gz: 3b2f9e7ee7e55af5b3d19a24381c7db70b9d68c46c4a6097de656d79bb1eb0e3d4ca544230775028fcae3d903cb6bb01faa56ab9ee6ad60a9a1c2537defeaf94
+  data.tar.gz: 02edc4fd36ab0832a28e5560e83aff3f8619c789a9990c4cc87a43aac1dfd6d834ce0e0e11fb4d3d4e9c491d4d3c8785bfe36ce8e52592b8d31c72224401c61c

data/lib/domain/password.rb

@@ -0,0 +1,43 @@
+require 'json'
+class Password
+    attr_accessor  :current_password
+    attr_accessor  :new_password
+
+    def initialize current_password: nil, new_password: nil
+        self.current_password, self.new_password = current_password, new_password
+    end
+
+    def to_json(*a)
+        { 
+           current_password: @current_password,
+            new_password: @new_password,
+      }.to_json(*a)
+      end
+    
+      def self.json_create(o)
+        b_from_json = new
+        b_from_json.current_password = o['current_password']
+        b_from_json.new_password = o['new_password']
+        b_from_json
+      end 
+    
+      def self.get_payload(password)
+        return password.to_json
+      end
+
+end
+
+class PasswordBase
+    attr_accessor  :user
+
+  def to_json(*a)
+    { 
+    user: @user
+    }.to_json(*a)
+  end
+  def self.json_create(o)
+    a_from_json = new
+    a_from_json.user = o['user']
+    a_from_json
+  end
+end

data/lib/domain/user.rb

@@ -4,31 +4,26 @@ class User
     attr_accessor  :first_name
     attr_accessor  :last_name
     attr_accessor  :password
-    attr_accessor  :current_password
-    attr_accessor  :new_password
     attr_accessor  :date_of_birth
     attr_accessor  :email
     attr_accessor  :image_url
 
-  def initialize first_name: nil, last_name: nil, password: nil, current_password: nil, new_password: nil,
-    date_of_birth:nil, email: nil, image_url: nil
-    self.first_name, self.last_name, self.password,self.current_password,self.new_password,
-    self.date_of_birth, self.email, self.image_url =
-    first_name, last_name, password,current_password, new_password, date_of_birth, email, image_url
+  def initialize first_name: nil, last_name: nil, password: nil, date_of_birth:nil, email: nil, image_url: nil
+    self.first_name, self.last_name, self.password, self.date_of_birth, self.email, self.image_url =
+    first_name, last_name, password,date_of_birth, email, image_url
    end
 
   
+   
   def to_json(*a)
     { 
-      first_name: @first_name,
-      last_name: @last_name,
-      password: @password,
-      current_password: @current_password,
-      new_password: @new_password,
-      date_of_birth: @date_of_birth,
-      email: @email,
-      image_url: @image_url
-    }.to_json(*a)
+     first_name: @first_name,
+     last_name: @last_name,
+     password: @password,
+     date_of_birth: @date_of_birth,
+     email: @email,
+     image_url: @image_url
+  }.to_json(*a)
   end
 
   def self.json_create(o)
@@ -36,8 +31,6 @@ class User
     b_from_json.first_name = o['first_name']
     b_from_json.last_name = o['last_name']
     b_from_json.password = o['password']
-    b_from_json.current_password = o['current_password']
-    b_from_json.new_password = o['new_password']
     b_from_json.date_of_birth = o['date_of_birth']
     b_from_json.email = o['email']
     b_from_json.image_url = o['image_url']

data/lib/shilpa20/authentication_service.rb

@@ -6,8 +6,6 @@ require_relative '../domain/application_config.rb'
 class AuthenticationService
     @@authentication_url = 'https://showoff-rails-react-production.herokuapp.com/oauth/token'
     @@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)
@@ -41,7 +39,7 @@ class AuthenticationService
         auth.grant_type = "password"
        # auth.client_id = "277ef29692f9a70d511415dc60592daf4cf2c6f6552d3e1b769924b2f2e2e6fe"
         #auth.client_secret = "d6106f26e8ff5b749a606a1fba557f44eb3dca8f48596847770beb9b643ea352"
-        auth.username = "sachinmurthy93@gmail.com"
+        auth.username = "sachinmurthy1000@gmail.com"
         auth.password = "password"
         return auth
     end
@@ -67,6 +65,12 @@ class AuthenticationService
 
 end
 
+
+#ApplicationConfig.set_config("277ef29692f9a70d511415dc60592daf4cf2c6f6552d3e1b769924b2f2e2e6fe", "d6106f26e8ff5b749a606a1fba557f44eb3dca8f48596847770beb9b643ea352")
+#auth_data = AuthenticationService.create_auth_data
+#puts AuthenticationService.create_authentication(auth_data)
+
+
 # to remove once tested -test create auth
 =begin
 

data/lib/shilpa20/user_service.rb

@@ -41,8 +41,8 @@ class UserService
             headers: {'Content-Type': 'application/json'})
     end
 
-    def self.change_password(user, bearer_token)
-        change_password_payload = User.get_payload(user)
+    def self.change_password(password, bearer_token)
+        change_password_payload = Password.get_payload(password)
         return RestClient::Request.execute(method: :post, url: @@change_password_url,
             payload: change_password_payload,
             headers: {'Content-Type': 'application/json', 'Authorization': bearer_token})
@@ -70,13 +70,13 @@ class UserService
     # to remove once tested
     def self.create_user_with_client_info
         user = User.new
-        user.first_name = "Sachin New"
+        user.first_name = "Sachin New1000"
         user.last_name = "Murthy"
-        user.password = "password"
-        user.current_password = "password"
-        user.new_password = "password123"
+       # user.password = "password"
+  #    user.current_password = "password"
+ #       user.new_password = "password123"
         user.date_of_birth = 1464083530
-        user.email = "sachinmurthy901@gmail.com"
+        #user.email = "sachinmurthy1000@gmail.com"
         user.image_url = "https://static.thenounproject.com/png/961-200.png"
     
         #user_with_client_info = ClientInfoBase.new
@@ -90,5 +90,8 @@ end
 
 # to remove once tested
 #ApplicationConfig.set_config("277ef29692f9a70d511415dc60592daf4cf2c6f6552d3e1b769924b2f2e2e6fe", "d6106f26e8ff5b749a606a1fba557f44eb3dca8f48596847770beb9b643ea352")
-#userWithClientIfno = UserService.create_user_with_client_info
-#puts UserService.create_user(userWithClientIfno)
+#user = User.new
+#user.email = "sachinmurthy93@gmail.com"
+#puts userWithClientIfno = UserService.check_email(user)
+#user = UserService.create_user_with_client_info
+#puts UserService.update_user(user, "848c39c1796fbaeacd0691a7c044aaa93d43ea14fdfeed562800cb52a0242a1b")

data/lib/shilpa20/user_widget_service.rb

@@ -7,7 +7,7 @@ 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_id = ApplicationConfig.get_client_id
     #@@client_secret = ApplicationConfig.get_client_secret
       
        def self.get_private_widgets(bearer_token)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shilpa20
 version: !ruby/object:Gem::Version
-  version: 1.2.4
+  version: 1.2.5
 platform: ruby
 authors:
 - Sachin Murthy
@@ -35,6 +35,7 @@ files:
 - lib/domain/application_config.rb
 - lib/domain/authentication.rb
 - lib/domain/client_info_base.rb
+- lib/domain/password.rb
 - lib/domain/user.rb
 - lib/domain/widget.rb
 - lib/domain/widget_base.rb