From 8d684e1d03c9fc359816b19a6b74d3498b4c3ac4 Mon Sep 17 00:00:00 2001
From: Paul Happy Hutchinson <paul.hutchinson@deskpro.com>
Date: Fri, 21 Mar 2025 10:31:32 +0000
Subject: [PATCH 1/2] Update secrets and branding for one-click

---
 manifest.json       | 14 ++++++++------
 src/pages/LogIn.tsx |  6 +++---
 src/types.ts        |  2 +-
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/manifest.json b/manifest.json
index e3d9878..ee6bdf1 100644
--- a/manifest.json
+++ b/manifest.json
@@ -8,7 +8,7 @@
   "isSingleInstall": false,
   "hasDevMode": true,
   "serveUrl": "https://apps-cdn.deskpro-service.com/__name__/__version__",
-  "secrets": "/r+RcJoWFqSX9UdSTGP2ViJRiZPqnjCPCpYxeoMHDD2Wr6eNNStVr5XtlWEqxVabmS2cyv0UWSalw5TjIV2foqVzw76o57fm1kuak+lyky3ezVuWrDEi4I808WzI70ZGFtO9JfB1HpMkvJ6/3rT2/W7KE2QnR2ZYoaJ0svQ+LRnUvcj2rfigf5S3ZMUQ/aX+0O8chQJmEdLBJ1Tkzksc05OlVXBnugUZ799SYBocM4O9zhp8GQnmWZlxNi0t4vuxs9FCR/7WxwgPcUhu3fi7ngzalc9pzzXhJ2IsawjUC82IypHzIi+JErOTACVXqBcsdDvAYmWw7qt1FLoUwLzFYWyBgYl8scH6dDSY6mndJIguZQH5+k2ZqFtpSsBgMHsvX0mjsnbqt+d0qdIs4/P9RK4AvLXvssJ5xZBu1ipPxfmC9rAN9yeKwlOMr4GlJry5iMKoPxc3CM24J8algEWikkcMuM6da1mh9NTdB0yL2cmYovE2xWLrqwS81BpfZ4rsC+OUOr8RI6hS61/pltXBqrm2ia7R7krw4WD4beEsJFxM+mhwj6VD7KWCDDfIjR72cnaZ/AEbD80pjJITLrgysm1E1BxFYyF+yScd0Oh/dLUTHlQXM8DLQ2dc4YiAdHU+O30MbNs7KbWSq5oqyDP4AjseUTOSvuPczr0EhcpnkgyK95pj/WsUK6S4dBIuFun7b8+L1Avk3jYCcx7hahm4blYZ1OpogunXCHhOVByjIJniVrVWbgLTc3xplj7rxMkdo5ybCFqAzf5LA++Lvf6zv2XJiyHK6B3Q9OwxA4/XfNcQzTCw3FvepqFMugSprLYw2OB5fdNGZyOyyhXY0wfQ56rrIBDZA6uxqNeLM7mm2ZN4ELkWF1LNCFYcHmkEUT6r+Cd+8HQP/WnBfXug2kwpzB5Y/DEr1cId1mQK9MariIN4+YzyaYI6YQ4SAgWG/BN6Cg7U3zwY/ojMuNw7NKwHRX+fm7t7ax9AS6joOOYaViyh3RE4hpVmzXnaVM3cJLujbJ36oAlR6c0M/H1TppF9KlWLXA1xcjlP8PuMMowwffBvXg4Hnkw1ERfbRNBrLXYRx1lWXOZdzs0/VwaYoJomVuvfMtVZgpjoPLaWySIBT2I=",
+  "secrets": "b6wUnZTx8/uJbsBUul9gGJ/wAP6sHtZlVMZgThDKH+ePNtHUNWKsiZ2e9O6zMPDOxhY/OhxHpTXvQB1zg0qdH3KPrAMelfFQGAW0wICRxO6ZCaShgnGn5BrMhISfqiupW7wLS8/AjZ8/AgS90smKmMSyZ0GhFxZEpitpnB8BT4Eb8jfM3FEQO9dRZXMkrgl+zGEKHc/Urx0siCwmLyqBMehKvoV+cM2RmwiPZtoXLlqSLLIfExBYZKf5hUWnduKolUxuHOoBe8CTVCjzKm+WdyeAfLwgPVxKDxqUz5zHx8s5grY1aCC1ZcXj34CtJ/XioXcAI4qT9Q89YqfQJrjb1DwWe2IJG9JdxkMDKQ6qCy+v00v3jcZnyIfkT2ZumeVoIN3rwFsa4zosf2vho+HykbMCTOjbmETsPUaFHgVG6eJL8bcl/cjsSeBZ4EeGnJ0ogedben6NOvADM997R6WFQreEqQljbKyMnv0n2I/WY1HZJ5stqIwZysD123Cj487FGck3Pq+KY8B5LYjx34JIRjuigS/g0wOfuaq4HxH5qCD3SnRprUF8dHg5v3Yj8XqgqGVt46Nzb8YfyeybKOGPxlR4JxWcrqhC9g/hHU/F/VZH2tvgklnJxqtaI4wug49b/aSVEltaNt0+ev6LrwuJxaynJRKU1DaQUNw2+ObcOtON3fIfCS+n/h5u5QYACX8hWoZwfrkoz6XdaNNegYYOEqCeqhcGVipIlaUL2yYmqb6hzrsUjZZqL9BpfXYE4i5y9R8+MFICKs7mfWHieBEg1Vijt4zmswTal9XcJHywoLEnLhRVhbfCXk4whdxLMdi9zoc6mijeBkYc36ZLXvWk25bnhCfS3CtuVV1BBBqix8Qy5yYwQW6+V0jEK+vUwResli41uOU5f4En7A6JDPhanXcy3ZCfpbK8jB/VQ/hdaNGykAtEnzcjlKx0jPKtupdtHeXTsbON9VG+iw0TFouvoSGO6QDbksqBU+Z2i8SLZvpQoWAblf4eKJLIuxj3mw3khFRVBJtM85uY+9QS8HnPr0xcsgcDNRY9cofwE9Ja5g8jTysxA5qPmA/SrbMiCVkE7QBxwMlhdnSl1d7+m8aPJOAgfWgXVvwJKAPdSFe6ako=",
   "targets": [
     {
       "target": "ticket_sidebar",
@@ -25,11 +25,13 @@
     }
   ],
   "settings": {
-    "use_deskpro_saas": {
-      "title": "Use Deskpro SAAS",
+    "use_advanced_connect": {
+      "title": "Advanced Connect",
+      "description": "Follow the setup guide and use your credentials to connect the app to Deskpro",
       "type": "boolean",
       "isRequired": false,
       "isBackendOnly": false,
+      "default": false,
       "order": 5
     },
     "client_id": {
@@ -37,7 +39,7 @@
       "type": "string",
       "isRequired": false,
       "isBackendOnly": false,
-      "condition": "settings.use_deskpro_saas != true",
+      "condition": "settings.use_advanced_connect != false",
       "order": 10
     },
     "client_secret": {
@@ -45,7 +47,7 @@
       "type": "string",
       "isRequired": false,
       "isBackendOnly": true,
-      "condition": "settings.use_deskpro_saas != true",
+      "condition": "settings.use_advanced_connect != false",
       "order": 20
     },
     "dont_add_comment_when_linking_issue": {
@@ -68,7 +70,7 @@
       "title": "Callback URL",
       "type": "app_embedded",
       "options": { "entrypoint": "#/admin/callback" },
-      "condition": "settings.use_deskpro_saas != true",
+      "condition": "settings.use_advanced_connect != false",
       "isRequired": false,
       "isBackendOnly": false,
       "order": 50
diff --git a/src/pages/LogIn.tsx b/src/pages/LogIn.tsx
index f082484..12e36ec 100644
--- a/src/pages/LogIn.tsx
+++ b/src/pages/LogIn.tsx
@@ -32,12 +32,12 @@ const LogInPage: FC = () => {
 
 
   useInitialisedDeskproAppClient(async (client) => {
-    if (context?.settings.use_deskpro_saas === undefined) {
+    if (context?.settings === undefined) {
       // Make sure settings have loaded.
       return;
     }
     const clientId = context?.settings.client_id;
-    const mode = context?.settings.use_deskpro_saas ? 'global' : 'local';
+    const mode = context?.settings.use_advanced_connect === true ? 'global' : 'local';
     if (mode === 'local' && typeof clientId !== 'string') {
       // Local mode requires a clientId.
       return;
@@ -84,7 +84,7 @@ const LogInPage: FC = () => {
       setError(error instanceof Error ? error.message : 'Unknown error');
       setLoading(false);
     }
-  }, [setAuthorizationUrl, context?.settings.client_id, context?.settings.use_deskpro_saas]);
+  }, [setAuthorizationUrl, context?.settings.client_id, context?.settings.use_advanced_connect]);
 
   const onSignIn = useCallback(() => {
     setLoading(true);
diff --git a/src/types.ts b/src/types.ts
index a90c6b9..6cd605c 100644
--- a/src/types.ts
+++ b/src/types.ts
@@ -11,5 +11,5 @@ export type Settings = {
     dont_add_comment_when_linking_issue: boolean,
     dont_add_deskpro_label: boolean,
     client_id: string,
-    use_deskpro_saas: boolean,
+    use_advanced_connect?: boolean,
 };
\ No newline at end of file

From 140992dd0fa629a2d2dd4a0fee4a332e5cd6c285 Mon Sep 17 00:00:00 2001
From: Paul Happy Hutchinson <paul.hutchinson@deskpro.com>
Date: Fri, 21 Mar 2025 10:40:17 +0000
Subject: [PATCH 2/2] Update secrets and branding for one-click

---
 src/pages/LogIn.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/LogIn.tsx b/src/pages/LogIn.tsx
index 12e36ec..ce732f1 100644
--- a/src/pages/LogIn.tsx
+++ b/src/pages/LogIn.tsx
@@ -37,7 +37,7 @@ const LogInPage: FC = () => {
       return;
     }
     const clientId = context?.settings.client_id;
-    const mode = context?.settings.use_advanced_connect === true ? 'global' : 'local';
+    const mode = context?.settings.use_advanced_connect === false ? 'global' : 'local';
     if (mode === 'local' && typeof clientId !== 'string') {
       // Local mode requires a clientId.
       return;