tesla_api 1.5.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 73167fdd579379407c55193de889645ca9b1b7fb6341fcb8a3abed2b219212f4
-  data.tar.gz: 939adf5aa3e3bfdee0ac6cdb13827f9292c08b40441d8dfd72b9d872cb784f43
+  metadata.gz: a0a2c77105e4ceabe402f838427c9efbfb917d7f74b49d3f5f6637e3581e0678
+  data.tar.gz: f07b11556f4d3a4a874d68ed9ced60ba40e71f759f251b0449a07fcf1513b8a0
 SHA512:
-  metadata.gz: f760988232016af782fdb8f5877e18e7be89d4dd8d3efbe71f3942b7ff6a0194ae67c67a4c829135acc860066d3291bd3079f20f19c02a56fd34c3742d620c74
-  data.tar.gz: 6ee1fdaba380e976bfdffb76bbd09c3ea3af8c309c5de0c3c2bf11fec38e75b3ddfe1d1b998de2a61ea5749bddc3d45be9304d1151ef2bef5d0662624616ef47
+  metadata.gz: ba1727791cdb0493e9a703e55d3b400d4c59dc300d5e1d463482c3622466f0f6172904c6185273405188735337b42c7ffaf055c1fe1e1b7fbd984a7894f85b34
+  data.tar.gz: 5d73d9cf6960742d4d63b013b2ece343879a4809cb4f9dccf4ac1e1dd3f9e36f6b2e3b731bf9675d70a512f6afc6ddea9a03052ab81f65283be26e8cc6124d39

data/.tool-versions

@@ -0,0 +1 @@
+ruby 2.6.4

data/.travis.yml

@@ -2,11 +2,15 @@ language: ruby
 rvm:
   - 2.6
 env:
-  global:
+  global: 
     - TESLA_EMAIL=elon.musk@teslamotors.com
     - TESLA_PASS=oilLOL
     - TESLA_CLIENT_ID=1
     - TESLA_CLIENT_SECRET=2
-    - TESLA_API_TOKEN=3
+    - TESLA_ACCESS_TOKEN=3
+    - TESLA_REFRESH_TOKEN=4
+before_install:
+  - gem update --system
+  - gem install bundler
 notifications:
   email: false

data/docs/miscellaneous/endpoints.md

@@ -1,6 +1,6 @@
 # Endpoints File
 
-This the latest contents of the ownerapi_endpoints.json file from the 3.8.4 version of the app.
+This the latest contents of the ownerapi_endpoints.json file from the 3.9.0 version of the app.
 
 ```json
 {
@@ -415,6 +415,11 @@ This the latest contents of the ownerapi_endpoints.json file from the 3.8.4 vers
     "URI": "api/1/energy_sites/{site_id}/history",
     "AUTH": true
   },
+  "CALENDAR_HISTORY_DATA": {
+    "TYPE": "GET",
+    "URI": "api/1/energy_sites/{site_id}/calendar_history",
+    "AUTH": true
+  },
   "BACKUP_RESERVE": {
     "TYPE": "POST",
     "URI": "api/1/energy_sites/{site_id}/backup",

data/docs/vehicle/optioncodes.md

@@ -17,6 +17,7 @@ appreciated!_
 | MS04 | Model S | This vehicle is a Model S | 
 | MDLX | Model X | This vehicle is a Model X | 
 | MDL3 | Model 3 | This vehicle is a Model 3 | 
+| MDLY | Model Y | This vehicle is a Model Y | 
 | RENA | Region: North America | | 
 | RENC | Region: Canada | | 
 | REEU | Region: Europe | | 
@@ -25,8 +26,17 @@ appreciated!_
 | AD05 | European 3-Phase, IT | | 
 | AD06 | Schuko (1 phase, 230V 13A) | | 
 | AD07 | Red IEC309 (3 phase, 400V 16A) | | 
+| AD08 | Blue Charging Adapter | | 
+| AD09 | Adapter, Swiss (1 phase, 10A) | | 
+| AD10 | Adapter, Denmark (1 phase, 13A) | | 
+| AD11 | Adapter, Italy (1 phase, 13A) | | 
 | AD15 | ? | | 
 | ADPX2 | Type 2 Public Charging Connector | | 
+| ADX4 | No European 3-Phase | |
+| ADX5 | European 3-Phase, IT | |
+| ADX6 | No - Adapter, Schuko (1 phase, 13A) | |
+| ADX7 | No - 3-ph Red IEC309 (3 phase, 16A) | |
+| ADX9 | No - Adapter, Swiss (1 phase, 10A) | |
 | ADX8 | Blue IEC309 (1 phase, 230V 32A) | | 
 | AF00 | No HEPA Filter | | 
 | AF02 | HEPA Filter | | 
@@ -37,15 +47,19 @@ appreciated!_
 | APF2 | Full Self-Driving Capability | | 
 | APH0 | Autopilot 2.0 Hardware | | 
 | APH2 | Autopilot 2.0 Hardware | | 
+| APBS | Autopilot | Model 3 Autopilot |
+| APF2 | Full Self-Driving Capability | |
 | APH3 | Autopilot 2.5 Hardware | |
 | APH4 | Autopilot 3.0 Hardware | Full Self-Driving Computer | 
 | APPA | Autopilot 1.0 Hardware | | 
 | APPB | Enhanced Autopilot | | 
 | AU00 | No Audio Package | | 
 | AU01 | Ultra High Fidelity Sound | | 
-| BC0B | Tesla Black Brake Calipers | | 
-| BC0R | Tesla Red Brake Calipers | | 
+| BC0B | Black Brake Calipers | | 
+| BC0R | Red Brake Calipers | |
+| BC3B | Black Brake Calipers, Model 3 | |
 | BCMB | Black Brake Calipers | | 
+| BCYR | Performance Brakes | |
 | BP00 | No Ludicrous | | 
 | BP01 | Ludicrous Speed Upgrade | | 
 | BR00 | No Battery Firmware Limit | | 
@@ -63,8 +77,13 @@ appreciated!_
 | BTX6 | 100 kWh | | 
 | BTX7 | 75 kWh | | 
 | BTX8 | 85 kWh | | 
+| CC01 | Five Seat Interior | |
+| CC02 | Six Seat Interior | |
 | CC04 | Seven Seat Interior | | 
+| CC12 | Six Seat Interior with Center Console | |
 | CDM0 | No CHAdeMO Charging Adaptor | | 
+| CF00 | High Power Charger | |
+| CF01 | 48amp charger | |
 | CH00 | Standard Charger (40 Amp) | | 
 | CH01 | Dual Chargers (80 Amp) | | 
 | CH04 | 72 Amp Charger (Model S/X) | | 
@@ -75,7 +94,8 @@ appreciated!_
 | COL2 | Metallic | | 
 | COL3 | Tesla Multi-Coat | | 
 | COUS | Country: United States | | 
-| CONL | Country: Netherlands | | 
+| CONL | Country: Netherlands | |
+| CPW1 | 20" Performance Wheels | |
 | CW00 | No Cold Weather Package | | 
 | CW02 | Subzero Weather Package | | 
 | DA00 | No Autopilot | | 
@@ -83,6 +103,7 @@ appreciated!_
 | DA02 | Autopilot Convenience Features | | 
 | DCF0 | Autopilot Convenience Features (DCF0) | | 
 | DRLH | Left Hand Drive | | 
+| BC3R | Performance Brakes | Model 3 |
 | DRRH | Right Hand Drive | | 
 | DSH5 | PUR Dash Pad | | 
 | DSH7 | Alcantara Dashboard Accents | | 
@@ -96,6 +117,7 @@ appreciated!_
 | FG02 | Exterior Lighting Package | | 
 | FMP6 | FMP6 | | 
 | FR01 | Base Front Row | | 
+| FR02 | Ventilated Front Seats | |
 | FR03 | FR03 | | 
 | FR04 | FR04 | | 
 | HC00 | No Home Charging installation | | 
@@ -106,6 +128,7 @@ appreciated!_
 | IDBA | Dark Ash Wood Decor | | 
 | IDBO | Figured Ash Wood Decor | | 
 | IDCF | Carbon Fiber Decor | | 
+| IDOK | Oak Decor | |
 | IDOM | Matte Obeche Wood Decor | | 
 | IDOG | Gloss Obeche Wood Decor | | 
 | IDLW | Lacewood Decor | | 
@@ -120,6 +143,8 @@ appreciated!_
 | INLPC | Cream | | 
 | INLPP | Black / Light Headliner | | 
 | INWPT | Tan Interior | | 
+| INYPB | All Black Premium Interior | |
+| INYPW | Black and White Premium Interior | |
 | IVBPP | All Black Interior | | 
 | IVBSW | Ultra White Interior | | 
 | IVBTB | All Black Interior | | 
@@ -138,53 +163,78 @@ appreciated!_
 | LT4W | LT4W | | 
 | LT5C | LT5C | | 
 | LT5P | LT5P | | 
-| LT6P | LT6P | | 
+| LT6P | LT6P | |
+| LTPB | Lower Trim PUR Black | |
+| ME01 | Memory Seats | |
 | ME02 | Memory Seats | | 
 | MI00 | 2015 Production Refresh | | 
 | MI01 | 2016 Production Refresh | | 
 | MI02 | 2017 Production Refresh | | 
-| MI03 | 201? Production Refresh (found on Model X ordered 11/2018 delivered 3/2019) | | 
+| MI03 | 201? Production Refresh | Found on Model X ordered 11/2018 delivered 3/2019 | 
+| MT300 | Standard Range Rear-Wheel Drive | |
 | MT301 | Standard Range Plus Rear-Wheel Drive | |
+| MT302 | Long Range Rear-Wheel Drive | |
+| MT303 | Long Range All-Wheel Drive | |
+| MT304 | Long Range All-Wheel Drive Performance | |
 | MT305 | Mid Range Rear-Wheel Drive | | 
-| OSSB | OSSB | | 
+| MTY02 | Long Range Rear-Wheel Drive | |
+| MTY03 | Long Range All-Wheel Drive | |
+| MTY04 | Long Range All-Wheel Drive Performance | |
+| OSSB | Safety CA Black | |
+| OSSW | Safety CA White | |
 | PA00 | No Paint Armor | | 
-| PBCW | Catalina White | | 
-| PBSB | Sierra Black | Translates to the Solid Black exterior color in design studio. Applicable to all variants of Model S, Model 3 and Model X. | 
+| PBCW | Solid White Color | | 
+| PBSB | Solid Black Color | | 
 | PBT8 | Performance 85kWh | | 
+| PC30 | No Performance Chassis | |
+| PC31 | Performance Chassis | |
 | PF00 | No Performance Legacy Package | | 
 | PF01 | Performance Legacy Package | | 
 | PI00 | No Premium Interior | | 
 | PI01 | Premium Upgrades Package | | 
 | PK00 | LEGACY No Parking Sensors | | 
-| PMAB | Anza Brown Metallic | | 
-| PMBL | Obsidian Black Multi-Coat | | 
-| PMMB | Monterey Blue Metallic | | 
-| PMMR | Multi-Coat Red | | 
-| PMNG | Midnight Silver Metallic | Translates to the Midnight Silver Metallic exterior color in design studio. Applicable to all variants of Model S, Model 3 and Model X. | 
-| PMSG | Sequoia Green Metallic | | 
-| PMSS | San Simeon Silver Metallic | | 
-| PMTG | Dolphin Grey Metallic | | 
-| PPMR | Muir Red Multi-Coat | Translates to the Red Multi-Coat exterior color in design studio. Applicable to all variants of Model S, Model 3 and Model X. | 
-| PPSB | Deep Blue Metallic | Translates to the Deep Blue Metallic exterior color in design studio. Applicable to all variants of Model S, Model 3 and Model X. | 
-| PPSR | Signature Red | | 
-| PPSW | Shasta Pearl White Multi-Coat | Translates to the Pearl White Multi-Coat exterior color in design studio. Applicable to all variants of Model S, Model 3 and Model X. | 
-| PPTI | Titanium Metallic | | 
+| PMAB | Anza Brown Metallic Color | | 
+| PMBL | Obsidian Black Multi-Coat Color | | 
+| PMMB | Monterey Blue Metallic Color | | 
+| PMMR | Red Multi-Coat Color | | 
+| PMNG | Midnight Silver Metallic Color | | 
+| PMSG | Green Metallic Color| | 
+| PMSS | San Simeon Silver Metallic Color | | 
+| PMTG | Dolphin Grey Metallic Color | | 
+| PPMR | Red Multi-Coat Color | | 
+| PPSB | Deep Blue Metallic Color | | 
+| PPSR | Signature Red Color | | 
+| PPSW | Pearl White Multi-Coat Color | | 
+| PPTI | Titanium Metallic Color | | 
+| PL31 | Performance Pedals | Model 3 |
 | PRM30 | Partial Premium Interior | |
 | PRM31 | Premium Interior | | 
+| PRM3S | Standard Interior | |
+| PRMY1 | Premium Interior | |
 | PS00 | No Parcel Shelf | | 
 | PS01 | Parcel Shelf | | 
 | PX00 | No Performance Plus Package | | 
 | PX01 | Performance Plus | | 
 | PX6D | Zero to 60 in 2.5 sec | | 
 | P85D | P85D | | 
+| QLBS | Black Premium Interior | |
+| QLFC | Cream Premium Interior | |
+| QLFP | Black Premium Interior | |
+| QLFW | White Premium Interior | |
+| QLWS | White Premium Interior | |
 | QNET | Tan NextGen | | 
+| QPBT | Black Textile Interior | |
 | QPMP | Black seats | | 
+| QTBS | Black Premium Interior | |
 | QTBW | White Premium Seats | | 
+| QTFC | Cream Premium Interior | |
 | QTFP | Black Premium Seats | | 
+| QTFW | White Premium Interior | |
 | QTPC | Cream Premium Seats | | 
 | QTPP | Black Premium Seats | | 
 | QTPT | Tan Premium Seats | | 
-| QTTB | Multi-Pattern Black Seats | | 
+| QTTB | Multi-Pattern Black Seats | |
+| QTWS | White Premium Interior | |
 | QVBM | Multi-Pattern Black Seats | | 
 | QVPC | Vegan Cream Seats | | 
 | QVPP | Vegan Cream Seats | | 
@@ -206,12 +256,14 @@ appreciated!_
 | SC01 | Supercharging Enabled | | 
 | SC04 | Pay Per Use Supercharging | | 
 | SC05 | Free Supercharging | | 
-| SP00 | No Security Package | | 
+| SP00 | No Security Package | |
 | SR01 | Standard 2nd row | | 
 | SR06 | Seven Seat Interior | | 
 | SR07 | Standard 2nd row | | 
 | ST00 | Non-leather Steering Wheel | | 
 | ST01 | Non-heated Leather Steering Wheel | | 
+| STY5S | Five Seat Interior | |
+| STY7S | Seven Seat Interior | |
 | SU00 | Standard Suspension | | 
 | SU01 | Smart Air Suspension | | 
 | TIC4 | All-Season Tires | | 
@@ -232,20 +284,49 @@ appreciated!_
 | UTAW | Light Headliner | | 
 | UTPB | Dark Headliner | | 
 | UTSB | Dark Headliner | | 
+| UTZW | Light Headliner | |
+| SLR1 | Carbon Fibre Spoiler | Model 3 |
+| SPT31 | Performance Upgrade | Model 3 |
+| SPTY1 | Performance Upgrade | Model Y |
+| W32P | 20" Performance Wheels | Model 3 |
 | W38B | 18" Aero Wheels | For the Model 3 and Model Y |
 | W39B | 19" Sport Wheels | | 
 | WT20 | 20" Silver Slipstream Wheels | | 
+| WT22 | 22" Silver Turbine Wheels | |
+| WTAB | 21" Black Arachnid Wheels | |
 | WTAS | 19" Silver Slipstream Wheels | | 
 | WTDS | 19" Grey Slipstream Wheels | | 
+| WTNN | 20" Nokian Winter Tires (non-studded) | |
+| WTNS | 20" Nokian Winter Tires (studded) | |
+| WTP2 | 20" Pirelli Winter Tires | |
+| WTSC | 20" Sonic Carbon Wheels | |
 | WTSG | 21" Turbine Wheels | | 
 | WTSP | 21" Turbine Wheels | | 
 | WTSS | 21" Turbine Wheels | | 
 | WTTB | 19" Cyclone Wheels | | 
+| WTTC | 21" Sonic Carbon Twin Turbine Wheels | |
+| WTUT | 22" Onyx Black Wheels | |
+| WTW2 | 19" Nokian Winter Wheel Set | |
+| WTW3 | 19" Pirelli Winter Wheel Set | |
 | WTW4 | 19" Winter Tire Set | | 
 | WTW5 | 21" Winter Tire Set | | 
+| WTW6 | 19" Nokian Winter Tires (studded) | |
+| WTW7 | 19" Nokian Winter Tires (non-studded) | |
+| WTW8 | 19" Pirelli Winter Tires | |
 | WTX1 | 19" Michelin Primacy Tire Upgrade | | 
+| WXNN | No 20" Nokian Winter Tires (non-studded) | |
+| WXNS | No 20" Nokian Winter Tires (studded) | |
+| WXP2 | No 20" Pirelli Winter Tires | |
+| WXW2 | No 19" Wheels with Nokian Winter Tyres | |
+| WXW3 | No 19" Wheels with Pirelli Winter Tyres | |
 | WXW4 | No 19" Winter Tire Set | | 
 | WXW5 | No 21" Winter Tire Set | | 
+| WXW6 | No 19" Nokian Winter Tires (studded) | |
+| WXW7 | No 19" Nokian Winter Tires (non-studded) | |
+| WXW8 | No 19" Pirelli Winter Tires | |
+| WY18B | 18" Aero Wheels | |
+| WY19B | 19" Sport Wheels | |
+| WY20P | 20" Performance Wheels | |
 | X001 | Override: Power Liftgate | | 
 | X003 | Maps & Navigation | | 
 | X004 | Override: No Navigation | | 

data/docs/vehicle/state/data.md

@@ -4,6 +4,8 @@
 
 A rollup of all the `data_request` endpoints plus vehicle configuration.
 
+*Note:* all `*_range` values are in miles, irrespective of GUI configuration.
+
 ### Response
 
 ```json

