passport_thrift_client 0.1.1 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: de9a26852607376df39ad6148062253bc6a5709d
-  data.tar.gz: f843d6dd60ca52689f7a7ce4c27f36f5c25cf7e7
+  metadata.gz: 54abe927fae2ca5ec4c97e129b147d48abf9d870
+  data.tar.gz: d1c198c1351d2d7fc0ea4efb343e4af9d2dae2d1
 SHA512:
-  metadata.gz: 2e20f5d79b4f6eca0316b0e218076120b3277dc90e24d603fa1432d3ccb6bcf99b6d9d282ae0ca86fda86bd197a98963ae15c4bc4959b7ffffdd62967f976035
-  data.tar.gz: f98430d6509fc67ac06deb40b98604c34cfe1290b30d3083d813f7446dfcdbbdd854d05ee0c29e9b11ed7bed77b7520bc4b8b0d0b99ca1f96459d396498589ed
+  metadata.gz: 5379488ba3673bb04565c9845084026c8adcf658f67a736d9ea1c6dc5df091a0e3d7ba6c738a2c8af8781512cd05cd0770d16c3d35edccbc6879d21f3c3c7e1e
+  data.tar.gz: 1a4fc3d4032e66d4a6c91d2c818a5e2228e94ea30a3861ca8d4a6fb02f8c0b4d699b37d3add1a4e3bc608806c08ad533f76fb339a50319f04a43f48c4b2ab9ac

data/lib/passport_thrift_client.rb

@@ -4,7 +4,6 @@ require 'remote_passport_service'
 require 'remote_passport_types'
 require 'remote_stat_user_track_service'
 require 'remote_thirdparty_sync_set_service'
-require 'remote_user_profile_service'
 require 'logger'
 
 module Passport
@@ -36,183 +35,7 @@ module Passport
 			   @@logger
 			end
 		end
