diff --git a/src/Core/Services/IPushService.cs b/src/Core/Services/IPushNotificationService.cs similarity index 93% rename from src/Core/Services/IPushService.cs rename to src/Core/Services/IPushNotificationService.cs index 57253113cd..18786a71d2 100644 --- a/src/Core/Services/IPushService.cs +++ b/src/Core/Services/IPushNotificationService.cs @@ -4,7 +4,7 @@ using Bit.Core.Models.Table; namespace Bit.Core.Services { - public interface IPushService + public interface IPushNotificationService { Task PushSyncCipherCreateAsync(Cipher cipher); Task PushSyncCipherUpdateAsync(Cipher cipher); diff --git a/src/Core/Services/Implementations/CipherService.cs b/src/Core/Services/Implementations/CipherService.cs index 3d699f1f86..dfebf69e94 100644 --- a/src/Core/Services/Implementations/CipherService.cs +++ b/src/Core/Services/Implementations/CipherService.cs @@ -17,7 +17,7 @@ namespace Bit.Core.Services private readonly IOrganizationRepository _organizationRepository; private readonly IOrganizationUserRepository _organizationUserRepository; private readonly ICollectionCipherRepository _collectionCipherRepository; - private readonly IPushService _pushService; + private readonly IPushNotificationService _pushService; public CipherService( ICipherRepository cipherRepository, @@ -26,7 +26,7 @@ namespace Bit.Core.Services IOrganizationRepository organizationRepository, IOrganizationUserRepository organizationUserRepository, ICollectionCipherRepository collectionCipherRepository, - IPushService pushService) + IPushNotificationService pushService) { _cipherRepository = cipherRepository; _folderRepository = folderRepository; diff --git a/src/Core/Services/Implementations/OrganizationService.cs b/src/Core/Services/Implementations/OrganizationService.cs index 8197526d85..961c36885f 100644 --- a/src/Core/Services/Implementations/OrganizationService.cs +++ b/src/Core/Services/Implementations/OrganizationService.cs @@ -24,7 +24,7 @@ namespace Bit.Core.Services private readonly IGroupRepository _groupRepository; private readonly IDataProtector _dataProtector; private readonly IMailService _mailService; - private readonly IPushService _pushService; + private readonly IPushNotificationService _pushService; public OrganizationService( IOrganizationRepository organizationRepository, @@ -34,7 +34,7 @@ namespace Bit.Core.Services IGroupRepository groupRepository, IDataProtectionProvider dataProtectionProvider, IMailService mailService, - IPushService pushService) + IPushNotificationService pushService) { _organizationRepository = organizationRepository; _organizationUserRepository = organizationUserRepository; diff --git a/src/Core/Services/Implementations/PushSharpPushService.cs b/src/Core/Services/Implementations/PushSharpPushNotificationService.cs similarity index 98% rename from src/Core/Services/Implementations/PushSharpPushService.cs rename to src/Core/Services/Implementations/PushSharpPushNotificationService.cs index 7c8af781ed..2d94fe5daa 100644 --- a/src/Core/Services/Implementations/PushSharpPushService.cs +++ b/src/Core/Services/Implementations/PushSharpPushNotificationService.cs @@ -18,18 +18,18 @@ using Microsoft.AspNetCore.Http; namespace Bit.Core.Services { - public class PushSharpPushService : IPushService + public class PushSharpPushNotificationService : IPushNotificationService { private readonly IDeviceRepository _deviceRepository; - private readonly ILogger _logger; + private readonly ILogger _logger; private readonly IHttpContextAccessor _httpContextAccessor; private GcmServiceBroker _gcmBroker; private ApnsServiceBroker _apnsBroker; - public PushSharpPushService( + public PushSharpPushNotificationService( IDeviceRepository deviceRepository, IHttpContextAccessor httpContextAccessor, - ILogger logger, + ILogger logger, IHostingEnvironment hostingEnvironment, GlobalSettings globalSettings) { diff --git a/src/Core/Services/Implementations/UserService.cs b/src/Core/Services/Implementations/UserService.cs index 32692096be..3dfd7afdfb 100644 --- a/src/Core/Services/Implementations/UserService.cs +++ b/src/Core/Services/Implementations/UserService.cs @@ -20,7 +20,7 @@ namespace Bit.Core.Services private readonly ICipherRepository _cipherRepository; private readonly IOrganizationUserRepository _organizationUserRepository; private readonly IMailService _mailService; - private readonly IPushService _pushService; + private readonly IPushNotificationService _pushService; private readonly IdentityErrorDescriber _identityErrorDescriber; private readonly IdentityOptions _identityOptions; private readonly IPasswordHasher _passwordHasher; @@ -32,7 +32,7 @@ namespace Bit.Core.Services ICipherRepository cipherRepository, IOrganizationUserRepository organizationUserRepository, IMailService mailService, - IPushService pushService, + IPushNotificationService pushService, IUserStore store, IOptions optionsAccessor, IPasswordHasher passwordHasher, diff --git a/src/Core/Services/NoopImplementations/NoopPushService.cs b/src/Core/Services/NoopImplementations/NoopPushNotificationService.cs similarity index 94% rename from src/Core/Services/NoopImplementations/NoopPushService.cs rename to src/Core/Services/NoopImplementations/NoopPushNotificationService.cs index f835b4f750..77325d8d92 100644 --- a/src/Core/Services/NoopImplementations/NoopPushService.cs +++ b/src/Core/Services/NoopImplementations/NoopPushNotificationService.cs @@ -4,7 +4,7 @@ using Bit.Core.Models.Table; namespace Bit.Core.Services { - public class NoopPushService : IPushService + public class NoopPushNotificationService : IPushNotificationService { public Task PushSyncCipherCreateAsync(Cipher cipher) { diff --git a/src/Core/Utilities/ServiceCollectionExtensions.cs b/src/Core/Utilities/ServiceCollectionExtensions.cs index 0c71f1de69..ff955f71ba 100644 --- a/src/Core/Utilities/ServiceCollectionExtensions.cs +++ b/src/Core/Utilities/ServiceCollectionExtensions.cs @@ -50,7 +50,7 @@ namespace Bit.Core.Utilities public static void AddDefaultServices(this IServiceCollection services) { services.AddSingleton(); - services.AddSingleton(); + services.AddSingleton(); services.AddSingleton(); services.AddSingleton(); } @@ -58,7 +58,7 @@ namespace Bit.Core.Utilities public static void AddNoopServices(this IServiceCollection services) { services.AddSingleton(); - services.AddSingleton(); + services.AddSingleton(); services.AddSingleton(); services.AddSingleton(); }