poke-go-api 0.1.5 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c43516f50725cfda3be25e7cb083dc9a35a4561d
-  data.tar.gz: a90012ee3e68fcd5b56ec7e8241b5a43acbd69ae
+  metadata.gz: 62e2737346452ed25a9d5d7844df4a7389fdbd31
+  data.tar.gz: b7695c8567f9e12971a8e2002f5e4962d4625802
 SHA512:
-  metadata.gz: cc884ed1e40abf088e060386105d2e0efb38e3bc6da8c7edae696872a80038f864e43fed385c4ad42fe60285a1f6b5379581abdd9111c051d961b46c857b19c8
-  data.tar.gz: 9193798106a73642003697ae4d48ca0fe0fd8f43d45199006506f5f8aa30b40039013d27fe2d0c1de24eda268320d4fdfca125cc661a4ce884b32f9060c3d8b7
+  metadata.gz: 507f26d5261a1a5257bb44c1d5c36755a825d33b1ee1ee82a00155a8596adeaec523ac77522ea053779711a4bb4e85ad8c4fd809e9a9c4175693328faba35a2a
+  data.tar.gz: a9554db26d2c2fce91d246d0dd1ff70d8009f4a2ec9b44c64f9caef53dfb4cf01a842abc4f38d28622f878abbc4d3e9a93b6a5c45ad0da0ec39148df56339f62

data/lib/poke-api/auth/google.rb

@@ -13,14 +13,16 @@ module Poke
         GOOGLE_LOGIN_APP        = 'com.nianticlabs.pokemongo'.freeze
         GOOGLE_LOGIN_CLIENT_SIG = '321187995bc7cdc2b5fc91b11a96e2baa8602c62'.freeze
 
-        def initialize(username, password)
-          @username = username
-          @password = password
-          @provider = 'google'
-          @expiry   = 0
+        def initialize(username, password, refresh_token)
+          @refresh_token = refresh_token
+          @username      = username
+          @password      = password
+          @provider      = 'google'
+          @expiry        = 0
         end
 
         def connect
+          return access_token_from_refresh_token if @refresh_token
           logger.debug '[>] Fetching Google access token'
 
           token_request = perform_request('Token') do
@@ -38,6 +40,27 @@ module Poke
 
         private
 
+        def access_token_from_refresh_token
+          logger.info '[>] Fetching Google access token from refresh token'
+
+          body = {
+            grant_type: 'refresh_token',
+            redirect_uri: 'urn:ietf:wg:oauth:2.0:oob',
+            refresh_token: @refresh_token,
+            scope: 'email',
+            client_secret: 'NCjF1TLi2CcY6t5mt0ZveuL7',
+            client_id: '848232511240-73ri3t7plvk96pj4f85uj8otdat2alem.apps.googleusercontent.com',
+          }
+
+          resp = HTTPClient.new.post('https://accounts.google.com/o/oauth2/token', body).body
+          data = JSON.parse(resp)
+
+          @access_token = data['id_token']
+          @expiry = data['expires_in'].to_i + Helpers.fetch_time(ms: false)
+
+          raise 'Invalid refresh token' unless data['id_token']
+        end
+
         def perform_request(method)
           response = yield
 

data/lib/poke-api/auth/ptc.rb

@@ -14,7 +14,7 @@ module Poke
         PTC_LOGIN_OAUTH = 'https://sso.pokemon.com/sso/oauth2.0/accessToken'.freeze
         PTC_LOGIN_CLIENT_SECRET = 'w8ScCUXJQc6kXKw8FiOhd8Fixzht18Dq3PEVkUCP5ZPxtgyWsbTvWHFLm2wNY0JR'.freeze
 
-        def initialize(username, password)
+        def initialize(username, password, _refresh_token)
           @username = username
           @password = password
           @provider = 'ptc'

data/lib/poke-api/client.rb

@@ -2,36 +2,32 @@ module Poke
   module API
     class Client
       include Logging
-      attr_accessor :lat, :lng, :alt, :endpoint, :ticket, :sig_loaded
-      attr_reader :sig_path, :auth
+      attr_accessor :endpoint, :sig_loaded, :refresh_token,
+                    :lat, :lng, :alt, :http_client, :ticket
+      attr_reader   :sig_path, :auth
 
       def initialize
-        @auth       = nil
         @endpoint   = 'https://pgorelease.nianticlabs.com/plfe/rpc'
         @reqs       = []
         @lat        = 0
         @lng        = 0
