From 544ce6b52418c5316f08e9ada267354c753e5bb4 Mon Sep 17 00:00:00 2001
From: Saurabh <saurabh6790@gmail.com>
Date: Tue, 16 Jul 2024 20:10:07 +0530
Subject: [PATCH 01/11] feat: provision to populate logos from website settings

---
 dashboard/src/views/partials/LoginBox.vue | 37 +++++++++++++++++++++--
 press/api/utils.py                        | 10 ++++++
 2 files changed, 44 insertions(+), 3 deletions(-)
 create mode 100644 press/api/utils.py

diff --git a/dashboard/src/views/partials/LoginBox.vue b/dashboard/src/views/partials/LoginBox.vue
index 364ca87697..13d6b32ed7 100644
--- a/dashboard/src/views/partials/LoginBox.vue
+++ b/dashboard/src/views/partials/LoginBox.vue
@@ -4,11 +4,15 @@
 			<div class="flex" @dblclick="redirectForFrappeioAuth">
 				<slot name="logo">
 					<div class="mx-auto flex items-center space-x-2">
-						<FCLogo class="inline-block h-7 w-7" />
+						<img
+							v-if="brandDetails && brandDetails.app_logo"
+							:src="brandDetails.app_logo"
+						/>
+						<FCLogo class="inline-block h-7 w-7" v-else />
 						<span
 							class="select-none text-xl font-semibold tracking-tight text-gray-900"
 						>
-							Frappe Cloud
+							{{ appName }}
 						</span>
 					</div>
 				</slot>
@@ -27,7 +31,11 @@
 			</div>
 		</div>
 		<div class="absolute bottom-4 z-[1] flex w-full justify-center">
-			<FrappeLogo class="h-4" />
+			<img
+				v-if="brandDetails && brandDetails.app_footer_logo"
+				:src="brandDetails.app_footer_logo"
+			/>
+			<FrappeLogo class="h-4" v-else />
 		</div>
 	</div>
 </template>
@@ -44,6 +52,13 @@ export default {
 		FCLogo,
 		FrappeLogo
 	},
+	data() {
+		return {
+			appLogo: '',
+			appName: 'Frappe Cloud',
+			appFooterLogo: ''
+		};
+	},
 	mounted() {
 		const params = new URLSearchParams(window.location.search);
 
@@ -59,6 +74,22 @@ export default {
 		redirectForFrappeioAuth() {
 			window.location = '/f-login';
 		}
+	},
+	resources: {
+		brandDetails() {
+			return {
+				url: 'press.api.utils.get_app_details',
+				auto: true,
+				onSuccess(data) {
+					console.log(data);
+				}
+			};
+		}
+	},
+	computed: {
+		brandDetails() {
+			return this.$resources.brandDetails.data || '';
+		}
 	}
 };
 </script>
diff --git a/press/api/utils.py b/press/api/utils.py
new file mode 100644
index 0000000000..75d2ef8fd2
--- /dev/null
+++ b/press/api/utils.py
@@ -0,0 +1,10 @@
+import frappe
+
+
+@frappe.whitelist(allow_guest=True)
+def get_app_details():
+	return {
+		"app_logo": frappe.get_website_settings("app_logo") or "default",
+		"app_name": frappe.get_website_settings("app_logo") or "default",
+		"app_footer_logo": frappe.get_website_settings("app_logo") or "default",
+	}

From 6c82323434a3f896b776cd66941c35e0e22480dd Mon Sep 17 00:00:00 2001
From: Saurabh <saurabh6790@gmail.com>
Date: Wed, 17 Jul 2024 19:55:14 +0530
Subject: [PATCH 02/11] feat: separate component to set branding info

---
 dashboard/src/views/general/BrandLogo.vue | 46 +++++++++++++++++++++++
 dashboard/src/views/partials/LoginBox.vue | 38 +++++--------------
 dashboard/src2/data/branding.js           | 15 ++++++++
 press/api/utils.py                        | 13 +++++--
 4 files changed, 79 insertions(+), 33 deletions(-)
 create mode 100644 dashboard/src/views/general/BrandLogo.vue
 create mode 100644 dashboard/src2/data/branding.js

diff --git a/dashboard/src/views/general/BrandLogo.vue b/dashboard/src/views/general/BrandLogo.vue
new file mode 100644
index 0000000000..5948eba785
--- /dev/null
+++ b/dashboard/src/views/general/BrandLogo.vue
@@ -0,0 +1,46 @@
+<template>
+	<span v-if="header">
+		<img
+			v-if="brandDetails && brandDetails.app_logo"
+			:src="brandDetails.app_logo"
+			class="inline-block h-7 w-7"
+		/>
+		<FCLogo class="inline-block h-7 w-7" v-else />
+	</span>
+
+	<span v-else-if="footer">
+		<img
+			v-if="brandDetails && brandDetails.app_footer_logo"
+			:src="brandDetails.app_footer_logo"
+		/>
+		<FrappeLogo class="h-4" v-else />
+	</span>
+
+	<span v-else> </span>
+</template>
+<script>
+import FCLogo from '@/components/icons/FCLogo.vue';
+import FrappeLogo from '@/components/icons/FrappeLogo.vue';
+
+export default {
+	name: 'BrandLogo',
+	components: {
+		FCLogo,
+		FrappeLogo
+	},
+	props: ['header', 'footer'],
+	resources: {
+		brandDetails() {
+			return {
+				url: 'press.api.utils.get_brand_details',
+				auto: true
+			};
+		}
+	},
+	computed: {
+		brandDetails() {
+			return this.$resources.brandDetails.data;
+		}
+	}
+};
+</script>
diff --git a/dashboard/src/views/partials/LoginBox.vue b/dashboard/src/views/partials/LoginBox.vue
index 13d6b32ed7..34f987a5b4 100644
--- a/dashboard/src/views/partials/LoginBox.vue
+++ b/dashboard/src/views/partials/LoginBox.vue
@@ -4,11 +4,7 @@
 			<div class="flex" @dblclick="redirectForFrappeioAuth">
 				<slot name="logo">
 					<div class="mx-auto flex items-center space-x-2">
-						<img
-							v-if="brandDetails && brandDetails.app_logo"
-							:src="brandDetails.app_logo"
-						/>
-						<FCLogo class="inline-block h-7 w-7" v-else />
+						<BrandLogo :header="1" />
 						<span
 							class="select-none text-xl font-semibold tracking-tight text-gray-900"
 						>
@@ -31,33 +27,20 @@
 			</div>
 		</div>
 		<div class="absolute bottom-4 z-[1] flex w-full justify-center">
-			<img
-				v-if="brandDetails && brandDetails.app_footer_logo"
-				:src="brandDetails.app_footer_logo"
-			/>
-			<FrappeLogo class="h-4" v-else />
+			<BrandLogo :footer="1" />
 		</div>
 	</div>
 </template>
 
 <script>
-import FCLogo from '@/components/icons/FCLogo.vue';
-import FrappeLogo from '@/components/icons/FrappeLogo.vue';
+import BrandLogo from '@/views/general/BrandLogo.vue';
 import { notify } from '@/utils/toast';
 
 export default {
 	name: 'LoginBox',
 	props: ['title', 'logo'],
 	components: {
-		FCLogo,
-		FrappeLogo
-	},
-	data() {
-		return {
-			appLogo: '',
-			appName: 'Frappe Cloud',
-			appFooterLogo: ''
-		};
+		BrandLogo
 	},
 	mounted() {
 		const params = new URLSearchParams(window.location.search);
@@ -76,19 +59,16 @@ export default {
 		}
 	},
 	resources: {
-		brandDetails() {
+		appName() {
 			return {
-				url: 'press.api.utils.get_app_details',
-				auto: true,
-				onSuccess(data) {
-					console.log(data);
-				}
+				url: 'press.api.utils.get_app_name',
+				auto: true
 			};
 		}
 	},
 	computed: {
-		brandDetails() {
-			return this.$resources.brandDetails.data || '';
+		appName() {
+			return this.$resources.appName.data;
 		}
 	}
 };
diff --git a/dashboard/src2/data/branding.js b/dashboard/src2/data/branding.js
new file mode 100644
index 0000000000..278ed6c22d
--- /dev/null
+++ b/dashboard/src2/data/branding.js
@@ -0,0 +1,15 @@
+import { createResource } from 'frappe-ui';
+
+export let BrandInfo = createResource({
+	url: 'press.api.utils.get_brand_details',
+	cache: 'site.brand',
+	initialData: []
+});
+
+export function fetchBrandInfo() {
+	BrandInfo.fetch();
+}
+
+export function getBrandInfo() {
+	return brand.data || [];
+}
diff --git a/press/api/utils.py b/press/api/utils.py
index 75d2ef8fd2..18fde2744d 100644
--- a/press/api/utils.py
+++ b/press/api/utils.py
@@ -2,9 +2,14 @@
 
 
 @frappe.whitelist(allow_guest=True)
-def get_app_details():
+def get_brand_details():
 	return {
-		"app_logo": frappe.get_website_settings("app_logo") or "default",
-		"app_name": frappe.get_website_settings("app_logo") or "default",
-		"app_footer_logo": frappe.get_website_settings("app_logo") or "default",
+		"app_logo": frappe.get_website_settings("app_logo"),
+		"app_name": frappe.get_website_settings("app_name"),
+		"app_footer_logo": frappe.get_website_settings("footer_logo"),
 	}
+
+
+@frappe.whitelist(allow_guest=True)
+def get_app_name():
+	return frappe.get_website_settings("app_name") or "Frappe Cloud"

From 089546ea462477c832cb0b275ff4f9ea6d60f704 Mon Sep 17 00:00:00 2001
From: Saurabh <saurabh6790@gmail.com>
Date: Thu, 18 Jul 2024 19:49:26 +0530
Subject: [PATCH 03/11] feat: use src2

---
 dashboard/src/views/partials/LoginBox.vue     | 25 ++++++-------------
 dashboard/src2/components/AppSidebar.vue      | 15 ++++++++---
 .../general => src2/components}/BrandLogo.vue | 11 ++------
 dashboard/src2/components/auth/LoginBox.vue   | 19 ++++++++------
 dashboard/src2/data/branding.js               |  2 +-
 dashboard/src2/main.js                        |  3 +++
 6 files changed, 37 insertions(+), 38 deletions(-)
 rename dashboard/{src/views/general => src2/components}/BrandLogo.vue (81%)

diff --git a/dashboard/src/views/partials/LoginBox.vue b/dashboard/src/views/partials/LoginBox.vue
index 34f987a5b4..364ca87697 100644
--- a/dashboard/src/views/partials/LoginBox.vue
+++ b/dashboard/src/views/partials/LoginBox.vue
@@ -4,11 +4,11 @@
 			<div class="flex" @dblclick="redirectForFrappeioAuth">
 				<slot name="logo">
 					<div class="mx-auto flex items-center space-x-2">
-						<BrandLogo :header="1" />
+						<FCLogo class="inline-block h-7 w-7" />
 						<span
 							class="select-none text-xl font-semibold tracking-tight text-gray-900"
 						>
-							{{ appName }}
+							Frappe Cloud
 						</span>
 					</div>
 				</slot>
@@ -27,20 +27,22 @@
 			</div>
 		</div>
 		<div class="absolute bottom-4 z-[1] flex w-full justify-center">
-			<BrandLogo :footer="1" />
+			<FrappeLogo class="h-4" />
 		</div>
 	</div>
 </template>
 
 <script>
-import BrandLogo from '@/views/general/BrandLogo.vue';
+import FCLogo from '@/components/icons/FCLogo.vue';
+import FrappeLogo from '@/components/icons/FrappeLogo.vue';
 import { notify } from '@/utils/toast';
 
 export default {
 	name: 'LoginBox',
 	props: ['title', 'logo'],
 	components: {
-		BrandLogo
+		FCLogo,
+		FrappeLogo
 	},
 	mounted() {
 		const params = new URLSearchParams(window.location.search);
@@ -57,19 +59,6 @@ export default {
 		redirectForFrappeioAuth() {
 			window.location = '/f-login';
 		}
-	},
-	resources: {
-		appName() {
-			return {
-				url: 'press.api.utils.get_app_name',
-				auto: true
-			};
-		}
-	},
-	computed: {
-		appName() {
-			return this.$resources.appName.data;
-		}
 	}
 };
 </script>
diff --git a/dashboard/src2/components/AppSidebar.vue b/dashboard/src2/components/AppSidebar.vue
index d40ac073e6..d993816c7b 100644
--- a/dashboard/src2/components/AppSidebar.vue
+++ b/dashboard/src2/components/AppSidebar.vue
@@ -32,10 +32,10 @@
 						class="flex w-[204px] items-center rounded-md px-2 py-2 text-left"
 						:class="open ? 'bg-white shadow-sm' : 'hover:bg-gray-200'"
 					>
-						<FCLogo class="mb-1 h-8 w-8 shrink-0 rounded" />
+						<BrandLogo :header="true" />
 						<div class="ml-2 flex flex-1 flex-col overflow-hidden">
 							<div class="text-base font-medium leading-none text-gray-900">
-								Frappe Cloud
+								{{ appName }}
 							</div>
 							<Tooltip :text="$team?.doc?.user || null">
 								<div
@@ -92,6 +92,8 @@ import { defineAsyncComponent } from 'vue';
 import AppSidebarItem from './AppSidebarItem.vue';
 import { Tooltip } from 'frappe-ui';
 import NavigationItems from './NavigationItems.vue';
+import { getBrandInfo } from '../data/branding';
+import BrandLogo from './BrandLogo.vue';
 
 export default {
 	name: 'AppSidebar',
@@ -101,7 +103,8 @@ export default {
 			import('./SwitchTeamDialog.vue')
 		),
 		Tooltip,
-		NavigationItems
+		NavigationItems,
+		BrandLogo
 	},
 	data() {
 		return {
@@ -118,6 +121,12 @@ export default {
 				'_blank'
 			);
 		}
+	},
+	compute: {
+		appName() {
+			let brandInfo = getBrandInfo();
+			return brandInfo.app_name;
+		}
 	}
 };
 </script>
diff --git a/dashboard/src/views/general/BrandLogo.vue b/dashboard/src2/components/BrandLogo.vue
similarity index 81%
rename from dashboard/src/views/general/BrandLogo.vue
rename to dashboard/src2/components/BrandLogo.vue
index 5948eba785..bae3194f39 100644
--- a/dashboard/src/views/general/BrandLogo.vue
+++ b/dashboard/src2/components/BrandLogo.vue
@@ -21,6 +21,7 @@
 <script>
 import FCLogo from '@/components/icons/FCLogo.vue';
 import FrappeLogo from '@/components/icons/FrappeLogo.vue';
+import { getBrandInfo } from '../data/branding';
 
 export default {
 	name: 'BrandLogo',
@@ -29,17 +30,9 @@ export default {
 		FrappeLogo
 	},
 	props: ['header', 'footer'],
-	resources: {
-		brandDetails() {
-			return {
-				url: 'press.api.utils.get_brand_details',
-				auto: true
-			};
-		}
-	},
 	computed: {
 		brandDetails() {
-			return this.$resources.brandDetails.data;
+			return getBrandInfo();
 		}
 	}
 };
diff --git a/dashboard/src2/components/auth/LoginBox.vue b/dashboard/src2/components/auth/LoginBox.vue
index 364ca87697..efdf0d15a7 100644
--- a/dashboard/src2/components/auth/LoginBox.vue
+++ b/dashboard/src2/components/auth/LoginBox.vue
@@ -4,11 +4,11 @@
 			<div class="flex" @dblclick="redirectForFrappeioAuth">
 				<slot name="logo">
 					<div class="mx-auto flex items-center space-x-2">
-						<FCLogo class="inline-block h-7 w-7" />
+						<BrandLogo :header="true" />
 						<span
 							class="select-none text-xl font-semibold tracking-tight text-gray-900"
 						>
-							Frappe Cloud
+							{{ appName }}
 						</span>
 					</div>
 				</slot>
@@ -27,22 +27,21 @@
 			</div>
 		</div>
 		<div class="absolute bottom-4 z-[1] flex w-full justify-center">
-			<FrappeLogo class="h-4" />
+			<BrandLogo :footer="true" />
 		</div>
 	</div>
 </template>
 
 <script>
-import FCLogo from '@/components/icons/FCLogo.vue';
-import FrappeLogo from '@/components/icons/FrappeLogo.vue';
+import BrandLogo from '../BrandLogo.vue';
 import { notify } from '@/utils/toast';
+import { getBrandInfo } from '../../data/branding';
 
 export default {
 	name: 'LoginBox',
 	props: ['title', 'logo'],
 	components: {
-		FCLogo,
-		FrappeLogo
+		BrandLogo
 	},
 	mounted() {
 		const params = new URLSearchParams(window.location.search);
@@ -59,6 +58,12 @@ export default {
 		redirectForFrappeioAuth() {
 			window.location = '/f-login';
 		}
+	},
+	computed: {
+		appName() {
+			let brandDetails = getBrandInfo();
+			return brandDetails.app_name;
+		}
 	}
 };
 </script>
diff --git a/dashboard/src2/data/branding.js b/dashboard/src2/data/branding.js
index 278ed6c22d..4935908d7b 100644
--- a/dashboard/src2/data/branding.js
+++ b/dashboard/src2/data/branding.js
@@ -11,5 +11,5 @@ export function fetchBrandInfo() {
 }
 
 export function getBrandInfo() {
-	return brand.data || [];
+	return BrandInfo.data || [];
 }
diff --git a/dashboard/src2/main.js b/dashboard/src2/main.js
index 405e798bda..397287e313 100644
--- a/dashboard/src2/main.js
+++ b/dashboard/src2/main.js
@@ -14,6 +14,7 @@ import * as Sentry from '@sentry/vue';
 import { session } from './data/session.js';
 import posthog from 'posthog-js';
 import { toast } from 'vue-sonner';
+import { fetchBrandInfo } from './data/branding.js';
 
 let request = options => {
 	let _options = options || {};
@@ -50,6 +51,8 @@ getInitialData().then(() => {
 	app.config.globalProperties.$socket = socket;
 	window.$socket = socket;
 	subscribeToJobUpdates(socket);
+	fetchBrandInfo();
+
 	if (session.isLoggedIn) {
 		fetchPlans();
 		session.roles.fetch();

From a1fefc12ef02a2faa8d450e201570ff362d76a7b Mon Sep 17 00:00:00 2001
From: Saurabh <saurabh6790@gmail.com>
Date: Fri, 19 Jul 2024 17:28:39 +0530
Subject: [PATCH 04/11] feat: use typed props

---
 dashboard/src2/components/AppSidebar.vue    |  4 ++--
 dashboard/src2/components/BrandLogo.vue     | 10 +++++++---
 dashboard/src2/components/auth/LoginBox.vue |  4 ++--
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/dashboard/src2/components/AppSidebar.vue b/dashboard/src2/components/AppSidebar.vue
index d993816c7b..49683d60fc 100644
--- a/dashboard/src2/components/AppSidebar.vue
+++ b/dashboard/src2/components/AppSidebar.vue
@@ -32,7 +32,7 @@
 						class="flex w-[204px] items-center rounded-md px-2 py-2 text-left"
 						:class="open ? 'bg-white shadow-sm' : 'hover:bg-gray-200'"
 					>
-						<BrandLogo :header="true" />
+						<BrandLogo type="header" />
 						<div class="ml-2 flex flex-1 flex-col overflow-hidden">
 							<div class="text-base font-medium leading-none text-gray-900">
 								{{ appName }}
@@ -122,7 +122,7 @@ export default {
 			);
 		}
 	},
-	compute: {
+	computed: {
 		appName() {
 			let brandInfo = getBrandInfo();
 			return brandInfo.app_name;
diff --git a/dashboard/src2/components/BrandLogo.vue b/dashboard/src2/components/BrandLogo.vue
index bae3194f39..a52eb961a1 100644
--- a/dashboard/src2/components/BrandLogo.vue
+++ b/dashboard/src2/components/BrandLogo.vue
@@ -1,5 +1,5 @@
 <template>
-	<span v-if="header">
+	<span v-if="type == 'header'">
 		<img
 			v-if="brandDetails && brandDetails.app_logo"
 			:src="brandDetails.app_logo"
@@ -8,7 +8,7 @@
 		<FCLogo class="inline-block h-7 w-7" v-else />
 	</span>
 
-	<span v-else-if="footer">
+	<span v-else-if="type == 'footer'">
 		<img
 			v-if="brandDetails && brandDetails.app_footer_logo"
 			:src="brandDetails.app_footer_logo"
@@ -29,7 +29,11 @@ export default {
 		FCLogo,
 		FrappeLogo
 	},
-	props: ['header', 'footer'],
+	props: {
+		type: {
+			type: String
+		}
+	},
 	computed: {
 		brandDetails() {
 			return getBrandInfo();
diff --git a/dashboard/src2/components/auth/LoginBox.vue b/dashboard/src2/components/auth/LoginBox.vue
index efdf0d15a7..3eaab40f84 100644
--- a/dashboard/src2/components/auth/LoginBox.vue
+++ b/dashboard/src2/components/auth/LoginBox.vue
@@ -4,7 +4,7 @@
 			<div class="flex" @dblclick="redirectForFrappeioAuth">
 				<slot name="logo">
 					<div class="mx-auto flex items-center space-x-2">
-						<BrandLogo :header="true" />
+						<BrandLogo type="header" />
 						<span
 							class="select-none text-xl font-semibold tracking-tight text-gray-900"
 						>
@@ -27,7 +27,7 @@
 			</div>
 		</div>
 		<div class="absolute bottom-4 z-[1] flex w-full justify-center">
-			<BrandLogo :footer="true" />
+			<BrandLogo type="footer" />
 		</div>
 	</div>
 </template>

From 4c9d9784fedbd900a188d888ca71e1601d6e9989 Mon Sep 17 00:00:00 2001
From: Saurabh <saurabh6790@gmail.com>
Date: Mon, 22 Jul 2024 15:00:24 +0530
Subject: [PATCH 05/11] feat: provision to setup branding info

---
 .../press/doctype/brand_settings/__init__.py  |  0
 .../doctype/brand_settings/brand_settings.js  |  8 ++
 .../brand_settings/brand_settings.json        | 92 +++++++++++++++++++
 .../doctype/brand_settings/brand_settings.py  | 41 +++++++++
 .../brand_settings/test_brand_settings.py     |  9 ++
 5 files changed, 150 insertions(+)
 create mode 100644 press/press/doctype/brand_settings/__init__.py
 create mode 100644 press/press/doctype/brand_settings/brand_settings.js
 create mode 100644 press/press/doctype/brand_settings/brand_settings.json
 create mode 100644 press/press/doctype/brand_settings/brand_settings.py
 create mode 100644 press/press/doctype/brand_settings/test_brand_settings.py

diff --git a/press/press/doctype/brand_settings/__init__.py b/press/press/doctype/brand_settings/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/press/press/doctype/brand_settings/brand_settings.js b/press/press/doctype/brand_settings/brand_settings.js
new file mode 100644
index 0000000000..05f6f89a76
--- /dev/null
+++ b/press/press/doctype/brand_settings/brand_settings.js
@@ -0,0 +1,8 @@
+// Copyright (c) 2024, Frappe and contributors
+// For license information, please see license.txt
+
+// frappe.ui.form.on("Brand Settings", {
+// 	refresh(frm) {
+
+// 	},
+// });
diff --git a/press/press/doctype/brand_settings/brand_settings.json b/press/press/doctype/brand_settings/brand_settings.json
new file mode 100644
index 0000000000..366c0079db
--- /dev/null
+++ b/press/press/doctype/brand_settings/brand_settings.json
@@ -0,0 +1,92 @@
+{
+ "actions": [],
+ "allow_rename": 1,
+ "creation": "2024-07-22 14:06:23.709878",
+ "doctype": "DocType",
+ "engine": "InnoDB",
+ "field_order": [
+  "brand_section",
+  "brand_logo",
+  "footer_logo",
+  "column_break_oezy",
+  "brand_name",
+  "terms_section",
+  "terms_of_service",
+  "cookie_policy",
+  "column_break_gcuq",
+  "privacy_policy"
+ ],
+ "fields": [
+  {
+   "fieldname": "brand_section",
+   "fieldtype": "Section Break",
+   "label": "Brand"
+  },
+  {
+   "fieldname": "column_break_oezy",
+   "fieldtype": "Column Break"
+  },
+  {
+   "fieldname": "brand_name",
+   "fieldtype": "Data",
+   "label": "Brand Name"
+  },
+  {
+   "fieldname": "terms_section",
+   "fieldtype": "Section Break",
+   "label": "Terms"
+  },
+  {
+   "fieldname": "terms_of_service",
+   "fieldtype": "Data",
+   "label": "Terms of Service"
+  },
+  {
+   "fieldname": "cookie_policy",
+   "fieldtype": "Data",
+   "label": "Cookie Policy"
+  },
+  {
+   "fieldname": "column_break_gcuq",
+   "fieldtype": "Column Break"
+  },
+  {
+   "fieldname": "privacy_policy",
+   "fieldtype": "Data",
+   "label": "Privacy Policy"
+  },
+  {
+   "fieldname": "brand_logo",
+   "fieldtype": "Attach Image",
+   "label": "Brand Logo"
+  },
+  {
+   "fieldname": "footer_logo",
+   "fieldtype": "Attach Image",
+   "label": "Footer Logo"
+  }
+ ],
+ "index_web_pages_for_search": 1,
+ "issingle": 1,
+ "links": [],
+ "modified": "2024-07-22 14:31:18.289758",
+ "modified_by": "Administrator",
+ "module": "Press",
+ "name": "Brand Settings",
+ "owner": "Administrator",
+ "permissions": [
+  {
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "print": 1,
+   "read": 1,
+   "role": "System Manager",
+   "share": 1,
+   "write": 1
+  }
+ ],
+ "sort_field": "creation",
+ "sort_order": "DESC",
+ "states": []
+}
\ No newline at end of file
diff --git a/press/press/doctype/brand_settings/brand_settings.py b/press/press/doctype/brand_settings/brand_settings.py
new file mode 100644
index 0000000000..38aadd5c1e
--- /dev/null
+++ b/press/press/doctype/brand_settings/brand_settings.py
@@ -0,0 +1,41 @@
+# Copyright (c) 2024, Frappe and contributors
+# For license information, please see license.txt
+
+import frappe
+from frappe.model.document import Document
+
+
+class BrandSettings(Document):
+	# begin: auto-generated types
+	# This code is auto-generated. Do not modify anything in this block.
+
+	from typing import TYPE_CHECKING
+
+	if TYPE_CHECKING:
+		from frappe.types import DF
+
+		brand_logo: DF.AttachImage | None
+		brand_name: DF.Data | None
+		cookie_policy: DF.Data | None
+		footer_logo: DF.AttachImage | None
+		privacy_policy: DF.Data | None
+		terms_of_service: DF.Data | None
+	# end: auto-generated types
+
+	pass
+
+
+def get_brand_details():
+	brand_details = frappe.get_cached_doc("Brand Settings")
+
+	return {
+		"brand_logo": brand_details.get("brand_logo"),
+		"brand_name": brand_details.get("brand_name") or "Frappe Cloud",
+		"footer_logo": brand_details.get("footer_logo"),
+	}
+
+
+def get_brand_name():
+	brand_details = frappe.get_cached_doc("Brand Settings")
+	print(brand_details.as_dict())
+	return brand_details.get("brand_name") or "Frappe Cloud"
diff --git a/press/press/doctype/brand_settings/test_brand_settings.py b/press/press/doctype/brand_settings/test_brand_settings.py
new file mode 100644
index 0000000000..4715cf3e93
--- /dev/null
+++ b/press/press/doctype/brand_settings/test_brand_settings.py
@@ -0,0 +1,9 @@
+# Copyright (c) 2024, Frappe and Contributors
+# See license.txt
+
+# import frappe
+from frappe.tests.utils import FrappeTestCase
+
+
+class TestBrandSettings(FrappeTestCase):
+	pass

From 91ece140391058c6af8d9fad0f44d77661910a15 Mon Sep 17 00:00:00 2001
From: Saurabh <saurabh6790@gmail.com>
Date: Mon, 22 Jul 2024 15:01:18 +0530
Subject: [PATCH 06/11] fix: naming and api's

---
 dashboard/src2/components/AppSidebar.vue    |  6 +++---
 dashboard/src2/components/BrandLogo.vue     |  9 +++++----
 dashboard/src2/components/auth/LoginBox.vue |  6 +++---
 press/api/utils.py                          | 17 ++++++++++-------
 4 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/dashboard/src2/components/AppSidebar.vue b/dashboard/src2/components/AppSidebar.vue
index 49683d60fc..f6e819dc05 100644
--- a/dashboard/src2/components/AppSidebar.vue
+++ b/dashboard/src2/components/AppSidebar.vue
@@ -35,7 +35,7 @@
 						<BrandLogo type="header" />
 						<div class="ml-2 flex flex-1 flex-col overflow-hidden">
 							<div class="text-base font-medium leading-none text-gray-900">
-								{{ appName }}
+								{{ brandName }}
 							</div>
 							<Tooltip :text="$team?.doc?.user || null">
 								<div
@@ -123,9 +123,9 @@ export default {
 		}
 	},
 	computed: {
-		appName() {
+		brandName() {
 			let brandInfo = getBrandInfo();
-			return brandInfo.app_name;
+			return brandInfo.brand_name;
 		}
 	}
 };
diff --git a/dashboard/src2/components/BrandLogo.vue b/dashboard/src2/components/BrandLogo.vue
index a52eb961a1..2b4e6bad98 100644
--- a/dashboard/src2/components/BrandLogo.vue
+++ b/dashboard/src2/components/BrandLogo.vue
@@ -1,8 +1,8 @@
 <template>
 	<span v-if="type == 'header'">
 		<img
-			v-if="brandDetails && brandDetails.app_logo"
-			:src="brandDetails.app_logo"
+			v-if="brandDetails && brandDetails.brand_logo"
+			:src="brandDetails.brand_logo"
 			class="inline-block h-7 w-7"
 		/>
 		<FCLogo class="inline-block h-7 w-7" v-else />
@@ -10,8 +10,9 @@
 
 	<span v-else-if="type == 'footer'">
 		<img
-			v-if="brandDetails && brandDetails.app_footer_logo"
-			:src="brandDetails.app_footer_logo"
+			v-if="brandDetails && brandDetails.footer_logo"
+			:src="brandDetails.footer_logo"
+			class="h-4"
 		/>
 		<FrappeLogo class="h-4" v-else />
 	</span>
diff --git a/dashboard/src2/components/auth/LoginBox.vue b/dashboard/src2/components/auth/LoginBox.vue
index 3eaab40f84..75c4b1a612 100644
--- a/dashboard/src2/components/auth/LoginBox.vue
+++ b/dashboard/src2/components/auth/LoginBox.vue
@@ -8,7 +8,7 @@
 						<span
 							class="select-none text-xl font-semibold tracking-tight text-gray-900"
 						>
-							{{ appName }}
+							{{ brandName }}
 						</span>
 					</div>
 				</slot>
@@ -60,9 +60,9 @@ export default {
 		}
 	},
 	computed: {
-		appName() {
+		brandName() {
 			let brandDetails = getBrandInfo();
-			return brandDetails.app_name;
+			return brandDetails.brand_name;
 		}
 	}
 };
diff --git a/press/api/utils.py b/press/api/utils.py
index 18fde2744d..ee58017922 100644
--- a/press/api/utils.py
+++ b/press/api/utils.py
@@ -1,15 +1,18 @@
 import frappe
+from press.press.doctype.brand_settings.brand_settings import (
+	get_brand_details as _get_brand_details,
+	get_brand_name as _get_brand_name,
+)
 
 
 @frappe.whitelist(allow_guest=True)
 def get_brand_details():
-	return {
-		"app_logo": frappe.get_website_settings("app_logo"),
-		"app_name": frappe.get_website_settings("app_name"),
-		"app_footer_logo": frappe.get_website_settings("footer_logo"),
-	}
+	data = _get_brand_details()
+
+	print(data)
+	return _get_brand_details()
 
 
 @frappe.whitelist(allow_guest=True)
-def get_app_name():
-	return frappe.get_website_settings("app_name") or "Frappe Cloud"
+def get_brand_name():
+	return _get_brand_name() or "Frappe Cloud"

From 23fd8efb06b062c2ba6b353fe448576a32f488bf Mon Sep 17 00:00:00 2001
From: Saurabh <saurabh6790@gmail.com>
Date: Mon, 22 Jul 2024 15:29:53 +0530
Subject: [PATCH 07/11] feat: provision to setup terms and policies

---
 dashboard/src2/pages/SetupAccount.vue               | 13 +++++++------
 press/api/utils.py                                  |  3 ---
 .../doctype/brand_settings/brand_settings.json      |  5 ++++-
 .../press/doctype/brand_settings/brand_settings.py  |  7 ++++++-
 4 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/dashboard/src2/pages/SetupAccount.vue b/dashboard/src2/pages/SetupAccount.vue
index 8f6e50df40..da13c756d2 100644
--- a/dashboard/src2/pages/SetupAccount.vue
+++ b/dashboard/src2/pages/SetupAccount.vue
@@ -76,17 +76,14 @@
 								By clicking on
 								<span>{{ isInvitation ? 'Accept' : 'Create account' }}</span
 								>, you accept our
-								<Link href="https://frappecloud.com/terms" target="_blank"
+								<Link :href="policies.terms_of_service" target="_blank"
 									>Terms of Service </Link
 								>,
-								<Link href="https://frappecloud.com/privacy" target="_blank">
+								<Link :href="policies.privacy_policy" target="_blank">
 									Privacy Policy
 								</Link>
 								&#38;
-								<Link
-									href="https://frappecloud.com/cookie-policy"
-									target="_blank"
-								>
+								<Link :href="policies.cookie_policy" target="_blank">
 									Cookie Policy
 								</Link>
 							</label>
@@ -120,6 +117,7 @@ import LoginBox from '../components/auth/LoginBox.vue';
 import Link from '@/components/Link.vue';
 import Form from '@/components/Form.vue';
 import ProductSignupPitch from '../components/ProductSignupPitch.vue';
+import { getBrandInfo } from '../data/branding';
 
 export default {
 	name: 'SetupAccount',
@@ -221,6 +219,9 @@ export default {
 				df.required = true;
 				return df;
 			});
+		},
+		policies() {
+			return getBrandInfo();
 		}
 	}
 };
diff --git a/press/api/utils.py b/press/api/utils.py
index ee58017922..1e0f3c8d68 100644
--- a/press/api/utils.py
+++ b/press/api/utils.py
@@ -7,9 +7,6 @@
 
 @frappe.whitelist(allow_guest=True)
 def get_brand_details():
-	data = _get_brand_details()
-
-	print(data)
 	return _get_brand_details()
 
 
diff --git a/press/press/doctype/brand_settings/brand_settings.json b/press/press/doctype/brand_settings/brand_settings.json
index 366c0079db..0d64761874 100644
--- a/press/press/doctype/brand_settings/brand_settings.json
+++ b/press/press/doctype/brand_settings/brand_settings.json
@@ -37,11 +37,13 @@
    "label": "Terms"
   },
   {
+   "description": "Define full URL like https://frappecloud.com/terms",
    "fieldname": "terms_of_service",
    "fieldtype": "Data",
    "label": "Terms of Service"
   },
   {
+   "description": "Define full URL like https://frappecloud.com/cookie-policy",
    "fieldname": "cookie_policy",
    "fieldtype": "Data",
    "label": "Cookie Policy"
@@ -51,6 +53,7 @@
    "fieldtype": "Column Break"
   },
   {
+   "description": "Define full URL like https://frappecloud.com/privacy",
    "fieldname": "privacy_policy",
    "fieldtype": "Data",
    "label": "Privacy Policy"
@@ -69,7 +72,7 @@
  "index_web_pages_for_search": 1,
  "issingle": 1,
  "links": [],
- "modified": "2024-07-22 14:31:18.289758",
+ "modified": "2024-07-22 15:27:04.394302",
  "modified_by": "Administrator",
  "module": "Press",
  "name": "Brand Settings",
diff --git a/press/press/doctype/brand_settings/brand_settings.py b/press/press/doctype/brand_settings/brand_settings.py
index 38aadd5c1e..0f6399f695 100644
--- a/press/press/doctype/brand_settings/brand_settings.py
+++ b/press/press/doctype/brand_settings/brand_settings.py
@@ -32,10 +32,15 @@ def get_brand_details():
 		"brand_logo": brand_details.get("brand_logo"),
 		"brand_name": brand_details.get("brand_name") or "Frappe Cloud",
 		"footer_logo": brand_details.get("footer_logo"),
+		"terms_of_service": brand_details.get("terms_of_service")
+		or "https://frappecloud.com/terms",
+		"cookie_policy": brand_details.get("cookie_policy")
+		or "https://frappecloud.com/cookie-policy",
+		"privacy_policy": brand_details.get("privacy_policy")
+		or "https://frappecloud.com/privacy",
 	}
 
 
 def get_brand_name():
 	brand_details = frappe.get_cached_doc("Brand Settings")
-	print(brand_details.as_dict())
 	return brand_details.get("brand_name") or "Frappe Cloud"

From aa34fef6dd328ff7b74ca07ae46c94d8539fe536 Mon Sep 17 00:00:00 2001
From: Saurabh <saurabh6790@gmail.com>
Date: Mon, 22 Jul 2024 18:36:12 +0530
Subject: [PATCH 08/11] feat: provision to setup custom welcome message while
 onboarding customer

---
 dashboard/src2/components/Onboarding.vue      | 26 +++++++++++++++++--
 press/api/utils.py                            |  6 +++++
 .../brand_settings/brand_settings.json        | 16 ++++++++++--
 .../doctype/brand_settings/brand_settings.py  |  5 ++++
 4 files changed, 49 insertions(+), 4 deletions(-)

diff --git a/dashboard/src2/components/Onboarding.vue b/dashboard/src2/components/Onboarding.vue
index 8f1cbe5351..3f402f448c 100644
--- a/dashboard/src2/components/Onboarding.vue
+++ b/dashboard/src2/components/Onboarding.vue
@@ -1,8 +1,11 @@
 <template>
 	<div class="mx-auto max-w-2xl rounded-lg border-0 px-2 sm:border sm:p-8">
 		<div class="prose prose-sm max-w-none">
-			<h1 class="text-2xl font-semibold">Welcome to Frappe Cloud</h1>
-			<p>
+			<h1 class="text-2xl font-semibold">Welcome to {{ brandName }}</h1>
+			<p v-if="onboarding">
+				{{ onboarding.message }}
+			</p>
+			<p v-else>
 				Frappe Cloud makes it easy to manage sites and apps like ERPNext in an
 				easy to use dashboard with powerful features like automatic backups,
 				custom domains, SSL certificates, custom apps, automatic updates and
@@ -266,6 +269,7 @@
 <script>
 import { defineAsyncComponent } from 'vue';
 import TextInsideCircle from './TextInsideCircle.vue';
+// import { fetchOnboardingDetails } from '../data/branding';
 
 export default {
 	name: 'Onboarding',
@@ -340,6 +344,12 @@ export default {
 		},
 		trialSite() {
 			return this.$team.doc.trial_sites?.[0];
+		},
+		onboarding() {
+			return this.$resources.onboardingDetails.data;
+		},
+		brandName() {
+			return this.$resources.brandName.data;
 		}
 	},
 	resources: {
@@ -348,6 +358,18 @@ export default {
 				url: 'press.api.marketplace.get_marketplace_apps_for_onboarding',
 				auto: true
 			};
+		},
+		onboardingDetails() {
+			return {
+				url: 'press.api.utils.get_onboarding_details',
+				auto: true
+			};
+		},
+		brandName() {
+			return {
+				url: 'press.api.utils.get_brand_name',
+				auto: true
+			};
 		}
 	}
 };
diff --git a/press/api/utils.py b/press/api/utils.py
index 1e0f3c8d68..f7502e12b9 100644
--- a/press/api/utils.py
+++ b/press/api/utils.py
@@ -2,6 +2,7 @@
 from press.press.doctype.brand_settings.brand_settings import (
 	get_brand_details as _get_brand_details,
 	get_brand_name as _get_brand_name,
+	get_onboarding_message,
 )
 
 
@@ -13,3 +14,8 @@ def get_brand_details():
 @frappe.whitelist(allow_guest=True)
 def get_brand_name():
 	return _get_brand_name() or "Frappe Cloud"
+
+
+@frappe.whitelist(allow_guest=True)
+def get_onboarding_details():
+	return {"message": get_onboarding_message()}
diff --git a/press/press/doctype/brand_settings/brand_settings.json b/press/press/doctype/brand_settings/brand_settings.json
index 0d64761874..a7b6808bc2 100644
--- a/press/press/doctype/brand_settings/brand_settings.json
+++ b/press/press/doctype/brand_settings/brand_settings.json
@@ -14,7 +14,9 @@
   "terms_of_service",
   "cookie_policy",
   "column_break_gcuq",
-  "privacy_policy"
+  "privacy_policy",
+  "onboarding_tab",
+  "onboarding_message"
  ],
  "fields": [
   {
@@ -67,12 +69,22 @@
    "fieldname": "footer_logo",
    "fieldtype": "Attach Image",
    "label": "Footer Logo"
+  },
+  {
+   "fieldname": "onboarding_tab",
+   "fieldtype": "Tab Break",
+   "label": "Onboarding"
+  },
+  {
+   "fieldname": "onboarding_message",
+   "fieldtype": "Text",
+   "label": "Onboarding Message"
   }
  ],
  "index_web_pages_for_search": 1,
  "issingle": 1,
  "links": [],
- "modified": "2024-07-22 15:27:04.394302",
+ "modified": "2024-07-22 16:22:33.080437",
  "modified_by": "Administrator",
  "module": "Press",
  "name": "Brand Settings",
diff --git a/press/press/doctype/brand_settings/brand_settings.py b/press/press/doctype/brand_settings/brand_settings.py
index 0f6399f695..dbf9596120 100644
--- a/press/press/doctype/brand_settings/brand_settings.py
+++ b/press/press/doctype/brand_settings/brand_settings.py
@@ -18,6 +18,7 @@ class BrandSettings(Document):
 		brand_name: DF.Data | None
 		cookie_policy: DF.Data | None
 		footer_logo: DF.AttachImage | None
+		onboarding_message: DF.Text | None
 		privacy_policy: DF.Data | None
 		terms_of_service: DF.Data | None
 	# end: auto-generated types
@@ -44,3 +45,7 @@ def get_brand_details():
 def get_brand_name():
 	brand_details = frappe.get_cached_doc("Brand Settings")
 	return brand_details.get("brand_name") or "Frappe Cloud"
+
+
+def get_onboarding_message():
+	return frappe.db.get_single_value("Brand Settings", "onboarding_message")

From f1fc762487d6739aa3cd0dd43974262e392f3d07 Mon Sep 17 00:00:00 2001
From: Saurabh <saurabh6790@gmail.com>
Date: Wed, 26 Jun 2024 19:18:49 +0530
Subject: [PATCH 09/11] feat: provision to disable frappe-io auth dependency

---
 press/api/marketplace.py                          |  5 ++++-
 press/api/partner.py                              | 15 ++++++++++++++-
 press/press/doctype/invoice/invoice.py            | 12 +++++++++++-
 .../doctype/press_settings/press_settings.json    |  7 +++++++
 press/press/doctype/team/team.py                  |  8 ++++++--
 .../team_deletion_request.py                      |  5 ++++-
 press/utils/billing.py                            |  4 ++++
 7 files changed, 50 insertions(+), 6 deletions(-)

diff --git a/press/api/marketplace.py b/press/api/marketplace.py
index ab5dd85fd7..8d4bff373d 100644
--- a/press/api/marketplace.py
+++ b/press/api/marketplace.py
@@ -25,7 +25,7 @@
 	get_plans_for_app,
 )
 from press.utils import get_app_tag, get_current_team, get_last_doc, unique
-from press.utils.billing import get_frappe_io_connection
+from press.utils.billing import get_frappe_io_connection, disabled_frappeio_auth
 
 
 @frappe.whitelist()
@@ -996,6 +996,9 @@ def get_discount_percent(plan, discount=0.0):
 		"Bronze": 30.0,
 	}
 
+	if disabled_frappeio_auth():
+		return discount
+
 	if team.erpnext_partner and frappe.get_value(
 		"Marketplace App Plan", plan, "partner_discount"
 	):
