diff --git a/util/Setup/AssetLinksBuilder.cs b/util/Setup/AssetLinksBuilder.cs deleted file mode 100644 index ee229b277a..0000000000 --- a/util/Setup/AssetLinksBuilder.cs +++ /dev/null @@ -1,35 +0,0 @@ -using System.IO; - -namespace Bit.Setup -{ - public class AssetLinksBuilder - { - private readonly Context _context; - - public AssetLinksBuilder(Context context) - { - _context = context; - } - - public void Build() - { - var model = new TemplateModel - { - Url = _context.Config.Url - }; - - Helpers.WriteLine(_context, "Building Asset Links For Fido2."); - Directory.CreateDirectory("/bitwarden/web/"); - var template = Helpers.ReadTemplate("AssetLinks"); - using (var sw = File.CreateText("/bitwarden/web/assetlinks.json")) - { - sw.Write(template(model)); - } - } - - public class TemplateModel - { - public string Url { get; set; } - } - } -} diff --git a/util/Setup/Program.cs b/util/Setup/Program.cs index b56b2ec4b4..39ee5126bc 100644 --- a/util/Setup/Program.cs +++ b/util/Setup/Program.cs @@ -106,9 +106,6 @@ namespace Bit.Setup var appIdBuilder = new AppIdBuilder(_context); appIdBuilder.Build(); - var assetLinksBuilder = new AssetLinksBuilder(_context); - assetLinksBuilder.Build(); - var dockerComposeBuilder = new DockerComposeBuilder(_context); dockerComposeBuilder.BuildForInstaller(); @@ -301,9 +298,6 @@ namespace Bit.Setup var appIdBuilder = new AppIdBuilder(_context); appIdBuilder.Build(); - var assetLinksBuilder = new AssetLinksBuilder(_context); - assetLinksBuilder.Build(); - var dockerComposeBuilder = new DockerComposeBuilder(_context); dockerComposeBuilder.BuildForUpdater(); diff --git a/util/Setup/Templates/AppId.hbs b/util/Setup/Templates/AppId.hbs index cfdefa6bb4..fb63b8140a 100644 --- a/util/Setup/Templates/AppId.hbs +++ b/util/Setup/Templates/AppId.hbs @@ -8,8 +8,7 @@ "ids": [ "{{{Url}}}", "ios:bundle-id:com.8bit.bitwarden", - "android:apk-key-hash:dUGFzUzf3lmHSLBDBIv+WaFyZMI", - "android:apk-key-hash-sha256:FubAP/lVUILntSvHc1ZpYh7LwOoDai/lmePXNKyyzgM" + "android:apk-key-hash:dUGFzUzf3lmHSLBDBIv+WaFyZMI" ] } ] diff --git a/util/Setup/Templates/AssetLinks.hbs b/util/Setup/Templates/AssetLinks.hbs deleted file mode 100644 index 9f6d08882b..0000000000 --- a/util/Setup/Templates/AssetLinks.hbs +++ /dev/null @@ -1,26 +0,0 @@ -[ - { - "relation":[ - "delegate_permission/common.handle_all_urls", - "delegate_permission/common.get_login_creds" - ], - "target":{ - "namespace":"web", - "site":"{{{Url}}}" - } - }, - { - "relation":[ - "delegate_permission/common.handle_all_urls", - "delegate_permission/common.get_login_creds" - ], - "target":{ - "namespace":"android_app", - "package_name":"com.x8bit.bitwarden", - "sha256_cert_fingerprints":[ - "24:E0:6C:04:C2:08:04:8F:19:F1:C9:93:B4:DD:A4:43:0E:A8:B0:6D:B8:37:5E:A0:E3:7B:83:46:96:B9:AC:3A", - "16:E6:C0:3F:F9:55:50:82:E7:B5:2B:C7:73:56:69:62:1E:CB:C0:EA:03:6A:2F:E5:99:E3:D7:34:AC:B2:CE:03" - ] - } - } -] diff --git a/util/Setup/Templates/NginxConfig.hbs b/util/Setup/Templates/NginxConfig.hbs index 5510b43931..a96ab307a1 100644 --- a/util/Setup/Templates/NginxConfig.hbs +++ b/util/Setup/Templates/NginxConfig.hbs @@ -84,16 +84,6 @@ server { add_header Content-Type $fido_content_type; } - location = /.well-known/assetlinks.json { - proxy_pass http://web:5000/assetlinks.json; -{{#if Ssl}} - include /etc/nginx/security-headers-ssl.conf; -{{/if}} - include /etc/nginx/security-headers.conf; - proxy_hide_header Content-Type; - add_header Content-Type application/json; - } - location = /duo-connector.html { proxy_pass http://web:5000/duo-connector.html; }