use suse-connect gem instead of scc_api

src/lib/registration/registration.rb

@@ -19,8 +19,8 @@
 # ------------------------------------------------------------------------------
 #
 
-require "scc_api"
 require "yast"
+require "suse/connect"
 
 require "registration/helpers"
 require "registration/sw_mgmt"
@@ -30,7 +30,7 @@ module Registration
   class Registration
     include Yast::Logger
 
-    SCC_CREDENTIALS = SccApi::Credentials::DEFAULT_CREDENTIALS_DIR + "/SCCCredentials"
+    SCC_CREDENTIALS = SUSE::Connect::Credentials::GLOBAL_CREDENTIALS_FILE
 
     attr_accessor :url
 
@@ -39,18 +39,24 @@ def initialize(url = nil)
     end
 
     def register(email, reg_code)
-      @scc = SccApi::Connection.new(email, reg_code)
+      settings = {
+        :token => reg_code,
+        :verbose => ENV["Y2DEBUG"] == "1"
+        # TODO FIXME: how to pass email?: "email" => email
+      }
 
       # set the current language to receive translated error messages
-      @scc.language = ::Registration::Helpers.language
+      # TODO FIXME: @scc.language = ::Registration::Helpers.language
 
       if @url
         log.info "Using custom registration URL: #{@url.inspect}"
-        @scc.url = @url
+        settings[:url] = @url
       end
 
-      # announce (register the system) first
-      @credentials = @scc.announce
+      login, password = SUSE::Connect::YaST.announce_system(settings)
+      @credentials = SUSE::Connect::Credentials.new(login, password, SCC_CREDENTIALS)
+
+      log.info "Global SCC credentials: #{@credentials}"
 
       # ensure the zypp config directories are writable in inst-sys
       ::Registration::SwMgmt.zypp_config_writable!

src/lib/yast/scc_api.rb → src/lib/yast/suse_connect.rb

@@ -22,10 +22,10 @@
 #
 # ***************************************************************************
 #
-# Summary: SCC API initialization
+# Summary: SUSE Connect API initialization
 #
 
-require "scc_api"
+require "suse/connect"
 require "yast/logger"
 
-SccApi::GlobalLogger.instance.log = Yast::Y2Logger.instance
+SUSE::Connect::GlobalLogger.instance.log = Yast::Y2Logger.instance