data/docs/vehicle/state/vehiclestate.md

@@ -50,3 +50,12 @@ Returns the vehicle's physical state, such as which doors are open.
   }
 }
 ```
+
+### Center Display States
+| State | Description     |
+|-------|-----------------|
+| 0     | Off             |
+| 2     | Normal On       |
+| 3     | Charging Screen |
+| 7     | Sentry Mode     |
+| 8     | Dog Mode        |

data/lib/tesla_api/client.rb

@@ -4,36 +4,57 @@ module TeslaApi
     base_uri 'https://owner-api.teslamotors.com/api/1'
     headers 'User-Agent' => "github.com/timdorr/tesla-api v:#{VERSION}"
     format :json
+    raise_on [401]
 
-    attr_reader :email, :token, :refresh_token, :client_id, :client_secret
+    attr_reader :email, :access_token, :access_token_expires_at, :refresh_token, :client_id, :client_secret
 
-    def initialize(email, client_id = ENV['TESLA_CLIENT_ID'], client_secret = ENV['TESLA_CLIENT_SECRET'])
+    def initialize(
+        email: nil,
+        access_token: nil,
+        access_token_expires_at: nil,
+        refresh_token: nil,
+        client_id: ENV['TESLA_CLIENT_ID'],
+        client_secret: ENV['TESLA_CLIENT_SECRET']
+    )
       @email = email
+
       @client_id = client_id
       @client_secret = client_secret
-    end
 
-    def token=(token)
-      @token = token
-      self.class.headers 'Authorization' => "Bearer #{token}"
+      self.update_token(
+          access_token: access_token,
+          access_token_expires_at: access_token_expires_at,
+          refresh_token: refresh_token
+      )
     end
 
-    def expires_in=(seconds)
-      @expires_in = seconds.to_f
-    end
+    def update_token(access_token:, access_token_expires_at:, refresh_token:)
+      @access_token = access_token
+      @access_token_expires_at = access_token_expires_at
+      @refresh_token = refresh_token
+      self.class.headers 'Authorization' => "Bearer #{access_token}" if access_token
 
-    def created_at=(timestamp)
-      @created_at = Time.at(timestamp.to_f).to_datetime
+      access_token
     end
 
-    def expired_at
-      return nil unless defined?(@created_at)
-      (@created_at.to_time + @expires_in.to_f).to_datetime
-    end
+    def refresh_access_token
+      response = self.class.post(
+          'https://owner-api.teslamotors.com/oauth/token',
+          body: {
+              grant_type: 'refresh_token',
+              client_id: client_id,
+              client_secret: client_secret,
+              refresh_token: refresh_token
+          }
+      )
 
-    def expired?
-      return true unless defined?(@created_at)
-      expired_at <= DateTime.now
+      self.update_token(
+          access_token: response['access_token'],
+          access_token_expires_at: Time.at(response['created_at'] + response['expires_in']).to_datetime,
+          refresh_token: response['refresh_token']
+      )
+
+      response
     end
 
     def login!(password)
@@ -48,10 +69,18 @@ module TeslaApi
           }
       )
 
-      self.expires_in    = response['expires_in']
-      self.created_at    = response['created_at']
-      self.token         = response['access_token']
-      self.refresh_token = response['refresh_token']
+      self.update_token(
+          access_token: response['access_token'],
+          access_token_expires_at: Time.at(response['created_at'] + response['expires_in']).to_datetime,
+          refresh_token: response['refresh_token']
+      )
+
+      response
+    end
+
+    def expired?
+      return true if access_token_expires_at.nil?
+      access_token_expires_at <= DateTime.now
     end
 
     def vehicles

data/lib/tesla_api/version.rb

@@ -1,3 +1,3 @@
 module TeslaApi
-  VERSION = '1.5.0'
+  VERSION = '2.0.0'
 end

data/spec/cassettes/client-refresh.yml

@@ -0,0 +1,51 @@
+---
+http_interactions:
+- request:
+    method: post
+    uri: https://owner-api.teslamotors.com/oauth/token
+    body:
+      encoding: UTF-8
+      string: grant_type=refresh_token&client_id=<TESLA_CLIENT_ID>&client_secret=<TESLA_CLIENT_SECRET>&refresh_token=<TESLA_REFRESH_TOKEN>
+    headers:
+      User-Agent:
+      - github.com/timdorr/tesla-api v:1.5.0
+      Authorization:
+      - Bearer <TESLA_ACCESS_TOKEN>
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Server:
+      - nginx
+      Date:
+      - Mon, 23 Sep 2019 17:25:05 GMT
+      Content-Type:
+      - application/json; charset=utf-8
+      Transfer-Encoding:
+      - chunked
+      Connection:
+      - keep-alive
+      X-Frame-Options:
+      - SAMEORIGIN
+      - SAMEORIGIN
+      X-Xss-Protection:
+      - 1; mode=block
+      X-Content-Type-Options:
+      - nosniff
+      Cache-Control:
+      - no-store
+      Pragma:
+      - no-cache
+      Etag:
+      - W/"25e04c26d708b6763d3dca87bcaeb2a7"
+      X-Request-Id:
+      - d153d7b0-ce0b-4c24-a109-e60488df7f48
+      X-Runtime:
+      - '0.020946'
+    body:
+      encoding: UTF-8
+      string: '{"access_token":"bb91d9892b8af05ad389f2d05b9689657a076f61c4d97ff398f23d86112fb5ca","token_type":"bearer","expires_in":3888000,"refresh_token":"21879d76c4e00309b3d69c6ecb128b89e0c7e210838404601d9f433e9a069022","created_at":1569259505}'
+    http_version: 
+  recorded_at: Mon, 23 Sep 2019 17:25:05 GMT
+recorded_with: VCR 4.0.0

data/spec/cassettes/vehicle-activate_speed_limit.yml

@@ -8,7 +8,7 @@ http_interactions:
       string: ''
     headers:
       Authorization:
-      - Bearer <TESLA_API_TOKEN>
+      - Bearer <TESLA_ACCESS_TOKEN>
   response:
     status:
       code: 200
@@ -54,7 +54,7 @@ http_interactions:
       string: pin=1234
     headers:
       Authorization:
-      - Bearer <TESLA_API_TOKEN>
+      - Bearer <TESLA_ACCESS_TOKEN>
   response:
     status:
       code: 200

data/spec/cassettes/vehicle-cancel_software_update.yml

@@ -10,7 +10,7 @@ http_interactions:
       User-Agent:
       - github.com/timdorr/tesla-api v:1.3.0
       Authorization:
-      - Bearer <TESLA_API_TOKEN>
+      - Bearer <TESLA_ACCESS_TOKEN>
   response:
     status:
       code: 200
@@ -59,7 +59,7 @@ http_interactions:
       User-Agent:
       - github.com/timdorr/tesla-api v:1.3.0
       Authorization:
-      - Bearer <TESLA_API_TOKEN>
+      - Bearer <TESLA_ACCESS_TOKEN>
   response:
     status:
       code: 200

data/spec/cassettes/vehicle-charge_port_door_close.yml

@@ -10,7 +10,7 @@ http_interactions:
       User-Agent:
       - github.com/timdorr/tesla-api v:1.3.0
       Authorization:
-      - Bearer <TESLA_API_TOKEN>
+      - Bearer <TESLA_ACCESS_TOKEN>
   response:
     status:
       code: 200
@@ -59,7 +59,7 @@ http_interactions:
       User-Agent:
       - github.com/timdorr/tesla-api v:1.3.0
       Authorization:
-      - Bearer <TESLA_API_TOKEN>
+      - Bearer <TESLA_ACCESS_TOKEN>
   response:
     status:
       code: 200

data/spec/cassettes/vehicle-clear_speed_limit_pin.yml

@@ -8,7 +8,7 @@ http_interactions:
       string: ''
     headers:
       Authorization:
-      - Bearer <TESLA_API_TOKEN>
+      - Bearer <TESLA_ACCESS_TOKEN>
   response:
     status:
       code: 200
@@ -54,7 +54,7 @@ http_interactions:
       string: pin=1234
     headers:
       Authorization:
-      - Bearer <TESLA_API_TOKEN>
+      - Bearer <TESLA_ACCESS_TOKEN>
   response:
     status:
       code: 200

data/spec/cassettes/vehicle-data.yml

@@ -10,7 +10,7 @@ http_interactions:
       User-Agent:
       - github.com/timdorr/tesla-api v:1.3.0
       Authorization:
-      - Bearer <TESLA_API_TOKEN>
+      - Bearer <TESLA_ACCESS_TOKEN>
   response:
     status:
       code: 200
@@ -59,7 +59,7 @@ http_interactions:
       User-Agent:
       - github.com/timdorr/tesla-api v:1.3.0
       Authorization:
-      - Bearer <TESLA_API_TOKEN>
+      - Bearer <TESLA_ACCESS_TOKEN>
   response:
     status:
       code: 200

data/spec/cassettes/vehicle-deactivate_speed_limit.yml

@@ -8,7 +8,7 @@ http_interactions:
       string: ''
     headers:
       Authorization:
-      - Bearer <TESLA_API_TOKEN>
+      - Bearer <TESLA_ACCESS_TOKEN>
   response:
     status:
       code: 200
@@ -54,7 +54,7 @@ http_interactions:
       string: pin=1234
     headers:
       Authorization:
-      - Bearer <TESLA_API_TOKEN>
+      - Bearer <TESLA_ACCESS_TOKEN>
   response:
     status:
       code: 200

data/spec/cassettes/vehicle-navigation_request.yml

@@ -10,7 +10,7 @@ http_interactions:
       User-Agent:
       - github.com/timdorr/tesla-api v:1.3.0
       Authorization:
-      - Bearer <TESLA_API_TOKEN>
+      - Bearer <TESLA_ACCESS_TOKEN>
   response:
     status:
       code: 200
@@ -59,7 +59,7 @@ http_interactions:
       User-Agent:
       - github.com/timdorr/tesla-api v:1.3.0
       Authorization:
-      - Bearer <TESLA_API_TOKEN>
+      - Bearer <TESLA_ACCESS_TOKEN>
   response:
     status:
       code: 200

data/spec/cassettes/vehicle-nearby_charging_sites.yml

@@ -10,7 +10,7 @@ http_interactions:
       User-Agent:
       - github.com/timdorr/tesla-api v:1.3.0
       Authorization:
-      - Bearer <TESLA_API_TOKEN>
+      - Bearer <TESLA_ACCESS_TOKEN>
   response:
     status:
       code: 200
@@ -59,7 +59,7 @@ http_interactions:
       User-Agent:
       - github.com/timdorr/tesla-api v:1.3.0
       Authorization:
-      - Bearer <TESLA_API_TOKEN>
+      - Bearer <TESLA_ACCESS_TOKEN>
   response:
     status:
       code: 400

data/spec/cassettes/vehicle-open_frunk.yml

@@ -8,7 +8,7 @@ http_interactions:
       string: ''
     headers:
       Authorization:
-      - Bearer <TESLA_API_TOKEN>
+      - Bearer <TESLA_ACCESS_TOKEN>
   response:
     status:
       code: 200
@@ -54,7 +54,7 @@ http_interactions:
       string: which_trunk=front
     headers:
       Authorization:
-      - Bearer <TESLA_API_TOKEN>
+      - Bearer <TESLA_ACCESS_TOKEN>
   response:
     status:
       code: 200

data/spec/cassettes/vehicle-open_trunk.yml

@@ -8,7 +8,7 @@ http_interactions:
       string: ''
     headers:
       Authorization:
-      - Bearer <TESLA_API_TOKEN>
+      - Bearer <TESLA_ACCESS_TOKEN>
   response:
     status:
       code: 200
@@ -54,7 +54,7 @@ http_interactions:
       string: which_trunk=front
     headers:
       Authorization:
-      - Bearer <TESLA_API_TOKEN>
+      - Bearer <TESLA_ACCESS_TOKEN>
   response:
     status:
       code: 200

data/spec/cassettes/vehicle-reset_valet_pin.yml

@@ -8,7 +8,7 @@ http_interactions:
       string: ''
     headers:
       Authorization:
-      - Bearer <TESLA_API_TOKEN>
+      - Bearer <TESLA_ACCESS_TOKEN>
   response:
     status:
       code: 200
@@ -49,7 +49,7 @@ http_interactions:
       string: ''
     headers:
       Authorization:
-      - Bearer <TESLA_API_TOKEN>
+      - Bearer <TESLA_ACCESS_TOKEN>
   response:
     status:
       code: 200

data/spec/cassettes/vehicle-schedule_software_update.yml

@@ -10,7 +10,7 @@ http_interactions:
       User-Agent:
       - github.com/timdorr/tesla-api v:1.3.0
       Authorization:
-      - Bearer <TESLA_API_TOKEN>
+      - Bearer <TESLA_ACCESS_TOKEN>
   response:
     status:
       code: 200
@@ -59,7 +59,7 @@ http_interactions:
       User-Agent:
       - github.com/timdorr/tesla-api v:1.3.0
       Authorization:
-      - Bearer <TESLA_API_TOKEN>
+      - Bearer <TESLA_ACCESS_TOKEN>
   response:
     status:
       code: 200

data/spec/cassettes/vehicle-seat_heater_request.yml

@@ -10,7 +10,7 @@ http_interactions:
       User-Agent:
       - github.com/timdorr/tesla-api v:1.4.1
       Authorization:
-      - Bearer <TESLA_API_TOKEN>
+      - Bearer <TESLA_ACCESS_TOKEN>
   response:
     status:
       code: 200
@@ -59,7 +59,7 @@ http_interactions:
       User-Agent:
       - github.com/timdorr/tesla-api v:1.4.1
       Authorization:
-      - Bearer <TESLA_API_TOKEN>
+      - Bearer <TESLA_ACCESS_TOKEN>
   response:
     status:
       code: 200

data/spec/cassettes/vehicle-set_sentry_mode.yml

@@ -10,7 +10,7 @@ http_interactions:
       User-Agent:
       - github.com/timdorr/tesla-api v:1.4.1
       Authorization:
-      - Bearer <TESLA_API_TOKEN>
+      - Bearer <TESLA_ACCESS_TOKEN>
   response:
     status:
       code: 200
@@ -59,7 +59,7 @@ http_interactions:
       User-Agent:
       - github.com/timdorr/tesla-api v:1.4.1
       Authorization:
-      - Bearer <TESLA_API_TOKEN>
+      - Bearer <TESLA_ACCESS_TOKEN>
   response:
     status:
       code: 200

data/spec/cassettes/vehicle-set_speed_limit.yml

@@ -8,7 +8,7 @@ http_interactions:
       string: ''
     headers:
       Authorization:
-      - Bearer <TESLA_API_TOKEN>
+      - Bearer <TESLA_ACCESS_TOKEN>
   response:
     status:
       code: 200
@@ -54,7 +54,7 @@ http_interactions:
       string: limit_mph=65
     headers:
       Authorization:
-      - Bearer <TESLA_API_TOKEN>
+      - Bearer <TESLA_ACCESS_TOKEN>
   response:
     status:
       code: 200

data/spec/cassettes/vehicle-set_valet_mode.yml

@@ -8,7 +8,7 @@ http_interactions:
       string: ''
     headers:
       Authorization:
-      - Bearer <TESLA_API_TOKEN>
+      - Bearer <TESLA_ACCESS_TOKEN>
   response:
     status:
       code: 200
@@ -49,7 +49,7 @@ http_interactions:
       string: on=true&password=1234
     headers:
       Authorization:
-      - Bearer <TESLA_API_TOKEN>
+      - Bearer <TESLA_ACCESS_TOKEN>
   response:
     status:
       code: 200

data/spec/cassettes/vehicle-steering_wheel_heater_request.yml

@@ -10,7 +10,7 @@ http_interactions:
       User-Agent:
       - github.com/timdorr/tesla-api v:1.4.1
       Authorization:
-      - Bearer <TESLA_API_TOKEN>
+      - Bearer <TESLA_ACCESS_TOKEN>
   response:
     status:
       code: 200
@@ -59,7 +59,7 @@ http_interactions:
       User-Agent:
       - github.com/timdorr/tesla-api v:1.4.1
       Authorization:
-      - Bearer <TESLA_API_TOKEN>
+      - Bearer <TESLA_ACCESS_TOKEN>
   response:
     status:
       code: 200

data/spec/lib/tesla_api/client_spec.rb

@@ -1,63 +1,79 @@
 require 'spec_helper'
 
 RSpec.describe TeslaApi::Client do
-  subject(:tesla_api) { TeslaApi::Client.new(ENV['TESLA_EMAIL']) }
+  subject(:tesla_api) { TeslaApi::Client.new(email: ENV['TESLA_EMAIL']) }
 
-  describe '#new client' do
-    it 'has no expiry date' do
-      expect(tesla_api.expired_at).to eq(nil)
-    end
+  context 'password grant auth' do
+    describe '#new' do
+      it 'has no expiry date' do
+        expect(tesla_api.access_token_expires_at).to eq(nil)
+      end
 
-    it 'has a expiry status set to true' do
-      expect(tesla_api.expired?).to eq(true)
+      it 'has a expiry status set to true' do
+        expect(tesla_api.expired?).to eq(true)
+      end
     end
-  end
 
-  describe '#token=' do
-    it 'sets a Bearer token' do
-      tesla_api.token = Faker::Lorem.characters(32)
-      expect(tesla_api.class.headers).to include({'Authorization' => /Bearer [a-z0-9]{32}/})
-    end
-  end
+    describe '#login!', vcr: { cassette_name: 'client-login' } do
+      it { is_expected.to be_a(TeslaApi::Client) }
 
-  describe '#login!', vcr: { cassette_name: 'client-login' } do
-    it { is_expected.to be_a(TeslaApi::Client) }
+      it 'logs into the API' do
+        tesla_api.login!(ENV['TESLA_PASS'])
+        expect(a_request(:post, "https://#{URI.parse(tesla_api.class.base_uri).host}/oauth/token")).to have_been_made.once
+      end
 
-    it 'logs into the API' do
-      tesla_api.login!(ENV['TESLA_PASS'])
-      expect(a_request(:post, "https://#{URI.parse(tesla_api.class.base_uri).host}/oauth/token")).to have_been_made.once
-    end
+      it 'sets a Bearer token header' do
+        tesla_api.login!(ENV['TESLA_PASS'])
+        expect(tesla_api.class.headers).to include({'Authorization' => /Bearer [a-z0-9]{32}/})
+      end
 
-    it 'set a expiry date' do
-      tesla_api.login!(ENV['TESLA_PASS'])
-      expect(tesla_api.expired_at).to eq(Time.at(1475777133 + 7776000).to_datetime)
-    end
+      it 'obtains a Bearer token' do
+        tesla_api.login!(ENV['TESLA_PASS'])
+        expect(tesla_api.access_token).to match(/[a-z0-9]{32}/)
+      end
 
-    it 'expose expiry status' do
-      tesla_api.login!(ENV['TESLA_PASS'])
-      tesla_api.created_at = (Time.now - 1).to_i
-      expect(tesla_api.expired?).to eq(false)
-    end
+      it 'set a expiry date' do
+        tesla_api.login!(ENV['TESLA_PASS'])
+        expect(tesla_api.access_token_expires_at).to eq(Time.at(1475777133 + 7776000).to_datetime)
+      end
 
-    it 'is expired when has a 90+ days old date' do
-      tesla_api.login!(ENV['TESLA_PASS'])
-      tesla_api.created_at = (Time.now - 7776000 - 1).to_i
-      expect(tesla_api.expired?).to eq(true)
-    end
+      it 'obtains a refresh token' do
+        tesla_api.login!(ENV['TESLA_PASS'])
+        expect(tesla_api.refresh_token).to match(/[a-z0-9]{32}/)
+      end
 
-    it 'sets a Bearer token header' do
-      tesla_api.login!(ENV['TESLA_PASS'])
-      expect(tesla_api.class.headers).to include({'Authorization' => /Bearer [a-z0-9]{32}/})
+      it 'expose expiry status' do
+        tesla_api.login!(ENV['TESLA_PASS'])
+        expect(tesla_api.expired?).to eq(true)
+      end
     end
+  end
+
+  context 'token grant auth' do
+    subject(:tesla_api) { TeslaApi::Client.new(
+        access_token: access_token,
+        access_token_expires_at: DateTime.now + 1,
+        refresh_token: refresh_token
+    ) }
+
+    let(:access_token) { ENV['TESLA_ACCESS_TOKEN'] }
+    let(:refresh_token) { ENV['TESLA_REFRESH_TOKEN'] }
+
+    describe '#new' do
+      it 'is not expired' do
+        expect(tesla_api.expired?).to eq(false)
+      end
 
-    it 'obtains a Bearer token' do
-      tesla_api.login!(ENV['TESLA_PASS'])
-      expect(tesla_api.token).to match(/[a-z0-9]{32}/)
+      it 'sets a Bearer token header' do
+        expect(tesla_api.class.headers).to include({'Authorization' => "Bearer #{access_token}"})
+      end
     end
 
-    it 'obtains a refresh token' do
-      tesla_api.login!(ENV['TESLA_PASS'])
-      expect(tesla_api.refresh_token).to match(/[a-z0-9]{32}/)
+    describe '#refresh_access_token', vcr: {cassette_name: 'client-refresh'} do
+      it 'refreshes the access token' do
+        tesla_api.refresh_access_token
+        expect(tesla_api.access_token).not_to eq(access_token)
+      end
     end
   end
 

data/spec/lib/tesla_api/vehicle_spec.rb

@@ -1,11 +1,7 @@
 require 'spec_helper'
 
 RSpec.describe TeslaApi::Vehicle do
-  let(:tesla_api) { TeslaApi::Client.new(ENV['TESLA_EMAIL']) }
-
-  before do
-    tesla_api.token = ENV['TESLA_API_TOKEN']
-  end
+  let(:tesla_api) { TeslaApi::Client.new(access_token: ENV['TESLA_ACCESS_TOKEN']) }
 
   subject(:vehicle) { tesla_api.vehicles.first }
 

data/spec/spec_helper.rb

@@ -1,5 +1,4 @@
 require 'dotenv'
-require 'faker'
 require 'vcr'
 require 'webmock/rspec'
 
@@ -17,7 +16,8 @@ VCR.configure do |c|
   c.define_cassette_placeholder('<TESLA_PASS>')          { ENV['TESLA_PASS'] }
   c.define_cassette_placeholder('<TESLA_CLIENT_ID>')     { ENV['TESLA_CLIENT_ID'] }
   c.define_cassette_placeholder('<TESLA_CLIENT_SECRET>') { ENV['TESLA_CLIENT_SECRET'] }
-  c.define_cassette_placeholder('<TESLA_API_TOKEN>')     { ENV['TESLA_API_TOKEN'] }
+  c.define_cassette_placeholder('<TESLA_ACCESS_TOKEN>')  { ENV['TESLA_ACCESS_TOKEN'] }
+  c.define_cassette_placeholder('<TESLA_REFRESH_TOKEN>') { ENV['TESLA_REFRESH_TOKEN'] }
 end
 
 RSpec.configure do |config|

data/tesla_api.gemspec

@@ -21,7 +21,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler', '~> 2.0'
   spec.add_development_dependency 'rake', '~> 12.0'
   spec.add_development_dependency 'rspec', '~> 3.1'
-  spec.add_development_dependency 'faker', '~> 1.4'
   spec.add_development_dependency 'vcr', '~> 4.0'
   spec.add_development_dependency 'webmock', '~> 3.0'
   spec.add_development_dependency 'dotenv', '~> 2.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tesla_api
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Tim Dorr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-30 00:00:00.000000000 Z
+date: 2019-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -94,20 +94,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.1'
-- !ruby/object:Gem::Dependency
-  name: faker
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.4'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: vcr
   requirement: !ruby/object:Gem::Requirement
@@ -161,6 +147,7 @@ files:
 - ".gitbook.yml"
 - ".gitignore"
 - ".rspec"
+- ".tool-versions"
 - ".travis.yml"
 - Gemfile
 - LICENSE
@@ -209,6 +196,7 @@ files:
 - lib/tesla_api/vehicle.rb
 - lib/tesla_api/version.rb
 - spec/cassettes/client-login.yml
+- spec/cassettes/client-refresh.yml
 - spec/cassettes/client-vehicles.yml
 - spec/cassettes/vehicle-activate_speed_limit.yml
 - spec/cassettes/vehicle-auto_conditioning_start.yml
@@ -280,12 +268,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.2
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: A wrapper for the Tesla JSON API
 test_files:
 - spec/cassettes/client-login.yml
+- spec/cassettes/client-refresh.yml
 - spec/cassettes/client-vehicles.yml
 - spec/cassettes/vehicle-activate_speed_limit.yml
 - spec/cassettes/vehicle-auto_conditioning_start.yml