steam-trade 0.1.7 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6fbde2803532a7f2bd6bf50986fcd678230e07db
-  data.tar.gz: 9ce311c6a2568ea06ca4068046f2958177e135ce
+  metadata.gz: 0a1495678776d1c4806ab7fd802ca00ef28c623c
+  data.tar.gz: 21068e4e00aeff3f4c15d98070244f1269dfb35e
 SHA512:
-  metadata.gz: 3dc473b18d24ee21829ea9b61504f80faf03cdf377f0fe7789f350d0ab432354a888ba664a89d8945d4ac3045f6be26f556240744a1f576bfbbcbb03aa72e618
-  data.tar.gz: 6de09926ac61687084e583b9adcba6c382400af597001a11ecefe92e4114d999a1ed3a620eeb5a70bffe5ec036270118bcc6c42ddbafe9711a2f35ea11ad57e8
+  metadata.gz: b0f884d6c889ff64fbd0541344c50d25af24f16a7c6fee6d9db418baa9dc56ac98af8409f3d14d9ca398060ae367ed99cd1eb277a5cfac4e0e52998efecb6e80
+  data.tar.gz: 545a7d3266806beeff7dadf1a6edd73a4f606e78d6586f5f4ce954e2c274848bb3a731a3c66674086f59728cd981232aafbb52a47f96bdbdcc890c06aa49a537

data/README.md

@@ -1,4 +1,4 @@
-# steam-trade V0.1.4
+# steam-trade V0.1.9
 Please check constantly for updates cause i'm still making this gem.
 
 This gem simplifes/allows sending steam trade offers programmatically.
@@ -7,11 +7,20 @@ this gem is primarly for trading cards, tho can be used to CS:GO and other games
 
 # Changelog
 ```
+0.1.7:
+- hotfix
+
+0.1.6:
+- hotfix
+
+0.1.5:
+- added mobile_login() which allows you to send and receive steam messages
+- added oauth_login() uses oauth token and steamMachine cookie to login in ( you get those from mobile_login())
+
 0.1.4:
 - added Social commands : send friend request, accept friend request, remove friend, send message, get messages
 - added function to update badges blueprint (useful when there is no gem update)
 
-
 0.1.3:
 - decreased cooldown between requests from 2 seconds to 1 second.
 - added a 0.6 second wait before attempting to confirm a trade offer (mobile).
@@ -50,11 +59,13 @@ this gem is primarly for trading cards, tho can be used to CS:GO and other games
   - [2FA codes](#2fa-codes)
     - [fa()](#fashared_secret-time_difference)
   - [Social Features](#social-commands)
+    - [mobile_login()](#mobile_loginusernamepasswordshared_secret)
+    - [oauth_login()](#oauth_loginoauth_tokensteammachine)
+    - [send_message()](#send_messagetarget-message)
+    - [poll_messages()](#poll_messages)
     - [send_friend_request()](#send_friend_requesttarget)
     - [accept_friend_request()](#accept_friend_requesttarget)
     - [remove_friend()](#remove_friendtarget)
-    - [send_message()](#send_messagetarget-message)
-    - [poll_messages()](#poll_messages)
   - [More commands](#more-commands)
 
 ## Installation
@@ -385,7 +396,7 @@ hash = account.sets_count('https://steamcommunity.com/tradeoffer/new/?partner=41
 
 ```
 
-#### update_blueprint()
+#### `update_blueprint()`
 - updates your locally saved badges blueprint
 ```ruby
 require 'steam-trade'
@@ -417,63 +428,95 @@ puts logged.fa() # will give a random code
 
 ```
 ## Social Commands
