From df5978fb5aadd693150bba31817bce714c96f9cd Mon Sep 17 00:00:00 2001
From: Siim Sams <siimsams@users.noreply.github.com>
Date: Tue, 5 Dec 2023 20:41:39 +0200
Subject: [PATCH 1/2] fix unable to update app_data for user

---
 server/resolvers/update_user.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/resolvers/update_user.go b/server/resolvers/update_user.go
index 5aaebdc..60c0b15 100644
--- a/server/resolvers/update_user.go
+++ b/server/resolvers/update_user.go
@@ -48,7 +48,7 @@ func UpdateUserResolver(ctx context.Context, params model.UpdateUserInput) (*mod
 		"user_id": params.ID,
 	})
 
-	if params.GivenName == nil && params.FamilyName == nil && params.Picture == nil && params.MiddleName == nil && params.Nickname == nil && params.Email == nil && params.Birthdate == nil && params.Gender == nil && params.PhoneNumber == nil && params.Roles == nil && params.IsMultiFactorAuthEnabled == nil {
+	if params.GivenName == nil && params.FamilyName == nil && params.Picture == nil && params.MiddleName == nil && params.Nickname == nil && params.Email == nil && params.Birthdate == nil && params.Gender == nil && params.PhoneNumber == nil && params.Roles == nil && params.IsMultiFactorAuthEnabled == nil && params.AppData == nil {
 		log.Debug("No params to update")
 		return res, fmt.Errorf("please enter atleast one param to update")
 	}

From a002e2faf75eabe43de12599f5c2b9d64652afa3 Mon Sep 17 00:00:00 2001
From: Lakhan Samani <lakhan.m.samani@gmail.com>
Date: Sat, 9 Dec 2023 02:03:27 +0530
Subject: [PATCH 2/2] fix: remove forgot password for magic link login

---
 app/src/pages/login.tsx | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/app/src/pages/login.tsx b/app/src/pages/login.tsx
index d53d36c..42e38a5 100644
--- a/app/src/pages/login.tsx
+++ b/app/src/pages/login.tsx
@@ -49,17 +49,18 @@ export default function Login({ urlProps }: { urlProps: Record<string, any> }) {
 						<AuthorizerMagicLinkLogin urlProps={urlProps} />
 					)}
 					{(config.is_basic_authentication_enabled ||
-						config.is_mobile_basic_authentication_enabled) && (
-						<Footer>
-							<Link
-								to="#"
-								onClick={() => setView(VIEW_TYPES.FORGOT_PASSWORD)}
-								style={{ marginBottom: 10 }}
-							>
-								Forgot Password?
-							</Link>
-						</Footer>
-					)}
+						config.is_mobile_basic_authentication_enabled) &&
+						!config.is_magic_link_login_enabled && (
+							<Footer>
+								<Link
+									to="#"
+									onClick={() => setView(VIEW_TYPES.FORGOT_PASSWORD)}
+									style={{ marginBottom: 10 }}
+								>
+									Forgot Password?
+								</Link>
+							</Footer>
+						)}
 				</Fragment>
 			)}
 			{view === VIEW_TYPES.FORGOT_PASSWORD && (