diff --git a/.gitignore b/.gitignore deleted file mode 100644 index add57be..0000000 --- a/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -bin/ -obj/ -/packages/ -riderModule.iml -/_ReSharper.Caches/ \ No newline at end of file diff --git a/.idea/.idea.W542.GandalfReborn/.idea/codeStyles/codeStyleConfig.xml b/.idea/.idea.W542.GandalfReborn/.idea/codeStyles/codeStyleConfig.xml deleted file mode 100644 index a55e7a1..0000000 --- a/.idea/.idea.W542.GandalfReborn/.idea/codeStyles/codeStyleConfig.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/.idea.W542.GandalfReborn/.idea/dataSources.xml b/.idea/.idea.W542.GandalfReborn/.idea/dataSources.xml deleted file mode 100644 index c500b12..0000000 --- a/.idea/.idea.W542.GandalfReborn/.idea/dataSources.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - postgresql - true - true - org.postgresql.Driver - jdbc:postgresql://localhost:5432/gandalf_reborn?user=root&password=root - $ProjectFileDir$ - - - \ No newline at end of file diff --git a/.idea/.idea.W542.GandalfReborn/.idea/vcs.xml b/.idea/.idea.W542.GandalfReborn/.idea/vcs.xml deleted file mode 100644 index 94a25f7..0000000 --- a/.idea/.idea.W542.GandalfReborn/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/Abstractions/InvokerContext.cs b/Abstractions/InvokerContext.cs deleted file mode 100644 index 12248b3..0000000 --- a/Abstractions/InvokerContext.cs +++ /dev/null @@ -1,6 +0,0 @@ -namespace Abstractions; - -public class InvokerContext -{ - public Abstractions.Invoker? Invoker { get; set; } -} \ No newline at end of file diff --git a/Data/Database/Repositories/AuthCodeRepository.cs b/Data/Database/Repositories/AuthCodeRepository.cs deleted file mode 100644 index 1319d03..0000000 --- a/Data/Database/Repositories/AuthCodeRepository.cs +++ /dev/null @@ -1,14 +0,0 @@ -using System.Linq.Expressions; -using LanguageExt.Common; -using Microsoft.EntityFrameworkCore; -using W542.GandalfReborn.Data.Entities.Base; -using W542.GandalfReborn.Data.Entities.Security; -using W542.GandalfReborn.Data.Entities.Subject; -using W542.GandalfReborn.Data.Entities.Tenant; -using W542.GandalfReborn.Data.Entities.Version; - -namespace W542.GandalfReborn.Data.Database.Repositories; - -public class AuthCodeRepository(ApplicationContext context) : GrRepository(context), IAuthCodeRepository; - -public interface IAuthCodeRepository : IGrRepository; \ No newline at end of file diff --git a/Data/Entities/Base/IMappingEntity.cs b/Data/Entities/Base/IMappingEntity.cs deleted file mode 100644 index 247737c..0000000 --- a/Data/Entities/Base/IMappingEntity.cs +++ /dev/null @@ -1,3 +0,0 @@ -namespace W542.GandalfReborn.Data.Entities.Base; - -public interface IMappingEntity; \ No newline at end of file diff --git a/Data/Entities/Security/AuthorityType.cs b/Data/Entities/Security/AuthorityType.cs deleted file mode 100644 index b635b58..0000000 --- a/Data/Entities/Security/AuthorityType.cs +++ /dev/null @@ -1,7 +0,0 @@ -namespace W542.GandalfReborn.Data.Entities.Security; - -public enum AuthorityType -{ - Tenant, - App -} \ No newline at end of file diff --git a/Data/Entities/Security/TokenType.cs b/Data/Entities/Security/TokenType.cs deleted file mode 100644 index 6f2285d..0000000 --- a/Data/Entities/Security/TokenType.cs +++ /dev/null @@ -1,7 +0,0 @@ -namespace W542.GandalfReborn.Data.Entities.Security; - -public enum TokenType -{ - Application, - User -} \ No newline at end of file diff --git a/Data/Entities/Subject/SignIn/SignInMethod.cs b/Data/Entities/Subject/SignIn/SignInMethod.cs deleted file mode 100644 index 851ee44..0000000 --- a/Data/Entities/Subject/SignIn/SignInMethod.cs +++ /dev/null @@ -1,8 +0,0 @@ -namespace W542.GandalfReborn.Data.Entities.Subject.SignIn; - -public enum SignInMethod -{ - Simple, - Google, - Steam -} \ No newline at end of file diff --git a/Data/Entities/Tenant/OwnerData.cs b/Data/Entities/Tenant/OwnerData.cs deleted file mode 100644 index 3319af7..0000000 --- a/Data/Entities/Tenant/OwnerData.cs +++ /dev/null @@ -1,8 +0,0 @@ -using W542.GandalfReborn.Data.Entities.Base; - -namespace W542.GandalfReborn.Data.Entities.Tenant; - -public abstract class OwnerData : VisibilityData -{ - public required long OwnerId { get; set; } -} \ No newline at end of file diff --git a/src/dotnet/.gitignore b/src/dotnet/.gitignore new file mode 100644 index 0000000..d978554 --- /dev/null +++ b/src/dotnet/.gitignore @@ -0,0 +1,97 @@ +# Created by https://www.toptal.com/developers/gitignore/api/rider +# Edit at https://www.toptal.com/developers/gitignore?templates=rider + +### Rider ### +# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider +# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839 + +# User-specific stuff +.idea/**/workspace.xml +.idea/**/tasks.xml +.idea/**/usage.statistics.xml +.idea/**/dictionaries +.idea/**/shelf + +# AWS User-specific +.idea/**/aws.xml + +# Generated files +.idea/**/contentModel.xml + +# Sensitive or high-churn files +.idea/**/dataSources/ +.idea/**/dataSources.ids +.idea/**/dataSources.local.xml +.idea/**/sqlDataSources.xml +.idea/**/dynamic.xml +.idea/**/uiDesigner.xml +.idea/**/dbnavigator.xml + +# Gradle +.idea/**/gradle.xml +.idea/**/libraries + +# Gradle and Maven with auto-import +# When using Gradle or Maven with auto-import, you should exclude module files, +# since they will be recreated, and may cause churn. Uncomment if using +# auto-import. +# .idea/artifacts +# .idea/compiler.xml +# .idea/jarRepositories.xml +# .idea/modules.xml +# .idea/*.iml +# .idea/modules +# *.iml +# *.ipr + +# CMake +cmake-build-*/ + +# Mongo Explorer plugin +.idea/**/mongoSettings.xml + +# File-based project format +*.iws + +# IntelliJ +out/ + +# mpeltonen/sbt-idea plugin +.idea_modules/ + +# JIRA plugin +atlassian-ide-plugin.xml + +# Cursive Clojure plugin +.idea/replstate.xml + +# SonarLint plugin +.idea/sonarlint/ + +# Crashlytics plugin (for Android Studio and IntelliJ) +com_crashlytics_export_strings.xml +crashlytics.properties +crashlytics-build.properties +fabric.properties + +# Editor-based Rest Client +.idea/httpRequests + +# Android studio 3.1+ serialized cache file +.idea/caches/build_file_checksums.ser + +# End of https://www.toptal.com/developers/gitignore/api/rider + +*.sln.DotSettings.user +.idea/**/.name +.idea/**/vcs.xml + +*.db +*.db-wal +*.db-shm +**/bin/ +**/obj/ + +.vs/ +*.log +*.tlog \ No newline at end of file diff --git a/.idea/.idea.W542.GandalfReborn/.idea/.gitignore b/src/dotnet/.idea/.idea.Suspectus.GandalfReborn/.idea/.gitignore similarity index 88% rename from .idea/.idea.W542.GandalfReborn/.idea/.gitignore rename to src/dotnet/.idea/.idea.Suspectus.GandalfReborn/.idea/.gitignore index 7648847..c98dc88 100644 --- a/.idea/.idea.W542.GandalfReborn/.idea/.gitignore +++ b/src/dotnet/.idea/.idea.Suspectus.GandalfReborn/.idea/.gitignore @@ -2,10 +2,10 @@ /shelf/ /workspace.xml # Rider ignored files +/contentModel.xml +/.idea.Suspectus.GandalfReborn.iml /modules.xml /projectSettingsUpdater.xml -/contentModel.xml -/.idea.W542.GandalfReborn.iml # Editor-based HTTP Client requests /httpRequests/ # Datasource local storage ignored files diff --git a/.idea/.idea.W542.GandalfReborn/.idea/indexLayout.xml b/src/dotnet/.idea/.idea.Suspectus.GandalfReborn/.idea/indexLayout.xml similarity index 80% rename from .idea/.idea.W542.GandalfReborn/.idea/indexLayout.xml rename to src/dotnet/.idea/.idea.Suspectus.GandalfReborn/.idea/indexLayout.xml index 32440b5..89ff583 100644 --- a/.idea/.idea.W542.GandalfReborn/.idea/indexLayout.xml +++ b/src/dotnet/.idea/.idea.Suspectus.GandalfReborn/.idea/indexLayout.xml @@ -2,8 +2,7 @@ - Docker - Scripts + ../../../gandalf-reborn diff --git a/Core/Core.csproj b/src/dotnet/Core/Core.csproj similarity index 100% rename from Core/Core.csproj rename to src/dotnet/Core/Core.csproj diff --git a/LICENSE.md b/src/dotnet/LICENSE.md similarity index 100% rename from LICENSE.md rename to src/dotnet/LICENSE.md diff --git a/Service/Service.csproj b/src/dotnet/Service/Service.csproj similarity index 100% rename from Service/Service.csproj rename to src/dotnet/Service/Service.csproj diff --git a/Abstractions/Invoker.cs b/src/dotnet/Suspectus.GandalfReborn.Abstractions/Invoker.cs similarity index 97% rename from Abstractions/Invoker.cs rename to src/dotnet/Suspectus.GandalfReborn.Abstractions/Invoker.cs index 3760f88..c8f6d61 100644 --- a/Abstractions/Invoker.cs +++ b/src/dotnet/Suspectus.GandalfReborn.Abstractions/Invoker.cs @@ -2,7 +2,7 @@ using System.Collections.Immutable; using System.Security.Claims; using System.Text.RegularExpressions; -namespace Abstractions; +namespace Suspectus.GandalfReborn.Abstractions; public partial class Invoker { diff --git a/src/dotnet/Suspectus.GandalfReborn.Abstractions/InvokerContext.cs b/src/dotnet/Suspectus.GandalfReborn.Abstractions/InvokerContext.cs new file mode 100644 index 0000000..658f59d --- /dev/null +++ b/src/dotnet/Suspectus.GandalfReborn.Abstractions/InvokerContext.cs @@ -0,0 +1,6 @@ +namespace Suspectus.GandalfReborn.Abstractions; + +public class InvokerContext +{ + public Invoker? Invoker { get; set; } +} \ No newline at end of file diff --git a/Abstractions/Abstractions.csproj b/src/dotnet/Suspectus.GandalfReborn.Abstractions/Suspectus.GandalfReborn.Abstractions.csproj similarity index 74% rename from Abstractions/Abstractions.csproj rename to src/dotnet/Suspectus.GandalfReborn.Abstractions/Suspectus.GandalfReborn.Abstractions.csproj index 17b910f..9cea2c7 100644 --- a/Abstractions/Abstractions.csproj +++ b/src/dotnet/Suspectus.GandalfReborn.Abstractions/Suspectus.GandalfReborn.Abstractions.csproj @@ -4,6 +4,7 @@ net9.0 enable enable + Suspectus.GandalfReborn.Abstractions diff --git a/Api/Commands/AuthCodeRequestCommand.cs b/src/dotnet/Suspectus.GandalfReborn.Api/Commands/AuthCodeRequestCommand.cs similarity index 85% rename from Api/Commands/AuthCodeRequestCommand.cs rename to src/dotnet/Suspectus.GandalfReborn.Api/Commands/AuthCodeRequestCommand.cs index 52b4e9a..ca5c3a9 100644 --- a/Api/Commands/AuthCodeRequestCommand.cs +++ b/src/dotnet/Suspectus.GandalfReborn.Api/Commands/AuthCodeRequestCommand.cs @@ -1,7 +1,7 @@ using LanguageExt.Common; -using W542.GandalfReborn.Data.Dto; +using Suspectus.GandalfReborn.Data.Dto; -namespace W542.GandalfReborn.Commands; +namespace Suspectus.GandalfReborn.Commands; public class AuthCodeRequestCommand : IGrCommand> { diff --git a/Api/Commands/CreateAuthCodeCommand.cs b/src/dotnet/Suspectus.GandalfReborn.Api/Commands/CreateAuthCodeCommand.cs similarity index 75% rename from Api/Commands/CreateAuthCodeCommand.cs rename to src/dotnet/Suspectus.GandalfReborn.Api/Commands/CreateAuthCodeCommand.cs index bf68754..562c251 100644 --- a/Api/Commands/CreateAuthCodeCommand.cs +++ b/src/dotnet/Suspectus.GandalfReborn.Api/Commands/CreateAuthCodeCommand.cs @@ -1,7 +1,7 @@ using LanguageExt.Common; -using W542.GandalfReborn.Data.Dto; +using Suspectus.GandalfReborn.Data.Dto; -namespace W542.GandalfReborn.Commands; +namespace Suspectus.GandalfReborn.Commands; public class CreateAuthCodeCommand : IGrCommand> { diff --git a/Api/Commands/CreateTokensCommand.cs b/src/dotnet/Suspectus.GandalfReborn.Api/Commands/CreateTokensCommand.cs similarity index 63% rename from Api/Commands/CreateTokensCommand.cs rename to src/dotnet/Suspectus.GandalfReborn.Api/Commands/CreateTokensCommand.cs index 6d453c4..775a4dc 100644 --- a/Api/Commands/CreateTokensCommand.cs +++ b/src/dotnet/Suspectus.GandalfReborn.Api/Commands/CreateTokensCommand.cs @@ -1,7 +1,7 @@ using LanguageExt.Common; -using W542.GandalfReborn.Data.Dto; +using Suspectus.GandalfReborn.Data.Dto; -namespace W542.GandalfReborn.Commands; +namespace Suspectus.GandalfReborn.Commands; public class CreateTokensCommand : IGrCommand> { diff --git a/Api/Commands/HashPasswordCommand.cs b/src/dotnet/Suspectus.GandalfReborn.Api/Commands/HashPasswordCommand.cs similarity index 76% rename from Api/Commands/HashPasswordCommand.cs rename to src/dotnet/Suspectus.GandalfReborn.Api/Commands/HashPasswordCommand.cs index fcb9de6..3262406 100644 --- a/Api/Commands/HashPasswordCommand.cs +++ b/src/dotnet/Suspectus.GandalfReborn.Api/Commands/HashPasswordCommand.cs @@ -1,6 +1,6 @@ using LanguageExt.Common; -namespace W542.GandalfReborn.Commands; +namespace Suspectus.GandalfReborn.Commands; public class HashPasswordCommand : IGrCommand> { diff --git a/Api/Commands/IGrCommand.cs b/src/dotnet/Suspectus.GandalfReborn.Api/Commands/IGrCommand.cs similarity index 60% rename from Api/Commands/IGrCommand.cs rename to src/dotnet/Suspectus.GandalfReborn.Api/Commands/IGrCommand.cs index ba4e4fd..76fa3ca 100644 --- a/Api/Commands/IGrCommand.cs +++ b/src/dotnet/Suspectus.GandalfReborn.Api/Commands/IGrCommand.cs @@ -1,5 +1,5 @@ using MediatR; -namespace W542.GandalfReborn.Commands; +namespace Suspectus.GandalfReborn.Commands; public interface IGrCommand : IRequest; \ No newline at end of file diff --git a/Api/Commands/RegisterCommand.cs b/src/dotnet/Suspectus.GandalfReborn.Api/Commands/RegisterCommand.cs similarity index 71% rename from Api/Commands/RegisterCommand.cs rename to src/dotnet/Suspectus.GandalfReborn.Api/Commands/RegisterCommand.cs index 6d2bee9..618e991 100644 --- a/Api/Commands/RegisterCommand.cs +++ b/src/dotnet/Suspectus.GandalfReborn.Api/Commands/RegisterCommand.cs @@ -1,7 +1,7 @@ using LanguageExt.Common; -using W542.GandalfReborn.Data.Entities.Subject; +using Suspectus.GandalfReborn.Data.Entities.Subject; -namespace W542.GandalfReborn.Commands; +namespace Suspectus.GandalfReborn.Commands; public class RegisterCommand : IGrCommand> { diff --git a/Api/Controllers/AuthController.cs b/src/dotnet/Suspectus.GandalfReborn.Api/Controllers/AuthController.cs similarity index 92% rename from Api/Controllers/AuthController.cs rename to src/dotnet/Suspectus.GandalfReborn.Api/Controllers/AuthController.cs index cd2ad0a..64cc4cb 100644 --- a/Api/Controllers/AuthController.cs +++ b/src/dotnet/Suspectus.GandalfReborn.Api/Controllers/AuthController.cs @@ -1,8 +1,8 @@ using MediatR; using Microsoft.AspNetCore.Mvc; -using W542.GandalfReborn.Commands; +using Suspectus.GandalfReborn.Commands; -namespace W542.GandalfReborn.Controllers; +namespace Suspectus.GandalfReborn.Controllers; [ApiController] [Route("api/[controller]")] diff --git a/Api/Extensions/ResultExtentions.cs b/src/dotnet/Suspectus.GandalfReborn.Api/Extensions/ResultExtentions.cs similarity index 94% rename from Api/Extensions/ResultExtentions.cs rename to src/dotnet/Suspectus.GandalfReborn.Api/Extensions/ResultExtentions.cs index 6bff2bc..c4d432e 100644 --- a/Api/Extensions/ResultExtentions.cs +++ b/src/dotnet/Suspectus.GandalfReborn.Api/Extensions/ResultExtentions.cs @@ -1,6 +1,6 @@ using LanguageExt.Common; -namespace W542.GandalfReborn.Extensions; +namespace Suspectus.GandalfReborn.Extensions; public static class ResultExtensions { diff --git a/Api/Handlers/Commands/IGrCommandHandler.cs b/src/dotnet/Suspectus.GandalfReborn.Api/Handlers/Commands/IGrCommandHandler.cs similarity index 61% rename from Api/Handlers/Commands/IGrCommandHandler.cs rename to src/dotnet/Suspectus.GandalfReborn.Api/Handlers/Commands/IGrCommandHandler.cs index 0aa0a56..3856f27 100644 --- a/Api/Handlers/Commands/IGrCommandHandler.cs +++ b/src/dotnet/Suspectus.GandalfReborn.Api/Handlers/Commands/IGrCommandHandler.cs @@ -1,6 +1,6 @@ using MediatR; -using W542.GandalfReborn.Commands; +using Suspectus.GandalfReborn.Commands; -namespace W542.GandalfReborn.Handlers.Commands; +namespace Suspectus.GandalfReborn.Handlers.Commands; public interface IGrCommandHandler : IRequestHandler where TCommand : IGrCommand; \ No newline at end of file diff --git a/Api/Handlers/Commands/RegisterCommandHandler.cs b/src/dotnet/Suspectus.GandalfReborn.Api/Handlers/Commands/RegisterCommandHandler.cs similarity index 75% rename from Api/Handlers/Commands/RegisterCommandHandler.cs rename to src/dotnet/Suspectus.GandalfReborn.Api/Handlers/Commands/RegisterCommandHandler.cs index a0223e3..8eb1e5f 100644 --- a/Api/Handlers/Commands/RegisterCommandHandler.cs +++ b/src/dotnet/Suspectus.GandalfReborn.Api/Handlers/Commands/RegisterCommandHandler.cs @@ -1,15 +1,13 @@ using LanguageExt.Common; using MediatR; -using W542.GandalfReborn.Commands; -using W542.GandalfReborn.Data.Database.Repositories; -using W542.GandalfReborn.Data.Entities.Base; -using W542.GandalfReborn.Data.Entities.Subject; -using W542.GandalfReborn.Data.Entities.Subject.SignIn; -using W542.GandalfReborn.Data.Entities.Tenant; -using W542.GandalfReborn.Extensions; -using W542.GandalfReborn.Handlers.Security; +using Suspectus.GandalfReborn.Commands; +using Suspectus.GandalfReborn.Data.Database.Repositories; +using Suspectus.GandalfReborn.Data.Entities.Base; +using Suspectus.GandalfReborn.Data.Entities.Subject; +using Suspectus.GandalfReborn.Data.Entities.Subject.SignIn; +using Suspectus.GandalfReborn.Extensions; -namespace W542.GandalfReborn.Handlers.Commands; +namespace Suspectus.GandalfReborn.Handlers.Commands; public class RegisterCommandHandler(ISubjectRepository subjectRepository, IMediator mediator) : IGrCommandHandler> { diff --git a/Api/Handlers/Security/AuthCodeRequestCommandHandler.cs b/src/dotnet/Suspectus.GandalfReborn.Api/Handlers/Security/AuthCodeRequestCommandHandler.cs similarity index 89% rename from Api/Handlers/Security/AuthCodeRequestCommandHandler.cs rename to src/dotnet/Suspectus.GandalfReborn.Api/Handlers/Security/AuthCodeRequestCommandHandler.cs index 1056782..5ab5ec0 100644 --- a/Api/Handlers/Security/AuthCodeRequestCommandHandler.cs +++ b/src/dotnet/Suspectus.GandalfReborn.Api/Handlers/Security/AuthCodeRequestCommandHandler.cs @@ -2,14 +2,14 @@ using LanguageExt.Common; using MediatR; using Microsoft.AspNetCore.Identity; using Microsoft.EntityFrameworkCore; -using W542.GandalfReborn.Commands; -using W542.GandalfReborn.Data.Database.Repositories; -using W542.GandalfReborn.Data.Dto; -using W542.GandalfReborn.Data.Entities.Subject.SignIn; -using W542.GandalfReborn.Extensions; -using W542.GandalfReborn.Handlers.Commands; +using Suspectus.GandalfReborn.Commands; +using Suspectus.GandalfReborn.Data.Database.Repositories; +using Suspectus.GandalfReborn.Data.Dto; +using Suspectus.GandalfReborn.Data.Entities.Subject.SignIn; +using Suspectus.GandalfReborn.Extensions; +using Suspectus.GandalfReborn.Handlers.Commands; -namespace W542.GandalfReborn.Handlers.Security; +namespace Suspectus.GandalfReborn.Handlers.Security; public class AuthCodeRequestCommandHandler(IPasswordHasher passwordHasher, ISubjectRepository subjectRepository, IMediator mediator) : IGrCommandHandler> { diff --git a/Api/Handlers/Security/CreateAuthCodeCommandHandler.cs b/src/dotnet/Suspectus.GandalfReborn.Api/Handlers/Security/CreateAuthCodeCommandHandler.cs similarity index 80% rename from Api/Handlers/Security/CreateAuthCodeCommandHandler.cs rename to src/dotnet/Suspectus.GandalfReborn.Api/Handlers/Security/CreateAuthCodeCommandHandler.cs index 1d161f0..d443180 100644 --- a/Api/Handlers/Security/CreateAuthCodeCommandHandler.cs +++ b/src/dotnet/Suspectus.GandalfReborn.Api/Handlers/Security/CreateAuthCodeCommandHandler.cs @@ -1,13 +1,13 @@ using AutoMapper; using LanguageExt.Common; using Microsoft.AspNetCore.Identity; -using W542.GandalfReborn.Commands; -using W542.GandalfReborn.Data.Database.Repositories; -using W542.GandalfReborn.Data.Dto; -using W542.GandalfReborn.Data.Entities.Security; -using W542.GandalfReborn.Handlers.Commands; +using Suspectus.GandalfReborn.Commands; +using Suspectus.GandalfReborn.Data.Database.Repositories; +using Suspectus.GandalfReborn.Data.Dto; +using Suspectus.GandalfReborn.Data.Entities.Security; +using Suspectus.GandalfReborn.Handlers.Commands; -namespace W542.GandalfReborn.Handlers.Security; +namespace Suspectus.GandalfReborn.Handlers.Security; public class CreateAuthCodeCommandHandler(IPasswordHasher passwordHasher, TimeProvider timeProvider, IAuthCodeRepository authCodeRepository, IMapper mapper) : IGrCommandHandler> { diff --git a/Api/Handlers/Security/CreateTokensCommandHandler.cs b/src/dotnet/Suspectus.GandalfReborn.Api/Handlers/Security/CreateTokensCommandHandler.cs similarity index 86% rename from Api/Handlers/Security/CreateTokensCommandHandler.cs rename to src/dotnet/Suspectus.GandalfReborn.Api/Handlers/Security/CreateTokensCommandHandler.cs index 0b67b83..7566ab5 100644 --- a/Api/Handlers/Security/CreateTokensCommandHandler.cs +++ b/src/dotnet/Suspectus.GandalfReborn.Api/Handlers/Security/CreateTokensCommandHandler.cs @@ -3,15 +3,15 @@ using JWT.Algorithms; using JWT.Builder; using JWT.Serializers; using LanguageExt.Common; -using Security.Scheme; -using W542.GandalfReborn.Commands; -using W542.GandalfReborn.Data.Database.Repositories; -using W542.GandalfReborn.Data.Dto; -using W542.GandalfReborn.Data.Entities.Security; -using W542.GandalfReborn.Extensions; -using W542.GandalfReborn.Handlers.Commands; +using Suspectus.GandalfReborn.Commands; +using Suspectus.GandalfReborn.Data.Database.Repositories; +using Suspectus.GandalfReborn.Data.Dto; +using Suspectus.GandalfReborn.Data.Entities.Security; +using Suspectus.GandalfReborn.Extensions; +using Suspectus.GandalfReborn.Handlers.Commands; +using Suspectus.GandalfReborn.Security.Scheme; -namespace W542.GandalfReborn.Handlers.Security; +namespace Suspectus.GandalfReborn.Handlers.Security; public class CreateTokensCommandHandler(TimeProvider timeProvider, IConfiguration configuration, IHashids hashids, ITokenMetadataRepository tokenMetadataRepository) : IGrCommandHandler> { diff --git a/Api/Handlers/Security/GetTokensCommandHandler.cs b/src/dotnet/Suspectus.GandalfReborn.Api/Handlers/Security/GetTokensCommandHandler.cs similarity index 87% rename from Api/Handlers/Security/GetTokensCommandHandler.cs rename to src/dotnet/Suspectus.GandalfReborn.Api/Handlers/Security/GetTokensCommandHandler.cs index da4491e..451224a 100644 --- a/Api/Handlers/Security/GetTokensCommandHandler.cs +++ b/src/dotnet/Suspectus.GandalfReborn.Api/Handlers/Security/GetTokensCommandHandler.cs @@ -3,14 +3,13 @@ using System.Text; using LanguageExt.Common; using MediatR; using Microsoft.EntityFrameworkCore; -using Microsoft.Extensions.Options; -using W542.GandalfReborn.Commands; -using W542.GandalfReborn.Data.Database.Repositories; -using W542.GandalfReborn.Data.Dto; -using W542.GandalfReborn.Extensions; -using W542.GandalfReborn.Handlers.Commands; +using Suspectus.GandalfReborn.Commands; +using Suspectus.GandalfReborn.Data.Database.Repositories; +using Suspectus.GandalfReborn.Data.Dto; +using Suspectus.GandalfReborn.Extensions; +using Suspectus.GandalfReborn.Handlers.Commands; -namespace W542.GandalfReborn.Handlers.Security; +namespace Suspectus.GandalfReborn.Handlers.Security; public class GetTokensCommandHandler(IAuthCodeRepository authCodeRepository, TimeProvider timeProvider, IMediator mediator) : IGrCommandHandler> { diff --git a/Api/Handlers/Security/PasswordHashingHandler.cs b/src/dotnet/Suspectus.GandalfReborn.Api/Handlers/Security/PasswordHashingHandler.cs similarity index 79% rename from Api/Handlers/Security/PasswordHashingHandler.cs rename to src/dotnet/Suspectus.GandalfReborn.Api/Handlers/Security/PasswordHashingHandler.cs index 760530f..c161691 100644 --- a/Api/Handlers/Security/PasswordHashingHandler.cs +++ b/src/dotnet/Suspectus.GandalfReborn.Api/Handlers/Security/PasswordHashingHandler.cs @@ -1,10 +1,10 @@ using LanguageExt.Common; using Microsoft.AspNetCore.Identity; -using W542.GandalfReborn.Commands; -using W542.GandalfReborn.Extensions; -using W542.GandalfReborn.Handlers.Commands; +using Suspectus.GandalfReborn.Commands; +using Suspectus.GandalfReborn.Extensions; +using Suspectus.GandalfReborn.Handlers.Commands; -namespace W542.GandalfReborn.Handlers.Security; +namespace Suspectus.GandalfReborn.Handlers.Security; public class PasswordHashingHandler(IPasswordHasher passwordHasher) : IGrCommandHandler> { diff --git a/Api/Program.cs b/src/dotnet/Suspectus.GandalfReborn.Api/Program.cs similarity index 90% rename from Api/Program.cs rename to src/dotnet/Suspectus.GandalfReborn.Api/Program.cs index f30aa6f..017b212 100644 --- a/Api/Program.cs +++ b/src/dotnet/Suspectus.GandalfReborn.Api/Program.cs @@ -1,14 +1,12 @@ using System.Reflection; using System.Text.Json.Serialization; -using Abstractions; using HashidsNet; using Microsoft.AspNetCore.Identity; using Microsoft.EntityFrameworkCore; -using Microsoft.Extensions.Options; -using Security; -using Security.Scheme; -using W542.GandalfReborn.Data.Database; -using W542.GandalfReborn.Data.Database.Repositories; +using Suspectus.GandalfReborn.Abstractions; +using Suspectus.GandalfReborn.Data.Database; +using Suspectus.GandalfReborn.Data.Database.Repositories; +using Suspectus.GandalfReborn.Security.Scheme; var builder = WebApplication.CreateBuilder(args); @@ -18,7 +16,7 @@ builder.Services.AddEndpointsApiExplorer(); builder.Services.AddDbContext(cfg => cfg .UseNpgsql( builder.Configuration.GetConnectionString("DefaultConnection"), - x => x.MigrationsAssembly("Data") + x => x.MigrationsAssembly("Suspectus.GandalfReborn.Data") ) ); diff --git a/Api/Properties/launchSettings.json b/src/dotnet/Suspectus.GandalfReborn.Api/Properties/launchSettings.json similarity index 100% rename from Api/Properties/launchSettings.json rename to src/dotnet/Suspectus.GandalfReborn.Api/Properties/launchSettings.json diff --git a/Api/Api.csproj b/src/dotnet/Suspectus.GandalfReborn.Api/Suspectus.GandalfReborn.Api.csproj similarity index 79% rename from Api/Api.csproj rename to src/dotnet/Suspectus.GandalfReborn.Api/Suspectus.GandalfReborn.Api.csproj index 5d697fa..81dc9f5 100644 --- a/Api/Api.csproj +++ b/src/dotnet/Suspectus.GandalfReborn.Api/Suspectus.GandalfReborn.Api.csproj @@ -4,7 +4,7 @@ net9.0 enable enable - W542.GandalfReborn + Suspectus.GandalfReborn 12 @@ -23,8 +23,8 @@ - - + + diff --git a/Api/TestController.cs b/src/dotnet/Suspectus.GandalfReborn.Api/TestController.cs similarity index 90% rename from Api/TestController.cs rename to src/dotnet/Suspectus.GandalfReborn.Api/TestController.cs index f6a6d40..8b2f143 100644 --- a/Api/TestController.cs +++ b/src/dotnet/Suspectus.GandalfReborn.Api/TestController.cs @@ -1,15 +1,15 @@ -using Abstractions; using HashidsNet; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Microsoft.EntityFrameworkCore; -using Security; -using W542.GandalfReborn.Data.Database; -using W542.GandalfReborn.Data.Entities.Base; -using W542.GandalfReborn.Data.Entities.Security; -using W542.GandalfReborn.Data.Entities.Tenant; +using Suspectus.GandalfReborn.Abstractions; +using Suspectus.GandalfReborn.Data.Database; +using Suspectus.GandalfReborn.Data.Entities.Base; +using Suspectus.GandalfReborn.Data.Entities.Security; +using Suspectus.GandalfReborn.Data.Entities.Tenant; +using Suspectus.GandalfReborn.Security; -namespace W542.GandalfReborn; +namespace Suspectus.GandalfReborn; [ApiController] [Route("api/[controller]")] diff --git a/Api/appsettings.Development.json b/src/dotnet/Suspectus.GandalfReborn.Api/appsettings.Development.json similarity index 100% rename from Api/appsettings.Development.json rename to src/dotnet/Suspectus.GandalfReborn.Api/appsettings.Development.json diff --git a/Api/appsettings.json b/src/dotnet/Suspectus.GandalfReborn.Api/appsettings.json similarity index 100% rename from Api/appsettings.json rename to src/dotnet/Suspectus.GandalfReborn.Api/appsettings.json diff --git a/Data/Database/ApplicationContext.cs b/src/dotnet/Suspectus.GandalfReborn.Data/Database/ApplicationContext.cs similarity index 95% rename from Data/Database/ApplicationContext.cs rename to src/dotnet/Suspectus.GandalfReborn.Data/Database/ApplicationContext.cs index 875e840..a1badd4 100644 --- a/Data/Database/ApplicationContext.cs +++ b/src/dotnet/Suspectus.GandalfReborn.Data/Database/ApplicationContext.cs @@ -1,14 +1,9 @@ -using Abstractions; -using AutoMapper; using Microsoft.EntityFrameworkCore; -using Microsoft.EntityFrameworkCore.ChangeTracking; -using W542.GandalfReborn.Data.Entities.Base; -using W542.GandalfReborn.Data.Entities.Security; -using W542.GandalfReborn.Data.Entities.Tenant; -using W542.GandalfReborn.Data.Entities.Version; -using W542.GandalfReborn.Data.Extensions; +using Suspectus.GandalfReborn.Abstractions; +using Suspectus.GandalfReborn.Data.Entities.Base; +using Suspectus.GandalfReborn.Data.Entities.Version; -namespace W542.GandalfReborn.Data.Database; +namespace Suspectus.GandalfReborn.Data.Database; public sealed class ApplicationContext(DbContextOptions options, InvokerContext invokerContext) : CoreContext(options) { diff --git a/Data/Database/CoreContext.cs b/src/dotnet/Suspectus.GandalfReborn.Data/Database/CoreContext.cs similarity index 94% rename from Data/Database/CoreContext.cs rename to src/dotnet/Suspectus.GandalfReborn.Data/Database/CoreContext.cs index 1015ef3..0c6e6d1 100644 --- a/Data/Database/CoreContext.cs +++ b/src/dotnet/Suspectus.GandalfReborn.Data/Database/CoreContext.cs @@ -1,12 +1,12 @@ using Microsoft.EntityFrameworkCore; -using W542.GandalfReborn.Data.Entities.App; -using W542.GandalfReborn.Data.Entities.Base; -using W542.GandalfReborn.Data.Entities.Security; -using W542.GandalfReborn.Data.Entities.Subject; -using W542.GandalfReborn.Data.Entities.Subject.SignIn; -using W542.GandalfReborn.Data.Entities.Tenant; +using Suspectus.GandalfReborn.Data.Entities.App; +using Suspectus.GandalfReborn.Data.Entities.Base; +using Suspectus.GandalfReborn.Data.Entities.Security; +using Suspectus.GandalfReborn.Data.Entities.Subject; +using Suspectus.GandalfReborn.Data.Entities.Subject.SignIn; +using Suspectus.GandalfReborn.Data.Entities.Tenant; -namespace W542.GandalfReborn.Data.Database; +namespace Suspectus.GandalfReborn.Data.Database; public abstract class CoreContext(DbContextOptions options) : DbContext(options) where T : DbContext { diff --git a/Data/Database/GrDbConnectionInterceptor.cs b/src/dotnet/Suspectus.GandalfReborn.Data/Database/GrDbConnectionInterceptor.cs similarity index 89% rename from Data/Database/GrDbConnectionInterceptor.cs rename to src/dotnet/Suspectus.GandalfReborn.Data/Database/GrDbConnectionInterceptor.cs index 771af97..6aac1d4 100644 --- a/Data/Database/GrDbConnectionInterceptor.cs +++ b/src/dotnet/Suspectus.GandalfReborn.Data/Database/GrDbConnectionInterceptor.cs @@ -1,9 +1,9 @@ using System.Data; using System.Data.Common; -using Abstractions; using Microsoft.EntityFrameworkCore.Diagnostics; +using Suspectus.GandalfReborn.Abstractions; -namespace W542.GandalfReborn.Data.Database; +namespace Suspectus.GandalfReborn.Data.Database; public class GrDbConnectionInterceptor(InvokerContext invokerContext) : IDbConnectionInterceptor { diff --git a/src/dotnet/Suspectus.GandalfReborn.Data/Database/Repositories/AuthCodeRepository.cs b/src/dotnet/Suspectus.GandalfReborn.Data/Database/Repositories/AuthCodeRepository.cs new file mode 100644 index 0000000..276ee36 --- /dev/null +++ b/src/dotnet/Suspectus.GandalfReborn.Data/Database/Repositories/AuthCodeRepository.cs @@ -0,0 +1,7 @@ +using Suspectus.GandalfReborn.Data.Entities.Security; + +namespace Suspectus.GandalfReborn.Data.Database.Repositories; + +public class AuthCodeRepository(ApplicationContext context) : GrRepository(context), IAuthCodeRepository; + +public interface IAuthCodeRepository : IGrRepository; \ No newline at end of file diff --git a/Data/Database/Repositories/GrRepository.cs b/src/dotnet/Suspectus.GandalfReborn.Data/Database/Repositories/GrRepository.cs similarity index 95% rename from Data/Database/Repositories/GrRepository.cs rename to src/dotnet/Suspectus.GandalfReborn.Data/Database/Repositories/GrRepository.cs index b280a2a..3d55dd2 100644 --- a/Data/Database/Repositories/GrRepository.cs +++ b/src/dotnet/Suspectus.GandalfReborn.Data/Database/Repositories/GrRepository.cs @@ -1,9 +1,8 @@ using LanguageExt.Common; using Microsoft.EntityFrameworkCore; -using W542.GandalfReborn.Data.Entities.Base; -using W542.GandalfReborn.Data.Entities.Tenant; +using Suspectus.GandalfReborn.Data.Entities.Base; -namespace W542.GandalfReborn.Data.Database.Repositories; +namespace Suspectus.GandalfReborn.Data.Database.Repositories; public abstract class GrRepository(ApplicationContext context) : IGrRepository where TEntity : class, IEntity { diff --git a/Data/Database/Repositories/IGrRepository.cs b/src/dotnet/Suspectus.GandalfReborn.Data/Database/Repositories/IGrRepository.cs similarity index 85% rename from Data/Database/Repositories/IGrRepository.cs rename to src/dotnet/Suspectus.GandalfReborn.Data/Database/Repositories/IGrRepository.cs index 500f037..91db84f 100644 --- a/Data/Database/Repositories/IGrRepository.cs +++ b/src/dotnet/Suspectus.GandalfReborn.Data/Database/Repositories/IGrRepository.cs @@ -1,7 +1,7 @@ using LanguageExt.Common; -using W542.GandalfReborn.Data.Entities.Base; +using Suspectus.GandalfReborn.Data.Entities.Base; -namespace W542.GandalfReborn.Data.Database.Repositories; +namespace Suspectus.GandalfReborn.Data.Database.Repositories; public interface IGrRepository where TEntity : class, IEntity { diff --git a/Data/Database/Repositories/SubjectRepository.cs b/src/dotnet/Suspectus.GandalfReborn.Data/Database/Repositories/SubjectRepository.cs similarity index 50% rename from Data/Database/Repositories/SubjectRepository.cs rename to src/dotnet/Suspectus.GandalfReborn.Data/Database/Repositories/SubjectRepository.cs index 2c2748c..12e5623 100644 --- a/Data/Database/Repositories/SubjectRepository.cs +++ b/src/dotnet/Suspectus.GandalfReborn.Data/Database/Repositories/SubjectRepository.cs @@ -1,8 +1,6 @@ -using System.Linq.Expressions; -using W542.GandalfReborn.Data.Entities.Subject; -using W542.GandalfReborn.Data.Entities.Version; +using Suspectus.GandalfReborn.Data.Entities.Subject; -namespace W542.GandalfReborn.Data.Database.Repositories; +namespace Suspectus.GandalfReborn.Data.Database.Repositories; public class SubjectRepository(ApplicationContext context) : GrRepository(context), ISubjectRepository; diff --git a/Data/Database/Repositories/TokenMetadataRepository.cs b/src/dotnet/Suspectus.GandalfReborn.Data/Database/Repositories/TokenMetadataRepository.cs similarity index 65% rename from Data/Database/Repositories/TokenMetadataRepository.cs rename to src/dotnet/Suspectus.GandalfReborn.Data/Database/Repositories/TokenMetadataRepository.cs index c3e1e67..7b487df 100644 --- a/Data/Database/Repositories/TokenMetadataRepository.cs +++ b/src/dotnet/Suspectus.GandalfReborn.Data/Database/Repositories/TokenMetadataRepository.cs @@ -1,7 +1,7 @@ -using W542.GandalfReborn.Data.Entities.Security; +using Suspectus.GandalfReborn.Data.Entities.Security; -namespace W542.GandalfReborn.Data.Database.Repositories; +namespace Suspectus.GandalfReborn.Data.Database.Repositories; public class TokenMetadataRepository(ApplicationContext context) : GrRepository(context), ITokenMetadataRepository; diff --git a/Data/Dto/AuthCodeDto.cs b/src/dotnet/Suspectus.GandalfReborn.Data/Dto/AuthCodeDto.cs similarity index 80% rename from Data/Dto/AuthCodeDto.cs rename to src/dotnet/Suspectus.GandalfReborn.Data/Dto/AuthCodeDto.cs index fa8a7f0..4c67722 100644 --- a/Data/Dto/AuthCodeDto.cs +++ b/src/dotnet/Suspectus.GandalfReborn.Data/Dto/AuthCodeDto.cs @@ -1,4 +1,4 @@ -namespace W542.GandalfReborn.Data.Dto; +namespace Suspectus.GandalfReborn.Data.Dto; public class AuthCodeDto { diff --git a/Data/Dto/TokenDto.cs b/src/dotnet/Suspectus.GandalfReborn.Data/Dto/TokenDto.cs similarity index 75% rename from Data/Dto/TokenDto.cs rename to src/dotnet/Suspectus.GandalfReborn.Data/Dto/TokenDto.cs index 05a8db9..00bb119 100644 --- a/Data/Dto/TokenDto.cs +++ b/src/dotnet/Suspectus.GandalfReborn.Data/Dto/TokenDto.cs @@ -1,4 +1,4 @@ -namespace W542.GandalfReborn.Data.Dto; +namespace Suspectus.GandalfReborn.Data.Dto; public class TokenDto { diff --git a/Data/Entities/App/AppRelationEntity.cs b/src/dotnet/Suspectus.GandalfReborn.Data/Entities/App/AppRelationEntity.cs similarity index 70% rename from Data/Entities/App/AppRelationEntity.cs rename to src/dotnet/Suspectus.GandalfReborn.Data/Entities/App/AppRelationEntity.cs index 186eb09..6b1f125 100644 --- a/Data/Entities/App/AppRelationEntity.cs +++ b/src/dotnet/Suspectus.GandalfReborn.Data/Entities/App/AppRelationEntity.cs @@ -1,9 +1,9 @@ -using W542.GandalfReborn.Data.Entities.Base; -using W542.GandalfReborn.Data.Entities.Subject; -using W542.GandalfReborn.Data.Entities.Tenant; -using W542.GandalfReborn.Data.Entities.Version; +using Suspectus.GandalfReborn.Data.Entities.Base; +using Suspectus.GandalfReborn.Data.Entities.Subject; +using Suspectus.GandalfReborn.Data.Entities.Tenant; +using Suspectus.GandalfReborn.Data.Entities.Version; -namespace W542.GandalfReborn.Data.Entities.App; +namespace Suspectus.GandalfReborn.Data.Entities.App; public class AppRelationEntity : AppRelationData, IVersionableEntity { diff --git a/Data/Entities/App/AppSubjectRelationEntity.cs b/src/dotnet/Suspectus.GandalfReborn.Data/Entities/App/AppSubjectRelationEntity.cs similarity index 71% rename from Data/Entities/App/AppSubjectRelationEntity.cs rename to src/dotnet/Suspectus.GandalfReborn.Data/Entities/App/AppSubjectRelationEntity.cs index 96c0b2b..e34c3d8 100644 --- a/Data/Entities/App/AppSubjectRelationEntity.cs +++ b/src/dotnet/Suspectus.GandalfReborn.Data/Entities/App/AppSubjectRelationEntity.cs @@ -1,10 +1,10 @@ -using W542.GandalfReborn.Data.Entities.Base; -using W542.GandalfReborn.Data.Entities.Security; -using W542.GandalfReborn.Data.Entities.Subject; -using W542.GandalfReborn.Data.Entities.Tenant; -using W542.GandalfReborn.Data.Entities.Version; +using Suspectus.GandalfReborn.Data.Entities.Base; +using Suspectus.GandalfReborn.Data.Entities.Security; +using Suspectus.GandalfReborn.Data.Entities.Subject; +using Suspectus.GandalfReborn.Data.Entities.Tenant; +using Suspectus.GandalfReborn.Data.Entities.Version; -namespace W542.GandalfReborn.Data.Entities.App; +namespace Suspectus.GandalfReborn.Data.Entities.App; public class AppSubjectRelationEntity : AppSubjectRelationData, IMappingEntity, IVersionableEntity { diff --git a/Data/Entities/Base/EntityVisibility.cs b/src/dotnet/Suspectus.GandalfReborn.Data/Entities/Base/EntityVisibility.cs similarity index 60% rename from Data/Entities/Base/EntityVisibility.cs rename to src/dotnet/Suspectus.GandalfReborn.Data/Entities/Base/EntityVisibility.cs index 187a1ba..38ae099 100644 --- a/Data/Entities/Base/EntityVisibility.cs +++ b/src/dotnet/Suspectus.GandalfReborn.Data/Entities/Base/EntityVisibility.cs @@ -1,4 +1,4 @@ -namespace W542.GandalfReborn.Data.Entities.Base; +namespace Suspectus.GandalfReborn.Data.Entities.Base; public enum EntityVisibility { diff --git a/Data/Entities/Base/IEntity.cs b/src/dotnet/Suspectus.GandalfReborn.Data/Entities/Base/IEntity.cs similarity index 51% rename from Data/Entities/Base/IEntity.cs rename to src/dotnet/Suspectus.GandalfReborn.Data/Entities/Base/IEntity.cs index 7055a5e..c4565e9 100644 --- a/Data/Entities/Base/IEntity.cs +++ b/src/dotnet/Suspectus.GandalfReborn.Data/Entities/Base/IEntity.cs @@ -1,4 +1,4 @@ -namespace W542.GandalfReborn.Data.Entities.Base; +namespace Suspectus.GandalfReborn.Data.Entities.Base; public interface IEntity { diff --git a/src/dotnet/Suspectus.GandalfReborn.Data/Entities/Base/IMappingEntity.cs b/src/dotnet/Suspectus.GandalfReborn.Data/Entities/Base/IMappingEntity.cs new file mode 100644 index 0000000..0e86cdf --- /dev/null +++ b/src/dotnet/Suspectus.GandalfReborn.Data/Entities/Base/IMappingEntity.cs @@ -0,0 +1,3 @@ +namespace Suspectus.GandalfReborn.Data.Entities.Base; + +public interface IMappingEntity; \ No newline at end of file diff --git a/Data/Entities/Base/IdData.cs b/src/dotnet/Suspectus.GandalfReborn.Data/Entities/Base/IdData.cs similarity index 58% rename from Data/Entities/Base/IdData.cs rename to src/dotnet/Suspectus.GandalfReborn.Data/Entities/Base/IdData.cs index 655c67f..12f6e5c 100644 --- a/Data/Entities/Base/IdData.cs +++ b/src/dotnet/Suspectus.GandalfReborn.Data/Entities/Base/IdData.cs @@ -1,4 +1,4 @@ -namespace W542.GandalfReborn.Data.Entities.Base; +namespace Suspectus.GandalfReborn.Data.Entities.Base; public abstract class IdData : IEntity { diff --git a/Data/Entities/Base/SubjectData.cs b/src/dotnet/Suspectus.GandalfReborn.Data/Entities/Base/SubjectData.cs similarity index 63% rename from Data/Entities/Base/SubjectData.cs rename to src/dotnet/Suspectus.GandalfReborn.Data/Entities/Base/SubjectData.cs index a816a21..92023ef 100644 --- a/Data/Entities/Base/SubjectData.cs +++ b/src/dotnet/Suspectus.GandalfReborn.Data/Entities/Base/SubjectData.cs @@ -1,4 +1,4 @@ -namespace W542.GandalfReborn.Data.Entities.Base; +namespace Suspectus.GandalfReborn.Data.Entities.Base; public abstract class SubjectData : VisibilityData { diff --git a/Data/Entities/Base/TenantRelationData.cs b/src/dotnet/Suspectus.GandalfReborn.Data/Entities/Base/TenantRelationData.cs similarity index 67% rename from Data/Entities/Base/TenantRelationData.cs rename to src/dotnet/Suspectus.GandalfReborn.Data/Entities/Base/TenantRelationData.cs index d88b9c9..1551ab5 100644 --- a/Data/Entities/Base/TenantRelationData.cs +++ b/src/dotnet/Suspectus.GandalfReborn.Data/Entities/Base/TenantRelationData.cs @@ -1,4 +1,4 @@ -namespace W542.GandalfReborn.Data.Entities.Base; +namespace Suspectus.GandalfReborn.Data.Entities.Base; public abstract class TenantRelationData : VisibilityData { diff --git a/Data/Entities/Base/VisibilityData.cs b/src/dotnet/Suspectus.GandalfReborn.Data/Entities/Base/VisibilityData.cs similarity index 67% rename from Data/Entities/Base/VisibilityData.cs rename to src/dotnet/Suspectus.GandalfReborn.Data/Entities/Base/VisibilityData.cs index 046bb85..48c2cb5 100644 --- a/Data/Entities/Base/VisibilityData.cs +++ b/src/dotnet/Suspectus.GandalfReborn.Data/Entities/Base/VisibilityData.cs @@ -1,4 +1,4 @@ -namespace W542.GandalfReborn.Data.Entities.Base; +namespace Suspectus.GandalfReborn.Data.Entities.Base; public abstract class VisibilityData : IdData { diff --git a/Data/Entities/ContentKeyAttribute.cs b/src/dotnet/Suspectus.GandalfReborn.Data/Entities/ContentKeyAttribute.cs similarity index 65% rename from Data/Entities/ContentKeyAttribute.cs rename to src/dotnet/Suspectus.GandalfReborn.Data/Entities/ContentKeyAttribute.cs index a690c3a..04b9a4f 100644 --- a/Data/Entities/ContentKeyAttribute.cs +++ b/src/dotnet/Suspectus.GandalfReborn.Data/Entities/ContentKeyAttribute.cs @@ -1,4 +1,4 @@ -namespace W542.GandalfReborn.Data.Entities; +namespace Suspectus.GandalfReborn.Data.Entities; [AttributeUsage(AttributeTargets.Property)] public class ContentKeyAttribute : Attribute diff --git a/Data/Entities/Security/AppUserRelationInternalAuthorityRelationEntity.cs b/src/dotnet/Suspectus.GandalfReborn.Data/Entities/Security/AppUserRelationInternalAuthorityRelationEntity.cs similarity index 75% rename from Data/Entities/Security/AppUserRelationInternalAuthorityRelationEntity.cs rename to src/dotnet/Suspectus.GandalfReborn.Data/Entities/Security/AppUserRelationInternalAuthorityRelationEntity.cs index fee4a4c..a63ca0f 100644 --- a/Data/Entities/Security/AppUserRelationInternalAuthorityRelationEntity.cs +++ b/src/dotnet/Suspectus.GandalfReborn.Data/Entities/Security/AppUserRelationInternalAuthorityRelationEntity.cs @@ -1,10 +1,10 @@ -using W542.GandalfReborn.Data.Entities.App; -using W542.GandalfReborn.Data.Entities.Base; -using W542.GandalfReborn.Data.Entities.Subject; -using W542.GandalfReborn.Data.Entities.Tenant; -using W542.GandalfReborn.Data.Entities.Version; +using Suspectus.GandalfReborn.Data.Entities.App; +using Suspectus.GandalfReborn.Data.Entities.Base; +using Suspectus.GandalfReborn.Data.Entities.Subject; +using Suspectus.GandalfReborn.Data.Entities.Tenant; +using Suspectus.GandalfReborn.Data.Entities.Version; -namespace W542.GandalfReborn.Data.Entities.Security; +namespace Suspectus.GandalfReborn.Data.Entities.Security; public class AppSubjectRelationInternalAuthorityRelationEntity : AppSubjectRelationInternalAuthorityRelationData, IMappingEntity, IVersionableEntity { diff --git a/Data/Entities/Security/AuthCodeEntity.cs b/src/dotnet/Suspectus.GandalfReborn.Data/Entities/Security/AuthCodeEntity.cs similarity index 76% rename from Data/Entities/Security/AuthCodeEntity.cs rename to src/dotnet/Suspectus.GandalfReborn.Data/Entities/Security/AuthCodeEntity.cs index 1c43b02..a14538c 100644 --- a/Data/Entities/Security/AuthCodeEntity.cs +++ b/src/dotnet/Suspectus.GandalfReborn.Data/Entities/Security/AuthCodeEntity.cs @@ -1,6 +1,6 @@ -using W542.GandalfReborn.Data.Entities.Base; +using Suspectus.GandalfReborn.Data.Entities.Base; -namespace W542.GandalfReborn.Data.Entities.Security; +namespace Suspectus.GandalfReborn.Data.Entities.Security; public class AuthCodeEntity : IdData { diff --git a/Data/Entities/Security/AuthorityEntity.cs b/src/dotnet/Suspectus.GandalfReborn.Data/Entities/Security/AuthorityEntity.cs similarity index 72% rename from Data/Entities/Security/AuthorityEntity.cs rename to src/dotnet/Suspectus.GandalfReborn.Data/Entities/Security/AuthorityEntity.cs index a88d8d0..01f02c5 100644 --- a/Data/Entities/Security/AuthorityEntity.cs +++ b/src/dotnet/Suspectus.GandalfReborn.Data/Entities/Security/AuthorityEntity.cs @@ -1,8 +1,8 @@ -using W542.GandalfReborn.Data.Entities.App; -using W542.GandalfReborn.Data.Entities.Base; -using W542.GandalfReborn.Data.Entities.Tenant; +using Suspectus.GandalfReborn.Data.Entities.App; +using Suspectus.GandalfReborn.Data.Entities.Base; +using Suspectus.GandalfReborn.Data.Entities.Tenant; -namespace W542.GandalfReborn.Data.Entities.Security; +namespace Suspectus.GandalfReborn.Data.Entities.Security; public class AuthorityEntity : IdData { diff --git a/src/dotnet/Suspectus.GandalfReborn.Data/Entities/Security/AuthorityType.cs b/src/dotnet/Suspectus.GandalfReborn.Data/Entities/Security/AuthorityType.cs new file mode 100644 index 0000000..7016152 --- /dev/null +++ b/src/dotnet/Suspectus.GandalfReborn.Data/Entities/Security/AuthorityType.cs @@ -0,0 +1,7 @@ +namespace Suspectus.GandalfReborn.Data.Entities.Security; + +public enum AuthorityType +{ + Tenant, + App +} \ No newline at end of file diff --git a/Data/Entities/Security/TenantSubjectRelationInternalAuthorityRelationEntity.cs b/src/dotnet/Suspectus.GandalfReborn.Data/Entities/Security/TenantSubjectRelationInternalAuthorityRelationEntity.cs similarity index 79% rename from Data/Entities/Security/TenantSubjectRelationInternalAuthorityRelationEntity.cs rename to src/dotnet/Suspectus.GandalfReborn.Data/Entities/Security/TenantSubjectRelationInternalAuthorityRelationEntity.cs index e8f4f97..b79cda2 100644 --- a/Data/Entities/Security/TenantSubjectRelationInternalAuthorityRelationEntity.cs +++ b/src/dotnet/Suspectus.GandalfReborn.Data/Entities/Security/TenantSubjectRelationInternalAuthorityRelationEntity.cs @@ -1,9 +1,9 @@ -using W542.GandalfReborn.Data.Entities.Base; -using W542.GandalfReborn.Data.Entities.Subject; -using W542.GandalfReborn.Data.Entities.Tenant; -using W542.GandalfReborn.Data.Entities.Version; +using Suspectus.GandalfReborn.Data.Entities.Base; +using Suspectus.GandalfReborn.Data.Entities.Subject; +using Suspectus.GandalfReborn.Data.Entities.Tenant; +using Suspectus.GandalfReborn.Data.Entities.Version; -namespace W542.GandalfReborn.Data.Entities.Security; +namespace Suspectus.GandalfReborn.Data.Entities.Security; public class TenantSubjectRelationInternalAuthorityRelationEntity : TenantSubjectRelationInternalAuthorityRelationData, IMappingEntity, IVersionableEntity { diff --git a/Data/Entities/Security/TokenMetaDataEntity.cs b/src/dotnet/Suspectus.GandalfReborn.Data/Entities/Security/TokenMetaDataEntity.cs similarity index 51% rename from Data/Entities/Security/TokenMetaDataEntity.cs rename to src/dotnet/Suspectus.GandalfReborn.Data/Entities/Security/TokenMetaDataEntity.cs index 7679fec..e47f8bc 100644 --- a/Data/Entities/Security/TokenMetaDataEntity.cs +++ b/src/dotnet/Suspectus.GandalfReborn.Data/Entities/Security/TokenMetaDataEntity.cs @@ -1,9 +1,6 @@ -using W542.GandalfReborn.Data.Entities.App; -using W542.GandalfReborn.Data.Entities.Base; -using W542.GandalfReborn.Data.Entities.Subject; -using W542.GandalfReborn.Data.Entities.Tenant; +using Suspectus.GandalfReborn.Data.Entities.Base; -namespace W542.GandalfReborn.Data.Entities.Security; +namespace Suspectus.GandalfReborn.Data.Entities.Security; public class TokenMetadataEntity : IdData { diff --git a/src/dotnet/Suspectus.GandalfReborn.Data/Entities/Security/TokenType.cs b/src/dotnet/Suspectus.GandalfReborn.Data/Entities/Security/TokenType.cs new file mode 100644 index 0000000..c3e0a53 --- /dev/null +++ b/src/dotnet/Suspectus.GandalfReborn.Data/Entities/Security/TokenType.cs @@ -0,0 +1,7 @@ +namespace Suspectus.GandalfReborn.Data.Entities.Security; + +public enum TokenType +{ + Application, + User +} \ No newline at end of file diff --git a/Data/Entities/Subject/SignIn/SignInEntity.cs b/src/dotnet/Suspectus.GandalfReborn.Data/Entities/Subject/SignIn/SignInEntity.cs similarity index 71% rename from Data/Entities/Subject/SignIn/SignInEntity.cs rename to src/dotnet/Suspectus.GandalfReborn.Data/Entities/Subject/SignIn/SignInEntity.cs index 25e4964..517813b 100644 --- a/Data/Entities/Subject/SignIn/SignInEntity.cs +++ b/src/dotnet/Suspectus.GandalfReborn.Data/Entities/Subject/SignIn/SignInEntity.cs @@ -1,6 +1,6 @@ -using W542.GandalfReborn.Data.Entities.Base; +using Suspectus.GandalfReborn.Data.Entities.Base; -namespace W542.GandalfReborn.Data.Entities.Subject.SignIn; +namespace Suspectus.GandalfReborn.Data.Entities.Subject.SignIn; public class SignInEntity : SubjectData { diff --git a/src/dotnet/Suspectus.GandalfReborn.Data/Entities/Subject/SignIn/SignInMethod.cs b/src/dotnet/Suspectus.GandalfReborn.Data/Entities/Subject/SignIn/SignInMethod.cs new file mode 100644 index 0000000..cbdcaed --- /dev/null +++ b/src/dotnet/Suspectus.GandalfReborn.Data/Entities/Subject/SignIn/SignInMethod.cs @@ -0,0 +1,8 @@ +namespace Suspectus.GandalfReborn.Data.Entities.Subject.SignIn; + +public enum SignInMethod +{ + Simple, + Google, + Steam +} \ No newline at end of file diff --git a/Data/Entities/Subject/SubjectEntity.cs b/src/dotnet/Suspectus.GandalfReborn.Data/Entities/Subject/SubjectEntity.cs similarity index 51% rename from Data/Entities/Subject/SubjectEntity.cs rename to src/dotnet/Suspectus.GandalfReborn.Data/Entities/Subject/SubjectEntity.cs index b869d5c..7b8bbfe 100644 --- a/Data/Entities/Subject/SubjectEntity.cs +++ b/src/dotnet/Suspectus.GandalfReborn.Data/Entities/Subject/SubjectEntity.cs @@ -1,9 +1,9 @@ -using W542.GandalfReborn.Data.Entities.App; -using W542.GandalfReborn.Data.Entities.Base; -using W542.GandalfReborn.Data.Entities.Subject.SignIn; -using W542.GandalfReborn.Data.Entities.Tenant; +using Suspectus.GandalfReborn.Data.Entities.App; +using Suspectus.GandalfReborn.Data.Entities.Base; +using Suspectus.GandalfReborn.Data.Entities.Subject.SignIn; +using Suspectus.GandalfReborn.Data.Entities.Tenant; -namespace W542.GandalfReborn.Data.Entities.Subject; +namespace Suspectus.GandalfReborn.Data.Entities.Subject; public class SubjectEntity : VisibilityData { diff --git a/src/dotnet/Suspectus.GandalfReborn.Data/Entities/Tenant/OwnerData.cs b/src/dotnet/Suspectus.GandalfReborn.Data/Entities/Tenant/OwnerData.cs new file mode 100644 index 0000000..18b47e2 --- /dev/null +++ b/src/dotnet/Suspectus.GandalfReborn.Data/Entities/Tenant/OwnerData.cs @@ -0,0 +1,8 @@ +using Suspectus.GandalfReborn.Data.Entities.Base; + +namespace Suspectus.GandalfReborn.Data.Entities.Tenant; + +public abstract class OwnerData : VisibilityData +{ + public required long OwnerId { get; set; } +} \ No newline at end of file diff --git a/Data/Entities/Tenant/TenantEntity.cs b/src/dotnet/Suspectus.GandalfReborn.Data/Entities/Tenant/TenantEntity.cs similarity index 76% rename from Data/Entities/Tenant/TenantEntity.cs rename to src/dotnet/Suspectus.GandalfReborn.Data/Entities/Tenant/TenantEntity.cs index 92fe97c..0831d4f 100644 --- a/Data/Entities/Tenant/TenantEntity.cs +++ b/src/dotnet/Suspectus.GandalfReborn.Data/Entities/Tenant/TenantEntity.cs @@ -1,8 +1,8 @@ -using W542.GandalfReborn.Data.Entities.App; -using W542.GandalfReborn.Data.Entities.Subject; -using W542.GandalfReborn.Data.Entities.Version; +using Suspectus.GandalfReborn.Data.Entities.App; +using Suspectus.GandalfReborn.Data.Entities.Subject; +using Suspectus.GandalfReborn.Data.Entities.Version; -namespace W542.GandalfReborn.Data.Entities.Tenant; +namespace Suspectus.GandalfReborn.Data.Entities.Tenant; public class TenantEntity : TenantData, IVersionableEntity { diff --git a/Data/Entities/Tenant/TenantSubjectRelationEntity.cs b/src/dotnet/Suspectus.GandalfReborn.Data/Entities/Tenant/TenantSubjectRelationEntity.cs similarity index 75% rename from Data/Entities/Tenant/TenantSubjectRelationEntity.cs rename to src/dotnet/Suspectus.GandalfReborn.Data/Entities/Tenant/TenantSubjectRelationEntity.cs index c9d1a52..73c9336 100644 --- a/Data/Entities/Tenant/TenantSubjectRelationEntity.cs +++ b/src/dotnet/Suspectus.GandalfReborn.Data/Entities/Tenant/TenantSubjectRelationEntity.cs @@ -1,9 +1,9 @@ -using W542.GandalfReborn.Data.Entities.Base; -using W542.GandalfReborn.Data.Entities.Security; -using W542.GandalfReborn.Data.Entities.Subject; -using W542.GandalfReborn.Data.Entities.Version; +using Suspectus.GandalfReborn.Data.Entities.Base; +using Suspectus.GandalfReborn.Data.Entities.Security; +using Suspectus.GandalfReborn.Data.Entities.Subject; +using Suspectus.GandalfReborn.Data.Entities.Version; -namespace W542.GandalfReborn.Data.Entities.Tenant; +namespace Suspectus.GandalfReborn.Data.Entities.Tenant; public class TenantSubjectRelationEntity : TenantSubjectRelationData, IMappingEntity, IVersionableEntity { diff --git a/Data/Entities/Version/IVersionEntity.cs b/src/dotnet/Suspectus.GandalfReborn.Data/Entities/Version/IVersionEntity.cs similarity index 66% rename from Data/Entities/Version/IVersionEntity.cs rename to src/dotnet/Suspectus.GandalfReborn.Data/Entities/Version/IVersionEntity.cs index 9cfd41b..b9f1e9f 100644 --- a/Data/Entities/Version/IVersionEntity.cs +++ b/src/dotnet/Suspectus.GandalfReborn.Data/Entities/Version/IVersionEntity.cs @@ -1,8 +1,8 @@ -using W542.GandalfReborn.Data.Entities.Base; -using W542.GandalfReborn.Data.Entities.Subject; -using W542.GandalfReborn.Data.Entities.Tenant; +using Suspectus.GandalfReborn.Data.Entities.Base; +using Suspectus.GandalfReborn.Data.Entities.Subject; +using Suspectus.GandalfReborn.Data.Entities.Tenant; -namespace W542.GandalfReborn.Data.Entities.Version; +namespace Suspectus.GandalfReborn.Data.Entities.Version; public interface IVersionableBase : IEntity, IVersionableEntity; diff --git a/Data/Entities/Version/VersionAction.cs b/src/dotnet/Suspectus.GandalfReborn.Data/Entities/Version/VersionAction.cs similarity index 58% rename from Data/Entities/Version/VersionAction.cs rename to src/dotnet/Suspectus.GandalfReborn.Data/Entities/Version/VersionAction.cs index fa17e4a..6eaea45 100644 --- a/Data/Entities/Version/VersionAction.cs +++ b/src/dotnet/Suspectus.GandalfReborn.Data/Entities/Version/VersionAction.cs @@ -1,4 +1,4 @@ -namespace W542.GandalfReborn.Data.Entities.Version; +namespace Suspectus.GandalfReborn.Data.Entities.Version; public enum VersionAction { diff --git a/Data/Extensions/StringExtensions.cs b/src/dotnet/Suspectus.GandalfReborn.Data/Extensions/StringExtensions.cs similarity index 93% rename from Data/Extensions/StringExtensions.cs rename to src/dotnet/Suspectus.GandalfReborn.Data/Extensions/StringExtensions.cs index 30fe37a..fb32755 100644 --- a/Data/Extensions/StringExtensions.cs +++ b/src/dotnet/Suspectus.GandalfReborn.Data/Extensions/StringExtensions.cs @@ -1,6 +1,6 @@ using System.Text; -namespace W542.GandalfReborn.Data.Extensions; +namespace Suspectus.GandalfReborn.Data.Extensions; public static class StringExtensions { diff --git a/Data/Mapper/AuthCodeDtoMappingProfile.cs b/src/dotnet/Suspectus.GandalfReborn.Data/Mapper/AuthCodeDtoMappingProfile.cs similarity index 55% rename from Data/Mapper/AuthCodeDtoMappingProfile.cs rename to src/dotnet/Suspectus.GandalfReborn.Data/Mapper/AuthCodeDtoMappingProfile.cs index 88562c6..8cd7876 100644 --- a/Data/Mapper/AuthCodeDtoMappingProfile.cs +++ b/src/dotnet/Suspectus.GandalfReborn.Data/Mapper/AuthCodeDtoMappingProfile.cs @@ -1,8 +1,8 @@ using AutoMapper; -using W542.GandalfReborn.Data.Dto; -using W542.GandalfReborn.Data.Entities.Security; +using Suspectus.GandalfReborn.Data.Dto; +using Suspectus.GandalfReborn.Data.Entities.Security; -namespace W542.GandalfReborn.Data.Mapper; +namespace Suspectus.GandalfReborn.Data.Mapper; public class AuthCodeDtoMappingProfile : Profile { diff --git a/Data/Migrations/20240903154112_sus.Designer.cs b/src/dotnet/Suspectus.GandalfReborn.Data/Migrations/20240903154112_sus.Designer.cs similarity index 99% rename from Data/Migrations/20240903154112_sus.Designer.cs rename to src/dotnet/Suspectus.GandalfReborn.Data/Migrations/20240903154112_sus.Designer.cs index a7e667b..132cd73 100644 --- a/Data/Migrations/20240903154112_sus.Designer.cs +++ b/src/dotnet/Suspectus.GandalfReborn.Data/Migrations/20240903154112_sus.Designer.cs @@ -5,7 +5,7 @@ using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Migrations; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata; -using W542.GandalfReborn.Data.Database; +using Suspectus.GandalfReborn.Data.Database; #nullable disable diff --git a/Data/Migrations/20240903154112_sus.cs b/src/dotnet/Suspectus.GandalfReborn.Data/Migrations/20240903154112_sus.cs similarity index 100% rename from Data/Migrations/20240903154112_sus.cs rename to src/dotnet/Suspectus.GandalfReborn.Data/Migrations/20240903154112_sus.cs diff --git a/Data/Migrations/20240914003536_addTokens.Designer.cs b/src/dotnet/Suspectus.GandalfReborn.Data/Migrations/20240914003536_addTokens.Designer.cs similarity index 99% rename from Data/Migrations/20240914003536_addTokens.Designer.cs rename to src/dotnet/Suspectus.GandalfReborn.Data/Migrations/20240914003536_addTokens.Designer.cs index dc45b38..b52b63c 100644 --- a/Data/Migrations/20240914003536_addTokens.Designer.cs +++ b/src/dotnet/Suspectus.GandalfReborn.Data/Migrations/20240914003536_addTokens.Designer.cs @@ -5,7 +5,7 @@ using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Migrations; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata; -using W542.GandalfReborn.Data.Database; +using Suspectus.GandalfReborn.Data.Database; #nullable disable diff --git a/Data/Migrations/20240914003536_addTokens.cs b/src/dotnet/Suspectus.GandalfReborn.Data/Migrations/20240914003536_addTokens.cs similarity index 100% rename from Data/Migrations/20240914003536_addTokens.cs rename to src/dotnet/Suspectus.GandalfReborn.Data/Migrations/20240914003536_addTokens.cs diff --git a/Data/Migrations/20240914005530_affwaf.Designer.cs b/src/dotnet/Suspectus.GandalfReborn.Data/Migrations/20240914005530_affwaf.Designer.cs similarity index 99% rename from Data/Migrations/20240914005530_affwaf.Designer.cs rename to src/dotnet/Suspectus.GandalfReborn.Data/Migrations/20240914005530_affwaf.Designer.cs index 92a08ef..23c3d8b 100644 --- a/Data/Migrations/20240914005530_affwaf.Designer.cs +++ b/src/dotnet/Suspectus.GandalfReborn.Data/Migrations/20240914005530_affwaf.Designer.cs @@ -5,7 +5,7 @@ using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Migrations; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata; -using W542.GandalfReborn.Data.Database; +using Suspectus.GandalfReborn.Data.Database; #nullable disable diff --git a/Data/Migrations/20240914005530_affwaf.cs b/src/dotnet/Suspectus.GandalfReborn.Data/Migrations/20240914005530_affwaf.cs similarity index 100% rename from Data/Migrations/20240914005530_affwaf.cs rename to src/dotnet/Suspectus.GandalfReborn.Data/Migrations/20240914005530_affwaf.cs diff --git a/Data/Migrations/20240914012943_fawfghh.Designer.cs b/src/dotnet/Suspectus.GandalfReborn.Data/Migrations/20240914012943_fawfghh.Designer.cs similarity index 99% rename from Data/Migrations/20240914012943_fawfghh.Designer.cs rename to src/dotnet/Suspectus.GandalfReborn.Data/Migrations/20240914012943_fawfghh.Designer.cs index 9ff207e..8ed53f3 100644 --- a/Data/Migrations/20240914012943_fawfghh.Designer.cs +++ b/src/dotnet/Suspectus.GandalfReborn.Data/Migrations/20240914012943_fawfghh.Designer.cs @@ -5,7 +5,7 @@ using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Migrations; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata; -using W542.GandalfReborn.Data.Database; +using Suspectus.GandalfReborn.Data.Database; #nullable disable diff --git a/Data/Migrations/20240914012943_fawfghh.cs b/src/dotnet/Suspectus.GandalfReborn.Data/Migrations/20240914012943_fawfghh.cs similarity index 100% rename from Data/Migrations/20240914012943_fawfghh.cs rename to src/dotnet/Suspectus.GandalfReborn.Data/Migrations/20240914012943_fawfghh.cs diff --git a/Data/Migrations/20240914014850_gjjjjjj.Designer.cs b/src/dotnet/Suspectus.GandalfReborn.Data/Migrations/20240914014850_gjjjjjj.Designer.cs similarity index 99% rename from Data/Migrations/20240914014850_gjjjjjj.Designer.cs rename to src/dotnet/Suspectus.GandalfReborn.Data/Migrations/20240914014850_gjjjjjj.Designer.cs index c7ce509..c6bd0b8 100644 --- a/Data/Migrations/20240914014850_gjjjjjj.Designer.cs +++ b/src/dotnet/Suspectus.GandalfReborn.Data/Migrations/20240914014850_gjjjjjj.Designer.cs @@ -5,7 +5,7 @@ using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Migrations; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata; -using W542.GandalfReborn.Data.Database; +using Suspectus.GandalfReborn.Data.Database; #nullable disable diff --git a/Data/Migrations/20240914014850_gjjjjjj.cs b/src/dotnet/Suspectus.GandalfReborn.Data/Migrations/20240914014850_gjjjjjj.cs similarity index 100% rename from Data/Migrations/20240914014850_gjjjjjj.cs rename to src/dotnet/Suspectus.GandalfReborn.Data/Migrations/20240914014850_gjjjjjj.cs diff --git a/Data/Migrations/20240914224344_jsoikgsoieg.Designer.cs b/src/dotnet/Suspectus.GandalfReborn.Data/Migrations/20240914224344_jsoikgsoieg.Designer.cs similarity index 99% rename from Data/Migrations/20240914224344_jsoikgsoieg.Designer.cs rename to src/dotnet/Suspectus.GandalfReborn.Data/Migrations/20240914224344_jsoikgsoieg.Designer.cs index afcf717..b144a6a 100644 --- a/Data/Migrations/20240914224344_jsoikgsoieg.Designer.cs +++ b/src/dotnet/Suspectus.GandalfReborn.Data/Migrations/20240914224344_jsoikgsoieg.Designer.cs @@ -5,7 +5,7 @@ using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Migrations; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata; -using W542.GandalfReborn.Data.Database; +using Suspectus.GandalfReborn.Data.Database; #nullable disable diff --git a/Data/Migrations/20240914224344_jsoikgsoieg.cs b/src/dotnet/Suspectus.GandalfReborn.Data/Migrations/20240914224344_jsoikgsoieg.cs similarity index 100% rename from Data/Migrations/20240914224344_jsoikgsoieg.cs rename to src/dotnet/Suspectus.GandalfReborn.Data/Migrations/20240914224344_jsoikgsoieg.cs diff --git a/Data/Migrations/20240919005908_afwawfawf.Designer.cs b/src/dotnet/Suspectus.GandalfReborn.Data/Migrations/20240919005908_afwawfawf.Designer.cs similarity index 99% rename from Data/Migrations/20240919005908_afwawfawf.Designer.cs rename to src/dotnet/Suspectus.GandalfReborn.Data/Migrations/20240919005908_afwawfawf.Designer.cs index 97c6a34..83af4fb 100644 --- a/Data/Migrations/20240919005908_afwawfawf.Designer.cs +++ b/src/dotnet/Suspectus.GandalfReborn.Data/Migrations/20240919005908_afwawfawf.Designer.cs @@ -5,7 +5,7 @@ using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Migrations; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata; -using W542.GandalfReborn.Data.Database; +using Suspectus.GandalfReborn.Data.Database; #nullable disable diff --git a/Data/Migrations/20240919005908_afwawfawf.cs b/src/dotnet/Suspectus.GandalfReborn.Data/Migrations/20240919005908_afwawfawf.cs similarity index 100% rename from Data/Migrations/20240919005908_afwawfawf.cs rename to src/dotnet/Suspectus.GandalfReborn.Data/Migrations/20240919005908_afwawfawf.cs diff --git a/Data/Migrations/20240919010339_ffffff.Designer.cs b/src/dotnet/Suspectus.GandalfReborn.Data/Migrations/20240919010339_ffffff.Designer.cs similarity index 99% rename from Data/Migrations/20240919010339_ffffff.Designer.cs rename to src/dotnet/Suspectus.GandalfReborn.Data/Migrations/20240919010339_ffffff.Designer.cs index 4472e37..11a89d9 100644 --- a/Data/Migrations/20240919010339_ffffff.Designer.cs +++ b/src/dotnet/Suspectus.GandalfReborn.Data/Migrations/20240919010339_ffffff.Designer.cs @@ -5,7 +5,7 @@ using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Migrations; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata; -using W542.GandalfReborn.Data.Database; +using Suspectus.GandalfReborn.Data.Database; #nullable disable diff --git a/Data/Migrations/20240919010339_ffffff.cs b/src/dotnet/Suspectus.GandalfReborn.Data/Migrations/20240919010339_ffffff.cs similarity index 100% rename from Data/Migrations/20240919010339_ffffff.cs rename to src/dotnet/Suspectus.GandalfReborn.Data/Migrations/20240919010339_ffffff.cs diff --git a/Data/Migrations/20240919010748_jmäpromh.Designer.cs b/src/dotnet/Suspectus.GandalfReborn.Data/Migrations/20240919010748_jmäpromh.Designer.cs similarity index 99% rename from Data/Migrations/20240919010748_jmäpromh.Designer.cs rename to src/dotnet/Suspectus.GandalfReborn.Data/Migrations/20240919010748_jmäpromh.Designer.cs index 24890b7..d575105 100644 --- a/Data/Migrations/20240919010748_jmäpromh.Designer.cs +++ b/src/dotnet/Suspectus.GandalfReborn.Data/Migrations/20240919010748_jmäpromh.Designer.cs @@ -5,7 +5,7 @@ using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Migrations; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata; -using W542.GandalfReborn.Data.Database; +using Suspectus.GandalfReborn.Data.Database; #nullable disable diff --git a/Data/Migrations/20240919010748_jmäpromh.cs b/src/dotnet/Suspectus.GandalfReborn.Data/Migrations/20240919010748_jmäpromh.cs similarity index 100% rename from Data/Migrations/20240919010748_jmäpromh.cs rename to src/dotnet/Suspectus.GandalfReborn.Data/Migrations/20240919010748_jmäpromh.cs diff --git a/Data/Migrations/20240919012025_fghdhhzttr.Designer.cs b/src/dotnet/Suspectus.GandalfReborn.Data/Migrations/20240919012025_fghdhhzttr.Designer.cs similarity index 99% rename from Data/Migrations/20240919012025_fghdhhzttr.Designer.cs rename to src/dotnet/Suspectus.GandalfReborn.Data/Migrations/20240919012025_fghdhhzttr.Designer.cs index d43bdb9..6db7549 100644 --- a/Data/Migrations/20240919012025_fghdhhzttr.Designer.cs +++ b/src/dotnet/Suspectus.GandalfReborn.Data/Migrations/20240919012025_fghdhhzttr.Designer.cs @@ -5,7 +5,7 @@ using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Migrations; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata; -using W542.GandalfReborn.Data.Database; +using Suspectus.GandalfReborn.Data.Database; #nullable disable diff --git a/Data/Migrations/20240919012025_fghdhhzttr.cs b/src/dotnet/Suspectus.GandalfReborn.Data/Migrations/20240919012025_fghdhhzttr.cs similarity index 100% rename from Data/Migrations/20240919012025_fghdhhzttr.cs rename to src/dotnet/Suspectus.GandalfReborn.Data/Migrations/20240919012025_fghdhhzttr.cs diff --git a/Data/Migrations/20240921214234_klöhmpdmpmgr.Designer.cs b/src/dotnet/Suspectus.GandalfReborn.Data/Migrations/20240921214234_klöhmpdmpmgr.Designer.cs similarity index 99% rename from Data/Migrations/20240921214234_klöhmpdmpmgr.Designer.cs rename to src/dotnet/Suspectus.GandalfReborn.Data/Migrations/20240921214234_klöhmpdmpmgr.Designer.cs index 7cc5e45..f6b732d 100644 --- a/Data/Migrations/20240921214234_klöhmpdmpmgr.Designer.cs +++ b/src/dotnet/Suspectus.GandalfReborn.Data/Migrations/20240921214234_klöhmpdmpmgr.Designer.cs @@ -5,7 +5,7 @@ using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Migrations; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata; -using W542.GandalfReborn.Data.Database; +using Suspectus.GandalfReborn.Data.Database; #nullable disable diff --git a/Data/Migrations/20240921214234_klöhmpdmpmgr.cs b/src/dotnet/Suspectus.GandalfReborn.Data/Migrations/20240921214234_klöhmpdmpmgr.cs similarity index 100% rename from Data/Migrations/20240921214234_klöhmpdmpmgr.cs rename to src/dotnet/Suspectus.GandalfReborn.Data/Migrations/20240921214234_klöhmpdmpmgr.cs diff --git a/Data/Migrations/ApplicationContextModelSnapshot.cs b/src/dotnet/Suspectus.GandalfReborn.Data/Migrations/ApplicationContextModelSnapshot.cs similarity index 99% rename from Data/Migrations/ApplicationContextModelSnapshot.cs rename to src/dotnet/Suspectus.GandalfReborn.Data/Migrations/ApplicationContextModelSnapshot.cs index b3e12d1..3a643c7 100644 --- a/Data/Migrations/ApplicationContextModelSnapshot.cs +++ b/src/dotnet/Suspectus.GandalfReborn.Data/Migrations/ApplicationContextModelSnapshot.cs @@ -4,7 +4,7 @@ using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata; -using W542.GandalfReborn.Data.Database; +using Suspectus.GandalfReborn.Data.Database; #nullable disable diff --git a/Data/Data.csproj b/src/dotnet/Suspectus.GandalfReborn.Data/Suspectus.GandalfReborn.Data.csproj similarity index 81% rename from Data/Data.csproj rename to src/dotnet/Suspectus.GandalfReborn.Data/Suspectus.GandalfReborn.Data.csproj index 2230b73..a60450f 100644 --- a/Data/Data.csproj +++ b/src/dotnet/Suspectus.GandalfReborn.Data/Suspectus.GandalfReborn.Data.csproj @@ -4,7 +4,7 @@ net9.0 enable enable - W542.GandalfReborn.Data + Suspectus.GandalfReborn.Data 12 @@ -22,7 +22,7 @@ - + diff --git a/Security/GrAuthorizeAttribute.cs b/src/dotnet/Suspectus.GandalfReborn.Security/GrAuthorizeAttribute.cs similarity index 94% rename from Security/GrAuthorizeAttribute.cs rename to src/dotnet/Suspectus.GandalfReborn.Security/GrAuthorizeAttribute.cs index 2a93265..b216aca 100644 --- a/Security/GrAuthorizeAttribute.cs +++ b/src/dotnet/Suspectus.GandalfReborn.Security/GrAuthorizeAttribute.cs @@ -1,11 +1,11 @@ -using Abstractions; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.Filters; -using W542.GandalfReborn.Data.Entities.Security; +using Suspectus.GandalfReborn.Abstractions; +using Suspectus.GandalfReborn.Data.Entities.Security; -namespace Security; +namespace Suspectus.GandalfReborn.Security; [AttributeUsage(AttributeTargets.Class | AttributeTargets.Method, AllowMultiple = true)] public class GrAuthorizeAttribute : Attribute, IAuthorizationFilter diff --git a/Security/Scheme/GandalfRebornJwtTokenAuthExtensions.cs b/src/dotnet/Suspectus.GandalfReborn.Security/Scheme/GandalfRebornJwtTokenAuthExtensions.cs similarity index 91% rename from Security/Scheme/GandalfRebornJwtTokenAuthExtensions.cs rename to src/dotnet/Suspectus.GandalfReborn.Security/Scheme/GandalfRebornJwtTokenAuthExtensions.cs index eef1728..beae63c 100644 --- a/Security/Scheme/GandalfRebornJwtTokenAuthExtensions.cs +++ b/src/dotnet/Suspectus.GandalfReborn.Security/Scheme/GandalfRebornJwtTokenAuthExtensions.cs @@ -1,6 +1,6 @@ using Microsoft.Extensions.DependencyInjection; -namespace Security.Scheme; +namespace Suspectus.GandalfReborn.Security.Scheme; public static class GandalfRebornJwtTokenAuthExtensions { diff --git a/Security/Scheme/GandalfRebornJwtTokenAuthSchemeHandler.cs b/src/dotnet/Suspectus.GandalfReborn.Security/Scheme/GandalfRebornJwtTokenAuthSchemeHandler.cs similarity index 97% rename from Security/Scheme/GandalfRebornJwtTokenAuthSchemeHandler.cs rename to src/dotnet/Suspectus.GandalfReborn.Security/Scheme/GandalfRebornJwtTokenAuthSchemeHandler.cs index c52cf23..415843b 100644 --- a/Security/Scheme/GandalfRebornJwtTokenAuthSchemeHandler.cs +++ b/src/dotnet/Suspectus.GandalfReborn.Security/Scheme/GandalfRebornJwtTokenAuthSchemeHandler.cs @@ -1,7 +1,6 @@ using System.Security.Claims; using System.Text.Encodings.Web; using System.Text.RegularExpressions; -using Abstractions; using HashidsNet; using JWT.Algorithms; using JWT.Builder; @@ -13,13 +12,13 @@ using Microsoft.AspNetCore.Mvc.Abstractions; using Microsoft.AspNetCore.Mvc.Infrastructure; using Microsoft.AspNetCore.Routing; using Microsoft.EntityFrameworkCore; -using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; -using W542.GandalfReborn.Data.Database; +using Suspectus.GandalfReborn.Abstractions; +using Suspectus.GandalfReborn.Data.Database; -namespace Security.Scheme; +namespace Suspectus.GandalfReborn.Security.Scheme; public class GandalfRebornJwtBody { diff --git a/Security/Scheme/GandalfRebornJwtTokenAuthSchemeOptions.cs b/src/dotnet/Suspectus.GandalfReborn.Security/Scheme/GandalfRebornJwtTokenAuthSchemeOptions.cs similarity index 82% rename from Security/Scheme/GandalfRebornJwtTokenAuthSchemeOptions.cs rename to src/dotnet/Suspectus.GandalfReborn.Security/Scheme/GandalfRebornJwtTokenAuthSchemeOptions.cs index 1830b38..8b537c9 100644 --- a/Security/Scheme/GandalfRebornJwtTokenAuthSchemeOptions.cs +++ b/src/dotnet/Suspectus.GandalfReborn.Security/Scheme/GandalfRebornJwtTokenAuthSchemeOptions.cs @@ -1,6 +1,6 @@ using Microsoft.AspNetCore.Authentication; -namespace Security.Scheme; +namespace Suspectus.GandalfReborn.Security.Scheme; public class GandalfRebornJwtTokenAuthSchemeOptions : AuthenticationSchemeOptions { diff --git a/Security/Security.csproj b/src/dotnet/Suspectus.GandalfReborn.Security/Suspectus.GandalfReborn.Security.csproj similarity index 62% rename from Security/Security.csproj rename to src/dotnet/Suspectus.GandalfReborn.Security/Suspectus.GandalfReborn.Security.csproj index df01195..fecc83f 100644 --- a/Security/Security.csproj +++ b/src/dotnet/Suspectus.GandalfReborn.Security/Suspectus.GandalfReborn.Security.csproj @@ -4,6 +4,7 @@ net9.0 enable enable + Suspectus.GandalfReborn.Security @@ -13,8 +14,8 @@ - - + + diff --git a/W542.GandalfReborn.sln b/src/dotnet/Suspectus.GandalfReborn.sln similarity index 67% rename from W542.GandalfReborn.sln rename to src/dotnet/Suspectus.GandalfReborn.sln index 205a2d2..509b6a9 100644 --- a/W542.GandalfReborn.sln +++ b/src/dotnet/Suspectus.GandalfReborn.sln @@ -1,12 +1,12 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Api", "Api\Api.csproj", "{067494CB-FE63-42F0-A154-586E50442969}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Suspectus.GandalfReborn.Api", "Suspectus.GandalfReborn.Api\Suspectus.GandalfReborn.Api.csproj", "{067494CB-FE63-42F0-A154-586E50442969}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Data", "Data\Data.csproj", "{B4AF6985-3268-4C2E-9C50-D92DA7D3711D}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Suspectus.GandalfReborn.Data", "Suspectus.GandalfReborn.Data\Suspectus.GandalfReborn.Data.csproj", "{B4AF6985-3268-4C2E-9C50-D92DA7D3711D}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Security", "Security\Security.csproj", "{C8C3047B-ED0B-4516-A282-8B07E3EEB430}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Suspectus.GandalfReborn.Security", "Suspectus.GandalfReborn.Security\Suspectus.GandalfReborn.Security.csproj", "{C8C3047B-ED0B-4516-A282-8B07E3EEB430}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Abstractions", "Abstractions\Abstractions.csproj", "{44C283FD-2E01-496C-9E8F-4E43C26C9733}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Suspectus.GandalfReborn.Abstractions", "Suspectus.GandalfReborn.Abstractions\Suspectus.GandalfReborn.Abstractions.csproj", "{44C283FD-2E01-496C-9E8F-4E43C26C9733}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution