mirror of
https://github.com/bitwarden/server
synced 2025-12-17 00:33:23 +00:00
[PM-1188] Server owner auth migration (#2825)
* [PM-1188] add sso project to auth * [PM-1188] move sso api models to auth * [PM-1188] fix sso api model namespace & imports * [PM-1188] move core files to auth * [PM-1188] fix core sso namespace & models * [PM-1188] move sso repository files to auth * [PM-1188] fix sso repo files namespace & imports * [PM-1188] move sso sql files to auth folder * [PM-1188] move sso test files to auth folders * [PM-1188] fix sso tests namespace & imports * [PM-1188] move auth api files to auth folder * [PM-1188] fix auth api files namespace & imports * [PM-1188] move auth core files to auth folder * [PM-1188] fix auth core files namespace & imports * [PM-1188] move auth email templates to auth folder * [PM-1188] move auth email folder back into shared directory * [PM-1188] fix auth email names * [PM-1188] move auth core models to auth folder * [PM-1188] fix auth model namespace & imports * [PM-1188] add entire Identity project to auth codeowners * [PM-1188] fix auth orm files namespace & imports * [PM-1188] move auth orm files to auth folder * [PM-1188] move auth sql files to auth folder * [PM-1188] move auth tests to auth folder * [PM-1188] fix auth test files namespace & imports * [PM-1188] move emergency access api files to auth folder * [PM-1188] fix emergencyaccess api files namespace & imports * [PM-1188] move emergency access core files to auth folder * [PM-1188] fix emergency access core files namespace & imports * [PM-1188] move emergency access orm files to auth folder * [PM-1188] fix emergency access orm files namespace & imports * [PM-1188] move emergency access sql files to auth folder * [PM-1188] move emergencyaccess test files to auth folder * [PM-1188] fix emergency access test files namespace & imports * [PM-1188] move captcha files to auth folder * [PM-1188] fix captcha files namespace & imports * [PM-1188] move auth admin files into auth folder * [PM-1188] fix admin auth files namespace & imports - configure mvc to look in auth folders for views * [PM-1188] remove extra imports and formatting * [PM-1188] fix ef auth model imports * [PM-1188] fix DatabaseContextModelSnapshot paths * [PM-1188] fix grant import in ef * [PM-1188] update sqlproj * [PM-1188] move missed sqlproj files * [PM-1188] move auth ef models out of auth folder * [PM-1188] fix auth ef models namespace * [PM-1188] remove auth ef models unused imports * [PM-1188] fix imports for auth ef models * [PM-1188] fix more ef model imports * [PM-1188] fix file encodings
This commit is contained in:
@@ -1,8 +1,10 @@
|
||||
using System.Net;
|
||||
using System.Reflection;
|
||||
using Bit.Core.Auth.Entities;
|
||||
using Bit.Core.Auth.Models.Business;
|
||||
using Bit.Core.Auth.Models.Mail;
|
||||
using Bit.Core.Entities;
|
||||
using Bit.Core.Entities.Provider;
|
||||
using Bit.Core.Models.Business;
|
||||
using Bit.Core.Models.Mail;
|
||||
using Bit.Core.Models.Mail.FamiliesForEnterprise;
|
||||
using Bit.Core.Models.Mail.Provider;
|
||||
@@ -44,7 +46,7 @@ public class HandlebarsMailService : IMailService
|
||||
WebVaultUrl = _globalSettings.BaseServiceUri.VaultWithHash,
|
||||
SiteName = _globalSettings.SiteName
|
||||
};
|
||||
await AddMessageContentAsync(message, "VerifyEmail", model);
|
||||
await AddMessageContentAsync(message, "Auth.VerifyEmail", model);
|
||||
message.MetaData.Add("SendGridBypassListManagement", true);
|
||||
message.Category = "VerifyEmail";
|
||||
await _mailDeliveryService.SendEmailAsync(message);
|
||||
@@ -62,7 +64,7 @@ public class HandlebarsMailService : IMailService
|
||||
Email = email,
|
||||
EmailEncoded = WebUtility.UrlEncode(email)
|
||||
};
|
||||
await AddMessageContentAsync(message, "VerifyDelete", model);
|
||||
await AddMessageContentAsync(message, "Auth.VerifyDelete", model);
|
||||
message.MetaData.Add("SendGridBypassListManagement", true);
|
||||
message.Category = "VerifyDelete";
|
||||
await _mailDeliveryService.SendEmailAsync(message);
|
||||
@@ -107,7 +109,7 @@ public class HandlebarsMailService : IMailService
|
||||
WebVaultUrl = _globalSettings.BaseServiceUri.VaultWithHash,
|
||||
SiteName = _globalSettings.SiteName
|
||||
};
|
||||
await AddMessageContentAsync(message, "TwoFactorEmail", model);
|
||||
await AddMessageContentAsync(message, "Auth.TwoFactorEmail", model);
|
||||
message.MetaData.Add("SendGridBypassListManagement", true);
|
||||
message.Category = "TwoFactorEmail";
|
||||
await _mailDeliveryService.SendEmailAsync(message);
|
||||
@@ -122,7 +124,7 @@ public class HandlebarsMailService : IMailService
|
||||
WebVaultUrl = _globalSettings.BaseServiceUri.VaultWithHash,
|
||||
SiteName = _globalSettings.SiteName
|
||||
};
|
||||
await AddMessageContentAsync(message, "MasterPasswordHint", model);
|
||||
await AddMessageContentAsync(message, "Auth.MasterPasswordHint", model);
|
||||
message.Category = "MasterPasswordHint";
|
||||
await _mailDeliveryService.SendEmailAsync(message);
|
||||
}
|
||||
@@ -135,7 +137,7 @@ public class HandlebarsMailService : IMailService
|
||||
WebVaultUrl = _globalSettings.BaseServiceUri.VaultWithHash,
|
||||
SiteName = _globalSettings.SiteName
|
||||
};
|
||||
await AddMessageContentAsync(message, "NoMasterPasswordHint", model);
|
||||
await AddMessageContentAsync(message, "Auth.NoMasterPasswordHint", model);
|
||||
message.Category = "NoMasterPasswordHint";
|
||||
await _mailDeliveryService.SendEmailAsync(message);
|
||||
}
|
||||
@@ -277,7 +279,7 @@ public class HandlebarsMailService : IMailService
|
||||
{
|
||||
Url = url.ToString()
|
||||
};
|
||||
await AddMessageContentAsync(message, "PasswordlessSignIn", model);
|
||||
await AddMessageContentAsync(message, "Auth.PasswordlessSignIn", model);
|
||||
message.Category = "PasswordlessSignIn";
|
||||
await _mailDeliveryService.SendEmailAsync(message);
|
||||
}
|
||||
@@ -371,7 +373,7 @@ public class HandlebarsMailService : IMailService
|
||||
TimeZone = "UTC",
|
||||
IpAddress = ip
|
||||
};
|
||||
await AddMessageContentAsync(message, "RecoverTwoFactor", model);
|
||||
await AddMessageContentAsync(message, "Auth.RecoverTwoFactor", model);
|
||||
message.Category = "RecoverTwoFactor";
|
||||
await _mailDeliveryService.SendEmailAsync(message);
|
||||
}
|
||||
@@ -588,7 +590,7 @@ public class HandlebarsMailService : IMailService
|
||||
WebVaultUrl = _globalSettings.BaseServiceUri.VaultWithHash,
|
||||
SiteName = _globalSettings.SiteName
|
||||
};
|
||||
await AddMessageContentAsync(message, "EmergencyAccessInvited", model);
|
||||
await AddMessageContentAsync(message, "Auth.EmergencyAccessInvited", model);
|
||||
message.Category = "EmergencyAccessInvited";
|
||||
await _mailDeliveryService.SendEmailAsync(message);
|
||||
}
|
||||
@@ -602,7 +604,7 @@ public class HandlebarsMailService : IMailService
|
||||
WebVaultUrl = _globalSettings.BaseServiceUri.VaultWithHash,
|
||||
SiteName = _globalSettings.SiteName
|
||||
};
|
||||
await AddMessageContentAsync(message, "EmergencyAccessAccepted", model);
|
||||
await AddMessageContentAsync(message, "Auth.EmergencyAccessAccepted", model);
|
||||
message.Category = "EmergencyAccessAccepted";
|
||||
await _mailDeliveryService.SendEmailAsync(message);
|
||||
}
|
||||
@@ -616,7 +618,7 @@ public class HandlebarsMailService : IMailService
|
||||
WebVaultUrl = _globalSettings.BaseServiceUri.VaultWithHash,
|
||||
SiteName = _globalSettings.SiteName
|
||||
};
|
||||
await AddMessageContentAsync(message, "EmergencyAccessConfirmed", model);
|
||||
await AddMessageContentAsync(message, "Auth.EmergencyAccessConfirmed", model);
|
||||
message.Category = "EmergencyAccessConfirmed";
|
||||
await _mailDeliveryService.SendEmailAsync(message);
|
||||
}
|
||||
@@ -633,7 +635,7 @@ public class HandlebarsMailService : IMailService
|
||||
Action = emergencyAccess.Type.ToString(),
|
||||
DaysLeft = emergencyAccess.WaitTimeDays - Convert.ToInt32((remainingTime).TotalDays),
|
||||
};
|
||||
await AddMessageContentAsync(message, "EmergencyAccessRecovery", model);
|
||||
await AddMessageContentAsync(message, "Auth.EmergencyAccessRecovery", model);
|
||||
message.Category = "EmergencyAccessRecovery";
|
||||
await _mailDeliveryService.SendEmailAsync(message);
|
||||
}
|
||||
@@ -645,7 +647,7 @@ public class HandlebarsMailService : IMailService
|
||||
{
|
||||
Name = CoreHelpers.SanitizeForEmail(approvingName),
|
||||
};
|
||||
await AddMessageContentAsync(message, "EmergencyAccessApproved", model);
|
||||
await AddMessageContentAsync(message, "Auth.EmergencyAccessApproved", model);
|
||||
message.Category = "EmergencyAccessApproved";
|
||||
await _mailDeliveryService.SendEmailAsync(message);
|
||||
}
|
||||
@@ -657,7 +659,7 @@ public class HandlebarsMailService : IMailService
|
||||
{
|
||||
Name = CoreHelpers.SanitizeForEmail(rejectingName),
|
||||
};
|
||||
await AddMessageContentAsync(message, "EmergencyAccessRejected", model);
|
||||
await AddMessageContentAsync(message, "Auth.EmergencyAccessRejected", model);
|
||||
message.Category = "EmergencyAccessRejected";
|
||||
await _mailDeliveryService.SendEmailAsync(message);
|
||||
}
|
||||
@@ -674,7 +676,7 @@ public class HandlebarsMailService : IMailService
|
||||
Action = emergencyAccess.Type.ToString(),
|
||||
DaysLeft = emergencyAccess.WaitTimeDays - Convert.ToInt32((remainingTime).TotalDays),
|
||||
};
|
||||
await AddMessageContentAsync(message, "EmergencyAccessRecoveryReminder", model);
|
||||
await AddMessageContentAsync(message, "Auth.EmergencyAccessRecoveryReminder", model);
|
||||
message.Category = "EmergencyAccessRecoveryReminder";
|
||||
await _mailDeliveryService.SendEmailAsync(message);
|
||||
}
|
||||
@@ -687,7 +689,7 @@ public class HandlebarsMailService : IMailService
|
||||
Name = CoreHelpers.SanitizeForEmail(initiatingName),
|
||||
Action = emergencyAccess.Type.ToString(),
|
||||
};
|
||||
await AddMessageContentAsync(message, "EmergencyAccessRecoveryTimedOut", model);
|
||||
await AddMessageContentAsync(message, "Auth.EmergencyAccessRecoveryTimedOut", model);
|
||||
message.Category = "EmergencyAccessRecoveryTimedOut";
|
||||
await _mailDeliveryService.SendEmailAsync(message);
|
||||
}
|
||||
@@ -841,7 +843,7 @@ public class HandlebarsMailService : IMailService
|
||||
WebVaultUrl = _globalSettings.BaseServiceUri.VaultWithHash,
|
||||
SiteName = _globalSettings.SiteName,
|
||||
};
|
||||
await AddMessageContentAsync(message, "OTPEmail", model);
|
||||
await AddMessageContentAsync(message, "Auth.OTPEmail", model);
|
||||
message.MetaData.Add("SendGridBypassListManagement", true);
|
||||
message.Category = "OTP";
|
||||
await _mailDeliveryService.SendEmailAsync(message);
|
||||
@@ -859,7 +861,7 @@ public class HandlebarsMailService : IMailService
|
||||
AffectedEmail = email
|
||||
|
||||
};
|
||||
await AddMessageContentAsync(message, "FailedLoginAttempts", model);
|
||||
await AddMessageContentAsync(message, "Auth.FailedLoginAttempts", model);
|
||||
message.Category = "FailedLoginAttempts";
|
||||
await _mailDeliveryService.SendEmailAsync(message);
|
||||
}
|
||||
@@ -876,7 +878,7 @@ public class HandlebarsMailService : IMailService
|
||||
AffectedEmail = email
|
||||
|
||||
};
|
||||
await AddMessageContentAsync(message, "FailedTwoFactorAttempts", model);
|
||||
await AddMessageContentAsync(message, "Auth.FailedTwoFactorAttempts", model);
|
||||
message.Category = "FailedTwoFactorAttempts";
|
||||
await _mailDeliveryService.SendEmailAsync(message);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user