fastlane-plugin-appcircle_testing_distribution 0.2.1 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3f63fd4350578ece6be711c5c65e1276d61f3e4e617fea3ad9665e15131b2848
-  data.tar.gz: 075a13c25c20648e325692db9327e8e973e95d43addfe9d10b14a79bc713c957
+  metadata.gz: 04a8808916e178499dd62526d02d5408c1161d6a7faf2b3dab95c5e4f71d83bc
+  data.tar.gz: 5cca9f900d1a7a4ac55be0c3672850c11b66b5ec10d6a954f02a8b740b5838b0
 SHA512:
-  metadata.gz: 1dcb8e9a3b6a26a5c030bb3e0c8b53f5f7bf12fd05f5676e9933ad5393d9aad0d9bca3d6a9732cb63c7083f2b12d78fc28b223f995c0fd001ccc3ad88d3c971d
-  data.tar.gz: 29302574b57bfed3b1dffb5546e3ba3bf05fa9771013137819ffada9e46196344d8f02a941c9995fbd2065ad4305a953003dc67f2cb694c71e2719f880044d91
+  metadata.gz: 6f56fd4fe450019acf7f09b21782fd27ecef0126512ec9ed12685c768218cfc41ac31f48b6b23eeb63442d1af017610be27d3bcacb637279204082accf6bfada
+  data.tar.gz: 5bd6a6082c8f950098c48cc4a741c4969627bda212e1a3f2246f06301c0c7219aa3be370da94a13d3c8517daf6803637e96329c0b6679d4953ac703e99f624a7

data/lib/fastlane/plugin/appcircle_testing_distribution/actions/appcircle_testing_distribution_action.rb

@@ -12,6 +12,7 @@ module Fastlane
     class AppcircleTestingDistributionAction < Action
       def self.run(params)
         personalAPIToken = params[:personalAPIToken]
+        personalAccessKey = params[:personalAccessKey]
         profileName = params[:profileName]
         appPath = params[:appPath]
         message = params[:message]
@@ -21,44 +22,47 @@ module Fastlane
 
         file_extension = File.extname(appPath).downcase
         unless valid_extensions.include?(file_extension)
-          raise "Invalid file extension: #{file_extension}. For Android, use .apk or .aab. For iOS, use .ipa or .zip(.xcarchive)."
+          UI.user_error!("Invalid file extension: #{file_extension}. For Android, use .apk or .aab. For iOS, use .ipa or .zip(.xcarchive).")
         end
 
-        if personalAPIToken.nil?
-          raise UI.error("Personal API Token is required to authenticate connections to Appcircle services. Please provide a valid access token")
+        if personalAPIToken.nil? && personalAccessKey.nil?
+          UI.user_error!("Either Personal API Token or Personal Access Key is required to authenticate connections to Appcircle services. Please provide a valid access token or access key")
+        elsif !personalAPIToken.nil? && !personalAccessKey.nil?
+          UI.user_error!("Personal API Token and Personal Access Key cannot be used together. Please provide only one authentication method")
         elsif profileName.nil?
-          raise UI.error("Distribution profile name is required to distribute applications. Please provide a distribution profile name")
+          UI.user_error!("Distribution profile name is required to distribute applications. Please provide a distribution profile name")
         elsif appPath.nil?
-          raise UI.error("Application file path is required to distribute applications. Please provide a valid application file path")
+          UI.user_error!("Application file path is required to distribute applications. Please provide a valid application file path")
         elsif message.nil?
-          raise UI.error("Message field is required. Please provide a valid message")
+          UI.user_error!("Message field is required. Please provide a valid message")
         end
 
-
-        authToken = self.ac_login(personalAPIToken)
+        authToken = self.ac_login(personalAPIToken, personalAccessKey)
 
         profileId = TDUploadService.get_profile_id(authToken, profileName, createProfileIfNotExists)
         self.ac_upload(authToken, appPath, profileId, message)
       end
 
-      def self.ac_login(personalAPIToken)
-        begin
+      def self.ac_login(personalAPIToken, personalAccessKey)
+        if personalAccessKey
+          user = TDAuthService.get_ac_token_with_personal_access_key(personal_access_key: personalAccessKey)
+        else
           user = TDAuthService.get_ac_token(pat: personalAPIToken)
-          UI.success("Login is successful.")
-          return user.accessToken
-        rescue => e
-          puts "Login failed: #{e.message}"
         end
+        UI.success("Login is successful.")
+        return user.accessToken
+      rescue StandardError => e
+        UI.user_error!("Login failed: #{e.message}")
       end
-      
+
       def self.checkTaskStatus(authToken, taskId)
         uri = URI.parse("https://api.appcircle.io/task/v1/tasks/#{taskId}")
         timeout = 1
-        
+
         response = self.send_request(uri, authToken)
-        if response.is_a?(Net::HTTPSuccess)
+        if response.kind_of?(Net::HTTPSuccess)
           stateValue = JSON.parse(response.body)["stateValue"]
-          
+
           if stateValue == 1
             sleep(1)
             return checkTaskStatus(authToken, taskId)
@@ -83,17 +87,15 @@ module Fastlane
       end
 
       def self.ac_upload(token, appPath, profileID, message)
-        begin
-          response = TDUploadService.upload_artifact(token: token, message: message, app: appPath, dist_profile_id: profileID)
-          result = self.checkTaskStatus(token, response['taskId'])
+        response = TDUploadService.upload_artifact(token: token, message: message, app: appPath, dist_profile_id: profileID)
+        result = self.checkTaskStatus(token, response['taskId'])
 
-          if result
-            UI.success("#{appPath} Uploaded to profile id #{profileID} successfully  🎉")
-          end
-        rescue => e
-          status_code = e.respond_to?(:response) && e.response ? e.response.code : 'unknown'
-          UI.error("Upload failed with status code #{status_code}, with message '#{e.message}'")
+        if result
+          UI.success("#{appPath} Uploaded to profile id #{profileID} successfully  🎉")
         end
+      rescue StandardError => e
+        status_code = e.respond_to?(:response) && e.response ? e.response.code : 'unknown'
+        UI.user_error!("Upload failed with status code #{status_code}, with message '#{e.message}'")
       end
 
       def self.description
@@ -117,16 +119,22 @@ module Fastlane
         [
           FastlaneCore::ConfigItem.new(key: :personalAPIToken,
                                        env_name: "AC_PERSONAL_API_TOKEN",
-                                       description: "Provide Personal API Token to authenticate connections to Appcircle services",
-                                       optional: false,
+                                       description: "Provide Personal API Token to authenticate connections to Appcircle services (alternative to personalAccessKey)",
+                                       optional: true,
+                                       type: String),
+
+          FastlaneCore::ConfigItem.new(key: :personalAccessKey,
+                                       env_name: "AC_PERSONAL_ACCESS_KEY",
+                                       description: "Provide Personal Access Key to authenticate connections to Appcircle services (alternative to personalAPIToken)",
+                                       optional: true,
                                        type: String),
-          
+
           FastlaneCore::ConfigItem.new(key: :profileName,
                                        env_name: "AC_PROFILE_NAME",
                                        description: "Enter the profile name of the Appcircle distribution profile. This name uniquely identifies the profile under which your applications will be distributed",
                                        optional: false,
                                        type: String),
-          
+
           FastlaneCore::ConfigItem.new(key: :createProfileIfNotExists,
                                        env_name: "AC_CREATE_PROFILE_IF_NOT_EXISTS",
                                        description: "If the profile does not exist, create a new profile with the given name",

data/lib/fastlane/plugin/appcircle_testing_distribution/helper/TDAuthService.rb

@@ -3,7 +3,6 @@ require 'uri'
 require 'cgi'
 require 'json'
 
-
 class UserResponse
   attr_accessor :accessToken
 
@@ -21,7 +20,7 @@ module TDAuthService
     request = Net::HTTP::Post.new(uri)
     request.content_type = 'application/x-www-form-urlencoded'
     request['Accept'] = 'application/json'
-    
+
     # Encode parameters
     params = { pat: pat }
     request.body = URI.encode_www_form(params)
@@ -31,10 +30,40 @@ module TDAuthService
       http.request(request)
     end
 
-    
+    # Check response
+    if response.kind_of?(Net::HTTPSuccess)
+      response_data = JSON.parse(response.body)
+
+      user = UserResponse.new(
+        accessToken: response_data['access_token']
+      )
+
+      return user
+    else
+      raise "HTTP Request failed (#{response.code} #{response.message})"
+    end
+  end
+
+  def self.get_ac_token_with_personal_access_key(personal_access_key:)
+    endpoint_url = 'https://auth.appcircle.io/auth/v1/token'
+    uri = URI(endpoint_url)
+
+    # Create HTTP request
+    request = Net::HTTP::Post.new(uri)
+    request.content_type = 'application/x-www-form-urlencoded'
+    request['Accept'] = 'application/json'
+
+    # Encode parameters
+    params = { 'personal-access-key' => personal_access_key }
+    request.body = URI.encode_www_form(params)
+
+    # Make the HTTP request
+    response = Net::HTTP.start(uri.host, uri.port, use_ssl: uri.scheme == 'https') do |http|
+      http.request(request)
+    end
 
     # Check response
-    if response.is_a?(Net::HTTPSuccess)
+    if response.kind_of?(Net::HTTPSuccess)
       response_data = JSON.parse(response.body)
 
       user = UserResponse.new(
@@ -46,4 +75,4 @@ module TDAuthService
       raise "HTTP Request failed (#{response.code} #{response.message})"
     end
   end
-end
+end

data/lib/fastlane/plugin/appcircle_testing_distribution/helper/TDUploadService.rb

@@ -10,17 +10,20 @@ module TDUploadService
     url = "https://api.appcircle.io/distribution/v2/profiles/#{dist_profile_id}/app-versions"
     headers = {
       Authorization: "Bearer #{token}",
-      Message: message,
-      content_type: :multipart
+      content_type: :multipart # multipart/form-data
     }
     payload = {
       Message: message,
       File: File.new(app, 'rb')
     }
-  
+
     begin
       response = RestClient.post(url, payload, headers)
-      JSON.parse(response.body) rescue response.body
+      begin
+        JSON.parse(response.body)
+      rescue StandardError
+        response.body
+      end
     rescue RestClient::ExceptionWithResponse => e
       raise e
     rescue StandardError => e
@@ -30,18 +33,16 @@ module TDUploadService
 
   def self.get_distribution_profiles(auth_token:)
     url = "#{BASE_URL}/distribution/v2/profiles"
-  
+
     # Set up the headers with authentication
     headers = {
       Authorization: "Bearer #{auth_token}",
       accept: 'application/json'
     }
-  
+
     begin
       response = RestClient.get(url, headers)
-      parsed_response = JSON.parse(response.body)
-  
-      parsed_response
+      JSON.parse(response.body)
     rescue RestClient::ExceptionWithResponse => e
       raise e
     rescue StandardError => e
@@ -59,7 +60,7 @@ module TDUploadService
     payload = {
       name: name
     }.to_json
-  
+
     begin
       response = RestClient.post(url, payload, headers)
       JSON.parse(response.body)
@@ -80,28 +81,28 @@ module TDUploadService
           profileId = profile['id']
         end
       end
-    rescue => e
+    rescue StandardError => e
       raise "Something went wrong while fetching profiles: #{e.message}"
     end
-      
+
     if profileId.nil? && !createProfileIfNotExists
       raise "Error: The test profile '#{profileName}' could not be found. The option 'createProfileIfNotExists' is set to false, so no new profile was created. To automatically create a new profile if it doesn't exist, set 'createProfileIfNotExists' to true."
     end
 
     if profileId.nil? && createProfileIfNotExists
       begin
-        puts "The test profile '#{profileName}' could not be found. A new profile is being created..."
+        puts("The test profile '#{profileName}' could not be found. A new profile is being created...")
         new_profile = TDUploadService.create_distribution_profile(name: profileName, auth_token: authToken)
         if new_profile.nil?
           raise "Error: The new profile could not be created."
         end
+
         profileId = new_profile['id']
-      rescue => e
+      rescue StandardError => e
         raise "Something went wrong while creating a new profile: #{e.message}"
       end
     end
 
     return profileId
   end
-
 end

data/lib/fastlane/plugin/appcircle_testing_distribution/version.rb

@@ -1,5 +1,5 @@
 module Fastlane
   module AppcircleTestingDistribution
-    VERSION = "0.2.1"
+    VERSION = "0.2.3"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-appcircle_testing_distribution
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.3
 platform: ruby
 authors:
 - appcircleio
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-01 00:00:00.000000000 Z
+date: 2025-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
 description:
 email: cloud@appcircle.io
 executables: []
@@ -45,7 +45,7 @@ homepage: https://github.com/appcircleio/fastlane_plugin_appcircle_testing_distr
 licenses:
 - MIT
 metadata:
-  rubygems_mfa_required: 'false'
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -61,7 +61,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.19
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: Efficiently distribute application builds to users or testing groups using