fastlane-plugin-appcircle_testing_distribution 0.2.3 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 04a8808916e178499dd62526d02d5408c1161d6a7faf2b3dab95c5e4f71d83bc
-  data.tar.gz: 5cca9f900d1a7a4ac55be0c3672850c11b66b5ec10d6a954f02a8b740b5838b0
+  metadata.gz: e01adda887a2e03213c82a2f1dd4c73e068599c6f2a72107663bc40b0246259d
+  data.tar.gz: 551d74f7d9d2ba2f9683fbc20c69c7e06c8897c7a711d98a6d636ce50fab7d82
 SHA512:
-  metadata.gz: 6f56fd4fe450019acf7f09b21782fd27ecef0126512ec9ed12685c768218cfc41ac31f48b6b23eeb63442d1af017610be27d3bcacb637279204082accf6bfada
-  data.tar.gz: 5bd6a6082c8f950098c48cc4a741c4969627bda212e1a3f2246f06301c0c7219aa3be370da94a13d3c8517daf6803637e96329c0b6679d4953ac703e99f624a7
+  metadata.gz: d77f4bf600f1281ac845c37c5a37cbe76c2ffffa3630f6d27d12e793912c80c01197ec746c2ef8d15f2c4c7a75e2798faeae10bad0485bb3e1ee5d65fbd5c472
+  data.tar.gz: fa09b51a8528c0693bf8a4371b29fd3ba1a87e42185069599744f28d0d06eab8430f8f38af5198fce624b9483ca0e20b6ad51df9f8cdc1565dcec150c7015ff1

data/LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2024 Guven Karanfil <guven.karanfil@smartface.io>
+Copyright (c) 2024 Appcircle, Inc. <info@appcircle.io>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -1,4 +1,4 @@
-## Appcircle Testing Distribution
+# Appcircle Testing Distribution
 
 [![fastlane Plugin Badge](https://rawcdn.githack.com/fastlane/fastlane/master/fastlane/assets/plugin-badge.svg)](https://rubygems.org/gems/fastlane-plugin-appcircle_testing_distribution)
 
@@ -38,24 +38,11 @@ Testing distribution is the process of distributing test builds to designated te
 
 Overall, using testing distribution in mobile DevOps significantly enhances the efficiency, security, and effectiveness of the software development process, leading to better products and faster delivery times.
 
-## System Requirements
+<!-- ## Testing Distribution
 
-**Compatible Agents:**
+In order to share your builds with testers, you can create testing distribution profiles and assign testing groups to the profiles.
 
-- macOS 14.2, 14.5
-
-**Supported Version:**
-
-- Fastlane 2.222.0
-- Ruby 3.2.2
-
-Note: Currently, plugins are only compatible to use with **Appcircle Cloud**. **Self-hosted** support will be available in future releases.
-
-## Testing Distribution
-
-In order to share your builds with testers, you can create distribution profiles and assign testing groups to the distribution profiles.
-
-![Distribution Profile](<https://cdn.appcircle.io/docs/assets/image%20(152).png>)
+![Testing Distribution Profile](<https://cdn.appcircle.io/docs/assets/image%20(152).png>)
 
 ## Generating/Managing the Personal API Tokens
 
@@ -65,11 +52,11 @@ To generate a Personal API Token, follow these steps:
 2. You'll find the Personal API Token section in the top right corner.
 3. Press the "Generate Token" button to generate your first token.
 
-![Token Generation](<https://cdn.appcircle.io/docs/assets/image%20(164).png>)
+![Token Generation](<https://cdn.appcircle.io/docs/assets/image%20(164).png>) -->
 
 ## Getting Started with the Extension: Usage Guide
 
-To share your builds with testers, you can create distribution profiles and assign testing groups to these profiles.
+To share your builds with testers, you can create testing distribution profiles and assign testing groups to these profiles.
 
 This project is a [_fastlane_](https://github.com/fastlane/fastlane) plugin. To get started with `fastlane-plugin-appcircle_testing_distribution`, add it to your project by running:
 
@@ -77,31 +64,48 @@ This project is a [_fastlane_](https://github.com/fastlane/fastlane) plugin. To
 fastlane add_plugin appcircle_testing_distribution
 ```
 
-```yml
+```ruby
   appcircle_testing_distribution(
-    personalAPIToken: "$(AC_PERSONAL_API_TOKEN)",
-    profileName: "$(AC_PROFILE_NAME)",
-    createProfileIfNotExists: Boolean,
-    appPath: "$(AC_APP_PATH)",
-    message: "$(AC_MESSAGE)",
+    personalAPIToken: ENV["AC_PERSONAL_API_TOKEN"],
+    subOrganizationName: ENV["AC_SUB_ORGANIZATION_NAME"],
+    profileName: ENV["AC_PROFILE_NAME"],
+    createProfileIfNotExists: ENV["AC_CREATE_PROFILE_IF_NOT_EXISTS"],
+    profileCreationSettings: {
+      authType: ENV["AC_PROFILE_AUTH_TYPE"],
+      username: ENV["AC_PROFILE_USERNAME"],
+      password: ENV["AC_PROFILE_PASSWORD"],
+      testingGroupNames: ENV["AC_PROFILE_TESTING_GROUP_NAMES"]
+    },
+    appPath: ENV["AC_APP_PATH"],
+    message: ENV["AC_MESSAGE"]
   )
 ```
 
-- `personalAPIToken`: The Appcircle Personal API token is utilized to authenticate and secure access to Appcircle services, ensuring that only authorized users can perform actions within the platform.
+- `personalAPIToken`: The Appcircle Personal API token used to authenticate and authorize access to Appcircle services within this plugin.
+- `subOrganizationName` (optional): Required when the Root Organization's `personalAPIToken` is used, and you want to create the profile under a sub-organization. In this case, provide the name of the sub-organization in this field. If you directly used the sub-organization's `personalAPIToken`, this parameter is not needed.
 - `profileName`: Specifies the profile that will be used for uploading the app.
-- `createProfileIfNotExists`: Ensures that a user profile is automatically created if it does not already exist; if the profile name already exists, the app will be uploaded to that existing profile instead.
-- `appPath`: Indicates the file path to the application that will be uploaded to Appcircle Testing Distribution Profile.
+- `createProfileIfNotExists` (optional): Ensures that a testing distribution profile is automatically created if it does not already exist; if the profile name already exists, the app will be uploaded to that existing profile instead.
+- `profileCreationSettings` (optional): If `createProfileIfNotExists` is `true` and a new profile being created, the profile will be configured with these settings.
+  - `authType`: Authentication type of the profile. `none`: None, `static`: Static Username and Password, `ldap`: LDAP Login, `sso`: SSO Login.
+  - `username`: The username for the profile if authentication type set to `static` (Static Username and Password).
+  - `password`: The password for the profile if authentication type set to `static` (Static Username and Password).
+  - `testingGroupNames`: Uploaded versions will be automatically shared with these testing groups. Example format: `group1, group2, group3`.
+- `appPath`: Indicates the file path to the application package that will be uploaded to Appcircle Testing Distribution Profile.
 - `message`: Your message to testers, ensuring they receive important updates and information regarding the application.
 
-### Leveraging Environment Variables
+## Further Details
 
-Utilize environment variables seamlessly by substituting the parameters with `$(VARIABLE_NAME)` in your task inputs. The extension automatically retrieves values from the specified environment variables within your pipeline.
+For more information please refer to the documentation.
 
-**Ensure that this action is added after build steps have been completed.**
-
-**If multiple workflows start simultaneously, the order in which versions are shared in the Testing Distribution is determined by the execution order of the publish step. The version that completes its build and triggers the publish plugin first will be shared first, followed by the others in sequence.**
-
-Efficiently distribute test binaries or beta versions using Appcircle, featuring seamless IPA and APK distribution capabilities. Streamline your testing process with our versatile tool designed to optimize your distribution workflow. If you need support or more information, please [contact us](https://appcircle.io/contact?utm_source=fastlane&utm_medium=plugin&utm_campaign=testing_distribution)
+- [Setting Up Appcircle Testing Distribution Plugin](https://docs.appcircle.io/marketplace/fastlane/testing-distribution)
+  - [Discover Action](https://docs.appcircle.io/marketplace/fastlane/testing-distribution#discover-action)
+  - [System Requirements](https://docs.appcircle.io/marketplace/fastlane/testing-distribution#system-requirements)
+  - [User Permission Requirements](https://docs.appcircle.io/marketplace/fastlane/testing-distribution#user-permission-requirements)
+  - [How to Add the Appcircle Distribute Action to Your Pipeline](https://docs.appcircle.io/marketplace/fastlane/testing-distribution#how-to-add-the-appcircle-distribute-action-to-your-pipeline)
+  - [CLI Usage](https://docs.appcircle.io/marketplace/fastlane/testing-distribution#cli-usage)
+  - [Distributing to Sub-Organizations](https://docs.appcircle.io/marketplace/fastlane/testing-distribution#distributing-to-sub-organizations)
+  - [Leveraging Environment Variables](https://docs.appcircle.io/marketplace/fastlane/testing-distribution#leveraging-environment-variables)
+- [References](https://docs.appcircle.io/marketplace/fastlane/testing-distribution#references)
 
 ## Issues and Feedback
 
@@ -110,9 +114,3 @@ For any other issues and feedback about this plugin, please submit it to this re
 ## Troubleshooting
 
 If you have trouble using plugins, check out the [Plugins Troubleshooting](https://docs.fastlane.tools/plugins/plugins-troubleshooting/) guide.
-
-## Reference
-
-- For details on generating an Appcircle Personal API Token, visit [Generating/Managing Personal API Tokens](https://docs.appcircle.io/appcircle-api/api-authentication#generatingmanaging-the-personal-api-tokens?utm_source=fastlane&utm_medium=plugin&utm_campaign=testing_distribution)
-
-- To create or learn more about Appcircle testing and distribution profiles, please refer to [Creating or Selecting a Distribution Profile](https://docs.appcircle.io/distribute/create-or-select-a-distribution-profile?utm_source=fastlane&utm_medium=plugin&utm_campaign=testing_distribution)

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

@@ -10,71 +10,127 @@ require_relative '../helper/TDUploadService'
 module Fastlane
   module Actions
     class AppcircleTestingDistributionAction < Action
+      VALID_EXTENSIONS = ['.apk', '.aab', '.ipa', '.zip']
+      AUTH_TYPE_MAPPING = {
+        'none' => 1, # None
+        'static' => 3, # Static Username and Password
+        'ldap' => 4, # LDAP Login
+        'sso' => 5 # SSO Login
+      }
+      
       def self.run(params)
         personalAPIToken = params[:personalAPIToken]
-        personalAccessKey = params[:personalAccessKey]
+        subOrganizationName = params[:subOrganizationName]
         profileName = params[:profileName]
+        createProfileIfNotExists = params[:createProfileIfNotExists] || false
+        #
+        profileCreationSettings = params[:profileCreationSettings]
+        profileAuthType = profileCreationSettings&.dig(:authType)
+        profileUsername = profileCreationSettings&.dig(:username)
+        profilePassword = profileCreationSettings&.dig(:password)
+        profileTestingGroupNames= profileCreationSettings&.dig(:testingGroupNames)
+        #
         appPath = params[:appPath]
         message = params[:message]
-        createProfileIfNotExists = params[:createProfileIfNotExists]
+        
+        profileAuthType = AUTH_TYPE_MAPPING[profileAuthType] # map input to API values
 
-        valid_extensions = ['.apk', '.aab', '.ipa', '.zip']
+        # Auth
+        authToken = self.ac_login(personalAPIToken, subOrganizationName)
 
-        file_extension = File.extname(appPath).downcase
-        unless valid_extensions.include?(file_extension)
-          UI.user_error!("Invalid file extension: #{file_extension}. For Android, use .apk or .aab. For iOS, use .ipa or .zip(.xcarchive).")
-        end
+        # Get or create profile
+        profileId = self.ac_get_or_create_profile(authToken, profileName, createProfileIfNotExists, profileCreationSettings, profileAuthType, profileUsername, profilePassword, profileTestingGroupNames)
+
+        # Upload package
+        self.ac_upload(authToken, appPath, profileId, profileName, message)
+      end
+
+      def self.ac_login(personalAPIToken, subOrganizationName)
+        begin
+          token = ''
+
+          user = TDAuthService.get_ac_token(pat: personalAPIToken)
+          UI.success("Login is successful.")
+          token = user.accessToken
+          
+          if subOrganizationName
+            organization_id = TDAuthService.get_organization_id(access_token: token, name: subOrganizationName)
+            user = TDAuthService.get_ac_token(pat: personalAPIToken, sub_organization_id: organization_id)
+            UI.message("Switched to sub-organization: #{subOrganizationName}")
+            token = user.accessToken
+          end
+          
+          return 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?
-          UI.user_error!("Distribution profile name is required to distribute applications. Please provide a distribution profile name")
-        elsif appPath.nil?
-          UI.user_error!("Application file path is required to distribute applications. Please provide a valid application file path")
-        elsif message.nil?
-          UI.user_error!("Message field is required. Please provide a valid message")
+        rescue => e
+          UI.user_error!("Login failed: \"#{e.message}\".")
         end
+      end
+
+      def self.ac_get_or_create_profile(authToken, profileName, createProfileIfNotExists, profileCreationSettings, profileAuthType, profileUsername, profilePassword, profileTestingGroupNames)
+        begin
+          profileId = TDUploadService.get_profile_id(authToken, profileName)
 
-        authToken = self.ac_login(personalAPIToken, personalAccessKey)
+          if profileId
+            UI.message("Profile '#{profileName}' found with ID: #{profileId}.")
+            UI.important("Warning: Profile '#{profileName}' already exists, so the provided profile creation settings will be ignored. To update the profile settings, please use the Appcircle web interface.") if profileCreationSettings
+
+          elsif profileId.nil? && !createProfileIfNotExists
+            UI.user_error!("Error: Profile '#{profileName}' not found. The option 'createProfileIfNotExists' is set to false, so a new profile was not created. To automatically create a new profile when it doesn't exist, set 'createProfileIfNotExists' to true.")
+          elsif profileId.nil? && createProfileIfNotExists
+            UI.message("Profile '#{profileName}' not found. Creating the new profile...")
+            profileId = TDUploadService.create_profile(authToken, profileName, profileAuthType, profileUsername, profilePassword, profileTestingGroupNames)
+          end
 
-        profileId = TDUploadService.get_profile_id(authToken, profileName, createProfileIfNotExists)
-        self.ac_upload(authToken, appPath, profileId, message)
+          return profileId
+          
+        rescue => e
+          UI.user_error!("Couldn't get the profile: \"#{e.message}\".")
+        end
       end
 
-      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)
+      def self.ac_upload(token, appPath, profileID, profileName, message)
+        begin
+          UI.message("Upload started.")
+          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 '#{profileName}' successfully  🎉")
+          end
+        rescue => 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
-        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.kind_of?(Net::HTTPSuccess)
-          stateValue = JSON.parse(response.body)["stateValue"]
-
-          if stateValue == 1
-            sleep(1)
-            return checkTaskStatus(authToken, taskId)
-          end
-          if stateValue == 3
-            return true
+        
+        check_interval = 1
+        # timeout = 2 * 60 * 60 # 2 hours in seconds
+        # start_time = Time.now
+      
+        loop do
+          response = self.send_request(uri, authToken)
+          if response.is_a?(Net::HTTPSuccess)
+            stateValue = JSON.parse(response.body)["stateValue"]
+      
+            if stateValue == 1
+              sleep(check_interval)
+            elsif stateValue == 3
+              return true
+            else
+              UI.error("Task Id #{taskId} failed with state value #{stateValue}.")
+              UI.user_error!("Upload could not be completed successfully.")
+            end
           else
-            UI.error("Task Id #{taskId} failed with state value #{stateValue}")
-            raise "Upload could not completed successfully"
+            UI.user_error!("Upload failed with response code #{response.code} and message '#{response.message}'.")
           end
-        else
-          raise "Upload failed with response code #{response.code} and message '#{response.message}'"
+
+          # if Time.now - start_time > timeout
+          #   UI.user_error!("Task Id #{taskId} timed out after 2 hours.")
+          # end
         end
       end
 
@@ -86,18 +142,6 @@ module Fastlane
         http.request(request)
       end
 
-      def self.ac_upload(token, appPath, profileID, message)
-        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 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
         "Efficiently distribute application builds to users or testing groups using Appcircle's robust platform."
       end
@@ -112,46 +156,81 @@ module Fastlane
 
       def self.details
         # Optional:
-        "Appcircle simplifies the distribution of builds to test teams with an extensive platform for managing and tracking applications, versions, testers, and teams. Appcircle integrates with enterprise authentication mechanisms such as LDAP and SSO, ensuring secure distribution of testing packages. Learn more about Appcircle testing distribution"
+        "Appcircle simplifies the distribution of builds to test teams with an extensive platform for managing and tracking applications, versions, testers, and teams. Appcircle integrates with enterprise authentication mechanisms such as LDAP and SSO, ensuring secure distribution of testing packages. Learn more about Appcircle testing distribution."
       end
 
       def self.available_options
         [
           FastlaneCore::ConfigItem.new(key: :personalAPIToken,
-                                       env_name: "AC_PERSONAL_API_TOKEN",
-                                       description: "Provide Personal API Token to authenticate connections to Appcircle services (alternative to personalAccessKey)",
-                                       optional: true,
-                                       type: String),
+                                       description: "Provide Personal API Token to authenticate connections to Appcircle services",
+                                       optional: false,
+                                       type: String,
+                                       verify_block: proc do |value|
+                                         UI.user_error!("Personal API Token cannot be empty. Please provide a valid access token.") unless value && !value.empty?
+                                       end),
 
-          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)",
+          FastlaneCore::ConfigItem.new(key: :subOrganizationName,
+                                       description: "Optional: Sub-organization name for app distribution. Profiles will be created under root organization if not provided",
                                        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",
+                                       description: "Enter the profile name of the Appcircle testing distribution profile. This name uniquely identifies the profile under which your applications will be distributed",
                                        optional: false,
-                                       type: String),
+                                       type: String,
+                                       verify_block: proc do |value|
+                                         UI.user_error!("Profile name cannot be empty. Please provide a testing distribution profile name.") unless value && !value.empty?
+                                       end),
 
           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",
+                                       description: "Optional: If the profile does not exist, create a new profile with the given name",
                                        optional: true,
                                        type: Boolean),
 
+          FastlaneCore::ConfigItem.new(key: :profileCreationSettings,
+                                       description: "Optional: Profile creation settings for the testing distribution profile",
+                                       optional: true,
+                                       type: Hash,
+                                       verify_block: proc do |value|
+                                         # Parse and Validate
+                                         if value[:authType] && !value[:authType].empty?
+                                           UI.user_error!("Invalid authType: '#{value[:authType]}'. Options: 'none' (None), 'static' (Static Username and Password), 'ldap' (LDAP Login), 'sso' (SSO Login).") unless AUTH_TYPE_MAPPING.key?(value[:authType])
+
+                                           if value[:authType] == 'static'
+                                             UI.user_error!("username must be a String and at least 6 characters long.") unless value[:username].kind_of?(String) && value[:username].length >= 6
+                                             UI.user_error!("password must be a String and at least 6 characters long.") unless value[:password].kind_of?(String) && value[:password].length >= 6
+                                           else
+                                             value[:username] = nil
+                                             value[:password] = nil
+                                           end
+                                         end
+
+                                         if value[:testingGroupNames] && !value[:testingGroupNames].empty?
+                                           value[:testingGroupNames] = value[:testingGroupNames].to_s.split(",").map(&:strip)
+                                           UI.user_error!("testingGroupNames must be a string array. Ex: 'group1, group2, group3'.") unless value[:testingGroupNames].kind_of?(Array)
+                                         end
+                                       end),
+
           FastlaneCore::ConfigItem.new(key: :appPath,
-                                       env_name: "AC_APP_PATH",
                                        description: "Specify the path to your application file. For iOS, this can be a .ipa or .xcarchive file path. For Android, specify the .apk or .appbundle file path",
                                        optional: false,
-                                       type: String),
+                                       type: String,
+                                       verify_block: proc do |value|
+                                         UI.user_error!("Application file path cannot be empty. Please provide a valid application file path.") unless value && !value.empty?
+
+                                         file_extension = File.extname(value).downcase
+                                         unless VALID_EXTENSIONS.include?(file_extension)
+                                           UI.user_error!("Invalid file extension: '#{file_extension}'. For Android, use .apk or .aab. For iOS, use .ipa or .zip(.xcarchive).")
+                                         end
+                                       end),
 
           FastlaneCore::ConfigItem.new(key: :message,
-                                       env_name: "AC_MESSAGE",
-                                       description: "Optional message to include with the distribution to provide additional information to testers or users receiving the build",
+                                       description: "Message to include with the distribution to provide additional information to testers or users receiving the build",
                                        optional: false,
-                                       type: String)
+                                       type: String,
+                                       verify_block: proc do |value|
+                                         UI.user_error!("Message field cannot be empty. Please provide a message.") unless value && !value.empty?
+                                       end)
         ]
       end
 

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

@@ -3,6 +3,7 @@ require 'uri'
 require 'cgi'
 require 'json'
 
+
 class UserResponse
   attr_accessor :accessToken
 
@@ -12,7 +13,7 @@ class UserResponse
 end
 
 module TDAuthService
-  def self.get_ac_token(pat:)
+  def self.get_ac_token(pat:, sub_organization_id: nil)
     endpoint_url = 'https://auth.appcircle.io/auth/v2/token'
     uri = URI(endpoint_url)
 
@@ -20,9 +21,10 @@ 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 }
+    params[:subOrganizationId] = sub_organization_id if sub_organization_id
     request.body = URI.encode_www_form(params)
 
     # Make the HTTP request
@@ -31,7 +33,7 @@ module TDAuthService
     end
 
     # Check response
-    if response.kind_of?(Net::HTTPSuccess)
+    if response.is_a?(Net::HTTPSuccess)
       response_data = JSON.parse(response.body)
 
       user = UserResponse.new(
@@ -40,39 +42,35 @@ module TDAuthService
 
       return user
     else
-      raise "HTTP Request failed (#{response.code} #{response.message})"
+      raise "Error: (#{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'
+  def self.get_organization_id(access_token:, name:)
+    endpoint_url = 'https://api.appcircle.io/identity/v1/organizations'
     uri = URI(endpoint_url)
-
+  
     # Create HTTP request
-    request = Net::HTTP::Post.new(uri)
-    request.content_type = 'application/x-www-form-urlencoded'
+    request = Net::HTTP::Get.new(uri)
+    request['Authorization'] = "Bearer #{access_token}"
     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.kind_of?(Net::HTTPSuccess)
+    if response.is_a?(Net::HTTPSuccess)
       response_data = JSON.parse(response.body)
+      organizations = response_data['data']
+      organization = organizations.find { |org| org['name'] == name }
+      
+      raise "Organization with name '#{name}' not found" unless organization
+      return organization['id']
 
-      user = UserResponse.new(
-        accessToken: response_data['access_token']
-      )
-
-      return user
     else
-      raise "HTTP Request failed (#{response.code} #{response.message})"
+      raise "Error: (#{response.code} #{response.message})"
     end
   end
-end
+end

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

@@ -9,21 +9,17 @@ module TDUploadService
   def self.upload_artifact(token:, message:, app:, dist_profile_id:)
     url = "https://api.appcircle.io/distribution/v2/profiles/#{dist_profile_id}/app-versions"
     headers = {
-      Authorization: "Bearer #{token}",
-      content_type: :multipart # multipart/form-data
+      Authorization: "Bearer #{token}"
     }
     payload = {
       Message: message,
-      File: File.new(app, 'rb')
+      File: File.new(app, 'rb'),
+      multipart: true # Force multipart encoding for RestClient
     }
-
+  
     begin
       response = RestClient.post(url, payload, headers)
-      begin
-        JSON.parse(response.body)
-      rescue StandardError
-        response.body
-      end
+      JSON.parse(response.body) rescue response.body
     rescue RestClient::ExceptionWithResponse => e
       raise e
     rescue StandardError => e
@@ -33,13 +29,32 @@ 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)
+      JSON.parse(response.body)
+    rescue RestClient::ExceptionWithResponse => e
+      raise e
+    rescue StandardError => e
+      raise e
+    end
+  end
 
+  def self.get_testing_groups(auth_token:)
+    url = "#{BASE_URL}/distribution/v2/testing-groups"
+  
+    # Set up the headers with authentication
+    headers = {
+      Authorization: "Bearer #{auth_token}",
+      accept: 'application/json'
+    }
+  
     begin
       response = RestClient.get(url, headers)
       JSON.parse(response.body)
@@ -60,7 +75,7 @@ module TDUploadService
     payload = {
       name: name
     }.to_json
-
+  
     begin
       response = RestClient.post(url, payload, headers)
       JSON.parse(response.body)
@@ -71,7 +86,40 @@ module TDUploadService
     end
   end
 
-  def self.get_profile_id(authToken, profileName, createProfileIfNotExists)
+  def self.update_distribution_profile(profile_id:, auth_type:, username:, password:, testing_group_ids:, auth_token:)
+    url = "#{BASE_URL}/distribution/v2/profiles/#{profile_id}"
+    headers = {
+      Authorization: "Bearer #{auth_token}",
+      content_type: :json,
+      accept: 'application/json-patch+json'
+    }
+
+    ### Construct the payload
+    payload = {}
+
+    settings_payload = {
+        authenticationType: auth_type,
+        username: username,
+        password: password
+    }.compact
+
+    payload[:settings] = settings_payload unless settings_payload.empty?
+    payload[:testingGroupIds] = testing_group_ids unless testing_group_ids&.empty?
+
+    payload = payload.compact.to_json
+    ###
+
+    begin
+      response = RestClient.patch(url, payload, headers)
+      JSON.parse(response.body)
+    rescue RestClient::ExceptionWithResponse => e
+      raise e
+    rescue StandardError => e
+      raise e
+    end
+  end
+
+  def self.get_profile_id(authToken, profileName)
     profileId = nil
 
     begin
@@ -79,30 +127,78 @@ module TDUploadService
       profiles.each do |profile|
         if profile["name"] == profileName
           profileId = profile['id']
+          break
         end
       end
-    rescue StandardError => e
-      raise "Something went wrong while fetching profiles: #{e.message}"
+    rescue => 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
+    return profileId
+  end
+
+  def self.get_testing_group_ids(authToken, testingGroupNames)
+    testingGroupIds = []
+    remainingGroupNames = Set.new(testingGroupNames)
 
-    if profileId.nil? && createProfileIfNotExists
-      begin
-        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."
+    begin
+      groups = TDUploadService.get_testing_groups(auth_token: authToken)
+
+      groups.each do |group|
+        if remainingGroupNames.include?(group["name"])
+          testingGroupIds.push(group['id'])
+          remainingGroupNames.delete(group["name"])
         end
+      end
+    rescue => e
+      raise "Something went wrong while fetching testing groups: #{e.message}."
+    end
+
+    raise "Following testing groups couldn't be found: '#{remainingGroupNames.to_a.join(', ')}'. Aborting profile creation..." unless remainingGroupNames.empty?
 
-        profileId = new_profile['id']
-      rescue StandardError => e
-        raise "Something went wrong while creating a new profile: #{e.message}"
+    return testingGroupIds
+  end
+
+  def self.create_profile(authToken, profileName, profileAuthType, profileUsername, profilePassword, profileTestingGroupNames)
+    # Get testing group IDs
+    if !profileTestingGroupNames&.empty?
+      profileTestingGroupIds = TDUploadService.get_testing_group_ids(authToken, profileTestingGroupNames)
+    end
+    
+    # Create
+    begin
+      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
+      raise "Something went wrong while creating a new profile: #{e.message}."
+    end
+
+    # Configure
+    begin
+      Fastlane::UI.message("Configuring the profile...")
+      configured_profile = TDUploadService.update_distribution_profile(
+        profile_id: profileId,
+        auth_type: profileAuthType,
+        username: profileUsername,
+        password: profilePassword,
+        testing_group_ids: profileTestingGroupIds,
+        auth_token: authToken
+      )
+      if configured_profile.nil?
+        raise "Error: The new profile could not be configured."
       end
+      profileId = configured_profile['id'] # Should be the same as before
+    rescue => e
+      raise "Something went wrong while configuring the new profile: #{e.message}."
     end
 
     return profileId
   end
+
 end

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

@@ -8,9 +8,6 @@ module Fastlane
       # class methods that you define here become available in your action
       # as `Helper::AppcircleTestingDistributionHelper.your_method`
       #
-      def self.show_message
-        UI.message("Hello from the appcircle_testing_distribution plugin helper!")
-      end
     end
   end
 end

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

@@ -1,5 +1,5 @@
 module Fastlane
   module AppcircleTestingDistribution
-    VERSION = "0.2.3"
+    VERSION = "0.4.0"
   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.3
+  version: 0.4.0
 platform: ruby
 authors:
 - appcircleio
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-11-24 00:00:00.000000000 Z
+date: 2024-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0'
 description:
 email: cloud@appcircle.io
 executables: []
@@ -32,8 +32,6 @@ extra_rdoc_files: []
 files:
 - LICENSE
 - README.md
-- images/PAT.png
-- images/distribution-start.png
 - images/extension-icon.png
 - lib/fastlane/plugin/appcircle_testing_distribution.rb
 - lib/fastlane/plugin/appcircle_testing_distribution/actions/appcircle_testing_distribution_action.rb
@@ -45,7 +43,7 @@ homepage: https://github.com/appcircleio/fastlane_plugin_appcircle_testing_distr
 licenses:
 - MIT
 metadata:
-  rubygems_mfa_required: 'true'
+  rubygems_mfa_required: 'false'
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -61,7 +59,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.4.19
 signing_key:
 specification_version: 4
 summary: Efficiently distribute application builds to users or testing groups using