From c3b2be17a98dd2fd6be939d383ca8bd192c814f6 Mon Sep 17 00:00:00 2001 From: Kyle Spearrin Date: Tue, 25 Jul 2017 22:34:07 -0400 Subject: [PATCH] version bump and project cleanup --- bitwarden-core.sln | 13 +- src/Api/Api.csproj | 11 +- src/Api/Properties/AssemblyInfo.cs | 23 --- src/Billing/Billing.csproj | 14 +- src/Billing/Properties/AssemblyInfo.cs | 23 --- src/Core/Core.csproj | 7 - src/Core/Properties/AssemblyInfo.cs | 23 --- src/Identity/Identity.csproj | 9 +- util/AnhMigrator/AnhMigrator.csproj | 18 -- util/AnhMigrator/Program.cs | 171 ------------------ util/Mail/Mail.csproj | 3 - util/Mail/wwwroot/styles.css | 4 + util/Mail/wwwroot/templates/announcement.html | 78 ++++++-- 13 files changed, 76 insertions(+), 321 deletions(-) delete mode 100644 src/Api/Properties/AssemblyInfo.cs delete mode 100644 src/Billing/Properties/AssemblyInfo.cs delete mode 100644 src/Core/Properties/AssemblyInfo.cs delete mode 100644 util/AnhMigrator/AnhMigrator.csproj delete mode 100644 util/AnhMigrator/Program.cs diff --git a/bitwarden-core.sln b/bitwarden-core.sln index f5fd49c697..1e4fb5789b 100644 --- a/bitwarden-core.sln +++ b/bitwarden-core.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 -VisualStudioVersion = 15.0.26430.6 +VisualStudioVersion = 15.0.26430.13 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{DD5BD056-4AAE-43EF-BBD2-0B569B8DA84D}" EndProject @@ -24,11 +24,9 @@ Project("{00D1A9C2-B5F0-4AF3-8072-F6C62B433612}") = "Sql", "src\Sql\Sql.sqlproj" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mail", "util\Mail\Mail.csproj", "{B78A6C74-1A24-48C6-802A-13BE3E4DAFF1}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Billing", "src\Billing\Billing.csproj", "{02BC2982-ED8D-4A6D-A41E-092B3DAEB98A}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Billing", "src\Billing\Billing.csproj", "{02BC2982-ED8D-4A6D-A41E-092B3DAEB98A}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Identity", "src\Identity\Identity.csproj", "{04148736-3C0B-445E-8B74-2020E7A53502}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AnhMigrator", "util\AnhMigrator\AnhMigrator.csproj", "{05C45D68-DAB9-40E6-9E2E-F81BBD2E0C42}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Identity", "src\Identity\Identity.csproj", "{04148736-3C0B-445E-8B74-2020E7A53502}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -62,10 +60,6 @@ Global {04148736-3C0B-445E-8B74-2020E7A53502}.Debug|Any CPU.Build.0 = Debug|Any CPU {04148736-3C0B-445E-8B74-2020E7A53502}.Release|Any CPU.ActiveCfg = Release|Any CPU {04148736-3C0B-445E-8B74-2020E7A53502}.Release|Any CPU.Build.0 = Release|Any CPU - {05C45D68-DAB9-40E6-9E2E-F81BBD2E0C42}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {05C45D68-DAB9-40E6-9E2E-F81BBD2E0C42}.Debug|Any CPU.Build.0 = Debug|Any CPU - {05C45D68-DAB9-40E6-9E2E-F81BBD2E0C42}.Release|Any CPU.ActiveCfg = Release|Any CPU - {05C45D68-DAB9-40E6-9E2E-F81BBD2E0C42}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -77,6 +71,5 @@ Global {B78A6C74-1A24-48C6-802A-13BE3E4DAFF1} = {DD5BD056-4AAE-43EF-BBD2-0B569B8DA84E} {02BC2982-ED8D-4A6D-A41E-092B3DAEB98A} = {DD5BD056-4AAE-43EF-BBD2-0B569B8DA84D} {04148736-3C0B-445E-8B74-2020E7A53502} = {DD5BD056-4AAE-43EF-BBD2-0B569B8DA84D} - {05C45D68-DAB9-40E6-9E2E-F81BBD2E0C42} = {DD5BD056-4AAE-43EF-BBD2-0B569B8DA84E} EndGlobalSection EndGlobal diff --git a/src/Api/Api.csproj b/src/Api/Api.csproj index d19830b90d..36bf29e01a 100644 --- a/src/Api/Api.csproj +++ b/src/Api/Api.csproj @@ -1,18 +1,9 @@  - 1.7.0 + 1.8.0 net461 - true Api - Exe - Api - false - false - false - false - false - false Bit.Api bitwarden-Api diff --git a/src/Api/Properties/AssemblyInfo.cs b/src/Api/Properties/AssemblyInfo.cs deleted file mode 100644 index cace456b91..0000000000 --- a/src/Api/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,23 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("Bit.Api")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("8bit Solutions LLC")] -[assembly: AssemblyProduct("bitwarden")] -[assembly: AssemblyCopyright("Copyright © 2015")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("e8548ad6-7fb0-439a-8eb5-549a10336d2d")] diff --git a/src/Billing/Billing.csproj b/src/Billing/Billing.csproj index f653a8630f..a58569bcd0 100644 --- a/src/Billing/Billing.csproj +++ b/src/Billing/Billing.csproj @@ -1,17 +1,9 @@  + 1.8.0 net461 - true Billing - Exe - Billing - false - false - false - false - false - false Bit.Billing bitwarden-Billing @@ -27,10 +19,6 @@ - - - - diff --git a/src/Billing/Properties/AssemblyInfo.cs b/src/Billing/Properties/AssemblyInfo.cs deleted file mode 100644 index fd565b5129..0000000000 --- a/src/Billing/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,23 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("Bit.Billing")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("8bit Solutions LLC")] -[assembly: AssemblyProduct("bitwarden")] -[assembly: AssemblyCopyright("Copyright © 2015")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("02bc2982-ed8d-4a6d-a41e-092b3daeb98a")] diff --git a/src/Core/Core.csproj b/src/Core/Core.csproj index 656f530935..91161ecaca 100644 --- a/src/Core/Core.csproj +++ b/src/Core/Core.csproj @@ -3,13 +3,6 @@ net461 Core - Core - false - false - false - false - false - false Bit.Core diff --git a/src/Core/Properties/AssemblyInfo.cs b/src/Core/Properties/AssemblyInfo.cs deleted file mode 100644 index df1be204ea..0000000000 --- a/src/Core/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,23 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("Bit.Core")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("8bit Solutions LLC")] -[assembly: AssemblyProduct("bitwarden")] -[assembly: AssemblyCopyright("Copyright © 2015")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("3973d21b-a692-4b60-9b70-3631c057423a")] diff --git a/src/Identity/Identity.csproj b/src/Identity/Identity.csproj index 62808e10be..434a423558 100644 --- a/src/Identity/Identity.csproj +++ b/src/Identity/Identity.csproj @@ -1,20 +1,21 @@  + 1.8.0 net461 Identity Bit.Identity bitwarden-Identity + + + + - - - - diff --git a/util/AnhMigrator/AnhMigrator.csproj b/util/AnhMigrator/AnhMigrator.csproj deleted file mode 100644 index 434be5f69a..0000000000 --- a/util/AnhMigrator/AnhMigrator.csproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - Exe - net461 - Bit.AnhMigrator - - - - - - - - - - - - \ No newline at end of file diff --git a/util/AnhMigrator/Program.cs b/util/AnhMigrator/Program.cs deleted file mode 100644 index a07acfd11d..0000000000 --- a/util/AnhMigrator/Program.cs +++ /dev/null @@ -1,171 +0,0 @@ -using Bit.Core.Models.Table; -using Dapper; -using Microsoft.Azure.NotificationHubs; -using System; -using System.Collections.Generic; -using System.Data; -using System.Data.SqlClient; -using System.Linq; -using System.Threading.Tasks; -using Bit.Core.Enums; -using Newtonsoft.Json; - -namespace Bit.AnhMigrator -{ - class Program - { - private const string SqlConnectionString = ""; - private const string AnhConnectionString = ""; - private const string AnhHubName = ""; - - private static DateTime _startDate = DateTime.UtcNow.AddYears(-10); - private static string _viewId = ""; - - private static NotificationHubClient _client; - - static void Main(string[] args) - { - _client = NotificationHubClient.CreateClientFromConnectionString( - AnhConnectionString, - AnhHubName); - - //RegisterAsync(args).Wait(); - //ViewAsync(args).Wait(); - Console.Read(); - } - - private static async Task RegisterAsync(string[] args) - { - IDictionary> orgUsersDict; - using(var connection = new SqlConnection(SqlConnectionString)) - { - var results = await connection.QueryAsync( - "SELECT * FROM [dbo].[OrganizationUser] WHERE [Status] = 2 AND [UserId] IS NOT NULL", - commandType: CommandType.Text); - - orgUsersDict = results - .GroupBy(ou => ou.UserId.Value) - .ToDictionary(ou => ou.Key, ou => ou.ToList()); - } - - IEnumerable devices; - using(var connection = new SqlConnection(SqlConnectionString)) - { - devices = await connection.QueryAsync( - "SELECT * FROM [dbo].[Device] WHERE [PushToken] IS NOT NULL AND [RevisionDate] > @StartDate", - new { StartDate = _startDate }, - commandType: CommandType.Text); - } - - var i = 0; - foreach(var device in devices) - { - i++; - - if(string.IsNullOrWhiteSpace(device.PushToken)) - { - return; - } - - var installation = new Installation - { - InstallationId = device.Id.ToString(), - PushChannel = device.PushToken, - Templates = new Dictionary() - }; - - installation.Tags = new List - { - $"userId:{device.UserId}" - }; - - if(!string.IsNullOrWhiteSpace(device.Identifier)) - { - installation.Tags.Add("deviceIdentifier:" + device.Identifier); - } - - if(orgUsersDict.ContainsKey(device.UserId)) - { - foreach(var orgUser in orgUsersDict[device.UserId]) - { - installation.Tags.Add("organizationId:" + orgUser.OrganizationId); - } - } - - string payloadTemplate = null, messageTemplate = null, badgeMessageTemplate = null; - switch(device.Type) - { - case DeviceType.Android: - payloadTemplate = "{\"data\":{\"data\":{\"type\":\"#(type)\",\"payload\":\"$(payload)\"}}}"; - messageTemplate = "{\"data\":{\"data\":{\"type\":\"#(type)\"}," + - "\"notification\":{\"title\":\"$(title)\",\"body\":\"$(message)\"}}}"; - - installation.Platform = NotificationPlatform.Gcm; - break; - case DeviceType.iOS: - payloadTemplate = "{\"data\":{\"type\":\"#(type)\",\"payload\":\"$(payload)\"}," + - "\"aps\":{\"alert\":null,\"badge\":null,\"content-available\":1}}"; - messageTemplate = "{\"data\":{\"type\":\"#(type)\"}," + - "\"aps\":{\"alert\":\"$(message)\",\"badge\":null,\"content-available\":1}}"; - badgeMessageTemplate = "{\"data\":{\"type\":\"#(type)\"}," + - "\"aps\":{\"alert\":\"$(message)\",\"badge\":\"#(badge)\",\"content-available\":1}}"; - - installation.Platform = NotificationPlatform.Apns; - break; - case DeviceType.AndroidAmazon: - payloadTemplate = "{\"data\":{\"type\":\"#(type)\",\"payload\":\"$(payload)\"}}"; - messageTemplate = "{\"data\":{\"type\":\"#(type)\",\"message\":\"$(message)\"}}"; - - installation.Platform = NotificationPlatform.Adm; - break; - default: - break; - } - - BuildInstallationTemplate(installation, "payload", payloadTemplate, device.UserId, device.Identifier); - BuildInstallationTemplate(installation, "message", messageTemplate, device.UserId, device.Identifier); - BuildInstallationTemplate(installation, "badgeMessage", badgeMessageTemplate ?? messageTemplate, device.UserId, - device.Identifier); - - await _client.CreateOrUpdateInstallationAsync(installation); - - Console.WriteLine("Added install #" + i + " (" + installation.InstallationId + ")"); - } - } - - private static void BuildInstallationTemplate(Installation installation, string templateId, string templateBody, - Guid userId, string deviceIdentifier) - { - if(templateBody == null) - { - return; - } - - var fullTemplateId = $"template:{templateId}"; - - var template = new InstallationTemplate - { - Body = templateBody, - Tags = new List - { - fullTemplateId, - $"{fullTemplateId}_userId:{userId}" - } - }; - - if(!string.IsNullOrWhiteSpace(deviceIdentifier)) - { - template.Tags.Add($"{fullTemplateId}_deviceIdentifier:{deviceIdentifier}"); - } - - installation.Templates.Add(fullTemplateId, template); - } - - private static async Task ViewAsync(string[] args) - { - var install = await _client.GetInstallationAsync(_viewId); - var json = JsonConvert.SerializeObject(install, Formatting.Indented); - Console.WriteLine(json); - } - } -} diff --git a/util/Mail/Mail.csproj b/util/Mail/Mail.csproj index 79dd4423a2..7f5115edfd 100644 --- a/util/Mail/Mail.csproj +++ b/util/Mail/Mail.csproj @@ -2,10 +2,7 @@ netcoreapp1.1 - true Mail - Exe - Mail 1.1.1 $(PackageTargetFallback);dotnet5.6;portable-net45+win8 Bit.Mail diff --git a/util/Mail/wwwroot/styles.css b/util/Mail/wwwroot/styles.css index 2831104a69..9d845ef785 100644 --- a/util/Mail/wwwroot/styles.css +++ b/util/Mail/wwwroot/styles.css @@ -102,6 +102,10 @@ body { padding: 0 0 10px; } +.content-block-spaced { + padding: 0 0 25px; +} + .indented { padding-left: 20px; } diff --git a/util/Mail/wwwroot/templates/announcement.html b/util/Mail/wwwroot/templates/announcement.html index 75c3c881ad..0b099d42bc 100644 --- a/util/Mail/wwwroot/templates/announcement.html +++ b/util/Mail/wwwroot/templates/announcement.html @@ -14,41 +14,87 @@
-
+ + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ Today we're excited to announce the release of the bitwarden premium membership, which includes access to some great new features: +
- A title! + File Attachments
- Some text about an announcement. + Often times you have sensitive files such as private keys, scanned documents, etc. that need to be securely stored, protected, and sharable. bitwarden premium gives you 1GB of encrypted file storage that allows you to securely store file attachments to any entry in your vault.
- - - - - - - - - -
•Bullet 1
•Bullet 2
+ 		+ → Learn more +
+ Additional Two-step Login (2FA) Options +
+ Premium membership unlocks access to additional two-step login options. Use Duo, YubiKey, and/or FIDO U2F to further secure your account. +
+ → Learn more +
+ TOTP Verification Codes +
+ bitwarden can replace existing authenticator apps such as Authy and Google Authenticator. Securely store authenticator keys and bitwarden will generate TOTP verification codes for you, even assisting you during login auto-fills. +
+ → Learn more +
+ Priority Customer Support +
+ Receive priority customer support when contacting us with questions or for help. Your inquires will be responded to quicker and prioritized over any others received by free users. +
+ Read the full announcement on our blog... +
+ You can purchase a bitwarden premium membership by logging into the web vault and navigating to Settings → Go Premium.
- Thank you!
+ Regards,
The bitwarden Team