Skip to content

Commit

Permalink
[PM-1188] Server owner auth migration (#2825)
Browse files Browse the repository at this point in the history
* [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
  • Loading branch information
jlf0dev authored Apr 14, 2023
1 parent 2529c5b commit 88dd745
Show file tree
Hide file tree
Showing 332 changed files with 704 additions and 522 deletions.
5 changes: 5 additions & 0 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,10 @@
#
# https://docs.github.com/en/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/about-code-owners

## Auth team files ##
**/Auth @bitwarden/team-auth-dev
bitwarden_license/src/Sso @bitwarden/team-auth-dev
src/Identity @bitwarden/team-auth-dev

**/SecretsManager @bitwarden/team-secrets-manager-dev
**/Vault @bitwarden/team-vault-dev
9 changes: 6 additions & 3 deletions bitwarden_license/src/Sso/Controllers/AccountController.cs
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
using System.Security.Claims;
using Bit.Core;
using Bit.Core.Auth.Entities;
using Bit.Core.Auth.Enums;
using Bit.Core.Auth.Models;
using Bit.Core.Auth.Models.Business.Tokenables;
using Bit.Core.Auth.Models.Data;
using Bit.Core.Auth.Repositories;
using Bit.Core.Entities;
using Bit.Core.Enums;
using Bit.Core.Models;
using Bit.Core.Models.Api;
using Bit.Core.Models.Business.Tokenables;
using Bit.Core.Models.Data;
using Bit.Core.Repositories;
using Bit.Core.Services;
using Bit.Core.Settings;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using Bit.Core.Enums;
using Bit.Core.Auth.Enums;
using Bit.Sso.Utilities;
using Microsoft.AspNetCore.Authentication;
using Microsoft.AspNetCore.Mvc;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using Bit.Core.Enums;
using Bit.Core.Auth.Enums;
using Microsoft.AspNetCore.Authentication;
using Microsoft.AspNetCore.Authentication.OpenIdConnect;
using Sustainsys.Saml2.AspNetCore2;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
using System.Security.Cryptography.X509Certificates;
using Bit.Core.Entities;
using Bit.Core.Enums;
using Bit.Core.Models.Data;
using Bit.Core.Repositories;
using Bit.Core.Auth.Entities;
using Bit.Core.Auth.Enums;
using Bit.Core.Auth.Models.Data;
using Bit.Core.Auth.Repositories;
using Bit.Core.Settings;
using Bit.Core.Utilities;
using Bit.Sso.Models;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using Bit.Core.Enums;
using Bit.Core.Auth.Enums;
using Microsoft.AspNetCore.Authentication;

namespace Bit.Sso.Utilities;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using Bit.Core.Enums;
using Bit.Core.Auth.Enums;
using Microsoft.AspNetCore.Authentication;
using Microsoft.AspNetCore.Authentication.OpenIdConnect;
using Sustainsys.Saml2.AspNetCore2;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
using Bit.Admin.IdentityServer;
using Bit.Admin.Models;
using Bit.Admin.Auth.IdentityServer;
using Bit.Admin.Auth.Models;
using Microsoft.AspNetCore.Identity;
using Microsoft.AspNetCore.Mvc;

namespace Bit.Admin.Controllers;
namespace Bit.Admin.Auth.Controllers;

public class LoginController : Controller
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
using Microsoft.AspNetCore.Identity;
using Microsoft.Extensions.Options;

namespace Bit.Admin.IdentityServer;
namespace Bit.Admin.Auth.IdentityServer;

public class PasswordlessSignInManager<TUser> : SignInManager<TUser> where TUser : class
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
using Bit.Core.Repositories;
using Quartz;

namespace Bit.Admin.Jobs;
namespace Bit.Admin.Auth.Jobs;

public class DatabaseExpiredGrantsJob : BaseJob
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
using Bit.Core.Repositories;
using Quartz;

namespace Bit.Admin.Jobs;
namespace Bit.Admin.Auth.Jobs;

public class DeleteAuthRequestsJob : BaseJob
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using System.ComponentModel.DataAnnotations;

namespace Bit.Admin.Models;
namespace Bit.Admin.Auth.Models;

public class LoginModel
{
Expand Down
File renamed without changes.
5 changes: 5 additions & 0 deletions src/Admin/Auth/Views/_ViewImports.cshtml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
@using Microsoft.AspNetCore.Identity
@using Bit.Admin.Auth
@using Bit.Admin.Auth.Models
@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
@addTagHelper "*, Admin"
3 changes: 3 additions & 0 deletions src/Admin/Auth/Views/_ViewStart.cshtml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
@{
Layout = "_Layout";
}
5 changes: 3 additions & 2 deletions src/Admin/IdentityServer/ServiceCollectionExtensions.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
using Bit.Core.Entities;
using Bit.Core.Identity;
using Bit.Admin.Auth.IdentityServer;
using Bit.Core.Auth.Identity;
using Bit.Core.Entities;
using Bit.Core.Settings;
using Microsoft.AspNetCore.Identity;
using Microsoft.Extensions.DependencyInjection.Extensions;
Expand Down
3 changes: 2 additions & 1 deletion src/Admin/Jobs/DeleteSendsJob.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using Bit.Core;
using Bit.Admin.Auth.Jobs;
using Bit.Core;
using Bit.Core.Jobs;
using Bit.Core.Repositories;
using Bit.Core.Services;
Expand Down
1 change: 1 addition & 0 deletions src/Admin/Jobs/JobsHostedService.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using System.Runtime.InteropServices;
using Bit.Admin.Auth.Jobs;
using Bit.Core.Jobs;
using Bit.Core.Settings;
using Quartz;
Expand Down
6 changes: 6 additions & 0 deletions src/Admin/Startup.cs
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
using Bit.SharedWeb.Utilities;
using Microsoft.AspNetCore.Identity;
using Stripe;
using Microsoft.AspNetCore.Mvc.Razor;

#if !OSS
using Bit.Commercial.Core.Utilities;
Expand Down Expand Up @@ -95,6 +96,11 @@ public void ConfigureServices(IServiceCollection services)
});
services.Configure<RouteOptions>(options => options.LowercaseUrls = true);

services.Configure<RazorViewEngineOptions>(o =>
{
o.ViewLocationFormats.Add("/Auth/Views/{1}/{0}.cshtml");
});

// Jobs service
Jobs.JobsHostedService.AddJobsServices(services, globalSettings.SelfHosted);
services.AddHostedService<Jobs.JobsHostedService>();
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
using Bit.Api.Models.Request;
using Bit.Api.Auth.Models.Request;
using Bit.Api.Auth.Models.Response;
using Bit.Api.Models.Response;
using Bit.Core.Auth.Entities;
using Bit.Core.Auth.Exceptions;
using Bit.Core.Context;
using Bit.Core.Entities;
using Bit.Core.Exceptions;
using Bit.Core.Repositories;
using Bit.Core.Services;
Expand All @@ -10,7 +12,7 @@
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;

namespace Bit.Api.Controllers;
namespace Bit.Api.Auth.Controllers;

[Route("auth-requests")]
[Authorize("Application")]
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
using Bit.Api.Models.Request;
using Bit.Api.Auth.Models.Request;
using Bit.Api.Auth.Models.Response;
using Bit.Api.Models.Request.Organizations;
using Bit.Api.Models.Response;
using Bit.Api.Vault.Models.Response;
using Bit.Core.Auth.Services;
using Bit.Core.Entities;
using Bit.Core.Exceptions;
using Bit.Core.Repositories;
Expand All @@ -10,7 +12,7 @@
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;

namespace Bit.Api.Controllers;
namespace Bit.Api.Auth.Controllers;

[Route("emergency-access")]
[Authorize("Application")]
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
using Bit.Api.Models.Request;
using Bit.Api.Models.Request.Accounts;
using Bit.Api.Auth.Models.Request;
using Bit.Api.Auth.Models.Request.Accounts;
using Bit.Api.Auth.Models.Response.TwoFactor;
using Bit.Api.Models.Request;
using Bit.Api.Models.Response;
using Bit.Api.Models.Response.TwoFactor;
using Bit.Core.Auth.Enums;
using Bit.Core.Auth.LoginFeatures.PasswordlessLogin.Interfaces;
using Bit.Core.Auth.Utilities;
using Bit.Core.Context;
using Bit.Core.Entities;
using Bit.Core.Enums;
using Bit.Core.Exceptions;
using Bit.Core.LoginFeatures.PasswordlessLogin.Interfaces;
using Bit.Core.Repositories;
using Bit.Core.Services;
using Bit.Core.Settings;
Expand All @@ -16,7 +18,7 @@
using Microsoft.AspNetCore.Identity;
using Microsoft.AspNetCore.Mvc;

namespace Bit.Api.Controllers;
namespace Bit.Api.Auth.Controllers;

[Route("two-factor")]
[Authorize("Web")]
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
using Bit.Core.Jobs;
using Bit.Core.Services;
using Bit.Core.Auth.Services;
using Bit.Core.Jobs;
using Quartz;

namespace Bit.Api.Jobs;
namespace Bit.Api.Auth.Jobs;

public class EmergencyAccessNotificationJob : BaseJob
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
using Bit.Core.Jobs;
using Bit.Core.Services;
using Bit.Core.Auth.Services;
using Bit.Core.Jobs;
using Quartz;

namespace Bit.Api.Jobs;
namespace Bit.Api.Auth.Jobs;

public class EmergencyAccessTimeoutJob : BaseJob
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using System.ComponentModel.DataAnnotations;

namespace Bit.Api.Models.Public;
namespace Bit.Api.Auth.Models.Public;

public abstract class AssociationWithPermissionsBaseModel
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using Bit.Core.Models.Data;

namespace Bit.Api.Models.Public.Request;
namespace Bit.Api.Auth.Models.Public.Request;

public class AssociationWithPermissionsRequestModel : AssociationWithPermissionsBaseModel
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using Bit.Core.Models.Data;

namespace Bit.Api.Models.Public.Response;
namespace Bit.Api.Auth.Models.Public.Response;

public class AssociationWithPermissionsResponseModel : AssociationWithPermissionsBaseModel
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using System.ComponentModel.DataAnnotations;

namespace Bit.Api.Models.Request.Accounts;
namespace Bit.Api.Auth.Models.Request.Accounts;

public class DeleteRecoverRequestModel
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using System.ComponentModel.DataAnnotations;
using Bit.Core.Utilities;

namespace Bit.Api.Models.Request.Accounts;
namespace Bit.Api.Auth.Models.Request.Accounts;

public class EmailRequestModel : SecretVerificationRequestModel
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using System.ComponentModel.DataAnnotations;
using Bit.Core.Utilities;

namespace Bit.Api.Models.Request.Accounts;
namespace Bit.Api.Auth.Models.Request.Accounts;

public class EmailTokenRequestModel : SecretVerificationRequestModel
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
using Bit.Core.Enums;
using Bit.Core.Utilities;

namespace Bit.Api.Models.Request.Accounts;
namespace Bit.Api.Auth.Models.Request.Accounts;

public class KdfRequestModel : PasswordRequestModel, IValidatableObject
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using System.ComponentModel.DataAnnotations;

namespace Bit.Api.Models.Request.Accounts;
namespace Bit.Api.Auth.Models.Request.Accounts;

public class PasswordHintRequestModel
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using System.ComponentModel.DataAnnotations;

namespace Bit.Api.Models.Request.Accounts;
namespace Bit.Api.Auth.Models.Request.Accounts;

public class PasswordRequestModel : SecretVerificationRequestModel
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using System.ComponentModel.DataAnnotations;

namespace Bit.Api.Models.Request.Accounts;
namespace Bit.Api.Auth.Models.Request.Accounts;

public class RegenerateTwoFactorRequestModel
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using System.ComponentModel.DataAnnotations;

namespace Bit.Api.Models.Request.Accounts;
namespace Bit.Api.Auth.Models.Request.Accounts;

public class SecretVerificationRequestModel : IValidatableObject
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
using System.ComponentModel.DataAnnotations;
using Bit.Core.Auth.Models.Api.Request.Accounts;
using Bit.Core.Entities;
using Bit.Core.Enums;
using Bit.Core.Models.Api.Request.Accounts;
using Bit.Core.Utilities;

namespace Bit.Api.Models.Request.Accounts;
namespace Bit.Api.Auth.Models.Request.Accounts;

public class SetKeyConnectorKeyRequestModel : IValidatableObject
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
using System.ComponentModel.DataAnnotations;
using Bit.Core.Auth.Models.Api.Request.Accounts;
using Bit.Core.Entities;
using Bit.Core.Enums;
using Bit.Core.Models.Api.Request.Accounts;
using Bit.Core.Utilities;

namespace Bit.Api.Models.Request.Accounts;
namespace Bit.Api.Auth.Models.Request.Accounts;

public class SetPasswordRequestModel : IValidatableObject
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
using System.ComponentModel.DataAnnotations;
using Bit.Api.Models.Request;
using Bit.Api.Vault.Models.Request;

namespace Bit.Api.Models.Request.Accounts;
namespace Bit.Api.Auth.Models.Request.Accounts;

public class UpdateKeyRequestModel
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using System.ComponentModel.DataAnnotations;
using Bit.Core.Entities;

namespace Bit.Api.Models.Request.Accounts;
namespace Bit.Api.Auth.Models.Request.Accounts;

public class UpdateProfileRequestModel
{
Expand Down
Loading

0 comments on commit 88dd745

Please sign in to comment.