Merge branch 'master' of github.com:bitwarden/server into feature/additional-item-types

Author: Hinton

.config/dotnet-tools.json

@@ -27,4 +27,4 @@
       ]
     }
   }
-}
+}

.github/PULL_REQUEST_TEMPLATE.md

@@ -16,11 +16,6 @@
 
 * **file.ext:** Description of what was changed and why
 
-## Testing requirements
-<!--What functionality requires testing by QA? This includes testing new behavior and regression testing-->
-
-
-
 ## Before you submit
 - [ ] I have checked for formatting errors (`dotnet tool run dotnet-format --check`) (required)
 - [ ] If making database changes - I have also updated Entity Framework queries and/or migrations

.vscode/launch.json

@@ -40,6 +40,7 @@
                 "Identity",
                 "Sso",
                 "Icons",
+                "Billing"
             ],
             "presentation": {
                 "hidden": false,
@@ -125,6 +126,28 @@
                 "/Views": "${workspaceFolder}/Views"
             }
         },
+        {
+            "name": "Billing",
+            "presentation": {
+                "hidden": false,
+                "group": "cloud",
+                "order": 10
+            },
+            "requireExactSource": true,
+            "type": "coreclr",
+            "request": "launch",
+            "preLaunchTask": "buildBilling",
+            "program": "${workspaceFolder}/src/Billing/bin/Debug/net5.0/Billing.dll",
+            "args": [],
+            "cwd": "${workspaceFolder}/src/Billing",
+            "stopAtEntry": false,
+            "env": {
+                "ASPNETCORE_ENVIRONMENT": "Development"
+            },
+            "sourceFileMap": {
+                "/Views": "${workspaceFolder}/Views"
+            }
+        },
         {
             "name": "Admin",
             "presentation": {

.vscode/tasks.json

@@ -89,6 +89,22 @@
                 "isDefault": true
             }
         },
+        {
+            "label": "buildBilling",
+            "command": "dotnet",
+            "type": "process",
+            "args": [
+                "build",
+                "${workspaceFolder}/src/Billing/Billing.csproj",
+                "/property:GenerateFullPaths=true",
+                "/consoleloggerparameters:NoSummary"
+            ],
+            "problemMatcher": "$msCompile",
+            "group": {
+                "kind": "build",
+                "isDefault": true
+            }
+        },
         {
             "label": "clean",
             "type": "shell",

bitwarden_license/src/Sso/Startup.cs

@@ -78,7 +78,7 @@ public void ConfigureServices(IServiceCollection services)
             services.AddCustomIdentityServices(globalSettings);
 
             // Services
-            services.AddBaseServices();
+            services.AddBaseServices(globalSettings);
             services.AddDefaultServices(globalSettings);
             services.AddCoreLocalizationServices();
         }

bitwarden_license/test/CmmCore.Test/packages.lock.json

@@ -298,6 +298,15 @@
           "IdentityModel": "4.3.0"
         }
       },
+      "Kralizek.AutoFixture.Extensions.MockHttp": {
+        "type": "Transitive",
+        "resolved": "1.2.0",
+        "contentHash": "6zmks7/5mVczazv910N7V2EdiU6B+rY61lwdgVO0o2iZuTI6KI3T+Hgkrjv0eGOKYucq2OMC+gnAc5Ej2ajoTQ==",
+        "dependencies": {
+          "AutoFixture": "4.11.0",
+          "RichardSzalay.MockHttp": "6.0.0"
+        }
+      },
       "libsodium": {
         "type": "Transitive",
         "resolved": "1.0.18",
@@ -1598,6 +1607,11 @@
           "System.Diagnostics.DiagnosticSource": "4.7.1"
         }
       },
+      "RichardSzalay.MockHttp": {
+        "type": "Transitive",
+        "resolved": "6.0.0",
+        "contentHash": "bStGNqIX/MGYtML7K3EzdsE/k5HGVAcg7XgN23TQXGXqxNC9fvYFR94fA0sGM5hAT36R+BBGet6ZDQxXL/IPxg=="
+      },
       "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl": {
         "type": "Transitive",
         "resolved": "4.3.2",
@@ -3547,6 +3561,7 @@
           "AutoFixture.AutoNSubstitute": "4.14.0",
           "AutoFixture.Xunit2": "4.14.0",
           "Core": "1.47.1",
+          "Kralizek.AutoFixture.Extensions.MockHttp": "1.2.0",
           "Microsoft.NET.Test.Sdk": "16.6.1",
           "NSubstitute": "4.2.2",
           "xunit": "2.4.1"
@@ -3599,6 +3614,7 @@
           "AutoFixture.Xunit2": "4.14.0",
           "Common": "1.47.1",
           "Core": "1.47.1",
+          "Kralizek.AutoFixture.Extensions.MockHttp": "1.2.0",
           "Microsoft.NET.Test.Sdk": "16.6.1",
           "Moq": "4.16.1",
           "NSubstitute": "4.2.2",

src/Admin/Controllers/OrganizationsController.cs

@@ -1,10 +1,13 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Threading.Tasks;
 using Bit.Admin.Models;
 using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Models.Business;
+using Bit.Core.Models.OrganizationConnectionConfigs;
+using Bit.Core.OrganizationFeatures.OrganizationSponsorships.FamiliesForEnterprise.Interfaces;
 using Bit.Core.Repositories;
 using Bit.Core.Services;
 using Bit.Core.Settings;
@@ -19,11 +22,14 @@ public class OrganizationsController : Controller
     {
         private readonly IOrganizationRepository _organizationRepository;
         private readonly IOrganizationUserRepository _organizationUserRepository;
+        private readonly IOrganizationConnectionRepository _organizationConnectionRepository;
+        private readonly ISelfHostedSyncSponsorshipsCommand _syncSponsorshipsCommand;
         private readonly ICipherRepository _cipherRepository;
         private readonly ICollectionRepository _collectionRepository;
         private readonly IGroupRepository _groupRepository;
         private readonly IPolicyRepository _policyRepository;
         private readonly IPaymentService _paymentService;
+        private readonly ILicensingService _licensingService;
         private readonly IApplicationCacheService _applicationCacheService;
         private readonly GlobalSettings _globalSettings;
         private readonly IReferenceEventService _referenceEventService;
@@ -32,23 +38,29 @@ public class OrganizationsController : Controller
         public OrganizationsController(
             IOrganizationRepository organizationRepository,
             IOrganizationUserRepository organizationUserRepository,
+            IOrganizationConnectionRepository organizationConnectionRepository,
+            ISelfHostedSyncSponsorshipsCommand syncSponsorshipsCommand,
             ICipherRepository cipherRepository,
             ICollectionRepository collectionRepository,
             IGroupRepository groupRepository,
             IPolicyRepository policyRepository,
             IPaymentService paymentService,
+            ILicensingService licensingService,
             IApplicationCacheService applicationCacheService,
             GlobalSettings globalSettings,
             IReferenceEventService referenceEventService,
             IUserService userService)
         {
             _organizationRepository = organizationRepository;
             _organizationUserRepository = organizationUserRepository;
+            _organizationConnectionRepository = organizationConnectionRepository;
+            _syncSponsorshipsCommand = syncSponsorshipsCommand;
             _cipherRepository = cipherRepository;
             _collectionRepository = collectionRepository;
             _groupRepository = groupRepository;
             _policyRepository = policyRepository;
             _paymentService = paymentService;
+            _licensingService = licensingService;
             _applicationCacheService = applicationCacheService;
             _globalSettings = globalSettings;
             _referenceEventService = referenceEventService;
@@ -104,7 +116,8 @@ public async Task<IActionResult> View(Guid id)
                 policies = await _policyRepository.GetManyByOrganizationIdAsync(id);
             }
             var users = await _organizationUserRepository.GetManyDetailsByOrganizationAsync(id);
-            return View(new OrganizationViewModel(organization, users, ciphers, collections, groups, policies));
+            var billingSyncConnection = _globalSettings.EnableCloudCommunication ? await _organizationConnectionRepository.GetByOrganizationIdTypeAsync(id, OrganizationConnectionType.CloudBillingSync) : null;
+            return View(new OrganizationViewModel(organization, billingSyncConnection, users, ciphers, collections, groups, policies));
         }
 
         [SelfHosted(NotSelfHostedOnly = true)]
@@ -130,8 +143,9 @@ public async Task<IActionResult> Edit(Guid id)
             }
             var users = await _organizationUserRepository.GetManyDetailsByOrganizationAsync(id);
             var billingInfo = await _paymentService.GetBillingAsync(organization);