-**ALL OF THE COMMANDS BELOW REQUIRES LOGIN**
-### `send_friend_request(target)`
-sends a friend request to the target
-- `target` can be a steamID64, tradelink, or profileID
+#### `mobile_login('username','password','shared_secret')`
+- this command will be called automatically if you attempt to use `send_message()` or `poll_messages()` without authentication
+- calling this explicitly allows you to painlessly retrieve the OAuth token and `SteamMachine#{steamid}` cookie to use in `oauth_login()`
+- this function returns a hash with `oauth_token` and `machine` as keys
+```ruby
+require 'steam-trade'
+
+h = Handler.new('user','pass','secret')
+data = h.mobile_login() #this works are you have setted username and password
+puts data ## will output with oauth token and steamMachine cookie
+
+###################
+h = Handler.new()
+data = h.mobile_login() # will raise an error cause there is no username or password
 
+##########
+
+h = Handler.new()
+data = h.mobile_login('user','pass','secret') ## will work, you are not logged in ( talking about community) here you can't use most of the commands (send_offer() etc) and those parameters you passed will not be setted as the Handler's
+
+######
+h = Handler.new('user1','pass1','secret1')
+data = mobile_login('user2','pass2','secret2') # this works but trading commands etc will be called using user1, and chat commands will be called using user2
+```
+#### `oauth_login(oauth_token,SteamMachine)`
+- `oauth_token` and `SteamMachine` can be retrieved from `mobile_login()`
+```ruby
+require 'steam-trade'
+h = Handler.new()
+h.oauth_login('oauth_token','SteamMachine')
+```
+#### `send_message(target, message)`
+sends a message to the target
+- `target` can be a steamID64, tradelink, or profileID
+- `message` the message to send
 ```ruby
 require 'steam-trade'
 
 h = Handler.new('username', 'password')
-h.send_friend_request('nomg3r')
+h.send_message('nomg3r', "Hello, Friend")
 ```
 
-### `accept_friend_request(target)`
-accepts a friend request from the target
-- `target` can be a steamID64, tradelink, or profileID
+#### `poll_messages()`
+gives you the messages you receieved (after mobile login is initiated (after you call send_message() or poll_messages()  ) )
 
 ```ruby
 require 'steam-trade'
 
 h = Handler.new('username', 'password')
-h.accept_friend_request('nomg3r')
+print h.poll_messages() # will not return messages so you call at again ( only the first time in the whole program )
+puts ""
+puts "------"
+sleep(10) #send a message to the logged in account
+print h.poll_messages() # actually have messages ( if you received some in the time between the first and the second request )
 ```
-
-### `remove_friend(target)`
-removes a friend
+**ALL OF THE COMMANDS BELOW REQUIRES LOGIN**
+#### `send_friend_request(target)`
+sends a friend request to the target
 - `target` can be a steamID64, tradelink, or profileID
 
 ```ruby
 require 'steam-trade'
 
 h = Handler.new('username', 'password')
-h.remove_friend('nomg3r')
+h.send_friend_request('nomg3r')
 ```
-### `send_message(target, message)`
-sends a message to the target
+
+#### `accept_friend_request(target)`
+accepts a friend request from the target
 - `target` can be a steamID64, tradelink, or profileID
-- `message` the message to send
+
 ```ruby
 require 'steam-trade'
 
 h = Handler.new('username', 'password')
-h.send_message('nomg3r', "Hello, Friend)
+h.accept_friend_request('nomg3r')
 ```
 
-### `poll_messages()`
-gives you the messages you receieved (after mobile login is initiated (after you call send_message() or poll_messages()  ) )
+### `remove_friend(target)`
+removes a friend
+- `target` can be a steamID64, tradelink, or profileID
 
 ```ruby
 require 'steam-trade'
 
 h = Handler.new('username', 'password')
-print h.poll_messages() # will not return messages so you call at again ( only the first time in the whole program )
-puts ""
-puts "------"
-sleep(10) #send a message to the logged in account
-print h.poll_messages() # actually have messages ( if you received some in the time between the first and the second request )
+h.remove_friend('nomg3r')
 ```
+
 ## More commands
 you can find more non-vital commands in the [wiki](https://github.com/OmG3r/steam-trade/wiki)
 ## License

data/lib/LoginExecutor.rb

@@ -3,7 +3,7 @@ module LoginCommands
 ########################################################################################
      private
       def login()
-            response = @session.post('https://store.steampowered.com/login/getrsakey/', {'username' => @username})
+            response = @session.post('https://store.steampowered.com/login/getrsakey/', {'username' => @username}).content
             data = pass_stamp(response,@password)
             encrypted_password = data["password"]
             timestamp = data["timestamp"]
@@ -27,7 +27,7 @@ module LoginCommands
                         'captcha_text' => '',
                         'emailsteamid' => '',
                         'rsatimestamp' => timestamp,
-                        'remember_login' => 'false'
+                        'remember_login' => @remember
                   }
 
                   login = @session.post('https://store.steampowered.com/login/dologin', send )

data/lib/meta/version.rb

@@ -1,4 +1,4 @@
 module   Meta
-      VERSION = "0.1.7"
+      VERSION = "0.1.9"
       GEM_NAME = "steam-trade"
 end

data/lib/steam-trade.rb

@@ -31,13 +31,15 @@ class Handler
       include SocialCommands
 
       def initialize(username = nil ,password = nil,*params)
-           raise "can only take 4 params, given #{params.length}" if params.length > 2
+           raise "can only take 5 params, given #{params.length}" if params.length > 3
+
             @loggedin = false # will be set to true once we login
 
-            @username = username
-            @password = password
+            @username = nil
+            @password = nil
             @secret = nil
             @time_difference = 0
+            @remember = false
 
             @session = Mechanize.new { |a| # the session which will hold your cookies to communicate with steam
                   a.user_agent_alias = 'Windows Mozilla'
@@ -46,17 +48,6 @@ class Handler
                #   a.agent.http.verify_mode = OpenSSL::SSL::VERIFY_NONE
             }
 
-            if params.length == 2
-                 @secret = params[0] if params[0].class == String
-                 @time_difference = params[1] if params[1].class == Integer
-            elsif params.length == 1 && params[0].class == String
-                 @secret = params[0]
-                 @time_difference = 0
-            elsif params.length == 1 && params[0].class == Integer
-                 @secret = nil
-                 @time_difference = params[0]
-            end
-
             @steamid = nil # will be initialized once you login and can be initialized with mobile_info
             @identity_secret = nil # can and should be initialized using mobile_info
             @api_key = nil # can be initalized through set_api_key or will be initialized once you login if possilbe
@@ -73,30 +64,67 @@ class Handler
             @umqid = nil # required to send messages
             @message_id = nil #requires to send messages
 
-            if @username.nil?
-                  output "Handler started"
-            else
-                  output "Handler started for #{@username}"
-            end
-            if username != nil && password != nil
+
+
+
+            if params.length == 3
+                  raise "shared_secret must be string, received #{parasm[0].class}" if params[0].class != String
+                  raise "time difference must be an integer, received #{params[1].class}" if params[1].class != Integer
+                  raise "remember_me must be a boolean, received #{params[2].class}" if !([TrueClass,FalseClass].include?(params[2].class))
+                  @secret = params[0] if params[0].class == String
+                  @time_difference = params[1] if params[1].class == Integer
+                  @remember = params[2] if [TrueClass,FalseClass].include?(params[2].class)
+            elsif params.length == 2
+                  if params[0].class == String
+                        raise "invalid fourth parameter type, received #{params[1].class}" if !([TrueClass,FalseClass].include?(params[1].class)) && params[1].class != Integer
+                        @secret = params[0]
+                        @time_difference = params[1] if params[1].class == Integer
+                        @remember = params[1] if [TrueClass,FalseClass].include?(params[1].class)
+                  elsif params[0].class == Integer
+                       raise "remember_me must be a boolean, received #{params[1].class}" if !([TrueClass,FalseClass].include?(params[1].class))
+                       @time_difference = params[0]
+                       @remember = params[1]
+                 else
+                       raise "invalid third parameter type"
+                 end
+           elsif params.length == 1
+                  raise "invalid third parameter type, received #{params[0].class}" if !([TrueClass,FalseClass].include?(params[0].class)) && params[0].class != Integer && params[0].class != String
+                 @secret = params[0] if params[0].class == String
+                 @time_difference = params[0] if params[0].class == Integer
+                 @remember = params[0] if [TrueClass,FalseClass].include?(params[0].class)
+           end
+
+
+
+
+            (@username.nil? || @username.class == Hash) ? (output "Handler started") : ( output "Handler started for #{@username}")
+
+            if username.class == String && password.class == String
+                  @username = username
+                  @password = password
                  login()
-            end
+           elsif username.class == Hash
+                 load_cookies(username)
+           end
+
+
       end
 
+
       def mobile_info(identity_secret, steamid = nil)
             @identity_secret = identity_secret
