senec 0.22.0 → 0.23.0

data/lib/senec/cloud/connection.rb

@@ -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 =
@@ -80,15 +80,19 @@ module Senec
 
       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 +112,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 +142,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)
@@ -169,48 +196,43 @@ module Senec
         response.headers['location'] || raise('No redirect location')
       end
 
-      def ensure_token_valid
+      def ensure_token_valid!
         authenticate! unless authenticated?
-        return true unless oauth_token.expired?
+        return unless oauth_token.expired?
 
         self.oauth_token = oauth_token.refresh!
-        true
       rescue StandardError => e
-        # :nocov:
-        warn "Token refresh failed: #{e.message}"
-        false
-        # :nocov:
+        warn "Token refresh failed: #{e.message}, trying to re-authenticate..."
+
+        authenticate!
       end
 
-      def get(url, default: nil)
-        return default unless ensure_token_valid
+      def get(url)
+        ensure_token_valid!
 
         response = oauth_token.get(url)
-        return default unless response.status == 200
-
         JSON.parse(response.body)
       rescue StandardError => e
         # :nocov:
         warn "API error: #{e.message}"
-        default
+        nil
         # :nocov:
       end
 
-      def post(url, data, default: nil)
-        return default unless ensure_token_valid
+      def post(url, data)
+        ensure_token_valid!
 
         response = oauth_token.post(
           url,
           body: data.to_json,
           headers: { 'Content-Type' => 'application/json' },
         )
-        return default unless response.status == 200
 
         JSON.parse(response.body)
       rescue StandardError => e
         # :nocov:
         warn "API error: #{e.message}"
-        default
+        nil
         # :nocov:
       end
 

data/lib/senec/version.rb

@@ -1,3 +1,3 @@
 module Senec
-  VERSION = '0.22.0'.freeze
+  VERSION = '0.23.0'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: senec
 version: !ruby/object:Gem::Version
-  version: 0.22.0
+  version: 0.23.0
 platform: ruby
 authors:
 - Georg Ledermann
@@ -96,8 +96,8 @@ files:
 - ".ruby-lsp/.gitignore"
 - ".ruby-lsp/Gemfile"
 - ".ruby-lsp/Gemfile.lock"
+- ".ruby-lsp/last_updated"
 - ".ruby-lsp/main_lockfile_hash"
-- ".ruby-lsp/needs_update"
 - ".vscode/settings.json"
 - CODE_OF_CONDUCT.md
 - LICENSE
@@ -164,6 +164,8 @@ files:
 - pkg/senec-0.2.0.gem
 - 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.3.0.gem
 - pkg/senec-0.4.0.gem
 - pkg/senec-0.5.0.gem
@@ -197,7 +199,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.7.1
+rubygems_version: 4.0.7
 specification_version: 4
 summary: Unofficial Ruby Client for SENEC Home
 test_files: []