Skip to content

Commit

Permalink
More cleanup from editor config suggestions
Browse files Browse the repository at this point in the history
  • Loading branch information
@niemyjski
niemyjski committed Feb 27, 2017
1 parent 14ac092 commit 7707cfb
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 17 deletions.
4 changes: 2 additions & 2 deletions src/Exceptionless.Api/Controllers/AuthController.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down Expand Up @@ -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.");
Expand Down
18 changes: 9 additions & 9 deletions src/Exceptionless.Api/Controllers/OrganizationController.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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."));

Expand Down Expand Up @@ -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();
Expand Down Expand Up @@ -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);
Expand All @@ -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(),
Expand Down Expand Up @@ -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();

Expand All @@ -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);
Expand Down
12 changes: 6 additions & 6 deletions src/Exceptionless.Core/Jobs/WorkItemHandlers/RemoveOrganizationWorkItemHandler.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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));
}

Expand All @@ -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);
Expand All @@ -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();
Expand Down

0 comments on commit 7707cfb

Please sign in to comment.