-            if @steamid == nil && steamid != nil
-                  @steamid = steamid
-            end
+            @steamid = steamid if  @steamid == nil && steamid != nil
       end
 
       def set_inventory_cache(timer = 120)
             integer = 5
             float = 5.5
             if timer.class == integer.class || timer.class == float.class
-                  @inventory_validity = timer
+                  @inventory_validity = timer.to_i
                   output "inventory validity set to #{timer}"
             end
+
+
             if @inventory_cache == false
                   @inventory_cache = true
                   output "inventory cache enabled"
@@ -111,13 +139,75 @@ class Handler
       end
 
       def toggle_messages()
-            if @messages == true
-                 output "messages are now disabled"
-                 @messages = false
-           else
-                 @messages = true
-                 output "messages are now enabled"
-           end
+            @messages == true ?  (output "messages are now disabled"; @messages = false;) : (output "messages are now enabled";@messages = true;)
+     end
+
+
+
+
+      def get_auth_cookies()
+            data = {}
+            #data['sessionid'] = @session.cookie_jar.jar["steamcommunity.com"]["/"]["sessionid"].value
+            begin
+                  data['steamLogin'] = @session.cookie_jar.jar["store.steampowered.com"]["/"]["steamLogin"].value
+            rescue
+                  data['steamLogin'] = @session.cookie_jar.jar["steamcommunity.com"]["/"]["steamLogin"].value
+            end
+
+            begin
+                  data['steamLoginSecure'] = @session.cookie_jar.jar["store.steampowered.com"]["/"]["steamLoginSecure"].value
+            rescue
+                   data['steamLoginSecure'] = @session.cookie_jar.jar["steamcommunity.com"]["/"]["steamLoginSecure"].value
+            end
+
+            if @steamid != nil
+                  begin
+                        data["steamMachineAuth#{@steamid}"] = @session.cookie_jar.jar["store.steampowered.com"]["/"]["steamMachineAuth#{@steamid}"].value
+                  rescue
+                         data["steamMachineAuth#{@steamid}"] = @session.cookie_jar.jar["steamcommunity.com"]["/"]["steamMachineAuth#{@steamid}"].value
+                  end
+
+            else
+
+                  @session.cookies.each { |c|
+                        if c.downcase.include?('steammachine')
+                              data[c] = c.value
+                         end
+                  }
+            end
+
+            return data
+
+
       end
+      private
+      def load_cookies(data)
+            container = []
+            data.each { |name, value|
+                  if name.include?("steamMachineAuth")
+                        container << (Mechanize::Cookie.new :domain => 'store.steampowered.com', :name => name , :value => value, :path => '/')
+                        container << (Mechanize::Cookie.new :domain => 'steamcommunity.com', :name => name , :value =>value, :path => '/')
+                        container << (Mechanize::Cookie.new :domain => 'help.steampowered.com', :name => name , :value => value, :path => '/')
+                        @steamid = name.sub('steamMachineAuth', '')
+                  elsif name == 'steamLogin'
+                        container << (Mechanize::Cookie.new :domain => 'store.steampowered.com', :name => name , :value => value, :path => '/')
+                        container << (Mechanize::Cookie.new :domain => 'steamcommunity.com', :name => name , :value =>value, :path => '/')
+                        container << (Mechanize::Cookie.new :domain => 'help.steampowered.com', :name => name , :value => value, :path => '/')
+                  elsif name == 'steamLoginSecure'
+                        container << (Mechanize::Cookie.new :domain => 'store.steampowered.com', :name => name , :value => value, :path => '/')
+                        container << (Mechanize::Cookie.new :domain => 'steamcommunity.com', :name => name , :value =>value, :path => '/')
+                        container << (Mechanize::Cookie.new :domain => 'help.steampowered.com', :name => name , :value => value, :path => '/')
+                  end
+            }
+
+            container.each { |cookie|
+                @session.cookie_jar << cookie
+            }
+            user = Nokogiri::HTML(@session.get('https://store.steampowered.com/stats/').content).css('#account_pulldown').text
+            raise "Could not login using cookies" if user ==  ''
+            output "logged in as #{user}"
+      end
+
+
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: steam-trade
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.9
 platform: ruby
 authors:
 - OmG3r
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-05-20 00:00:00.000000000 Z
+date: 2018-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler