match/lib/match/change_password.rb in fastlane-2.105.2 vs match/lib/match/change_password.rb in fastlane-2.106.0

@@ -1,32 +1,45 @@
 require_relative 'module'
-require_relative 'encrypt'
-require_relative 'git_helper'
 
+require_relative 'storage'
+require_relative 'encryption'
+
 module Match
   # These functions should only be used while in (UI.) interactive mode
   class ChangePassword
-    def self.update(params: nil, from: nil, to: nil)
+    def self.update(params: nil)
       ensure_ui_interactive
-      to ||= ChangePassword.ask_password(message: "New passphrase for Git Repo: ", confirm: false)
-      from ||= ChangePassword.ask_password(message: "Old passphrase for Git Repo: ", confirm: true)
-      GitHelper.clear_changes
-      workspace = GitHelper.clone(params[:git_url],
-                                  params[:shallow_clone],
-                                  manual_password: from,
-                                  skip_docs: params[:skip_docs],
-                                  branch: params[:git_branch],
-                                  git_full_name: params[:git_full_name],
-                                  git_user_email: params[:git_user_email],
-                                  clone_branch_directly: params[:clone_branch_directly])
-      Encrypt.new.clear_password(params[:git_url])
-      Encrypt.new.store_password(params[:git_url], to)
 
+      to = ChangePassword.ask_password(message: "New passphrase for Git Repo: ", confirm: true)
+
+      # Choose the right storage and encryption implementations
+      storage = Storage.for_mode(params[:storage_mode], {
+        git_url: params[:git_url],
+        shallow_clone: params[:shallow_clone],
+        skip_docs: params[:skip_docs],
+        git_branch: params[:git_branch],
+        git_full_name: params[:git_full_name],
+        git_user_email: params[:git_user_email],
+        clone_branch_directly: params[:clone_branch_directly]
+      })
+      storage.download
+
+      encryption = Encryption.for_storage_mode(params[:storage_mode], {
+        git_url: params[:git_url],
+        working_directory: storage.working_directory
+      })
+      encryption.decrypt_files
+
+      encryption.clear_password
+      encryption.store_password(to)
+
       message = "[fastlane] Changed passphrase"
-      GitHelper.commit_changes(workspace, message, params[:git_url], params[:git_branch])
+      encryption.encrypt_files
+      storage.save_changes!(custom_message: message)
     end
 
-    def self.ask_password(message: "Passphrase for Git Repo: ", confirm: true)
+    # This method is called from both here, and from `openssl.rb`
+    def self.ask_password(message: "Passphrase for Git Repo: ", confirm: nil)
       ensure_ui_interactive
       loop do
         password = UI.password(message)
         if confirm
           password2 = UI.password("Type passphrase again: ")