diff --git a/press/api/partner.py b/press/api/partner.py
index cdb8e1464c..733d2e2242 100644
--- a/press/api/partner.py
+++ b/press/api/partner.py
@@ -45,7 +45,20 @@ def update_partnership_date(team, partnership_date):
 
 @frappe.whitelist()
 def get_partner_details(partner_email):
-	from press.utils.billing import get_frappe_io_connection
+	from press.utils.billing import get_frappe_io_connection, disabled_frappeio_auth
+
+	if disabled_frappeio_auth():
+		return frappe._dict(
+			{
+				"email": "",
+				"partner_type": "",
+				"company_name": "",
+				"custom_ongoing_period_fc_invoice_contribution": "",
+				"custom_ongoing_period_enterprise_invoice_contribution": "",
+				"partner_name": "",
+				"custom_number_of_certified_members": "",
+			}
+		)
 
 	client = get_frappe_io_connection()
 	data = client.get_doc(
diff --git a/press/press/doctype/invoice/invoice.py b/press/press/doctype/invoice/invoice.py
index c1e077dfa7..65cd9d11d4 100644
--- a/press/press/doctype/invoice/invoice.py
+++ b/press/press/doctype/invoice/invoice.py
@@ -12,7 +12,11 @@
 from press.api.client import dashboard_whitelist
 from press.overrides import get_permission_query_conditions_for_doctype
 from press.utils import log_error
-from press.utils.billing import convert_stripe_money, get_frappe_io_connection
+from press.utils.billing import (
+	convert_stripe_money,
+	get_frappe_io_connection,
+	disabled_frappeio_auth
+)
 
 
 class Invoice(Document):
@@ -762,6 +766,9 @@ def create_invoice_on_frappeio(self):
 			return
 
 		try:
+			if disabled_frappeio_auth():
+				return
+
 			team = frappe.get_doc("Team", self.team)
 			address = (
 				frappe.get_doc("Address", team.billing_address) if team.billing_address else None
@@ -815,6 +822,9 @@ def fetch_invoice_pdf(self):
 		if self.frappe_invoice:
 			from urllib.parse import urlencode
 
+			if disabled_frappeio_auth():
+				return
+
 			client = self.get_frappeio_connection()
 			print_format = frappe.db.get_single_value("Press Settings", "print_format")
 			params = urlencode(
diff --git a/press/press/doctype/press_settings/press_settings.json b/press/press/doctype/press_settings/press_settings.json
index 7fd1812bc6..81433f3864 100644
--- a/press/press/doctype/press_settings/press_settings.json
+++ b/press/press/doctype/press_settings/press_settings.json
@@ -43,6 +43,7 @@
   "erpnext_api_secret",
   "column_break_38",
   "frappeio_authentication_section",
+  "disable_frappe_auth",
   "frappe_url",
   "frappeio_api_key",
   "column_break_39",
@@ -1204,6 +1205,12 @@
    "fieldname": "branch",
    "fieldtype": "Data",
    "label": "Branch"
+  },
+  {
+    "default": "0",
+    "fieldname": "disable_frappe_auth",
+    "fieldtype": "Check",
+    "label": "Disable Frappe Auth"
   }
  ],
  "issingle": 1,
diff --git a/press/press/doctype/team/team.py b/press/press/doctype/team/team.py
index b23535348b..bc13aa4a3b 100644
--- a/press/press/doctype/team/team.py
+++ b/press/press/doctype/team/team.py
@@ -22,6 +22,7 @@
 	get_frappe_io_connection,
 	get_stripe,
 	process_micro_debit_test_charge,
+	disabled_frappeio_auth,
 )
 from press.utils.telemetry import capture
 
@@ -476,7 +477,7 @@ def create_partner_referral_code(self):
 			self.save(ignore_permissions=True)
 
 	def get_partnership_start_date(self):
-		if frappe.flags.in_test:
+		if frappe.flags.in_test or disabled_frappeio_auth():
 			return frappe.utils.getdate()
 
 		client = get_frappe_io_connection()
@@ -640,7 +641,7 @@ def update_billing_details_on_draft_invoices(self):
 			frappe.get_doc("Invoice", draft_invoice).save()
 
 	def update_billing_details_on_frappeio(self):
-		if frappe.flags.in_install:
+		if frappe.flags.in_install or disabled_frappeio_auth():
 			return
 
 		try:
@@ -947,6 +948,9 @@ def billing_details(self, timezone=None):
 
 	def get_partner_level(self):
 		# fetch partner level from frappe.io
+		if disabled_frappeio_auth():
+			return "", ""
+
 		client = get_frappe_io_connection()
 		response = client.session.get(
 			f"{client.url}/api/method/get_partner_level",
diff --git a/press/press/doctype/team_deletion_request/team_deletion_request.py b/press/press/doctype/team_deletion_request/team_deletion_request.py
index a3bb826f50..39042ac295 100644
--- a/press/press/doctype/team_deletion_request/team_deletion_request.py
+++ b/press/press/doctype/team_deletion_request/team_deletion_request.py
@@ -169,7 +169,10 @@ def delete_stripe_customer(self):
 	@handle_exc
 	def delete_data_on_frappeio(self):
 		"""Anonymize data on frappe.io"""
-		from press.utils.billing import get_frappe_io_connection
+		from press.utils.billing import get_frappe_io_connection, disabled_frappeio_auth
+
+		if disabled_frappeio_auth():
+			return
 
 		client = get_frappe_io_connection()
 		response = client.session.delete(
diff --git a/press/utils/billing.py b/press/utils/billing.py
index e0d451dfc8..42288b6fb9 100644
--- a/press/utils/billing.py
+++ b/press/utils/billing.py
@@ -77,6 +77,10 @@ def get_erpnext_com_connection():
 	)
 
 
+def disabled_frappeio_auth():
+	return frappe.db.get_single_value("Press Settings", "disable_frappe_auth", cache=True)
+
+
 def get_frappe_io_connection():
 	if hasattr(frappe.local, "press_frappeio_conn"):
 		return frappe.local.press_frappeio_conn

From db0b13e089ab95d1c829df1e2ad0d7fcc94d015d Mon Sep 17 00:00:00 2001
From: Tanmoy Sarkar <57363826+tanmoysrt@users.noreply.github.com>
Date: Fri, 30 Aug 2024 17:59:17 +0530
Subject: [PATCH 10/11] feat: add secret key as normal field (#2116)

---
 press/press/doctype/subscription/subscription.json | 10 ++++++++--
 press/press/doctype/subscription/subscription.py   |  1 +
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/press/press/doctype/subscription/subscription.json b/press/press/doctype/subscription/subscription.json
index d486d67a72..59dc34198b 100644
--- a/press/press/doctype/subscription/subscription.json
+++ b/press/press/doctype/subscription/subscription.json
@@ -15,7 +15,8 @@
   "interval",
   "site",
   "marketplace_app_subscription",
-  "additional_storage"
+  "additional_storage",
+  "secret_key"
  ],
  "fields": [
   {
@@ -89,6 +90,11 @@
    "fieldname": "additional_storage",
    "fieldtype": "Data",
    "label": "Additional Storage"
+  },
+  {
+   "fieldname": "secret_key",
+   "fieldtype": "Data",
+   "label": "Secret Key"
   }
  ],
  "index_web_pages_for_search": 1,
@@ -98,7 +104,7 @@
    "link_fieldname": "subscription"
   }
  ],
