fastlane-plugin-samsungknox 0.0.1 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 687b05c8ca644f58b824440eb3432392a52c5fa773de88bfe372c736568b5cf8
-  data.tar.gz: '08b1eede7d6c7141ce4e503c8417d77a5ab6ee91c1de7a9890f7a28fec80f450'
+  metadata.gz: 13f339b3a0c91bae5b4367b52ddb51edc1677ffb4d648cb4d2bc2ea4edbdb59f
+  data.tar.gz: a473a896843e29ac7ba7c4e35fadeb4b887f6cd0c8d02306bfbccda9679b92b5
 SHA512:
-  metadata.gz: 1c7a159f8251cac45b64f7b34a64064dabbc7154c6ce85562aa8324000bfa765b87b4b04d286e1405d09ba27dec76ae89dcaa19ef4a6130a16a47c068a9630d0
-  data.tar.gz: 0c636b4e3f83bea1cd84d3b9163800db4aadca4b4a5b2d3fb02866c88215ea3c4fa97b36def2a245448bc9841377666b2a420adb0b02cf0e2d28c46bf04057b3
+  metadata.gz: f55918dc6f651cb7206f0b3bbf83e1f8a209db04877d328e7b4ff2fdc485a3da056f4d8d5b321b7e7792e39f7a11794f9ccc3dd2dc84a435f84d7b91b514431b
+  data.tar.gz: 4a619558aaee807883d1ab61560d56b4e50301bd7f0ea7a0060112e704b0b315b2c9fb310524f60f88dc1e148d2bb89f6c8c337d920da881018f3f3fa7f2da58

data/lib/fastlane/plugin/samsungknox/actions/knox_configure_library_upload_app_action.rb

@@ -7,16 +7,14 @@ module Fastlane
   module Actions
     class KnoxConfigureLibraryUploadAppAction < Action
       def self.run(params)
-        UI.message("Welcome to Knox Configure Library Application Upload Fastlane!")
+        UI.header("Step: KC Upload App")
 
-        credential = { 
+        access_token = KnoxTokenGenerator.generate_knox_access_token({
           path: params[:credential_path], 
           key: params[:credential_key] 
-        }
-
-        access_token = KnoxTokenGenerator.generate_knox_access_token(
-          credential, 
-          params[:clientIdentifierJwtToken]
+          },
+          params[:clientIdentifierJwtToken],
+          params[:api_region].downcase
         )
 
         # application_info = KnoxConfigureLibraryAlreadyExistsAppVersionCheck.search_by_package_name(
@@ -26,11 +24,9 @@ module Fastlane
 
         KnoxConfigureLibraryUploadApp.upload_app(
           access_token[:token], 
-          params[:app_file_path]
+          params[:app_file_path],
+          params[:app_description]
         )
-
-        UI.success(access_token)
-
       end
 
       def self.description
@@ -42,7 +38,6 @@ module Fastlane
       end
 
       def self.return_value
-        # If your method provides a return value, you can describe here what it does
       end
 
       def self.details
@@ -59,7 +54,9 @@ module Fastlane
           #                              env_name: "KC_PACKAGE_NAME",
           #                              description: "",
           #                              optional: false),
-          FastlaneCore::ConfigItem.new(key: :description,
+          
+          # App Configuretion
+          FastlaneCore::ConfigItem.new(key: :app_description,
                                        env_name: "KC_APP_DESCRIPTION",
                                        description: "",
                                        optional: true),
@@ -67,6 +64,16 @@ module Fastlane
                                        env_name: "KC_APP_FILE_PATH",
                                        description: "Path to your APK file",
                                        optional: true),
+          
+          # Knox Credential Configuration
+          FastlaneCore::ConfigItem.new(key: :api_region,
+                                       env_name: "KC_API_REGION",
+                                       description: "",
+                                       optional: false,
+                                       verify_block: proc do |value|
+                                          UI.user_error!("No API region for Knox Credential given, pass using `api_region: 'value'`") unless (value and not value.empty?)
+                                        end
+                                      ),
           FastlaneCore::ConfigItem.new(key: :credential_key,
                                        env_name: "KNOX_CREDENTIAL_KEY",
                                        description: "",

data/lib/fastlane/plugin/samsungknox/helper/knox_configure_library_upload_app.rb

@@ -5,7 +5,7 @@ module Fastlane
   UI = FastlaneCore::UI unless Fastlane.const_defined?("UI")
 
   module KnoxConfigureLibraryUploadApp
-    def self.upload_app(access_token, app_file_path)
+    def self.upload_app(access_token, app_file_path, app_description)
       uri = URI('https://eu-kcs-api.samsungknox.com/kcs/v1/kc/applications/upload')
 
       File.open(app_file_path) do |file|

data/lib/fastlane/plugin/samsungknox/helper/knox_token_generator.rb

@@ -54,8 +54,8 @@ module Fastlane
       base64_public_key
     end
 
-    def self.get_access_token(validity_for_access_token_in_minutes, base64_encoded_string_public_key, client_identifier_jwt)
-      uri = URI('https://eu-kcs-api.samsungknox.com/ams/v1/users/accesstoken')
+    def self.get_access_token(validity_for_access_token_in_minutes, base64_encoded_string_public_key, client_identifier_jwt, api_region)
+      uri = URI("https://#{api_region}-kcs-api.samsungknox.com/ams/v1/users/accesstoken")
     
       request_body = {
         base64EncodedStringPublicKey: base64_encoded_string_public_key,
@@ -74,8 +74,8 @@ module Fastlane
       end
     end
 
-    def self.generate_knox_access_token(credential, clientIdentifierJwtToken)
-      UI.header('Step: 🔐 KNOX ACCESS TOKEN GENERATE STEP 🔐 ')
+    def self.generate_knox_access_token(credential, clientIdentifierJwtToken, api_region)
+      UI.header('Step: 🔐 KNOX ACCESS TOKEN GENERATE 🔐 ')
 
       UI.message('⏳ Sign the knox token using the credential...')
       generate_signed_jwt_result = generate_signed_jwt(credential, clientIdentifierJwtToken, true)
@@ -84,7 +84,7 @@ module Fastlane
       sign_by_client_identifier_jwt_token = generate_signed_jwt_result[:token]
 
       UI.message('⏳ Request the knox client identifier jwt ams access token...')
-      ams_access_token = get_access_token(30, base64_encoding_public_Key, sign_by_client_identifier_jwt_token)
+      ams_access_token = get_access_token(30, base64_encoding_public_Key, sign_by_client_identifier_jwt_token, api_region)
       UI.message('⏳ Sign the knox token using the ams access token and private key...')
       token = generate_signed_jwt(credential, ams_access_token, false)
 

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

@@ -1,5 +1,5 @@
 module Fastlane
   module Samsungknox
-    VERSION = "0.0.1"
+    VERSION = "0.1.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-samsungknox
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
 platform: ruby
 authors:
 - jieey1140
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-24 00:00:00.000000000 Z
+date: 2023-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -163,7 +163,6 @@ files:
 - lib/fastlane/plugin/samsungknox/helper/knox_configure_error_message.rb
 - lib/fastlane/plugin/samsungknox/helper/knox_configure_library_already_exists_app_version_check.rb
 - lib/fastlane/plugin/samsungknox/helper/knox_configure_library_upload_app.rb
-- lib/fastlane/plugin/samsungknox/helper/knox_configure_upload_application_to_library.rb
 - lib/fastlane/plugin/samsungknox/helper/knox_token_generator.rb
 - lib/fastlane/plugin/samsungknox/version.rb
 homepage: https://github.com/REDREDGROUP/samsungknox