From 6de6a9101b950030f08827d3a58a77315409f077 Mon Sep 17 00:00:00 2001 From: Martin DONADIEU Date: Fri, 6 May 2022 01:20:04 +0200 Subject: [PATCH 1/7] fix: for capacitor --- packages/auth-compat/src/platform.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/auth-compat/src/platform.ts b/packages/auth-compat/src/platform.ts index dc0c5d9ca0c..fc75689bd9f 100644 --- a/packages/auth-compat/src/platform.ts +++ b/packages/auth-compat/src/platform.ts @@ -51,7 +51,7 @@ function _isHttpOrHttps(): boolean { */ export function _isAndroidOrIosCordovaScheme(ua: string = getUA()): boolean { return !!( - (_getCurrentScheme() === 'file:' || _getCurrentScheme() === 'ionic:') && + (_getCurrentScheme() === 'file:' || _getCurrentScheme() === 'ionic:' || _getCurrentScheme() === 'capacitor:') && ua.toLowerCase().match(/iphone|ipad|ipod|android/) ); } From 3f53385ac09679014afb439b82b614f5222baa0f Mon Sep 17 00:00:00 2001 From: Martin DONADIEU Date: Mon, 9 May 2022 12:34:31 +0200 Subject: [PATCH 2/7] Update platform.ts --- packages/auth-compat/src/platform.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/auth-compat/src/platform.ts b/packages/auth-compat/src/platform.ts index fc75689bd9f..4cc39612cb2 100644 --- a/packages/auth-compat/src/platform.ts +++ b/packages/auth-compat/src/platform.ts @@ -51,7 +51,8 @@ function _isHttpOrHttps(): boolean { */ export function _isAndroidOrIosCordovaScheme(ua: string = getUA()): boolean { return !!( - (_getCurrentScheme() === 'file:' || _getCurrentScheme() === 'ionic:' || _getCurrentScheme() === 'capacitor:') && + (_getCurrentScheme() === 'file:' || _getCurrentScheme() === 'ionic:' + || _getCurrentScheme() === 'capacitor:') && ua.toLowerCase().match(/iphone|ipad|ipod|android/) ); } From 076093b72d201bbf75119e659415dc78e4cc22fc Mon Sep 17 00:00:00 2001 From: Martin DONADIEU Date: Mon, 9 May 2022 12:34:47 +0200 Subject: [PATCH 3/7] Update platform.ts --- packages/auth-compat/src/platform.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/auth-compat/src/platform.ts b/packages/auth-compat/src/platform.ts index 4cc39612cb2..ba823be2c61 100644 --- a/packages/auth-compat/src/platform.ts +++ b/packages/auth-compat/src/platform.ts @@ -52,7 +52,7 @@ function _isHttpOrHttps(): boolean { export function _isAndroidOrIosCordovaScheme(ua: string = getUA()): boolean { return !!( (_getCurrentScheme() === 'file:' || _getCurrentScheme() === 'ionic:' - || _getCurrentScheme() === 'capacitor:') && + || _getCurrentScheme() === 'capacitor:') && ua.toLowerCase().match(/iphone|ipad|ipod|android/) ); } From f3acf0854b482991a074d99c0ff7ac25e9170044 Mon Sep 17 00:00:00 2001 From: martindonadieu Date: Fri, 20 May 2022 20:12:11 +0100 Subject: [PATCH 4/7] fix: lint --- packages/auth-compat/src/platform.ts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/auth-compat/src/platform.ts b/packages/auth-compat/src/platform.ts index ba823be2c61..2bf08181ff4 100644 --- a/packages/auth-compat/src/platform.ts +++ b/packages/auth-compat/src/platform.ts @@ -51,10 +51,12 @@ function _isHttpOrHttps(): boolean { */ export function _isAndroidOrIosCordovaScheme(ua: string = getUA()): boolean { return !!( - (_getCurrentScheme() === 'file:' || _getCurrentScheme() === 'ionic:' - || _getCurrentScheme() === 'capacitor:') && + (_getCurrentScheme() === 'file:' || + _getCurrentScheme() === 'ionic:' || + _getCurrentScheme() === 'capacitor:') && ua.toLowerCase().match(/iphone|ipad|ipod|android/) ); + } /** From 2542c4eb975778e23cbf5711fcfdc18a865de342 Mon Sep 17 00:00:00 2001 From: martindonadieu Date: Fri, 20 May 2022 20:13:35 +0100 Subject: [PATCH 5/7] fix: lint --- packages/auth-compat/src/platform.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/auth-compat/src/platform.ts b/packages/auth-compat/src/platform.ts index 2bf08181ff4..9bfc372aed8 100644 --- a/packages/auth-compat/src/platform.ts +++ b/packages/auth-compat/src/platform.ts @@ -52,8 +52,8 @@ function _isHttpOrHttps(): boolean { export function _isAndroidOrIosCordovaScheme(ua: string = getUA()): boolean { return !!( (_getCurrentScheme() === 'file:' || - _getCurrentScheme() === 'ionic:' || - _getCurrentScheme() === 'capacitor:') && + _getCurrentScheme() === 'ionic:' || + _getCurrentScheme() === 'capacitor:') && ua.toLowerCase().match(/iphone|ipad|ipod|android/) ); From c570ec4eb7a276c6b037fab4105e354312605a51 Mon Sep 17 00:00:00 2001 From: martindonadieu Date: Fri, 20 May 2022 20:20:47 +0100 Subject: [PATCH 6/7] fix: lint issue in CI --- packages/auth-compat/src/platform.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/auth-compat/src/platform.ts b/packages/auth-compat/src/platform.ts index 9bfc372aed8..f1ac4e797b1 100644 --- a/packages/auth-compat/src/platform.ts +++ b/packages/auth-compat/src/platform.ts @@ -56,7 +56,6 @@ export function _isAndroidOrIosCordovaScheme(ua: string = getUA()): boolean { _getCurrentScheme() === 'capacitor:') && ua.toLowerCase().match(/iphone|ipad|ipod|android/) ); - } /** From 0de2c767c1b8b6a054f6dd1a98b78d1282d8472a Mon Sep 17 00:00:00 2001 From: martindonadieu Date: Fri, 20 May 2022 22:16:37 +0100 Subject: [PATCH 7/7] add changeset --- .changeset/polite-fireants-mate.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/polite-fireants-mate.md diff --git a/.changeset/polite-fireants-mate.md b/.changeset/polite-fireants-mate.md new file mode 100644 index 00000000000..da7060abeff --- /dev/null +++ b/.changeset/polite-fireants-mate.md @@ -0,0 +1,5 @@ +--- +'@firebase/auth-compat': patch +--- + +Fix auth scheme reconition in capacitor env