- "modified": "2024-06-26 18:32:18.087251",
+ "modified": "2024-08-30 12:55:23.639210",
  "modified_by": "Administrator",
  "module": "Press",
  "name": "Subscription",
diff --git a/press/press/doctype/subscription/subscription.py b/press/press/doctype/subscription/subscription.py
index bec0a56a3f..9879a86fd4 100644
--- a/press/press/doctype/subscription/subscription.py
+++ b/press/press/doctype/subscription/subscription.py
@@ -31,6 +31,7 @@ class Subscription(Document):
 		marketplace_app_subscription: DF.Link | None
 		plan: DF.DynamicLink
 		plan_type: DF.Link
+		secret_key: DF.Data | None
 		site: DF.Link | None
 		team: DF.Link
 	# end: auto-generated types

From d601256ffd510d073de378c38838e78372dbb672 Mon Sep 17 00:00:00 2001
From: Tanmoy Sarkar <57363826+tanmoysrt@users.noreply.github.com>
Date: Fri, 30 Aug 2024 18:27:50 +0530
Subject: [PATCH 11/11] feat: move secret_key creation logic to code (#2118)

---
 press/press/doctype/subscription/subscription.py | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/press/press/doctype/subscription/subscription.py b/press/press/doctype/subscription/subscription.py
index 9879a86fd4..af41eb9071 100644
--- a/press/press/doctype/subscription/subscription.py
+++ b/press/press/doctype/subscription/subscription.py
@@ -83,6 +83,14 @@ def get_list_query(query, **list_args):
 
 		return query.run(as_dict=True)
 
+	def before_validate(self):
+		if not self.secret_key and self.document_type == "Marketplace App":
+			self.secret_key = frappe.utils.generate_hash(length=40)
+			if not frappe.db.exists("Site Config Key", {"key": f"sk_{self.document_name}"}):
+				frappe.get_doc(
+					doctype="Site Config Key", internal=True, key=f"sk_{self.document_name}"
+				).insert(ignore_permissions=True)
+
 	def validate(self):
 		self.validate_duplicate()