From a4e5df674b2c938b187cd2f07172bfc71ccb6e2a Mon Sep 17 00:00:00 2001
From: Revant Nandgaonkar <revant.one@gmail.com>
Date: Sun, 6 Nov 2022 06:11:24 +0000
Subject: [PATCH] fix(email): oauth_access call and info message

---
 .../doctype/email_account/email_account.js    | 86 +++++++++----------
 1 file changed, 42 insertions(+), 44 deletions(-)

diff --git a/frappe/email/doctype/email_account/email_account.js b/frappe/email/doctype/email_account/email_account.js
index 92b7deece3..ba6ebd4de7 100644
--- a/frappe/email/doctype/email_account/email_account.js
+++ b/frappe/email/doctype/email_account/email_account.js
@@ -67,22 +67,16 @@ frappe.email_defaults_pop = {
 };
 
 function oauth_access(frm) {
-	return frappe.call({
-		method: "frappe.client.get",
-		args: {
-				doctype: "Connected App",
-				name: frm.doc.connected_app,
-		},
-		callback: app => {
-			return frappe.call({
-				method: "initiate_web_application_flow",
-				doc: app.message,
-				callback: function (r) {
-					window.open(r.message, "_self");
-				},
-			});
-		},
-	});
+	frappe.model.with_doc("Connected App", frm.doc.connected_app, () => {
+		const connected_app = frappe.get_doc("Connected App", frm.doc.connected_app);
+		return frappe.call({
+			doc: connected_app,
+			method: "initiate_web_application_flow",
+			callback: function(r) {
+				window.open(r.message, "_self");
+			}
+		});
+	})
 }
 
 function set_default_max_attachment_size(frm, field) {
@@ -176,18 +170,20 @@ frappe.ui.form.on("Email Account", {
 	},
 
 	after_save(frm) {
-		frappe.call({
-			method: "frappe.integrations.doctype.connected_app.connected_app.check_active_token",
-			args: {
-				connected_app: frm.doc.connected_app,
-				connected_user: frm.doc.connected_user,
-			},
-			callback: r => {
-				if (!r.message) {
-					oauth_access(frm);
-				}
-			},
-		});
+		if (frm.doc.auth_method === "OAuth") {
+			frappe.call({
+				method: "frappe.integrations.doctype.connected_app.connected_app.check_active_token",
+				args: {
+					connected_app: frm.doc.connected_app,
+					connected_user: frm.doc.connected_user,
+				},
+				callback: r => {
+					if (!r.message) {
+						oauth_access(frm);
+					}
+				},
+			});
+		}
 	},
 
 	show_gmail_message_for_less_secure_apps: function (frm) {
@@ -203,22 +199,24 @@ frappe.ui.form.on("Email Account", {
 	},
 
 	show_oauth_authorization_message(frm) {
-		frappe.call({
-			method: "frappe.integrations.doctype.connected_app.connected_app.check_active_token",
-			args: {
-				connected_app: frm.doc.connected_app,
-				connected_user: frm.doc.connected_user,
-			},
-			callback: r => {
-				if (frm.doc.auth_method === "OAuth" && !r.message) {
-					let msg = __(
-						'OAuth has been enabled but not authorised. Please use "Authorise API Access" button to do the same.'
-					);
-					frm.dashboard.clear_headline();
-					frm.dashboard.set_headline_alert(msg, "yellow");
-				}
-			},
-		});
+		if (frm.doc.auth_method === "OAuth") {
+			frappe.call({
+				method: "frappe.integrations.doctype.connected_app.connected_app.check_active_token",
+				args: {
+					connected_app: frm.doc.connected_app,
+					connected_user: frm.doc.connected_user,
+				},
+				callback: r => {
+					if (!r.message) {
+						let msg = __(
+							'OAuth has been enabled but not authorised. Please use "Authorise API Access" button to do the same.'
+						);
+						frm.dashboard.clear_headline();
+						frm.dashboard.set_headline_alert(msg, "yellow");
+					}
+				},
+			});
+		}
 	},
 
 	authorize_api_access: function (frm) {