+            var billingSyncConnection = _globalSettings.EnableCloudCommunication ? await _organizationConnectionRepository.GetByOrganizationIdTypeAsync(id, OrganizationConnectionType.CloudBillingSync) : null;
             return View(new OrganizationEditModel(organization, users, ciphers, collections, groups, policies,
-                billingInfo, _globalSettings));
+                billingInfo, billingSyncConnection, _globalSettings));
         }
 
         [HttpPost]
@@ -164,5 +178,40 @@ public async Task<IActionResult> Delete(Guid id)
 
             return RedirectToAction("Index");
         }
+
+        public async Task<IActionResult> TriggerBillingSync(Guid id)
+        {
+            var organization = await _organizationRepository.GetByIdAsync(id);
+            if (organization == null)
+            {
+                return RedirectToAction("Index");
+            }
+            var connection = (await _organizationConnectionRepository.GetEnabledByOrganizationIdTypeAsync(id, OrganizationConnectionType.CloudBillingSync)).FirstOrDefault();
+            if (connection != null)
+            {
+                try
+                {
+                    var config = connection.GetConfig<BillingSyncConfig>();
+                    await _syncSponsorshipsCommand.SyncOrganization(id, config.CloudOrganizationId, connection);
+                    TempData["ConnectionActivated"] = id;
+                    TempData["ConnectionError"] = null;
+                }
+                catch (Exception ex)
+                {
+                    TempData["ConnectionError"] = ex.Message;
+                }
+
+                if (_globalSettings.SelfHosted)
+                {
+                    return RedirectToAction("View", new { id });
+                }
+                else
+                {
+                    return RedirectToAction("Edit", new { id });
+                }
+            }
+            return RedirectToAction("Index");
+        }
+
     }
 }

src/Admin/Jobs/DatabaseExpiredSponsorshipsJob.cs

@@ -0,0 +1,42 @@
+using System;
+using System.Threading.Tasks;
+using Bit.Core;
+using Bit.Core.Jobs;
+using Bit.Core.Repositories;
+using Bit.Core.Settings;
+using Microsoft.Extensions.Logging;
+using Quartz;
+
+namespace Bit.Admin.Jobs
+{
+    public class DatabaseExpiredSponsorshipsJob : BaseJob
+    {
+        private GlobalSettings _globalSettings;
+        private readonly IMaintenanceRepository _maintenanceRepository;
+
+        public DatabaseExpiredSponsorshipsJob(
+            IMaintenanceRepository maintenanceRepository,
+            ILogger<DatabaseExpiredSponsorshipsJob> logger,
+            GlobalSettings globalSettings)
+            : base(logger)
+        {
+            _maintenanceRepository = maintenanceRepository;
+            _globalSettings = globalSettings;
+        }
+
+        protected override async Task ExecuteJobAsync(IJobExecutionContext context)
+        {
+            if (_globalSettings.SelfHosted && !_globalSettings.EnableCloudCommunication)
+            {
+                return;
+            }
+            _logger.LogInformation(Constants.BypassFiltersEventId, "Execute job task: DeleteExpiredSponsorshipsAsync");
+
+            // allow a 90 day grace period before deleting
+            var deleteDate = DateTime.UtcNow.AddDays(-90);
+
+            await _maintenanceRepository.DeleteExpiredSponsorshipsAsync(deleteDate);
+            _logger.LogInformation(Constants.BypassFiltersEventId, "Finished job task: DeleteExpiredSponsorshipsAsync");
+        }
+    }
+}

src/Admin/Jobs/JobsHostedService.cs

@@ -55,6 +55,11 @@ public override async Task StartAsync(CancellationToken cancellationToken)
                 .StartNow()
                 .WithCronSchedule("0 0 0 ? * SUN", x => x.InTimeZone(timeZone))
                 .Build();
+            var everyMondayAtMidnightTrigger = TriggerBuilder.Create()
+                .WithIdentity("EveryMondayAtMidnightTrigger")
+                .StartNow()
+                .WithCronSchedule("0 0 0 ? * MON", x => x.InTimeZone(timeZone))
+                .Build();
             var everyDayAtMidnightUtc = TriggerBuilder.Create()
                 .WithIdentity("EveryDayAtMidnightUtc")
                 .StartNow()
@@ -67,7 +72,8 @@ public override async Task StartAsync(CancellationToken cancellationToken)
                 new Tuple<Type, ITrigger>(typeof(DatabaseExpiredGrantsJob), everyFridayAt10pmTrigger),
                 new Tuple<Type, ITrigger>(typeof(DatabaseUpdateStatisticsJob), everySaturdayAtMidnightTrigger),
                 new Tuple<Type, ITrigger>(typeof(DatabaseRebuildlIndexesJob), everySundayAtMidnightTrigger),
-                new Tuple<Type, ITrigger>(typeof(DeleteCiphersJob), everyDayAtMidnightUtc)
+                new Tuple<Type, ITrigger>(typeof(DeleteCiphersJob), everyDayAtMidnightUtc),
+                new Tuple<Type, ITrigger>(typeof(DatabaseExpiredSponsorshipsJob), everyMondayAtMidnightTrigger)
             };
 
             if (!_globalSettings.SelfHosted)
@@ -88,6 +94,7 @@ public static void AddJobsServices(IServiceCollection services, bool selfHosted)
             services.AddTransient<DatabaseUpdateStatisticsJob>();
             services.AddTransient<DatabaseRebuildlIndexesJob>();
             services.AddTransient<DatabaseExpiredGrantsJob>();
+            services.AddTransient<DatabaseExpiredSponsorshipsJob>();
             services.AddTransient<DeleteSendsJob>();
             services.AddTransient<DeleteCiphersJob>();
         }

src/Admin/Models/OrganizationEditModel.cs

@@ -4,7 +4,7 @@
 using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Models.Business;
-using Bit.Core.Models.Data;
+using Bit.Core.Models.Data.Organizations.OrganizationUsers;
 using Bit.Core.Settings;
 using Bit.Core.Utilities;
 
@@ -16,8 +16,9 @@ public OrganizationEditModel() { }
 
         public OrganizationEditModel(Organization org, IEnumerable<OrganizationUserUserDetails> orgUsers,
             IEnumerable<Cipher> ciphers, IEnumerable<Collection> collections, IEnumerable<Group> groups,
-            IEnumerable<Policy> policies, BillingInfo billingInfo, GlobalSettings globalSettings)
-            : base(org, orgUsers, ciphers, collections, groups, policies)
+            IEnumerable<Policy> policies, BillingInfo billingInfo, IEnumerable<OrganizationConnection> connections,
+            GlobalSettings globalSettings)
+            : base(org, connections, orgUsers, ciphers, collections, groups, policies)
         {
             BillingInfo = billingInfo;
             BraintreeMerchantId = globalSettings.Braintree.MerchantId;