From 539607d87a30106893f3e95d9704d571280471c4 Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Mon, 17 Jul 2023 13:09:38 +0530
Subject: [PATCH 1/3] fix(UX): OAuth confirm access screen

---
 .../includes/oauth_confirmation.html          | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/frappe/templates/includes/oauth_confirmation.html b/frappe/templates/includes/oauth_confirmation.html
index 3fbbb75971..b5b3947ceb 100644
--- a/frappe/templates/includes/oauth_confirmation.html
+++ b/frappe/templates/includes/oauth_confirmation.html
@@ -1,22 +1,19 @@
 {% if not error %}
 <div class="panel panel-default">
   <div class="panel-heading">
-    <h3 class="panel-title">{{ _("{} wants to access the following details from your account").format(client_id) }}</h3>
+    <div class="panel-title h3">{{ _(client_id) }}</div>
+    <p class="panel-subtitle">{{ _("wants to access the following details from your account") }}</p>
   </div>
   <div class="panel-body">
-      <ul class="list-group">
+      <ul>
       {% for dtl in details %}
-        <li class="list-group-item">{{ dtl.title() }}</li>
+        <li>{{ dtl.title() }}</li>
       {% endfor %}
       </ul>
-    <ul class="list-inline">
-      <li>
-        <button id="allow" class="btn btn-sm btn-primary">{{ _("Allow") }}</button>
-      </li>
-      <li>
-        <button id="deny" class="btn btn-sm btn-light">{{ _("Deny") }}</button>
-      </li>
-    </ul>
+    <div class="action-buttons d-flex">
+      <button id="deny" class="btn btn-sm btn-light btn-block mr-3">{{ _("Deny") }}</button>
+      <button id="allow" class="btn btn-sm btn-primary btn-block">{{ _("Allow") }}</button>
+    </div>
   </div>
 </div>
 <script type="text/javascript">

From cbe9ec26bd4e13f2d89f71ca246d17ff9b55bf85 Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Mon, 17 Jul 2023 15:48:30 +0530
Subject: [PATCH 2/3] fix: do not show Home primary button

---
 frappe/integrations/oauth2.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/integrations/oauth2.py b/frappe/integrations/oauth2.py
index 39f98e2f1b..7abcfb5655 100644
--- a/frappe/integrations/oauth2.py
+++ b/frappe/integrations/oauth2.py
@@ -113,7 +113,7 @@ def authorize(**kwargs):
 				resp_html = frappe.render_template(
 					"templates/includes/oauth_confirmation.html", response_html_params
 				)
-				frappe.respond_as_web_page("Confirm Access", resp_html)
+				frappe.respond_as_web_page("Confirm Access", resp_html, primary_action=None)
 		except (FatalClientError, OAuth2Error) as e:
 			return generate_json_error_response(e)
 

From 264372a2a3344d7ffe8482b88fb6407bb3335393 Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Tue, 18 Jul 2023 17:15:58 +0530
Subject: [PATCH 3/3] fix: show list of user details that we are giving access
 to if scope is openid

---
 frappe/integrations/oauth2.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/frappe/integrations/oauth2.py b/frappe/integrations/oauth2.py
index 7abcfb5655..bf71a68aaa 100644
--- a/frappe/integrations/oauth2.py
+++ b/frappe/integrations/oauth2.py
@@ -101,6 +101,10 @@ def authorize(**kwargs):
 				frappe.local.response["type"] = "redirect"
 				frappe.local.response["location"] = success_url
 			else:
+				if "openid" in scopes:
+					scopes.remove("openid")
+					scopes.extend(["First Name", "Last Name", "Email", "Password", "User Image", "Roles"])
+
 				# Show Allow/Deny screen.
 				response_html_params = frappe._dict(
 					{