fastlane-plugin-taiwan_number_one 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bb753f703cb1ca29144e73ab02075eef0ba777a23005447ae29b71b7851c5469
-  data.tar.gz: 8d62b2ac64f6ff3b45adeec927f060e0785ee75f9c0ecb7ca70ac3e7217abc10
+  metadata.gz: c476927219f7b1a3dcc7a6b5028143512ade17422dabd2068c1e17ed3694e9d3
+  data.tar.gz: c68e731269bfaa3dbe968aa439bc3259d2dfde16967ad3b7ebfa190eae36369e
 SHA512:
-  metadata.gz: 8ab1d0603fcb11a782a795a50d2c8624428215b16d5132bf1658657ffc0c8eff78c51c19a6e21ae870d6040444f24085a914116c52c1c72e82eab623dced7f9d
-  data.tar.gz: 5f947b531a3e54378f787addf6b12af3882d84fcb9b935f9f3d97b0105de5dac820bddfcb5208f100aa5b3319cd27e6e1fcf4b0487eb925c136915ceeac5ca87
+  metadata.gz: bf4d2fc1e683b7f2d7c39cedea1952342a89aae659c40095310ea1b6ba7cf6dc93febcc861157431229271a5727ffc48e2647299154ca5a84e4ca21b38a8c319
+  data.tar.gz: 6f8868bbdad6f94983f435816ecd3f8fef9475f90e87a3ece2f49584538655fa53f81d63b38159105a03eb30d655962958e823248e724b864261d4afe766fb02

data/README.md

@@ -64,6 +64,24 @@ lane :release_decision do |options|
 end
 ```
 
+or this:
+```
+desc "reject App store version"
+lane :reject_app do
+  api_key = app_store_connect_api_key(
+    key_id: ENV["ASC_API_KEY_ID"],
+    issuer_id: ENV["ISSUER_ID"],
+    key_content: ENV["ASC_API_KEY"]
+  )
+  release_decision(
+    app_decision: Fastlane::Actions::TaiwanNumberOneAction::DicisionType::REJECT,
+    api_key: api_key
+  )
+end
+```
+
+*for more info about app_store_connect_api_key, please refer to [here](http://docs.fastlane.tools/actions/app_store_connect_api_key/#app_store_connect_api_key) and [here](http://docs.fastlane.tools/app-store-connect-api/#using-an-app-store-connect-api-key)
+
 Since there might have some problem in `reject_if_possible` of `Deliver`, so it's better to call this Action before `Deliver` everytime.
 
 something like this:
@@ -105,6 +123,8 @@ username      |Your Apple ID Username                                       |
 app_identifier|The bundle identifier of your app                            |
 team_id       |The ID of your App Store Connect team if you're in multiple teams. (optional)|
 team_name     |The name of your App Store Connect team if you're in multiple teams. (optional)|
+api_key_path	|Path to your App Store Connect API Key JSON file (https://docs.fastlane.tools/app-store-connect-api/#using-fastlane-api-key-json-file)	|
+api_key	      |Your App Store Connect API Key information (https://docs.fastlane.tools/app-store-connect-api/#use-return-value-and-pass-in-as-an-option) |
 
 ## Run tests for this plugin
 

data/lib/fastlane/plugin/taiwan_number_one/actions/taiwan_number_one_action.rb

@@ -11,6 +11,8 @@ module Fastlane
       end
 
       def self.run(params)
+        params[:api_key] ||= Actions.lane_context[SharedValues::APP_STORE_CONNECT_API_KEY]
+
         app_id = params.fetch(:app_identifier)
         username = params.fetch(:username)
         unless app_id && username
@@ -18,21 +20,20 @@ module Fastlane
           return
         end
 
-        # Prompts select team if multiple teams and none specified
-        UI.message("Login to App Store Connect (#{params[:username]})")
-        Spaceship::ConnectAPI.login(
-          params[:username],
-          use_portal: false,
-          use_tunes: true,
-          tunes_team_id: params[:team_id],
-          team_name: params[:team_name]
-        )
-        UI.message("Login successful")
-
-        # Get App
-        application = Spaceship::Application.find(app_id)
-        unless application
-          UI.user_error!("Could not find app with bundle identifier '#{app_id}' on account #{params[:username]}")
+        token = self.api_token(params)
+        if token
+          UI.message("Using App Store Connect API token...")
+          Spaceship::ConnectAPI.token = token
+        else
+          UI.message("Login to App Store Connect (#{params[:username]})")
+          Spaceship::ConnectAPI.login(
+            params[:username],
+            use_portal: false,
+            use_tunes: true,
+            tunes_team_id: params[:team_id],
+            team_name: params[:team_name]
+          )
+          UI.message("Login successful")
         end
 
         app = Spaceship::ConnectAPI::App.find(app_id)
@@ -62,7 +63,7 @@ module Fastlane
           case decision
           when DicisionType::RELEASE
             UI.message("decision is release")
-            release_version_if_possible(app: application, app_store_version: app_store_version)
+            release_version_if_possible(app: app, app_store_version: app_store_version)
           when DicisionType::REJECT
             UI.message("decision is reject")
             reject_version_if_possible(app: app, app_store_version: app_store_version)
@@ -89,7 +90,7 @@ module Fastlane
           return DicisionType::REJECT
         end
       end
-      
+
       def self.release_version_if_possible(app: nil, app_store_version: Spaceship::ConnectAPI::AppStoreVersion)
         unless app
           UI.user_error!("Could not find app with bundle identifier '#{params[:app_identifier]}' on account #{params[:username]}")
@@ -108,14 +109,21 @@ module Fastlane
         unless app
           UI.user_error!("Could not find app with bundle identifier '#{params[:app_identifier]}' on account #{params[:username]}")
         end
-        
+
         if app_store_version.reject!
-          UI.success("rejected version #{app_store_version} Successfully!")
+          UI.success("rejected version #{app_store_version.version_string} Successfully!")
         else
           UI.user_error!("An error occurred while rejected version #{app_store_version}")
         end
       end
 
+      def self.api_token(params)
+        params[:api_key] ||= Actions.lane_context[SharedValues::APP_STORE_CONNECT_API_KEY]
+        api_token ||= Spaceship::ConnectAPI::Token.create(params[:api_key]) if params[:api_key]
+        api_token ||= Spaceship::ConnectAPI::Token.from_json_file(params[:api_key_path]) if params[:api_key_path]
+        return api_token
+      end
+
       def self.description
         "release or reject if status is Pending Developer Release."
       end
@@ -180,7 +188,22 @@ module Fastlane
                                        default_value_dynamic: true,
                                        verify_block: proc do |value|
                                          ENV["FASTLANE_ITC_TEAM_NAME"] = value.to_s
-                                       end)
+                                       end),
+          FastlaneCore::ConfigItem.new(key: :api_key_path,
+                                       env_name: "FL_REGISTER_DEVICE_API_KEY_PATH",
+                                       description: "Path to your App Store Connect API Key JSON file (https://docs.fastlane.tools/app-store-connect-api/#using-fastlane-api-key-json-file)",
+                                       optional: true,
+                                       conflicting_options: [:api_key],
+                                       verify_block: proc do |value|
+                                         UI.user_error!("Couldn't find API key JSON file at path '#{value}'") unless File.exist?(value)
+                                       end),
+          FastlaneCore::ConfigItem.new(key: :api_key,
+                                       env_name: "FL_REGISTER_DEVICE_API_KEY",
+                                       description: "Your App Store Connect API Key information (https://docs.fastlane.tools/app-store-connect-api/#use-return-value-and-pass-in-as-an-option)",
+                                       type: Hash,
+                                       optional: true,
+                                       sensitive: true,
+                                       conflicting_options: [:api_key_path])
         ]
       end
 
@@ -194,7 +217,8 @@ module Fastlane
       def self.example_code
         [
           'taiwan_number_one(
-            app_decision: "release", # Set to true to skip verification of HTML preview
+            app_decision: "release",
+            api_key: "api_key" # your app_store_connect_api_key 
           )'
         ]
       end

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

@@ -1,5 +1,5 @@
 module Fastlane
   module TaiwanNumberOne
-    VERSION = "0.1.2"
+    VERSION = "0.2.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-taiwan_number_one
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - andrew54068
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-13 00:00:00.000000000 Z
+date: 2021-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry