Adjust after merging master branch and solve conflicts

SUSE · Nov 6, 2024 · 09e876b · 09e876b
1 parent e50c470
commit 09e876b
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/engines/zypper_auth/lib/zypper_auth/engine.rb b/engines/zypper_auth/lib/zypper_auth/engine.rb
@@ -31,7 +31,7 @@ def verify_instance(request, logger, system, params_product_id = nil)
       )
 
       is_valid = verification_provider.instance_valid?
-      return false if is_valid && system.hybrid? && !handle_scc_subscription(request, system, verification_provider, logger, params_product_id)
+      return false if is_valid && system.hybrid? && !handle_scc_subscription(request, system, verification_provider, params_product_id)
 
       # update repository and registry cache
       InstanceVerification.update_cache(request.remote_ip, system.login, base_product.id)
@@ -50,9 +50,9 @@ def verify_instance(request, logger, system, params_product_id = nil)
       false
     end
 
-    def handle_scc_subscription(request, system, verification_provider, logger, params_product_id = nil)
+    def handle_scc_subscription(request, system, verification_provider, params_product_id = nil)
       product_class = Product.find_by(id: params_product_id).product_class if params_product_id.present?
-      result = SccProxy.scc_check_subscription_expiration(request.headers, system.login, system.system_token, logger, system.proxy_byos_mode, product_class)
+      result = SccProxy.scc_check_subscription_expiration(request.headers, system, product_class)
       return true if result[:is_active]
 
       ZypperAuth.zypper_auth_message(request, system, verification_provider, result[:message])