-		
-		class ThriftUserProfileService
-		
-			def initialize(config = {})
-				if config['servers'].nil? 
-					raise 'servers must be determined!'
-					return
-				end
-				config = DEFAULT_CONFIG.merge(config)
-				config['client_class'] = 'Passport::Thrift::RemoteUserProfileService::Client'
-				@thriftClient = ThriftClient.new(config)
-				@@logger = LoggerFactory.getLogger("ThriftUserProfileService")
-			end
-			
-			def destroy
-				@@logger.error("before ThriftUserProfileService destroy")
-				begin
-					@thriftClient.destroy
-				rescue Exception => e
-					@@logger.error("ThriftUserProfileService destroy error !! #{e.message}" + "\n" + e.backtrace.join("\n"))
-				end
-				@@logger.error("thriftUserProfileService destroyed!")
-			end
-			
-			def save(profile = {})
-				if (profile['uid'].nil?)
-					return
-				end
-				profile = Passport::Thrift::Profile.new(profile)
-				@thriftClient.save(profile)
-			end
-			
-			def getProfileByUid(uid)
-				profile = @thriftClient.getProfileByUid(uid)
-				return convert_profile_to_hash(profile)
-			end
-			
-			def getProfileByUids(uids)
-				profile_map = @thriftClient.getProfileByUids(uids)
-				unless profile_map.nil?
-					hash_profile_map = {}
-					profile_map.each do |k, v|
-						hash_profile_map[k] = convert_profile_to_hash(v)
-					end
-					return hash_profile_map
-				end
-				return nil
-			end
-			
-			def getNicknameByUid(uid)
-				@thriftClient.getNicknameByUid(uid)
-			end
-			
-			def getMultiNickNameByUids(uidList)
-				@thriftClient.getMultiNickNameByUids(uidList)
-			end
-			
-			def queryUserBasicInfo(uid)
-				begin
-				    if uid && uid.to_i > 0
-						info = @thriftClient.queryUserBasicInfo(uid)
-						info = convert_user_basicinfo_to_hash(info)
-					end
-					unless info
-						@@logger.error("query user basic info return nil , uid: #{uid}")
-					end
-					return info
-				rescue Exception => e
-					@@logger.error("query user basic info error, uid: #{uid},cause by :#{e.message}," + " \n" + e.backtrace.join("\n"))
-					if info
-						@@logger.error("info : #{info.inspect}")
-					end
-				end
-			end
-			
-			def getMultiUserBasicInfos(uids)
-				info_map = @thriftClient.getMultiUserBasicInfos(uids)
-				unless info_map.nil?
-					hash_info_map = {}
-					info_map.each do |k, v|
-						hash_info_map[k] = convert_user_basicinfo_to_hash(v)
-					end
-					return hash_info_map
-				end
-				return nil
-			end
-			
-			def getProfileByNickname(nickname)
-				profile_list = @thriftClient.getProfileByNickname(nickname)
-				unless profile_list.nil?
-					hash_profile_list = []
-					profile_list.each do |p|
-						hash_profile_list << convert_profile_to_hash(p)
-					end
-					return hash_profile_list
-				end
-				return nil
-			end
-			
-			def checkNickname(oldNickname, nickname)
-				@thriftClient.checkNickname(oldNickname, nickname)
-			end
-			
-			def checkNicknameFormat(nickname)
-				@thriftClient.checkNicknameFormat(nickname)
-			end
-			
-			def checkNicknameDuplicate(oldNickname, nickname)
-				@thriftClient.checkNicknameDuplicate(oldNickname, nickname)
-			end
-			
-			def getProfielByEmail(email)
-				convert_profile_to_hash(@thriftClient.getProfielByEmail(email))
-			end
-			
-			def convert_profile_to_hash(profile)
-				unless profile.nil? || profile.isNull
-					profile = profile.to_hash
-					if profile['createTime'] > 0
-						profile['createTime'] = Time.at(profile['createTime'] / 1000).to_s 
-					else 
-						profile['createTime'] = nil
-					end
-					if profile['lastModifyTime'] > 0
-						profile['lastModifyTime'] = Time.at(profile['lastModifyTime'] / 1000).to_s  
-					else
-						profile['lastModifyTime'] = nil
-					end
-					
-					if profile['loginBanStart'] > 0
-						profile['loginBanStart'] = Time.at(profile['loginBanStart'] / 1000).to_s
-					else
-						profile['loginBanStart'] = nil
-					end
-					
-					if profile['loginBanEnd'] > 0
-						profile['loginBanEnd'] = Time.at(profile['loginBanEnd'] / 1000).to_s
-					else
-						profile['loginBanEnd'] = nil
-					end
-					
-					return profile
-				end
-				return nil
-			end
-		
-			def convert_user_basicinfo_to_hash(profile)
-				unless profile.nil? || profile.isNull
-					profile = profile.to_hash
-					if profile['createdTime'] > 0
-						profile['createdTime'] = Time.at(profile['createdTime'] / 1000).to_s 
-					else 
-						profile['createdTime'] = nil
-					end
-					
-					if profile['loginBanStart'] > 0
-						profile['loginBanStart'] = Time.at(profile['loginBanStart'] / 1000).to_s
-					else
-						profile['loginBanStart'] = nil
-					end
-					
-					if profile['loginBanEnd'] > 0
-						profile['loginBanEnd'] = Time.at(profile['loginBanEnd'] / 1000).to_s
-					else
-						profile['loginBanEnd'] = nil
-					end
-					
-					if profile['vCategoryId'] <= 0
-						profile['vCategoryId'] = nil
-					end
-					
-					return profile
-				end
-				return nil
-			end
-		end
-		
+	
 		class ThriftLoginService
 			def initialize(config = {})
 				if config['servers'].nil? 
@@ -277,6 +100,14 @@ module Passport
 				end
 				@@logger.error("ThriftPassportService destroyed!")
 			end
+
+			def modifyPassword(uid, old_password, new_password, new_password_confirm)
+				@thriftClient.modifyPassword(uid, old_password, new_password, new_password_confirm)
+			end
+
+			def setPassword(uid, new_password, new_password_confirm)
+				@thriftClient.setPassword(uid, new_password, new_password_confirm)
+			end
 			
 			def queryPassportByEmail(email)
 				convert_passport_to_hash(@thriftClient.queryPassportByEmail(email))

data/lib/remote_login_service.rb