-        @alt        = 8
+        @alt        = rand(1..9)
         @ticket     = Auth::Ticket.new
-        @sig_path   = nil
         @sig_loaded = false
       end
 
       def login(username, password, provider)
         @username, @password, @provider = username, password, provider.upcase
-
         raise Errors::InvalidProvider, provider unless %w(PTC GOOGLE).include?(@provider)
-        logger.info "[+] Logging in user: #{username}"
 
         begin
-          @auth = Auth.const_get(@provider).new(username, password)
+          @auth = Auth.const_get(@provider).new(@username, @password, @refresh_token)
           @auth.connect
         rescue StandardError => ex
           raise Errors::LoginFailure.new(@provider, ex)
         end
 
-        get_hatched_eggs
-        call
+        initialize_ticket
         logger.info "[+] Login with #{@provider} Successful"
       end
 
@@ -40,7 +36,7 @@ module Poke
         raise Errors::NoRequests if @reqs.empty?
 
         check_expiry
-        req = RequestBuilder.new(@auth, [@lat, @lng, @alt], @endpoint)
+        req = RequestBuilder.new(@auth, [@lat, @lng, @alt], @endpoint, @http_client)
 
         begin
           resp = req.request(@reqs, self)
@@ -67,9 +63,8 @@ module Poke
         pos = Poke::API::Helpers.get_position(loc).first
         logger.info "[+] Given location: #{pos.address}"
 
-        logger.info "[+] Lat/Long: #{pos.latitude}, #{pos.longitude}"
-        @lat = pos.latitude
-        @lng = pos.longitude
+        logger.info "[+] Lat/Long/Alt: #{pos.latitude}, #{pos.longitude}"
+        @lat, @lng = pos.latitude, pos.longitude
       end
 
       def store_lat_lng(lat, lng)
@@ -84,6 +79,11 @@ module Poke
 
       private
 
+      def initialize_ticket
+        get_hatched_eggs
+        call
+      end
+
       def check_expiry
         unless @ticket.has_ticket?
           now = Helpers.fetch_time(ms: false)

data/lib/poke-api/request_builder.rb

@@ -6,12 +6,12 @@ module Poke
       include Logging
       attr_reader :position, :start_time
 
-      def initialize(auth, pos, endpoint)
+      def initialize(auth, pos, endpoint, http_client)
         @access_token = auth.access_token
         @provider     = auth.provider
         @endpoint     = endpoint
         @position     = pos
-        @client       = HTTPClient.new(agent_name: 'PokeAPI/0.0.1')
+        @client       = http_client ? http_client : HTTPClient.new
         @start_time   = Helpers.fetch_time
       end
 

data/lib/poke-api/testing.rb

@@ -27,22 +27,22 @@ OpenSSL::SSL::VERIFY_PEER = OpenSSL::SSL::VERIFY_NONE
 
 #Poke::API::Logging.log_level = :DEBUG
 client = Poke::API::Client.new
-client.activate_signature('encrypt64bit.dll')
-
-client.store_location('New York')
-client.login('username', 'password', 'google')
+#client.refresh_token = "1/QyOAeM7043LCkvyFfm61MXWV9UOBPutLwuLbjePhqPw"
+client.activate_signature('C:\encrypt64bit.dll')
+client.store_location('Glasgow')
+client.login('sof2er@gmail.com', 'kidureallypwnme', 'google')
 
 client.get_player
 client.call
 #Get cells
-# cell_ids = Poke::API::Helpers.get_cells(client.lat, client.lng)
+cell_ids = Poke::API::Helpers.get_cells(client.lat, client.lng)
 
-# # # Construct map objects call
-# client.get_map_objects(
-#   latitude: client.lat,
-#   longitude: client.lng,
-#   since_timestamp_ms: [0] * cell_ids.length,
-#   cell_id: cell_ids
-# )
+# Construct map objects call
+client.get_map_objects(
+  latitude: client.lat,
+  longitude: client.lng,
+  since_timestamp_ms: [0] * cell_ids.length,
+  cell_id: cell_ids
+)
 
-# p client.call
+p client.call

data/lib/poke-api/version.rb

@@ -1,5 +1,5 @@
 module Poke
   module API
-    VERSION = '0.1.5'.freeze
+    VERSION = '0.1.7'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: poke-go-api
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.7
 platform: ruby
 authors:
 - Nabeel Amjad
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-09 00:00:00.000000000 Z
+date: 2016-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httpclient