More cleanup from editor config suggestions

Author: niemyjski

src/Exceptionless.Api/Controllers/AuthController.cs

@@ -494,7 +494,7 @@ private async Task<IHttpActionResult> ExternalLoginAsync<TClient>(ExternalAuthIn
         }
 
         private async Task<User> FromExternalLoginAsync(UserInfo userInfo) {
-            User existingUser = await _userRepository.GetUserByOAuthProviderAsync(userInfo.ProviderName, userInfo.Id);
+            var existingUser = await _userRepository.GetUserByOAuthProviderAsync(userInfo.ProviderName, userInfo.Id);
 
             // Link user accounts.
             if (CurrentUser != null) {
@@ -530,7 +530,7 @@ private async Task<User> FromExternalLoginAsync(UserInfo userInfo) {
             }
 
             // Check to see if a user already exists with this email address.
-            User user = !String.IsNullOrEmpty(userInfo.Email) ? await _userRepository.GetByEmailAddressAsync(userInfo.Email) : null;
+            var user = !String.IsNullOrEmpty(userInfo.Email) ? await _userRepository.GetByEmailAddressAsync(userInfo.Email) : null;
             if (user == null) {
                 if (!Settings.Current.EnableAccountCreation)
                     throw new ApplicationException("Account Creation is currently disabled.");

src/Exceptionless.Api/Controllers/OrganizationController.cs

@@ -339,7 +339,7 @@ public async Task<IHttpActionResult> ChangePlanAsync(string id, string planId, s
             if (organization == null)
                 return Ok(ChangePlanResult.FailWithMessage("Invalid OrganizationId."));
 
-            BillingPlan plan = BillingManager.GetBillingPlan(planId);
+            var plan = BillingManager.GetBillingPlan(planId);
             if (plan == null)
                 return Ok(ChangePlanResult.FailWithMessage("Invalid PlanId."));
 
@@ -383,7 +383,7 @@ public async Task<IHttpActionResult> ChangePlanAsync(string id, string planId, s
                     if (!String.IsNullOrWhiteSpace(couponId))
                         createCustomer.CouponId = couponId;
 
-                    StripeCustomer customer = await customerService.CreateAsync(createCustomer);
+                    var customer = await customerService.CreateAsync(createCustomer);
 
                     organization.BillingStatus = BillingStatus.Active;
                     organization.RemoveSuspension();
@@ -444,14 +444,14 @@ public async Task<IHttpActionResult> AddUserAsync(string id, string email) {
             if (String.IsNullOrEmpty(id) || !CanAccessOrganization(id) || String.IsNullOrEmpty(email))
                 return NotFound();
 
-            Organization organization = await GetModelAsync(id);
+            var organization = await GetModelAsync(id);
             if (organization == null)
                 return NotFound();
 
             if (!await _billingManager.CanAddUserAsync(organization))
                 return PlanLimitReached("Please upgrade your plan to add an additional user.");
 
-            User user = await _userRepository.GetByEmailAddressAsync(email);
+            var user = await _userRepository.GetByEmailAddressAsync(email);
             if (user != null) {
                 if (!user.OrganizationIds.Contains(organization.Id)) {
                     user.OrganizationIds.Add(organization.Id);
@@ -465,7 +465,7 @@ await _messagePublisher.PublishAsync(new UserMembershipChanged {
 
                 await _mailer.SendAddedToOrganizationAsync(CurrentUser, organization, user);
             } else {
-                Invite invite = organization.Invites.FirstOrDefault(i => String.Equals(i.EmailAddress, email, StringComparison.OrdinalIgnoreCase));
+                var invite = organization.Invites.FirstOrDefault(i => String.Equals(i.EmailAddress, email, StringComparison.OrdinalIgnoreCase));
                 if (invite == null) {
                     invite = new Invite {
                         Token = StringExtensions.GetNewToken(),
@@ -496,9 +496,9 @@ public async Task<IHttpActionResult> RemoveUserAsync(string id, string email) {
             if (organization == null)
                 return NotFound();
 
-            User user = await _userRepository.GetByEmailAddressAsync(email);
+            var user = await _userRepository.GetByEmailAddressAsync(email);
             if (user == null || !user.OrganizationIds.Contains(id)) {
-                Invite invite = organization.Invites.FirstOrDefault(i => String.Equals(i.EmailAddress, email, StringComparison.OrdinalIgnoreCase));
+                var invite = organization.Invites.FirstOrDefault(i => String.Equals(i.EmailAddress, email, StringComparison.OrdinalIgnoreCase));
                 if (invite == null)
                     return Ok();
 
@@ -511,9 +511,9 @@ public async Task<IHttpActionResult> RemoveUserAsync(string id, string email) {
                 if ((await _userRepository.GetByOrganizationIdAsync(organization.Id)).Total == 1)
                     return BadRequest("An organization must contain at least one user.");
 
-                List<Project> projects = (await _projectRepository.GetByOrganizationIdAsync(organization.Id)).Documents.Where(p => p.NotificationSettings.ContainsKey(user.Id)).ToList();
+                var projects = (await _projectRepository.GetByOrganizationIdAsync(organization.Id)).Documents.Where(p => p.NotificationSettings.ContainsKey(user.Id)).ToList();
                 if (projects.Count > 0) {
-                    foreach (Project project in projects)
+                    foreach (var project in projects)
                         project.NotificationSettings.Remove(user.Id);
 
                     await _projectRepository.SaveAsync(projects);

src/Exceptionless.Core/Jobs/WorkItemHandlers/RemoveOrganizationWorkItemHandler.cs

@@ -36,7 +36,7 @@ public RemoveOrganizationWorkItemHandler(IOrganizationRepository organizationRep
         }
 
         public override Task<ILock> GetWorkItemLockAsync(object workItem, CancellationToken cancellationToken = new CancellationToken()) {
-            var cacheKey = $"{nameof(RemoveOrganizationWorkItemHandler)}:{((RemoveOrganizationWorkItem)workItem).OrganizationId}";
+            string cacheKey = $"{nameof(RemoveOrganizationWorkItemHandler)}:{((RemoveOrganizationWorkItem)workItem).OrganizationId}";
             return _lockProvider.AcquireAsync(cacheKey, TimeSpan.FromMinutes(15), new CancellationToken(true));
         }
 
@@ -56,14 +56,14 @@ public override async Task HandleItemAsync(WorkItemContext context) {
                 Log.Info("Canceling stripe subscription for the organization '{0}' with Id: '{1}'.", organization.Name, organization.Id);
 
                 var subscriptionService = new StripeSubscriptionService(Settings.Current.StripeApiKey);
-                var subscriptions = (await subscriptionService.ListAsync(organization.StripeCustomerId).AnyContext()).Where(s => !s.CanceledAt.HasValue);
+                var subscriptions = (await subscriptionService.ListAsync(new StripeSubscriptionListOptions { CustomerId = organization.StripeCustomerId }).AnyContext()).Where(s => !s.CanceledAt.HasValue);
                 foreach (var subscription in subscriptions)
-                    await subscriptionService.CancelAsync(organization.StripeCustomerId, subscription.Id).AnyContext();
+                    await subscriptionService.CancelAsync(subscription.Id).AnyContext();
             }
 
             await context.ReportProgressAsync(20, "Removing users").AnyContext();
             var users = await _userRepository.GetByOrganizationIdAsync(organization.Id).AnyContext();
-            foreach (User user in users.Documents) {
+            foreach (var user in users.Documents) {
                 // delete the user if they are not associated to any other organizations and they are not the current user
                 if (user.OrganizationIds.All(oid => String.Equals(oid, organization.Id)) && !String.Equals(user.Id, workItem.CurrentUserId)) {
                     Log.Info("Removing user '{0}' as they do not belong to any other organizations.", user.Id, organization.Name, organization.Id);
@@ -84,8 +84,8 @@ public override async Task HandleItemAsync(WorkItemContext context) {
             await context.ReportProgressAsync(50, "Removing projects").AnyContext();
             var projects = await _projectRepository.GetByOrganizationIdAsync(organization.Id).AnyContext();
             if (workItem.IsGlobalAdmin && projects.Total > 0) {
-                var completed = 1;
-                foreach (Project project in projects.Documents) {
+                int completed = 1;
+                foreach (var project in projects.Documents) {
                     Log.Info("Resetting all project data for project '{0}' with Id: '{1}'.", project.Name, project.Id);
                     await _eventRepository.RemoveAllByProjectIdAsync(organization.Id, project.Id).AnyContext();
                     await _stackRepository.RemoveAllByProjectIdAsync(organization.Id, project.Id).AnyContext();