@@ -1,203 +1,196 @@
-#
-# Autogenerated by Thrift Compiler (0.9.1)
-#
-# DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
-#
-
-require 'thrift'
-require 'remote_passport_types'
-
-module Passport
-  module Thrift
-    module RemoteLoginService
-      class Client
-        include ::Thrift::Client
-
-        def checkLogin(token, rememberMe, loginHelpInfo)
-          send_checkLogin(token, rememberMe, loginHelpInfo)
-          return recv_checkLogin()
-        end
-
-        def send_checkLogin(token, rememberMe, loginHelpInfo)
-          send_message('checkLogin', CheckLogin_args, :token => token, :rememberMe => rememberMe, :loginHelpInfo => loginHelpInfo)
-        end
-
-        def recv_checkLogin()
-          result = receive_message(CheckLogin_result)
-          return result.success unless result.success.nil?
-          raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'checkLogin failed: unknown result')
-        end
-
-        def login(info, loginHelpInfo)
-          send_login(info, loginHelpInfo)
-          return recv_login()
-        end
-
-        def send_login(info, loginHelpInfo)
-          send_message('login', Login_args, :info => info, :loginHelpInfo => loginHelpInfo)
-        end
-
-        def recv_login()
-          result = receive_message(Login_result)
-          return result.success unless result.success.nil?
-          raise result.ex unless result.ex.nil?
-          raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'login failed: unknown result')
-        end
-
-        def logout(info, deviceToken)
-          send_logout(info, deviceToken)
-          recv_logout()
-        end
-
-        def send_logout(info, deviceToken)
-          send_message('logout', Logout_args, :info => info, :deviceToken => deviceToken)
-        end
-
-        def recv_logout()
-          result = receive_message(Logout_result)
-          return
-        end
-
-      end
-
-      class Processor
-        include ::Thrift::Processor
-
-        def process_checkLogin(seqid, iprot, oprot)
-          args = read_args(iprot, CheckLogin_args)
-          result = CheckLogin_result.new()
-          result.success = @handler.checkLogin(args.token, args.rememberMe, args.loginHelpInfo)
-          write_result(result, oprot, 'checkLogin', seqid)
-        end
-
-        def process_login(seqid, iprot, oprot)
-          args = read_args(iprot, Login_args)
-          result = Login_result.new()
-          begin
-            result.success = @handler.login(args.info, args.loginHelpInfo)
-          rescue ::Passport::Thrift::PassportException => ex
-            result.ex = ex
-          end
-          write_result(result, oprot, 'login', seqid)
-        end
-
-        def process_logout(seqid, iprot, oprot)
-          args = read_args(iprot, Logout_args)
-          result = Logout_result.new()
-          @handler.logout(args.info, args.deviceToken)
-          write_result(result, oprot, 'logout', seqid)
-        end
-
-      end
-
-      # HELPER FUNCTIONS AND STRUCTURES
-
-      class CheckLogin_args
-        include ::Thrift::Struct, ::Thrift::Struct_Union
-        TOKEN = 1
-        REMEMBERME = 2
-        LOGINHELPINFO = 3
-
-        FIELDS = {
-          TOKEN => {:type => ::Thrift::Types::STRING, :name => 'token'},
-          REMEMBERME => {:type => ::Thrift::Types::STRING, :name => 'rememberMe'},
-          LOGINHELPINFO => {:type => ::Thrift::Types::STRUCT, :name => 'loginHelpInfo', :class => ::Passport::Thrift::LoginHelpInfo}
-        }
-
-        def struct_fields; FIELDS; end
-
-        def validate
-        end
-
-        ::Thrift::Struct.generate_accessors self
-      end
-
-      class CheckLogin_result
-        include ::Thrift::Struct, ::Thrift::Struct_Union
-        SUCCESS = 0
-
-        FIELDS = {
-          SUCCESS => {:type => ::Thrift::Types::BOOL, :name => 'success'}
-        }
-
-        def struct_fields; FIELDS; end
-
-        def validate
-        end
-
-        ::Thrift::Struct.generate_accessors self
-      end
-
-      class Login_args
-        include ::Thrift::Struct, ::Thrift::Struct_Union
-        INFO = 1
-        LOGINHELPINFO = 2
-
-        FIELDS = {
-          INFO => {:type => ::Thrift::Types::STRUCT, :name => 'info', :class => ::Passport::Thrift::LoginInfo},
-          LOGINHELPINFO => {:type => ::Thrift::Types::STRUCT, :name => 'loginHelpInfo', :class => ::Passport::Thrift::LoginHelpInfo}
-        }
-
-        def struct_fields; FIELDS; end
-
-        def validate
-        end
-
-        ::Thrift::Struct.generate_accessors self
-      end
-
-      class Login_result
-        include ::Thrift::Struct, ::Thrift::Struct_Union
-        SUCCESS = 0
-        EX = 1
-
-        FIELDS = {
-          SUCCESS => {:type => ::Thrift::Types::STRUCT, :name => 'success', :class => ::Passport::Thrift::MobileLoginInfo},
-          EX => {:type => ::Thrift::Types::STRUCT, :name => 'ex', :class => ::Passport::Thrift::PassportException}
-        }
-
-        def struct_fields; FIELDS; end
-
-        def validate
-        end
-
-        ::Thrift::Struct.generate_accessors self
-      end
-
-      class Logout_args
-        include ::Thrift::Struct, ::Thrift::Struct_Union
-        INFO = 1
-        DEVICETOKEN = 2
-
-        FIELDS = {
-          INFO => {:type => ::Thrift::Types::STRUCT, :name => 'info', :class => ::Passport::Thrift::MobileLoginInfo},
-          DEVICETOKEN => {:type => ::Thrift::Types::STRING, :name => 'deviceToken'}
-        }
-
-        def struct_fields; FIELDS; end
-
-        def validate
-        end
-
-        ::Thrift::Struct.generate_accessors self
-      end
-
-      class Logout_result
-        include ::Thrift::Struct, ::Thrift::Struct_Union
-
-        FIELDS = {
-
-        }
-
-        def struct_fields; FIELDS; end
-
-        def validate
-        end
-
-        ::Thrift::Struct.generate_accessors self
-      end
-
-    end
-
-  end
-end
+#
+# Autogenerated by Thrift Compiler (0.9.1)
+#
+# DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+#
+
+require 'thrift'
+require 'remote_passport_types'
+
+module Passport
+  module Thrift
+    module RemoteLoginService
+      class Client
+        include ::Thrift::Client
+
+        def checkLogin(token, rememberMe, loginHelpInfo)
+          send_checkLogin(token, rememberMe, loginHelpInfo)
+          return recv_checkLogin()
+        end
+
+        def send_checkLogin(token, rememberMe, loginHelpInfo)
+          send_message('checkLogin', CheckLogin_args, :token => token, :rememberMe => rememberMe, :loginHelpInfo => loginHelpInfo)
+        end
+
+        def recv_checkLogin()
+          result = receive_message(CheckLogin_result)
+          return result.success unless result.success.nil?
+          raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'checkLogin failed: unknown result')
+        end
+
+        def login(info, loginHelpInfo)
+          send_login(info, loginHelpInfo)
+          return recv_login()
+        end
+
+        def send_login(info, loginHelpInfo)
+          send_message('login', Login_args, :info => info, :loginHelpInfo => loginHelpInfo)
+        end
+
+        def recv_login()
+          result = receive_message(Login_result)
+          return result.success unless result.success.nil?
+          raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'login failed: unknown result')
+        end
+
+        def logout(info, deviceToken)
+          send_logout(info, deviceToken)
+          recv_logout()
+        end
+
+        def send_logout(info, deviceToken)
+          send_message('logout', Logout_args, :info => info, :deviceToken => deviceToken)
+        end
+
+        def recv_logout()
+          result = receive_message(Logout_result)
+          return
+        end
+
+      end
+
+      class Processor
+        include ::Thrift::Processor
+
+        def process_checkLogin(seqid, iprot, oprot)
+          args = read_args(iprot, CheckLogin_args)
+          result = CheckLogin_result.new()
+          result.success = @handler.checkLogin(args.token, args.rememberMe, args.loginHelpInfo)
+          write_result(result, oprot, 'checkLogin', seqid)
+        end
+
+        def process_login(seqid, iprot, oprot)
+          args = read_args(iprot, Login_args)
+          result = Login_result.new()
+          result.success = @handler.login(args.info, args.loginHelpInfo)
+          write_result(result, oprot, 'login', seqid)
+        end
+
+        def process_logout(seqid, iprot, oprot)
+          args = read_args(iprot, Logout_args)
+          result = Logout_result.new()
+          @handler.logout(args.info, args.deviceToken)
+          write_result(result, oprot, 'logout', seqid)
+        end
+
+      end
+
+      # HELPER FUNCTIONS AND STRUCTURES
+
+      class CheckLogin_args
+        include ::Thrift::Struct, ::Thrift::Struct_Union
+        TOKEN = 1
+        REMEMBERME = 2
+        LOGINHELPINFO = 3
+
+        FIELDS = {
+          TOKEN => {:type => ::Thrift::Types::STRING, :name => 'token'},
+          REMEMBERME => {:type => ::Thrift::Types::STRING, :name => 'rememberMe'},
+          LOGINHELPINFO => {:type => ::Thrift::Types::STRUCT, :name => 'loginHelpInfo', :class => ::Passport::Thrift::LoginHelpInfo}
+        }
+
+        def struct_fields; FIELDS; end
+
+        def validate
+        end
+
+        ::Thrift::Struct.generate_accessors self
+      end
+
+      class CheckLogin_result
+        include ::Thrift::Struct, ::Thrift::Struct_Union
+        SUCCESS = 0
+
+        FIELDS = {
+          SUCCESS => {:type => ::Thrift::Types::BOOL, :name => 'success'}
+        }
+
+        def struct_fields; FIELDS; end
+
+        def validate
+        end
+
+        ::Thrift::Struct.generate_accessors self
+      end
+
+      class Login_args
+        include ::Thrift::Struct, ::Thrift::Struct_Union
+        INFO = 1
+        LOGINHELPINFO = 2
+
+        FIELDS = {
+          INFO => {:type => ::Thrift::Types::STRUCT, :name => 'info', :class => ::Passport::Thrift::LoginInfo},
+          LOGINHELPINFO => {:type => ::Thrift::Types::STRUCT, :name => 'loginHelpInfo', :class => ::Passport::Thrift::LoginHelpInfo}
+        }
+
+        def struct_fields; FIELDS; end
+
+        def validate
+        end
+
+        ::Thrift::Struct.generate_accessors self
+      end
+
+      class Login_result
+        include ::Thrift::Struct, ::Thrift::Struct_Union
+        SUCCESS = 0
+
+        FIELDS = {
+          SUCCESS => {:type => ::Thrift::Types::STRUCT, :name => 'success', :class => ::Passport::Thrift::MobileLoginInfo}
+        }
+
+        def struct_fields; FIELDS; end
+
+        def validate
+        end
+
+        ::Thrift::Struct.generate_accessors self
+      end
+
+      class Logout_args
+        include ::Thrift::Struct, ::Thrift::Struct_Union
+        INFO = 1
+        DEVICETOKEN = 2
+
+        FIELDS = {
+          INFO => {:type => ::Thrift::Types::STRUCT, :name => 'info', :class => ::Passport::Thrift::MobileLoginInfo},
+          DEVICETOKEN => {:type => ::Thrift::Types::STRING, :name => 'deviceToken'}
+        }
+
+        def struct_fields; FIELDS; end
+
+        def validate
+        end
+
+        ::Thrift::Struct.generate_accessors self
+      end
+
+      class Logout_result
+        include ::Thrift::Struct, ::Thrift::Struct_Union
+
+        FIELDS = {
+
+        }
+
+        def struct_fields; FIELDS; end
+
+        def validate
+        end
+
+        ::Thrift::Struct.generate_accessors self
+      end
+
+    end
+
+  end
+end

data/lib/remote_passport_constants.rb

@@ -1,13 +1,13 @@
-#
-# Autogenerated by Thrift Compiler (0.9.1)
-#
-# DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
-#
-
-require 'thrift'
-require 'remote_passport_types'
-
-module Passport
-  module Thrift
-  end
-end
+#
+# Autogenerated by Thrift Compiler (0.9.1)
+#
+# DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+#
+
+require 'thrift'
+require 'remote_passport_types'
+
+module Passport
+  module Thrift
+  end
+end