huginn_renault_ze_agent 0.1.5 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1e05902dbefc48961c1a6392c562c862e34eec4b2855931fe9cf1ef720346148
-  data.tar.gz: 82c7cf393d268bc1761191a113c224c63801686c72a6d3ba17d4a7a11ad9f4aa
+  metadata.gz: 32def01ce48f435627926af651b7c7101321ee9ea2e68987231814e32512d5c8
+  data.tar.gz: b70fb6f9c144f3fd28701e442465e5443d8681c8af889c24772152aa000d8e0d
 SHA512:
-  metadata.gz: fa6e5dedec4dd05c117dd253d5e2b8840e9d0f513ce493272daf97036f979e54a15407370a4a46c63753461d9ffb9664aafb9e80392b4c18b0d7d201903acc0a
-  data.tar.gz: f938c71489e3dc565c4a13a240bfab108b0b915f649625d85bbecf3241fd649b49b2078e9b7a852f5c70a37359654b3f2d6e7675e964783c0da539a10aa8c7ad
+  metadata.gz: d0461a1e5c9ae97440a7d2a030030b94d544eaa1a625da097e56aea0a03ac4dfdf2bed426b55cb44ef30dfe670903207371e550ed3102b84deaf4ab7bf0e33d5
+  data.tar.gz: 1fd129a0fdc9635c66e2846db6453e03e76fa122ddba7880f6ddaa405f0b02a5a2d5adb20b09766e7605dae12c7401ca4e6b12a65765ed9d8898721d613627d6

data/lib/huginn_renault_ze_agent/renault_ze_battery_agent.rb

@@ -50,13 +50,16 @@ module Agents
     def check
       username = interpolated["username"].present? ? interpolated["username"] : credential("renault_ze_username")
       password = interpolated["password"].present? ? interpolated["password"] : credential("renault_ze_password")
+      redacted_password = password.size.times.map { "•" }.join
+      log("Logging in #{username} with #{redacted_password}...")
+
       service = RenaultZE::Client.new(username, password)
 
       begin
         content = service.get_battery(service.login())
       rescue
         error("Could not fetch battery level: #{$!}")
-        raise
+        return
       end
 
       if memory["last_update"] != content["last_update"]

data/lib/renault_ze/renault_ze_connect.rb

@@ -1,18 +1,15 @@
 module RenaultZE
   class Client
+    API_BASE_URL = 'https://www.services.renault-ze.com/api/'
+
     def initialize(username, password)
       @username = username
       @password = password
     end
 
     def login
-      response = HTTParty.post(
-        "https://www.services.renault-ze.com/api/user/login",
-        headers: {
-          "Accept": "application/json",
-          "Content-Type": "application/json",
-          "User-Agent": "Huginn/2019"
-        }, 
+      response = HTTParty.post(API_BASE_URL + "user/login",
+        headers: {"Content-Type": "application/json"}, 
         body: {username: @username, password: @password}.to_json
       )
       raise "Login - Unexpected response code: #{response}" unless response.code == 200
@@ -28,13 +25,8 @@ module RenaultZE
       raise "Battery - Missing token in input: #{creds}" if creds[:token].nil?
       raise "Battery - Missing VIN in input: #{creds}" if creds[:vin].nil?
 
-      response = HTTParty.get(
-        "https://www.services.renault-ze.com/api/vehicle/#{creds[:vin]}/battery",
-        headers: {
-          "Accept": "application/json",
-          "Authorization": "Bearer #{creds[:token]}",
-          "User-Agent": "Huginn/2019"
-        }
+      response = HTTParty.get(API_BASE_URL + "/vehicle/#{creds[:vin]}/battery",
+        headers: {"Authorization": "Bearer #{creds[:token]}"}
       )
       raise "Battery - Unexpected response code: #{response}" unless response.code == 200
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: huginn_renault_ze_agent
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.7
 platform: ruby
 authors:
 - Adrian Schoenig
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-07 00:00:00.000000000 Z
+date: 2019-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler