senec 0.22.1 → 0.24.0

data/lib/senec/cloud/connection.rb

@@ -8,7 +8,7 @@ module Senec
 
     CLIENT_ID = 'endcustomer-app-frontend'.freeze
     REDIRECT_URI = 'senec-app-auth://keycloak.prod'.freeze
-    SCOPE = 'roles meinsenec'.freeze
+    SCOPE = 'roles profile meinsenec'.freeze
 
     SYSTEMS_HOST = 'https://senec-app-systems-proxy.prod.senec.dev'.freeze
     MEASUREMENTS_HOST = 'https://senec-app-measurements-proxy.prod.senec.dev'.freeze
@@ -40,8 +40,8 @@ module Senec
           )
 
         # Manual HTTP needed for Keycloak cross-domain form handling
-        login_form_url = fetch_login_form_url(auth_url)
-        redirect_url = submit_credentials(login_form_url)
+        form_type, form_url = fetch_login_form(auth_url)
+        redirect_url = submit_credentials(form_type, form_url)
         authorization_code = extract_authorization_code(redirect_url)
 
         self.oauth_token =
@@ -57,38 +57,58 @@ module Senec
       end
 
       def systems
-        get "#{SYSTEMS_HOST}/v1/systems"
+        get "#{SYSTEMS_HOST}/systems/api/v1"
       end
 
       def system_details(system_id)
-        get "#{SYSTEMS_HOST}/systems/#{system_id}/details"
+        get "#{SYSTEMS_HOST}/systems/api/v1/#{system_id}/details"
       end
 
       def dashboard(system_id)
-        get "#{MEASUREMENTS_HOST}/v1/systems/#{system_id}/dashboard"
+        get "#{MEASUREMENTS_HOST}/measurements/api/v1/systems/#{system_id}/dashboard"
       end
 
       def wallbox(system_id, wallbox_id)
-        get "#{WALLBOX_HOST}/v1/systems/#{system_id}/wallboxes/#{wallbox_id}"
+        get "#{WALLBOX_HOST}/wallbox/api/v1/systems/#{system_id}/wallboxes/#{wallbox_id}"
       end
 
       def wallbox_search(system_id)
-        post "#{WALLBOX_HOST}/v1/systems/wallboxes/search", { systemIds: [system_id] }
+        post "#{WALLBOX_HOST}/wallbox/api/v1/systems/wallboxes/search", { systemIds: [system_id] }
+      end
+
+      def measurements(system_id, resolution:, from:, to:)
+        params = URI.encode_www_form(
+          resolution:,
+          from: from.strftime('%Y-%m-%dT%H:%M:%SZ'),
+          to: to.strftime('%Y-%m-%dT%H:%M:%SZ'),
+        )
+
+        get "#{MEASUREMENTS_HOST}/measurements/api/v1/systems/#{system_id}/measurements?#{params}"
+      end
+
+      def data_availability(system_id, timezone:)
+        params = URI.encode_www_form(timezone:)
+
+        get "#{MEASUREMENTS_HOST}/measurements/api/v1/systems/#{system_id}/data-availability/timespan?#{params}"
       end
 
       private
 
       attr_accessor :oauth_token
 
-      def fetch_login_form_url(auth_url)
+      def fetch_login_form(auth_url)
         response = http_request(:get, auth_url)
         store_cookies(response) # Required for Keycloak CSRF protection
-        extract_login_form_action_url(response.body) || raise('Login form not found')
+        detect_login_form(response.body) || raise('Login form not found')
       end
 
-      def submit_credentials(form_url)
-        credentials = { username:, password: }
-        response = http_request(:post, form_url, data: credentials)
+      def submit_credentials(form_type, form_url)
+        case form_type
+        when :username_and_password
+          response = http_request(:post, form_url, data: { username:, password: })
+        when :username_only
+          response = submit_username_then_password(form_url)
+        end
 
         if response.status == 200
           # Check if MFA is required
@@ -108,6 +128,20 @@ module Senec
         handle_redirect_response(response)
       end
 
+      def submit_username_then_password(form_url)
+        response = http_request(:post, form_url, data: { username: })
+        store_cookies(response)
+
+        raise 'Password form not found' unless response.status == 200
+
+        password_form_url = find_form_action_url(response.body) do |f|
+          f.match(/name=["']?password["']?/i)
+        end
+        raise 'Password form not found' unless password_form_url
+
+        http_request(:post, password_form_url, data: { username:, password: })
+      end
+
       def submit_totp_form(form_url)
         totp = build_totp_from_uri(totp_uri)
 
@@ -124,12 +158,21 @@ module Senec
         params['code'] || raise('No authorization code found')
       end
 
-      def extract_login_form_action_url(html)
-        find_form_action_url(html) do |form|
-          # Look for a form with username and password fields
+      def detect_login_form(html)
+        # Check for combined form first (backward compatible with old SENEC flow)
+        url = find_form_action_url(html) do |form|
           form.match(/name=["']?username["']?/i) &&
             form.match(/name=["']?password["']?/i)
         end
+        return [:username_and_password, url] if url
+
+        # Check for username-only form (new two-step SENEC flow)
+        url = find_form_action_url(html) do |form|
+          form.match(/name=["']?username["']?/i)
+        end
+        return [:username_only, url] if url
+
+        nil
       end
 
       def extract_totp_form_action_url(html)
@@ -186,10 +229,10 @@ module Senec
         response = oauth_token.get(url)
         JSON.parse(response.body)
       rescue StandardError => e
-        # :nocov:
+        # simplecov:disable
         warn "API error: #{e.message}"
         nil
-        # :nocov:
+        # simplecov:enable
       end
 
       def post(url, data)
@@ -203,10 +246,10 @@ module Senec
 
         JSON.parse(response.body)
       rescue StandardError => e
-        # :nocov:
+        # simplecov:disable
         warn "API error: #{e.message}"
         nil
-        # :nocov:
+        # simplecov:enable
       end
 
       def http_request(method, url, data: nil)
@@ -234,9 +277,9 @@ module Senec
       def openid_config
         @openid_config ||= JSON.parse(http_request(:get, CONFIG_URL).body)
       rescue StandardError => e
-        # :nocov:
+        # simplecov:disable
         raise "Failed to load OpenID configuration: #{e.message}"
-        # :nocov:
+        # simplecov:enable
       end
 
       def cookies

data/lib/senec/version.rb

@@ -1,3 +1,3 @@
 module Senec
-  VERSION = '0.22.1'.freeze
+  VERSION = '0.24.0'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: senec
 version: !ruby/object:Gem::Version
-  version: 0.22.1
+  version: 0.24.0
 platform: ruby
 authors:
 - Georg Ledermann
@@ -96,15 +96,16 @@ files:
 - ".ruby-lsp/.gitignore"
 - ".ruby-lsp/Gemfile"
 - ".ruby-lsp/Gemfile.lock"
+- ".ruby-lsp/freshness_hash"
 - ".ruby-lsp/last_updated"
 - ".ruby-lsp/main_lockfile_hash"
-- ".ruby-lsp/needs_update"
 - ".vscode/settings.json"
 - CODE_OF_CONDUCT.md
 - LICENSE
 - README.md
 - Rakefile
 - coverage/.last_run.json
+- coverage/.report_stamp
 - coverage/.resultset.json
 - coverage/.resultset.json.lock
 - coverage/assets/0.13.2/DataTables-1.10.20/images/sort_asc.png
@@ -166,6 +167,8 @@ files:
 - pkg/senec-0.20.0.gem
 - pkg/senec-0.21.0.gem
 - pkg/senec-0.22.0.gem
+- pkg/senec-0.22.1.gem
+- pkg/senec-0.23.0.gem
 - pkg/senec-0.3.0.gem
 - pkg/senec-0.4.0.gem
 - pkg/senec-0.5.0.gem
@@ -199,7 +202,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.7.1
+rubygems_version: 4.0.19
 specification_version: 4
 summary: Unofficial Ruby Client for SENEC Home
 test_files: []