From 5b755214900a8038f9985628ef8f1a32bfb31f3d Mon Sep 17 00:00:00 2001
From: Lakhan Samani <lakhan.m.samani@gmail.com>
Date: Sun, 3 Dec 2023 22:27:37 +0530
Subject: [PATCH] fix is basic auth enabled

---
 app/package-lock.json   | 25 +++++++++++++++++--------
 app/package.json        |  2 +-
 app/src/pages/login.tsx |  7 +++++--
 app/yarn.lock           | 24 +++++++++++++++---------
 4 files changed, 38 insertions(+), 20 deletions(-)

diff --git a/app/package-lock.json b/app/package-lock.json
index a9cec9e..62ac19d 100644
--- a/app/package-lock.json
+++ b/app/package-lock.json
@@ -9,7 +9,7 @@
 			"version": "1.0.0",
 			"license": "ISC",
 			"dependencies": {
-				"@authorizerdev/authorizer-react": "^1.1.16",
+				"@authorizerdev/authorizer-react": "^1.1.18",
 				"@types/react": "^17.0.15",
 				"@types/react-dom": "^17.0.9",
 				"esbuild": "^0.12.17",
@@ -27,9 +27,9 @@
 			}
 		},
 		"node_modules/@authorizerdev/authorizer-js": {
-			"version": "1.2.17",
-			"resolved": "https://registry.npmjs.org/@authorizerdev/authorizer-js/-/authorizer-js-1.2.17.tgz",
-			"integrity": "sha512-aF/lu9wZR7TBRaRMAes/hy1q8cZzz5Zo60QLU9Iu09sqnhliHJCp5wSkjsVH+V4ER9i7bmJ2HNABTmOdluxj3A==",
+			"version": "1.2.18",
+			"resolved": "https://registry.npmjs.org/@authorizerdev/authorizer-js/-/authorizer-js-1.2.18.tgz",
+			"integrity": "sha512-9j5U/4lqaaEcG78Zli+TtLJ0migSKhFwnXXunulAGTZOzQSTCJ/CSSPip5wWNa/Mkr6gdEMwk1HYfhIdk2A9Mg==",
 			"dependencies": {
 				"cross-fetch": "^3.1.5"
 			},
@@ -41,11 +41,12 @@
 			}
 		},
 		"node_modules/@authorizerdev/authorizer-react": {
-			"version": "1.1.16",
-			"resolved": "https://registry.npmjs.org/@authorizerdev/authorizer-react/-/authorizer-react-1.1.16.tgz",
-			"integrity": "sha512-zdLcAqQe6J6cTuZ41QOxdsjEruXLDRk/Trlj5qsLFfIiov3gjuS5a9nTkGRLLOhZqdr6VFBRNfFTrhEdeqHjZw==",
+			"version": "1.1.18",
+			"resolved": "https://registry.npmjs.org/@authorizerdev/authorizer-react/-/authorizer-react-1.1.18.tgz",
+			"integrity": "sha512-5SgFzG1VatmrMpl9XKwPcoVmCayA4Hn+sd2I9CwRlCWkdcna4pGJL8kYesuIGjGagS9394qp4ICRLRZ35wXj8A==",
 			"dependencies": {
-				"@authorizerdev/authorizer-js": "^1.2.17"
+				"@authorizerdev/authorizer-js": "^1.2.18",
+				"validator": "^13.11.0"
 			},
 			"engines": {
 				"node": ">=10"
@@ -847,6 +848,14 @@
 				"node": ">=4.2.0"
 			}
 		},
+		"node_modules/validator": {
+			"version": "13.11.0",
+			"resolved": "https://registry.npmjs.org/validator/-/validator-13.11.0.tgz",
+			"integrity": "sha512-Ii+sehpSfZy+At5nPdnyMhx78fEoPDkR2XW/zimHEL3MyGJQOCQ7WeP20jPYRz7ZCpcKLB21NxuXHF3bxjStBQ==",
+			"engines": {
+				"node": ">= 0.10"
+			}
+		},
 		"node_modules/value-equal": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/value-equal/-/value-equal-1.0.1.tgz",
diff --git a/app/package.json b/app/package.json
index 0c03545..530b65c 100644
--- a/app/package.json
+++ b/app/package.json
@@ -12,7 +12,7 @@
 	"author": "Lakhan Samani",
 	"license": "ISC",
 	"dependencies": {
-		"@authorizerdev/authorizer-react": "^1.1.16",
+		"@authorizerdev/authorizer-react": "^1.1.18",
 		"@types/react": "^17.0.15",
 		"@types/react-dom": "^17.0.9",
 		"esbuild": "^0.12.17",
diff --git a/app/src/pages/login.tsx b/app/src/pages/login.tsx
index 088e7f6..d53d36c 100644
--- a/app/src/pages/login.tsx
+++ b/app/src/pages/login.tsx
@@ -32,6 +32,7 @@ const FooterContent = styled.div`
 export default function Login({ urlProps }: { urlProps: Record<string, any> }) {
 	const { config } = useAuthorizer();
 	const [view, setView] = useState<VIEW_TYPES>(VIEW_TYPES.LOGIN);
+	const isBasicAuth = config.is_basic_authentication_enabled;
 	return (
 		<Fragment>
 			{view === VIEW_TYPES.LOGIN && (
@@ -39,14 +40,16 @@ export default function Login({ urlProps }: { urlProps: Record<string, any> }) {
 					<h1 style={{ textAlign: 'center' }}>Login</h1>
 					<AuthorizerSocialLogin urlProps={urlProps} />
 					<br />
-					{config.is_basic_authentication_enabled &&
+					{(config.is_basic_authentication_enabled ||
+						config.is_mobile_basic_authentication_enabled) &&
 						!config.is_magic_link_login_enabled && (
 							<AuthorizerBasicAuthLogin urlProps={urlProps} />
 						)}
 					{config.is_magic_link_login_enabled && (
 						<AuthorizerMagicLinkLogin urlProps={urlProps} />
 					)}
-					{config.is_basic_authentication_enabled && (
+					{(config.is_basic_authentication_enabled ||
+						config.is_mobile_basic_authentication_enabled) && (
 						<Footer>
 							<Link
 								to="#"
diff --git a/app/yarn.lock b/app/yarn.lock
index 4cb3a8d..d9fa871 100644
--- a/app/yarn.lock
+++ b/app/yarn.lock
@@ -2,19 +2,20 @@
 # yarn lockfile v1
 
 
-"@authorizerdev/authorizer-js@^1.2.17":
-  version "1.2.17"
-  resolved "https://registry.npmjs.org/@authorizerdev/authorizer-js/-/authorizer-js-1.2.17.tgz"
-  integrity sha512-aF/lu9wZR7TBRaRMAes/hy1q8cZzz5Zo60QLU9Iu09sqnhliHJCp5wSkjsVH+V4ER9i7bmJ2HNABTmOdluxj3A==
+"@authorizerdev/authorizer-js@^1.2.18":
+  version "1.2.18"
+  resolved "https://registry.npmjs.org/@authorizerdev/authorizer-js/-/authorizer-js-1.2.18.tgz"
+  integrity sha512-9j5U/4lqaaEcG78Zli+TtLJ0migSKhFwnXXunulAGTZOzQSTCJ/CSSPip5wWNa/Mkr6gdEMwk1HYfhIdk2A9Mg==
   dependencies:
     cross-fetch "^3.1.5"
 
-"@authorizerdev/authorizer-react@^1.1.16":
-  version "1.1.16"
-  resolved "https://registry.npmjs.org/@authorizerdev/authorizer-react/-/authorizer-react-1.1.16.tgz"
-  integrity sha512-zdLcAqQe6J6cTuZ41QOxdsjEruXLDRk/Trlj5qsLFfIiov3gjuS5a9nTkGRLLOhZqdr6VFBRNfFTrhEdeqHjZw==
+"@authorizerdev/authorizer-react@^1.1.18":
+  version "1.1.18"
+  resolved "https://registry.npmjs.org/@authorizerdev/authorizer-react/-/authorizer-react-1.1.18.tgz"
+  integrity sha512-5SgFzG1VatmrMpl9XKwPcoVmCayA4Hn+sd2I9CwRlCWkdcna4pGJL8kYesuIGjGagS9394qp4ICRLRZ35wXj8A==
   dependencies:
-    "@authorizerdev/authorizer-js" "^1.2.17"
+    "@authorizerdev/authorizer-js" "^1.2.18"
+    validator "^13.11.0"
 
 "@babel/code-frame@^7.22.13":
   version "7.22.13"
@@ -594,6 +595,11 @@ typescript@^4.3.5:
   resolved "https://registry.npmjs.org/typescript/-/typescript-4.3.5.tgz"
   integrity sha512-DqQgihaQ9cUrskJo9kIyW/+g0Vxsk8cDtZ52a3NGh0YNTfpUSArXSohyUGnvbPazEPLu398C0UxmKSOrPumUzA==
 
+validator@^13.11.0:
+  version "13.11.0"
+  resolved "https://registry.npmjs.org/validator/-/validator-13.11.0.tgz"
+  integrity sha512-Ii+sehpSfZy+At5nPdnyMhx78fEoPDkR2XW/zimHEL3MyGJQOCQ7WeP20jPYRz7ZCpcKLB21NxuXHF3bxjStBQ==
+
 value-equal@^1.0.1:
   version "1.0.1"
   resolved "https://registry.npmjs.org/value-equal/-/value-equal-1.0.1.tgz"