From d1a28c41337d0c6c1c2938c75f71879941717798 Mon Sep 17 00:00:00 2001 From: Thomas Leclaire Date: Wed, 27 Jan 2021 17:32:50 +0100 Subject: [PATCH 1/3] manage simple slash for protocol scheme of msteams Signed-off-by: Thomas Leclaire --- Finicky/Finicky/Info.plist | 2 +- config-api/src/processUrl.ts | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Finicky/Finicky/Info.plist b/Finicky/Finicky/Info.plist index 7a1b318..6a56a10 100644 --- a/Finicky/Finicky/Info.plist +++ b/Finicky/Finicky/Info.plist @@ -90,7 +90,7 @@ CFBundleVersion - 254 + 268 LSApplicationCategoryType public.app-category.utilities LSMinimumSystemVersion diff --git a/config-api/src/processUrl.ts b/config-api/src/processUrl.ts index 14f7403..95ff82d 100644 --- a/config-api/src/processUrl.ts +++ b/config-api/src/processUrl.ts @@ -109,8 +109,9 @@ function createUrl(url: UrlObject) { let hash = url.hash ? `#${url.hash}` : ""; let auth = url.username ? `${url.username}` : ""; auth += url.password ? `:${url.password}` : ""; + let slashes = (url.protocol === "msteams") ? "/":"//" - return `${protocol}://${auth}${host}${port}${pathname}${search}${hash}`; + return `${protocol}:${slashes}${auth}${host}${port}${pathname}${search}${hash}`; } function processUrlRewrites(config: FinickyConfig, options: Options) { From bf3c497fe02828a8aae3652a8e66c7d21f37d39a Mon Sep 17 00:00:00 2001 From: Thomas Leclaire Date: Wed, 27 Jan 2021 17:32:50 +0100 Subject: [PATCH 2/3] manage simple slash for protocol scheme of msteams Signed-off-by: Thomas Leclaire --- Finicky/Finicky/Info.plist | 2 +- config-api/src/utils.ts | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Finicky/Finicky/Info.plist b/Finicky/Finicky/Info.plist index 4a8bade..424020f 100644 --- a/Finicky/Finicky/Info.plist +++ b/Finicky/Finicky/Info.plist @@ -90,7 +90,7 @@ CFBundleVersion - 282 + 284 LSApplicationCategoryType public.app-category.utilities LSMinimumSystemVersion diff --git a/config-api/src/utils.ts b/config-api/src/utils.ts index 513b29c..808cc42 100644 --- a/config-api/src/utils.ts +++ b/config-api/src/utils.ts @@ -59,8 +59,9 @@ export function composeUrl(url: UrlObject) { let hash = url.hash ? `#${url.hash}` : ""; let auth = url.username ? `${url.username}` : ""; auth += url.password ? `:${url.password}` : ""; + let slashes = (url.protocol === "msteams") ? "/":"//" - return `${protocol}://${auth}${host}${port}${pathname}${search}${hash}`; + return `${protocol}:${slashes}${auth}${host}${port}${pathname}${search}${hash}`; } /** From db88947c955006b97db43a0eba291ed718ea1045 Mon Sep 17 00:00:00 2001 From: Thomas Leclaire Date: Wed, 27 Jan 2021 17:32:50 +0100 Subject: [PATCH 3/3] manage simple slash for protocol scheme of msteams Signed-off-by: Thomas Leclaire --- Finicky/Finicky/Info.plist | 2 +- config-api/src/utils.ts | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Finicky/Finicky/Info.plist b/Finicky/Finicky/Info.plist index 4a8bade..424020f 100644 --- a/Finicky/Finicky/Info.plist +++ b/Finicky/Finicky/Info.plist @@ -90,7 +90,7 @@ CFBundleVersion - 282 + 284 LSApplicationCategoryType public.app-category.utilities LSMinimumSystemVersion diff --git a/config-api/src/utils.ts b/config-api/src/utils.ts index 513b29c..808cc42 100644 --- a/config-api/src/utils.ts +++ b/config-api/src/utils.ts @@ -59,8 +59,9 @@ export function composeUrl(url: UrlObject) { let hash = url.hash ? `#${url.hash}` : ""; let auth = url.username ? `${url.username}` : ""; auth += url.password ? `:${url.password}` : ""; + let slashes = (url.protocol === "msteams") ? "/":"//" - return `${protocol}://${auth}${host}${port}${pathname}${search}${hash}`; + return `${protocol}:${slashes}${auth}${host}${port}${pathname}${search}${hash}`; } /**