fastlane-plugin-firebase 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8709ae7cfc1e92170d2c4e18efe1960c26df6281
-  data.tar.gz: 96a0afe222d6010f35a450caa88edfc0d5056540
+  metadata.gz: ef89928a9b87b6aed33614bcb671d50b4058a76f
+  data.tar.gz: c790ef4fda8c4160027f3cabe5cda9dd98cfa5a9
 SHA512:
-  metadata.gz: ccc8c899b5176e4cf535c01bd58f53423324724ec075b799a0fd7f9a487d60d5b0c8d87a5e518a6a88eb5d4393254c15b0438a29ea2a776cccff0319eede4d39
-  data.tar.gz: 6069a93a1ca51d2ce9211b410e81cac6e9af8b61e3ba04be6d3e7e41d8876b3822645b3a80eabed81741a23351328b35d2675f3de1fffe3f3ee265010ccb13c4
+  metadata.gz: 0c6c50bf6f4400f23d95042830ec52a7fc43d30fc3d456391b3fa493da9457cde41fce14855c62b5a00f2234b33c5ec904ba1d598181e17c6ed8bfead2dcdbc1
+  data.tar.gz: 44ac9bbf5a0393854f1cd980a9a3f869554f3c5c813dfd41349533ddc090995be94c5caf340781586ab3bde06172fbfe282528ace75e74dd9843096c484a01f6

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

@@ -13,7 +13,8 @@ module Fastlane
        
         projects.each_with_index { |p, i| 
           UI.message "#{i+1}. #{p["displayName"]} (#{p["projectNumber"]})" 
-          p["clientSummary"].sort {|left, right| left["clientId"] <=> right["clientId"] }.each_with_index { |client, j|
+          clients = p["clientSummary"] || []
+          clients.sort {|left, right| left["clientId"] <=> right["clientId"] }.each_with_index { |client, j|
             UI.message "  - #{client["clientId"]} (#{client["displayName"]})" 
           } 
         }

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

@@ -17,7 +17,7 @@ module Fastlane
 			require 'digest/sha1'
 			require 'json'
 			require 'cgi'
-
+			
 			def initialize(email, password)
 				@agent = Mechanize.new
 				@base_url = "https://console.firebase.google.com"
@@ -45,21 +45,106 @@ module Fastlane
 
 				#Send
 				page = @agent.submit(google_form, google_form.buttons.first)
-				match = page.search("script").text.scan(/\\x22api-key\\x22:\\x22(.*?)\\x22/)
 				
+				while page do
+					if extract_api_key(page) then
+						UI.success "Successfuly logged in"
+						return true
+					else
+
+						if error = page.at("#errormsg_0_Passwd") then
+							message = error.text.strip
+						elsif page.xpath("//div[@class='captcha-img']").count > 0 then
+							page = captcha_challenge(page)
+							next
+						elsif page.form.action.include? "/signin/challenge/" then
+							page = signin_challenge(page)
+							next
+						else 
+							message = "Unknown error"
+						end
+						raise LoginError, "Login failed: #{message}"
+					end 
+
+					end
+			end
+
+			def extract_api_key(page) 
+				#Find api key in javascript
+				match = page.search("script").text.scan(/\\x22api-key\\x22:\\x22(.*?)\\x22/)
 				if match.count == 1 then
 					@api_key = match[0][0]
 					@authorization_headers = create_authorization_headers()
-					UI.success "Successfuly logged in"
-					true
-				else
-					if error = page.at("#errormsg_0_Passwd") then
-						message = error.text.strip
-					else
-						message = "Unknown error"
+					return true
+				end
+
+				return false
+			end
+
+			def captcha_challenge(page)
+				if UI.confirm "To proceed you need to fill in captcha. Do you want to download captcha image?" then
+					img_src = page.xpath("//div[@class='captcha-img']/img").attribute("src").value
+					image = @agent.get(img_src)
+					if image != nil then
+						UI.success "Captcha image downloaded"
+					else 
+						UI.crash! "Failed to download captcha image"
 					end
-					raise LoginError, "Login failed: #{message}"
-				end 
+
+					file = Tempfile.new(["firebase_captcha_image", ".jpg"])
+					path = file.path 
+					
+					image.save!(path)
+
+					UI.success "Captcha image saved at #{path}"
+
+					if UI.confirm "Preview image?" then 
+						if system("qlmanage -p #{path} >& /dev/null &") != true && system("open #{path} 2> /dev/null") != true then
+							UI.error("Unable to find program to preview the image, open it manually")
+						end
+					end
+
+					captcha = UI.input "Enter captcha (case insensitive):"
+					password = UI.password "Re-enter password:"
+
+					captcha_form = page.form()
+
+					captcha_form.logincaptcha = captcha
+					captcha_form.Passwd = password
+
+					page = @agent.submit(captcha_form, captcha_form.buttons.first)
+					return page
+				else 
+					return nil
+				end
+				
+			end
+			
+			def signin_challenge(page)
+				UI.header "Sign-in challenge"
+
+				form_id = "challenge"
+				form = page.form_with(:id => form_id)
+				type = (form["challengeType"] || "-1").to_i
+
+				# Two factor verification
+				if type == 9 then
+					div = page.at("##{form_id} div")
+					if div != nil then 
+						UI.important div.xpath("div[1]").text
+						UI.important div.xpath("div[2]").text
+					end
+					
+					code = UI.input "Enter code G-:"
+					form.Pin = code
+					page = @agent.submit(form, form.buttons.first)
+					return page
+				else 
+					html = page.at("##{form_id}").to_html
+					UI.user_error! "Unknown challenge type \n\n#{html}"
+				end
+
+				return nil
 			end
 
 			def generate_sapisid_hash(time, sapisid, origin) 
@@ -122,7 +207,7 @@ module Fastlane
 			def project_list
 				UI.message "Retrieving project list"
 				json = request_json("v1/projects")
-				projects = json["project"]
+				projects = json["project"] || []
 				UI.success "Found #{projects.count} projects"
 				projects
 			end

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

@@ -1,36 +1,49 @@
 module Fastlane
   module Firebase
   	
+
 		class Manager
 			def server_name
         "firebase.google.com"
       end
 
-
-
 			def login(username)
 				item = Security::InternetPassword.find(server: server_name(), account: username)
-        password = item.password if item
+        keychain_password = item.password if item
 
+        password = keychain_password
         begin 
-          password = UI.input("Password for #{username}") unless password
+          password = UI.password("Password for #{username}") unless password
           
           #Api instance
           @api = Firebase::Api.new(username, password)
           
           #Store password
-          Security::InternetPassword.add(server_name(), username, password) unless item.password == password
+          Security::InternetPassword.add(server_name(), username, password) unless keychain_password == password
 
           @api
         rescue Firebase::Api::LoginError => e
-          password = nil
           UI.error e.message
-          retry
+
+          if UI.confirm "Do you want to re-enter your password?" then
+        	  password = nil
+            if keychain_password then
+              puts "Removing Keychain entry for user '#{username}'...".yellow
+              Security::InternetPassword.delete(server: server_name(), account: username)
+            end
+            keychain_password = nil
+            retry
+          end
         end
 			end
 
 			def select_project(project_number)
 				projects = @api.project_list()
+        if projects.count == 0 then
+          UI.user_error! "No projects exist under the account"
+          return
+        end
+
 				if project = projects.select {|p| p["projectNumber"] == project_number }.first then
 					project
 				else 
@@ -41,7 +54,12 @@ module Fastlane
       end
 
       def select_client(project, client_id)
-      	clients = project["clientSummary"].sort {|left, right| left["clientId"] <=> right["clientId"] }
+        if project["clientSummary"] == nil then
+          UI.user_error! "Project has no clients"
+          return
+        end
+
+        clients = (project["clientSummary"] || []).sort {|left, right| left["clientId"] <=> right["clientId"] }
 
       	if client = clients.select {|c| c["clientId"] == client_id }.first then
       		client

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-firebase
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Tomas Kohout
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-21 00:00:00.000000000 Z
+date: 2017-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler