fastlane-plugin-amazon_app_submission 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f52eed564ae7f2ef5d42738c00c3f45a71e0438cb63b6bcad67b53f0c646562b
-  data.tar.gz: 623727ff4a80c261d9ff34c28b012b2c2f067295eabdb3cf40ee2dbbc1f0e40c
+  metadata.gz: e0e6f5db2e79b36447f13ff25a3e8f8573cbdd273578ed7ede2f645f4a534b33
+  data.tar.gz: c76ce77ad9e439cf5d68a8b672c8e714488f5606f2cd27ff2958ba551a2d4e2a
 SHA512:
-  metadata.gz: c9e84b1862121a03660d78b7fdcd5c0a45290982f5e5e8fd1a5b76bdfc37dfa199c9f03c9c7262cf262e6fdb7a0ac6b3cf6633244f93e937acde4494d8ccdfa9
-  data.tar.gz: d345f6b63c462c4510edc2df6e9aa3957711abf93e83f58f022c8742117fe9bc6db8ebd920a94568dcbd3c9c7c461eb9e25a57ac3b5fa698cae8b5d2bf479140
+  metadata.gz: 3996ee47b85cb300b2d5ea07216960aa7fce672ff0dab042216018d83895b127f50b04bff9dcac283a2766a3ae3b17bd4ce475b21ba23a687d88f30313c06211
+  data.tar.gz: a9ebb48964cade0bfa36a415a888629ee51710575b99baf731bffffaab9e580ddf5f0ea6107c34803c1283473f6a1e6ceff15f940aabc90215df3f5201998bbf

data/README.md

@@ -28,21 +28,23 @@ Call `amazon_app_submission` in your Fastfile.
     client_id: "<CLIENT_ID>",
     client_secret: "<CLIENT_SECRET>",
     app_id: "<APP_ID>",
-    apk_path: "<APK_PATH>",
     # Optional
-    changelogs_folder_path:  "<CHANGELOG_PATH>",
+    apk_path: "<APK_PATH>",
+    upload_apk: true,
+    changelogs_path:  "<CHANGELOG_PATH>",
     upload_changelogs: false,
     submit_for_review: false
   )
 ```
 
-| param | default value | optional | description 
+| param | default value | optional | description
 |:----------|:-----------:|:-----------:|:-----------:|
-client_id | - | false | getting client id from Amazon developer console dashboard 
-client_secret | - | false | getting client secret from Amazon developer console dashboard 
-app_id | - | false | getting app id from Amazon developer console dashboard 
-apk_path | - | false | link where you storing the release apk 
-changelogs_folder_path | "" | true | setting the folder path where you have the change logs with different file for each language, if language file not found it will use default.txt
+client_id | - | false | getting client id from Amazon developer console dashboard
+client_secret | - | false | getting client secret from Amazon developer console dashboard
+app_id | - | false | getting app id from Amazon developer console dashboard
+apk_path | - | true | link where you storing the release apk
+upload_apk  | true  | true  | set this to false to not upload an apk. can be used to only upload changelogs
+changelogs_path | "" | true | setting the folder path where you have the change logs with different file for each language, if language file not found it will use default.txt
 upload_changelogs | false | true | updating the change logs for the upcoming version
 submit_for_review | false | true | submit the uploaded APK to the store  
 
@@ -60,9 +62,9 @@ Spanish | es-ES.txt
 Spanish-Mexican | es-MX.txt
 Other | default.txt  
 
-## Testing 
+## Testing
 
-For testing the plugin locally you have to get `client_id`, `client_secret`, `app_id` and `apk_path` in fastlane/Fastfile 
+For testing the plugin locally you have to get `client_id`, `client_secret`, `app_id` and `apk_path` in fastlane/Fastfile
 please check Usage step to see how you can get them.
 
 Then call `bundle exec fastlane test` in your terminal

data/lib/fastlane/plugin/amazon_app_submission/actions/amazon_app_submission_action.rb

@@ -11,49 +11,58 @@ module Fastlane
 
         if token.nil?
           UI.message("Cannot retrieve token, please check your client ID and client secret")
-        end  
+        end
 
         UI.message("Getting current edit")
         current_edit_id, edit_eTag = Helper::AmazonAppSubmissionHelper.open_edit(token, params[:app_id])
-        
+
         if current_edit_id.nil?
         UI.message("Current edit not found, creating a new edit")
         Helper::AmazonAppSubmissionHelper.create_new_edit(token, params[:app_id])
         current_edit_id, edit_eTag = Helper::AmazonAppSubmissionHelper.open_edit(token, params[:app_id])
         end  
-       
-        UI.message("Get current apk id")
-        current_apk_id = Helper::AmazonAppSubmissionHelper.get_current_apk_id(token, params[:app_id], current_edit_id)
 
-        UI.message("Get current apk ETag")
-        current_apk_eTag = Helper::AmazonAppSubmissionHelper.get_current_apk_etag(token, params[:app_id], current_edit_id, current_apk_id)
+        if current_edit_id.nil?
+        UI.error("Creating new edit failed!")
+        return
+        end
+
+        if params[:upload_apk]
+          UI.message("Get current apk id")
+          current_apk_id = Helper::AmazonAppSubmissionHelper.get_current_apk_id(token, params[:app_id], current_edit_id)
 
-        UI.message("Replacing the apk with ETag #{current_apk_eTag}")
-        replace_apk_response_code, replace_apk_response =  Helper::AmazonAppSubmissionHelper.replaceExistingApk(token, params[:app_id], current_edit_id, current_apk_id, current_apk_eTag,  params[:apk_path])
+          UI.message("Get current apk ETag")
+          current_apk_eTag = Helper::AmazonAppSubmissionHelper.get_current_apk_etag(token, params[:app_id], current_edit_id, current_apk_id)
+
+          UI.message("Replacing the apk with apk from #{params[:apk_path]}")
+          replace_apk_response_code, replace_apk_response =  Helper::AmazonAppSubmissionHelper.replaceExistingApk(token, params[:app_id], current_edit_id, current_apk_id, current_apk_eTag, params[:apk_path])
+        end
 
         if params[:upload_changelogs]
           UI.message("Updating the changelogs")
           Helper::AmazonAppSubmissionHelper.update_listings( token, params[:app_id],current_edit_id, params[:changelogs_path], params[:changelogs_path])
         end
-        
-        if replace_apk_response_code == '200' 
-          if params[:submit_for_review] 
-             UI.message("Submitting to Amazon app store")
-              Helper::AmazonAppSubmissionHelper.commit_edit(token, params[:app_id], current_edit_id, edit_eTag)
-           end 
-        else
-          UI.message("Amazon app submission failed at replacing the apk error code #{replace_apk_response_code} and error respones #{replace_apk_response}")
-          return
+
+        if params[:upload_apk]
+          if replace_apk_response_code == '200'
+            if params[:submit_for_review]
+               UI.message("Submitting to Amazon app store")
+               Helper::AmazonAppSubmissionHelper.commit_edit(token, params[:app_id], current_edit_id, edit_eTag)
+            end
+          else
+            UI.message("Amazon app submission failed at replacing the apk error code #{replace_apk_response_code} and error respones #{replace_apk_response}")
+            return
+          end
         end
         UI.message("Amazon app submission finished successfully!")
       end
 
       def self.description
-        "fast-lane plugin for Amazon App Submissions"
+        "Fastlane plugin for Amazon App Submissions"
       end
 
       def self.authors
-        ["mohammedhemaid"]
+        ["mohammedhemaid", "saschagraeff"]
       end
 
       def self.return_value
@@ -62,7 +71,7 @@ module Fastlane
 
       def self.details
         # Optional:
-        "fast-lane plugin for Amazon App Submissions"
+        "Fastlane plugin for Amazon App Submissions"
       end
 
       def self.available_options
@@ -72,7 +81,7 @@ module Fastlane
                                  description: "Amazon App Submission Client ID",
                                     optional: false,
                                         type: String),
-  
+
             FastlaneCore::ConfigItem.new(key: :client_secret,
                                     env_name: "AMAZON_APP_SUBMISSION_CLIENT_SECRET",
                                  description: "Amazon App Submission Client Secret",
@@ -85,10 +94,18 @@ module Fastlane
                                     optional: false,
                                         type: String),
 
+            FastlaneCore::ConfigItem.new(key: :upload_apk,
+                                    env_name: "AMAZON_APP_SUBMISSION_UPLOAD_APK",
+                                 description: "Amazon App Submission upload apk file",
+                               default_value: true,
+                                    optional: true,
+                                        type: Boolean),
+
             FastlaneCore::ConfigItem.new(key: :apk_path,
                                     env_name: "AMAZON_APP_SUBMISSION_APK_PATH",
                                  description: "Amazon App Submission APK Path",
-                                    optional: false,
+                               default_value: "",
+                                    optional: true,
                                         type: String),
 
             FastlaneCore::ConfigItem.new(key: :changelogs_path,
@@ -100,17 +117,17 @@ module Fastlane
 
             FastlaneCore::ConfigItem.new(key: :upload_changelogs,
                                     env_name: "AMAZON_APP_SUBMISSION_SKIP_UPLOAD_CHANGELOGS",
-                                 description: "Amazon App Submission skip upload changelogs",
+                                 description: "Amazon App Submission upload changelogs",
                                default_value: false,
                                     optional: true,
-                                        type: Boolean),            
+                                        type: Boolean),
 
             FastlaneCore::ConfigItem.new(key: :submit_for_review,
                                     env_name: "AMAZON_APP_SUBMISSION_SUBMIT_FOR_REVIEW",
                                  description: "Amazon App Submission submit for review",
                                default_value: false,
                                     optional: true,
-                                        type: Boolean)    
+                                        type: Boolean)
 
           # FastlaneCore::ConfigItem.new(key: :your_option,
           #                         env_name: "AMAZON_APP_SUBMISSION_YOUR_OPTION",

data/lib/fastlane/plugin/amazon_app_submission/helper/amazon_app_submission_helper.rb

@@ -23,12 +23,16 @@ module Fastlane
         res = http.request(req)
         result_json = JSON.parse(res.body)
         auth_token = "Bearer #{result_json['access_token']}"
-        
+
+        if result_json['error'] == 'invalid_scope'
+          UI.message("It seems that the provided security profile is not attached to the App Submission API")
+        end
+
         return auth_token
       end
 
       def self.create_new_edit(token, app_id)
-        
+
         create_edit_path = "/v1/applications/#{app_id}/edits"
         create_edit_url = BASE_URL + create_edit_path
 
@@ -43,12 +47,12 @@ module Fastlane
 
         res = http.request(req)
         current_edit = JSON.parse(res.body)
-
+        
         return current_edit['id']
       end
-      
+
       def self.open_edit(token, app_id)
-        
+
         get_edit_path = "/v1/applications/#{app_id}/edits"
         get_edit_url = BASE_URL + get_edit_path
 
@@ -82,11 +86,11 @@ module Fastlane
         )
 
         res = http.request(req)
-        if !res.body.nil? 
-        apks = JSON.parse(res.body)
-        firstAPK = apks[0]
-        apk_id = firstAPK['id']
-        return apk_id
+        if !res.body.nil?
+          apks = JSON.parse(res.body)
+          firstAPK = apks.kind_of?(Array) ? apks[0] : apks
+          apk_id = firstAPK['id']
+          return apk_id
         end
       end
 
@@ -112,7 +116,7 @@ module Fastlane
 
         replace_apk_path = "/v1/applications/#{app_id}/edits/#{edit_id}/apks/#{apk_id}/replace"
         local_apk = File.open(apk_path, "r").read
-              
+
         apk_uri = URI.parse(apk_path)
         apk_name = apk_uri.path.split('/').last
 
@@ -143,7 +147,7 @@ module Fastlane
 
       def self.delete_apk(token, app_id, edit_id, apk_id, eTag)
 
-        delete_apk_path = "/v1/applications/#{app_id}/edits/#{edit_id}/apks/#{apk_id}" 
+        delete_apk_path = "/v1/applications/#{app_id}/edits/#{edit_id}/apks/#{apk_id}"
         delete_apk_url = BASE_URL + delete_apk_path
 
         uri = URI(delete_apk_url)
@@ -162,7 +166,7 @@ module Fastlane
 
       def self.uploadNewApk(token, app_id, edit_id, apk_path)
 
-        add_apk_path = "/v1/applications/#{app_id}/edits/#{edit_id}/apks/upload" 
+        add_apk_path = "/v1/applications/#{app_id}/edits/#{edit_id}/apks/upload"
         add_apk_url = BASE_URL + add_apk_path
         local_apk = File.open(apk_path, 'r').read
 
@@ -203,7 +207,7 @@ module Fastlane
         listings_response['listings'].each do |lang, listing|
         lang_path = "/v1/applications/#{app_id}/edits/#{edit_id}/listings/#{lang}"
         lang_url = BASE_URL + lang_path
-  
+
         uri = URI(lang_url)
         http = Net::HTTP.new(uri.host, uri.port)
         http.use_ssl = true
@@ -225,7 +229,7 @@ module Fastlane
 
         update_listings_path = "/v1/applications/#{app_id}/edits/#{edit_id}/listings/#{lang}"
         update_listings_url = BASE_URL + update_listings_path
-  
+
         uri = URI(update_listings_url)
         http = Net::HTTP.new(uri.host, uri.port)
         http.use_ssl = true
@@ -235,7 +239,7 @@ module Fastlane
             'Content-Type' => 'application/json',
             'If-Match' => etag
         )
-        
+
         req.body = listing.to_json
         res = http.request(req)
         listings_response = JSON.parse(res.body)
@@ -264,7 +268,7 @@ module Fastlane
 
       def self.commit_edit(token, app_id, edit_id, eTag)
 
-        commit_edit_path = "/v1/applications/#{app_id}/edits/#{edit_id}/commit" 
+        commit_edit_path = "/v1/applications/#{app_id}/edits/#{edit_id}/commit"
         commit_edit_url = BASE_URL + commit_edit_path
 
         uri = URI(commit_edit_url)

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

@@ -1,5 +1,5 @@
 module Fastlane
   module AmazonAppSubmission
-    VERSION = "0.3.0"
+    VERSION = "0.4.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-amazon_app_submission
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - mohammedhemaid
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-06-13 00:00:00.000000000 Z
+date: 2022-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler