fastlane-plugin-firebase_management 1.0.2 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 404070b44bafc2d2f983b13a4fa5bfba0eb5def830f66cad096c5fa57ca31021
-  data.tar.gz: 994ad2f5533c6cde536087c34bf7919b61e09be431d7bd6878bded2c8905ec7f
+  metadata.gz: 3adaab65a73979fa08b173d84889365da61fdb15f548ad5b83e7d54fc18979fd
+  data.tar.gz: 3782786d5e38e74ac69f07625d07119b726ac43d6e4953843d745440f9f8b7f3
 SHA512:
-  metadata.gz: 9c9ea8fb8317338d3480af2a8580fed3b0d1889880630deecd37b9efb862200194661f4e99a094faea98d9a5a12cb65e15ee000c30e70943b61a229c6707535d
-  data.tar.gz: d864b0348120c4b3d3ec812820fc06bb52b2ae5db7cb0f4c9286f967ab4982be1e442ec40115dd91f81b02c99b07c3a22afe0effb363aff785453467b7ba96c6
+  metadata.gz: 433f1186d577d4482340978e34f2cb312ddc0a4da523909e20d1c55f96de19a3781d251dc19b2b02017486f99ed374286d7d6df03696d83a3a88e6ffdc1675e0
+  data.tar.gz: 5b01e928ebc18d00836f7995b206b51ad67d2908be74b91209b4a327de939122f4187daddce288fe0a7423f80bec3b45de1ef8a9e9e66872ef27b7289f91baa5

data/lib/fastlane/plugin/firebase_management/actions/firebase_add_app_action.rb

@@ -6,7 +6,15 @@ module Fastlane
 				manager = FirebaseManagement::Manager.new
 				
 				# login
-				api = manager.login(params[:service_account_json_path])
+				api = nil
+				if params[:service_account_json_path] != nil then
+					api = manager.serviceAccountLogin(params[:service_account_json_path])
+				elsif params[:email] != nil && params[:client_secret_json_path] != nil then
+					api = manager.userLogin(params[:email], params[:client_secret_json_path])
+				else
+					UI.error "You must define service_account_json_path or email with client_secret_json_path."
+					return nil
+				end
 
 				# select project
 				project_id = params[:project_id] || manager.select_project(nil)["projectId"]
@@ -88,10 +96,20 @@ module Fastlane
 
 			def self.available_options
 				[
+					FastlaneCore::ConfigItem.new(key: :email,
+											env_name: "FIREBASE_EMAIL",
+										 description: "User's email to identify stored credentials",
+											optional: true),
+
+					FastlaneCore::ConfigItem.new(key: :client_secret_json_path,
+											env_name: "FIREBASE_CLIENT_SECRET_JSON_PATH",
+										 description: "Path to client secret json file",
+											optional: true),
+
 					FastlaneCore::ConfigItem.new(key: :service_account_json_path,
 											env_name: "FIREBASE_SERVICE_ACCOUNT_JSON_PATH",
 										 description: "Path to service account json key",
-											optional: false),
+											optional: true),
 
 					FastlaneCore::ConfigItem.new(key: :project_id,
 											env_name: "FIREBASE_PROJECT_ID",

data/lib/fastlane/plugin/firebase_management/actions/firebase_download_config_action.rb

@@ -6,7 +6,15 @@ module Fastlane
 				manager = FirebaseManagement::Manager.new
 
 				# login
-				api = manager.login(params[:service_account_json_path])
+				api = nil
+				if params[:service_account_json_path] != nil then
+					api = manager.serviceAccountLogin(params[:service_account_json_path])
+				elsif params[:email] != nil && params[:client_secret_json_path] != nil then
+					api = manager.userLogin(params[:email], params[:client_secret_json_path])
+				else
+					UI.error "You must define service_account_json_path or email with client_secret_json_path."
+					return nil
+				end
 
 				# select project
 				project_id = params[:project_id] || manager.select_project(nil)["projectId"]
@@ -56,18 +64,31 @@ module Fastlane
 
 			def self.available_options
 				[
+					FastlaneCore::ConfigItem.new(key: :email,
+											env_name: "FIREBASE_EMAIL",
+										 description: "User's email to identify stored credentials",
+											optional: true),
+
+					FastlaneCore::ConfigItem.new(key: :client_secret_json_path,
+											env_name: "FIREBASE_CLIENT_SECRET_JSON_PATH",
+										 description: "Path to client secret json file",
+											optional: true),
+
 					FastlaneCore::ConfigItem.new(key: :service_account_json_path,
 					                        env_name: "FIREBASE_SERVICE_ACCOUNT_JSON_PATH",
 					                     description: "Path to service account json key",
-					                        optional: false),
+					                        optional: true),
+
 					FastlaneCore::ConfigItem.new(key: :project_id,
 					                        env_name: "FIREBASE_PROJECT_ID",
 					                     description: "Project id",
 					                        optional: true),
+
 					FastlaneCore::ConfigItem.new(key: :app_id,
 					                        env_name: "FIREBASE_APP_ID",
 					                     description: "Project app id",
 					                        optional: true),
+
 					FastlaneCore::ConfigItem.new(key: :type,
 											env_name: "FIREBASE_TYPE",
 										 description: "Type of client (ios, android)",
@@ -81,6 +102,7 @@ module Fastlane
 					                     description: "Path for the downloaded config",
 					                        optional: false,
 					                   default_value: "./"),
+					
 					FastlaneCore::ConfigItem.new(key: :output_name,
 					                        env_name: "FIREBASE_OUTPUT_NAME",
 					                     description: "Name of the downloaded file",

data/lib/fastlane/plugin/firebase_management/actions/firebase_list_action.rb

@@ -6,23 +6,24 @@ module Fastlane
 				manager = FirebaseManagement::Manager.new
 
 				# login
-				api = manager.login(params[:service_account_json_path])
+				api = nil
+				if params[:service_account_json_path] != nil then
+					api = manager.serviceAccountLogin(params[:service_account_json_path])
+				elsif params[:email] != nil && params[:client_secret_json_path] != nil then
+					api = manager.userLogin(params[:email], params[:client_secret_json_path])
+				else
+					UI.error "You must define service_account_json_path or email with client_secret_json_path."
+					return nil
+				end
 
 				# download list of projects
 				projects = api.project_list()
 
-				# download list of apps for each project
-				projects.map! { |project|
-					project["iosApps"] = api.ios_app_list(project["projectId"])
-					project["androidApps"] = api.android_app_list(project["projectId"])
-					project
-				}
-
 				# create formatted output
 				projects.each_with_index { |p, i| 
 					UI.message "#{i+1}. #{p["displayName"]} (#{p["projectId"]})" 
 					
-					ios_apps = p["iosApps"] || []
+					ios_apps = api.ios_app_list(p["projectId"])
 					if !ios_apps.empty? then
 						UI.message "  iOS"
 						ios_apps.sort {|left, right| left["appId"] <=> right["appId"] }.each_with_index { |app, j|
@@ -30,7 +31,7 @@ module Fastlane
 						}
 					end
 
-					android_apps = p["androidApps"] || []
+					android_apps = api.android_app_list(p["projectId"])
 					if !android_apps.empty? then
 						UI.message "  Android"
 						android_apps.sort {|left, right| left["appId"] <=> right["appId"] }.each_with_index { |app, j|
@@ -61,10 +62,20 @@ module Fastlane
 
 			def self.available_options
 				[
+					FastlaneCore::ConfigItem.new(key: :email,
+											env_name: "FIREBASE_EMAIL",
+										 description: "User's email to identify stored credentials",
+											optional: true),
+
+					FastlaneCore::ConfigItem.new(key: :client_secret_json_path,
+											env_name: "FIREBASE_CLIENT_SECRET_JSON_PATH",
+										 description: "Path to client secret json file",
+											optional: true),
+
 					FastlaneCore::ConfigItem.new(key: :service_account_json_path,
-						env_name: "FIREBASE_SERVICE_ACCOUNT_JSON_PATH",
-						description: "Path to service account json key",
-						optional: false
+											env_name: "FIREBASE_SERVICE_ACCOUNT_JSON_PATH",
+										 description: "Path to service account json key",
+											optional: true
 					)
 				]
 			end

data/lib/fastlane/plugin/firebase_management/lib/api.rb

@@ -16,17 +16,8 @@ module Fastlane
 			require 'googleauth'
 			require 'httparty'
 
-			def initialize(jsonPath)
+			def initialize(access_token)
 				@base_url = "https://firebase.googleapis.com"
-
-				scope = 'https://www.googleapis.com/auth/firebase https://www.googleapis.com/auth/cloud-platform'
-
-				authorizer = Google::Auth::ServiceAccountCredentials.make_creds(
-					json_key_io: File.open(jsonPath),
-					scope: scope
-				)
-
-				access_token = authorizer.fetch_access_token!["access_token"]
 				@authorization_headers = {
 					'Authorization' => 'Bearer ' + access_token
 				}

data/lib/fastlane/plugin/firebase_management/lib/manager.rb

@@ -2,14 +2,49 @@ module Fastlane
 	module FirebaseManagement
 		class Manager
 
-			def login(jsonPath)
-				begin 
-					#Api instance
-					@api = FirebaseManagement::Api.new(jsonPath)
-					@api
-				rescue StandardError => e
-					UI.crash! e
+			require 'googleauth'
+			require 'googleauth/stores/file_token_store'
+
+			def userLogin(email, client_secrets_path)
+
+				system 'mkdir -p ~/.google'
+
+				oob_uri = "urn:ietf:wg:oauth:2.0:oob"
+
+				scopes = [
+					'https://www.googleapis.com/auth/firebase',
+					'https://www.googleapis.com/auth/cloud-platform'
+				]
+				client_id = Google::Auth::ClientId.from_file(client_secrets_path)
+				token_store = Google::Auth::Stores::FileTokenStore.new(:file => File.expand_path("~/.google/tokens.yaml"))
+				authorizer = Google::Auth::UserAuthorizer.new(client_id, scopes, token_store)
+
+				credentials = authorizer.get_credentials(email)
+				if credentials.nil?
+				  url = authorizer.get_authorization_url(base_url: oob_uri)
+				  UI.message "Open #{url} in your browser and enter the resulting code."
+
+				  code = Fastlane::Actions::PromptAction.run(text: "Code: ")
+
+				  credentials = authorizer.get_and_store_credentials_from_code(user_id: email, code: code, base_url: oob_uri)
 				end
+				
+				token = credentials.fetch_access_token!["access_token"]
+				@api = FirebaseManagement::Api.new(token)
+				@api
+			end
+
+			def serviceAccountLogin(jsonPath)
+				scope = 'https://www.googleapis.com/auth/firebase https://www.googleapis.com/auth/cloud-platform'
+
+				authorizer = Google::Auth::ServiceAccountCredentials.make_creds(
+					json_key_io: File.open(jsonPath),
+					scope: scope
+				)
+
+				token = authorizer.fetch_access_token!["access_token"]
+				@api = FirebaseManagement::Api.new(token)
+				@api
 			end
 
 			def select_project(project_id)

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

@@ -1,5 +1,5 @@
 module Fastlane
   module FirebaseManagement
-    VERSION = "1.0.2"
+    VERSION = "1.1.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-firebase_management
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.0
 platform: ruby
 authors:
 - Ackee