Merge pull request #11 from timdorr/explicit-login

Explicit Login

Author: timdorr

lib/tesla_api/client.rb

@@ -4,10 +4,20 @@ class Client
     base_uri "https://owner-api.teslamotors.com/api/1"
     format :json
 
-    attr_reader :email
+    attr_reader :email, :token, :client_id, :client_secret
 
-    def initialize(email, password, client_id, client_secret)
+    def initialize(email, 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}"
+    end
+
+    def login!(password)
       response = self.class.post(
           "https://owner-api.teslamotors.com/oauth/token",
           body: {
@@ -18,7 +28,8 @@ def initialize(email, password, client_id, client_secret)
               "password" => password
           }
       )
-      self.class.headers "Authorization" => "Bearer #{response["access_token"]}"
+
+      self.token = response["access_token"]
     end
 
     def vehicles

lib/tesla_api/version.rb

@@ -1,3 +1,3 @@
 module TeslaApi
-  VERSION = "1.0.0"
+  VERSION = "1.1.0"
 end

spec/cassettes/client-initialize.yml spec/cassettes/client-login.ymlspec/cassettes/client-initialize.yml renamed to spec/cassettes/client-login.yml

@@ -1,17 +1,30 @@
 require 'spec_helper'
 
 RSpec.describe TeslaApi::Client do
-  subject(:tesla_api) { TeslaApi::Client.new(ENV["TESLA_EMAIL"], ENV["TESLA_PASS"], ENV["TESLA_CLIENT_ID"], ENV["TESLA_CLIENT_SECRET"]) }
+  subject(:tesla_api) { TeslaApi::Client.new(ENV["TESLA_EMAIL"]) }
 
-  describe "#initialize", vcr: { cassette_name: "client-initialize" } do
+  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) }
 
     it "logs into the API" do
-      base_uri = URI.parse(tesla_api.class.base_uri)
-      expect(a_request(:post, "https://#{base_uri.host}/oauth/token")).to have_been_made.once
+      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" do
+    it "obtains a Bearer token" do
+      tesla_api.login!(ENV["TESLA_PASS"])
+      expect(tesla_api.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}/})
     end
   end

spec/cassettes/client-vehicles.yml

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 RSpec.describe TeslaApi::Vehicle do
-  let(:tesla_api) { TeslaApi::Client.new(ENV["TESLA_EMAIL"], ENV["TESLA_PASS"], ENV["TESLA_CLIENT_ID"], ENV["TESLA_CLIENT_SECRET"]) }
+  let(:tesla_api) { TeslaApi::Client.new(ENV["TESLA_EMAIL"]) }
 
   subject(:vehicle) { tesla_api.vehicles.first }
 

spec/lib/tesla_api/client_spec.rb

@@ -11,6 +11,7 @@
 Coveralls::Output.silent = true
 
 require 'dotenv'
+require 'faker'
 require 'vcr'
 require 'webmock/rspec'
 

spec/lib/tesla_api/vehicle_spec.rb

@@ -23,6 +23,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.1"
+  spec.add_development_dependency "faker", "~> 1.4"
   spec.add_development_dependency "vcr", "~> 2.9"
   spec.add_development_dependency "webmock", "~> 1.20"
   spec.add_development_dependency "dotenv", "~> 1.0"