From f078047b680a1fcbf059477a46c1cc675d6c6c9f Mon Sep 17 00:00:00 2001 From: chris Date: Sat, 8 Mar 2025 10:08:36 +0100 Subject: [PATCH] refactor: rename files and update namespaces for consistency --- .../.idea/.gitignore | 0 .../.idea/indexLayout.xml | 0 .../Invoker.cs | 2 +- .../InvokerContext.cs | 2 +- .../Suspectus.Gandalf.Abstractions.csproj} | 2 +- .../Commands/AuthCodeRequestCommand.cs | 4 ++-- .../Commands/CreateAuthCodeCommand.cs | 4 ++-- .../Commands/CreateTokensCommand.cs | 4 ++-- .../Commands/HashPasswordCommand.cs | 2 +- .../Commands/IGrCommand.cs | 2 +- .../Commands/RegisterCommand.cs | 4 ++-- .../Controllers/AuthController.cs | 4 ++-- .../Extensions/ResultExtentions.cs | 2 +- .../Handlers/Commands/IGrCommandHandler.cs | 4 ++-- .../Commands/RegisterCommandHandler.cs | 14 +++++++------- .../Security/AuthCodeRequestCommandHandler.cs | 14 +++++++------- .../Security/CreateAuthCodeCommandHandler.cs | 12 ++++++------ .../Security/CreateTokensCommandHandler.cs | 16 ++++++++-------- .../Security/GetTokensCommandHandler.cs | 12 ++++++------ .../Security/PasswordHashingHandler.cs | 8 ++++---- .../Program.cs | 10 +++++----- .../Properties/launchSettings.json | 0 .../Suspectus.Gandalf.Api.csproj} | 6 +++--- .../TestController.cs | 14 +++++++------- .../appsettings.Development.json | 0 .../appsettings.json | 0 .../Database/ApplicationContext.cs | 8 ++++---- .../Database/CoreContext.cs | 14 +++++++------- .../Database/GrDbConnectionInterceptor.cs | 4 ++-- .../Repositories/AuthCodeRepository.cs | 4 ++-- .../Database/Repositories/GrRepository.cs | 4 ++-- .../Database/Repositories/IGrRepository.cs | 4 ++-- .../Database/Repositories/SubjectRepository.cs | 4 ++-- .../Repositories/TokenMetadataRepository.cs | 4 ++-- .../Dto/AuthCodeDto.cs | 2 +- .../Dto/TokenDto.cs | 2 +- .../Entities/App/AppRelationEntity.cs | 10 +++++----- .../Entities/App/AppSubjectRelationEntity.cs | 12 ++++++------ .../Entities/Base/EntityVisibility.cs | 2 +- .../Entities/Base/IEntity.cs | 2 +- .../Entities/Base/IMappingEntity.cs | 3 +++ .../Entities/Base/IdData.cs | 2 +- .../Entities/Base/SubjectData.cs | 2 +- .../Entities/Base/TenantRelationData.cs | 2 +- .../Entities/Base/VisibilityData.cs | 2 +- .../Entities/ContentKeyAttribute.cs | 2 +- ...rRelationInternalAuthorityRelationEntity.cs | 12 ++++++------ .../Entities/Security/AuthCodeEntity.cs | 4 ++-- .../Entities/Security/AuthorityEntity.cs | 8 ++++---- .../Entities/Security/AuthorityType.cs | 7 +++++++ ...tRelationInternalAuthorityRelationEntity.cs | 10 +++++----- .../Entities/Security/TokenMetaDataEntity.cs | 4 ++-- .../Entities/Security/TokenType.cs | 7 +++++++ .../Entities/Subject/SignIn/SignInEntity.cs | 4 ++-- .../Entities/Subject/SignIn/SignInMethod.cs | 8 ++++++++ .../Entities/Subject/SubjectEntity.cs | 10 +++++----- .../Entities/Tenant/OwnerData.cs | 8 ++++++++ .../Entities/Tenant/TenantEntity.cs | 8 ++++---- .../Tenant/TenantSubjectRelationEntity.cs | 10 +++++----- .../Entities/Version/IVersionEntity.cs | 8 ++++---- .../Entities/Version/VersionAction.cs | 2 +- .../Extensions/StringExtensions.cs | 2 +- .../Mapper/AuthCodeDtoMappingProfile.cs | 6 +++--- .../Migrations/20240903154112_sus.Designer.cs | 2 +- .../Migrations/20240903154112_sus.cs | 0 .../20240914003536_addTokens.Designer.cs | 2 +- .../Migrations/20240914003536_addTokens.cs | 0 .../20240914005530_affwaf.Designer.cs | 2 +- .../Migrations/20240914005530_affwaf.cs | 0 .../20240914012943_fawfghh.Designer.cs | 2 +- .../Migrations/20240914012943_fawfghh.cs | 0 .../20240914014850_gjjjjjj.Designer.cs | 2 +- .../Migrations/20240914014850_gjjjjjj.cs | 0 .../20240914224344_jsoikgsoieg.Designer.cs | 2 +- .../Migrations/20240914224344_jsoikgsoieg.cs | 0 .../20240919005908_afwawfawf.Designer.cs | 2 +- .../Migrations/20240919005908_afwawfawf.cs | 0 .../20240919010339_ffffff.Designer.cs | 2 +- .../Migrations/20240919010339_ffffff.cs | 0 .../20240919010748_jmäpromh.Designer.cs | 2 +- .../Migrations/20240919010748_jmäpromh.cs | 0 .../20240919012025_fghdhhzttr.Designer.cs | 2 +- .../Migrations/20240919012025_fghdhhzttr.cs | 0 .../20240921214234_klöhmpdmpmgr.Designer.cs | 2 +- .../Migrations/20240921214234_klöhmpdmpmgr.cs | 0 .../ApplicationContextModelSnapshot.cs | 2 +- .../Suspectus.Gandalf.Data.csproj} | 4 ++-- .../GrAuthorizeAttribute.cs | 6 +++--- .../GandalfRebornJwtTokenAuthExtensions.cs | 2 +- .../GandalfRebornJwtTokenAuthSchemeHandler.cs | 6 +++--- .../GandalfRebornJwtTokenAuthSchemeOptions.cs | 2 +- .../Suspectus.Gandalf.Security.csproj} | 6 +++--- .../Entities/Base/IMappingEntity.cs | 3 --- .../Entities/Security/AuthorityType.cs | 7 ------- .../Entities/Security/TokenType.cs | 7 ------- .../Entities/Subject/SignIn/SignInMethod.cs | 8 -------- .../Entities/Tenant/OwnerData.cs | 8 -------- ...spectus.GandalfReborn.sln => Suspectus.sln} | 18 ++++++++++++++---- 98 files changed, 230 insertions(+), 220 deletions(-) rename src/dotnet/.idea/{.idea.Suspectus.GandalfReborn => .idea.Suspectus}/.idea/.gitignore (100%) rename src/dotnet/.idea/{.idea.Suspectus.GandalfReborn => .idea.Suspectus}/.idea/indexLayout.xml (100%) rename src/dotnet/{Suspectus.GandalfReborn.Abstractions => Suspectus.Gandalf.Abstractions}/Invoker.cs (97%) rename src/dotnet/{Suspectus.GandalfReborn.Abstractions => Suspectus.Gandalf.Abstractions}/InvokerContext.cs (60%) rename src/dotnet/{Suspectus.GandalfReborn.Abstractions/Suspectus.GandalfReborn.Abstractions.csproj => Suspectus.Gandalf.Abstractions/Suspectus.Gandalf.Abstractions.csproj} (74%) rename src/dotnet/{Suspectus.GandalfReborn.Api => Suspectus.Gandalf.Api}/Commands/AuthCodeRequestCommand.cs (85%) rename src/dotnet/{Suspectus.GandalfReborn.Api => Suspectus.Gandalf.Api}/Commands/CreateAuthCodeCommand.cs (75%) rename src/dotnet/{Suspectus.GandalfReborn.Api => Suspectus.Gandalf.Api}/Commands/CreateTokensCommand.cs (63%) rename src/dotnet/{Suspectus.GandalfReborn.Api => Suspectus.Gandalf.Api}/Commands/HashPasswordCommand.cs (76%) rename src/dotnet/{Suspectus.GandalfReborn.Api => Suspectus.Gandalf.Api}/Commands/IGrCommand.cs (60%) rename src/dotnet/{Suspectus.GandalfReborn.Api => Suspectus.Gandalf.Api}/Commands/RegisterCommand.cs (71%) rename src/dotnet/{Suspectus.GandalfReborn.Api => Suspectus.Gandalf.Api}/Controllers/AuthController.cs (92%) rename src/dotnet/{Suspectus.GandalfReborn.Api => Suspectus.Gandalf.Api}/Extensions/ResultExtentions.cs (94%) rename src/dotnet/{Suspectus.GandalfReborn.Api => Suspectus.Gandalf.Api}/Handlers/Commands/IGrCommandHandler.cs (61%) rename src/dotnet/{Suspectus.GandalfReborn.Api => Suspectus.Gandalf.Api}/Handlers/Commands/RegisterCommandHandler.cs (78%) rename src/dotnet/{Suspectus.GandalfReborn.Api => Suspectus.Gandalf.Api}/Handlers/Security/AuthCodeRequestCommandHandler.cs (89%) rename src/dotnet/{Suspectus.GandalfReborn.Api => Suspectus.Gandalf.Api}/Handlers/Security/CreateAuthCodeCommandHandler.cs (80%) rename src/dotnet/{Suspectus.GandalfReborn.Api => Suspectus.Gandalf.Api}/Handlers/Security/CreateTokensCommandHandler.cs (86%) rename src/dotnet/{Suspectus.GandalfReborn.Api => Suspectus.Gandalf.Api}/Handlers/Security/GetTokensCommandHandler.cs (87%) rename src/dotnet/{Suspectus.GandalfReborn.Api => Suspectus.Gandalf.Api}/Handlers/Security/PasswordHashingHandler.cs (79%) rename src/dotnet/{Suspectus.GandalfReborn.Api => Suspectus.Gandalf.Api}/Program.cs (90%) rename src/dotnet/{Suspectus.GandalfReborn.Api => Suspectus.Gandalf.Api}/Properties/launchSettings.json (100%) rename src/dotnet/{Suspectus.GandalfReborn.Api/Suspectus.GandalfReborn.Api.csproj => Suspectus.Gandalf.Api/Suspectus.Gandalf.Api.csproj} (79%) rename src/dotnet/{Suspectus.GandalfReborn.Api => Suspectus.Gandalf.Api}/TestController.cs (90%) rename src/dotnet/{Suspectus.GandalfReborn.Api => Suspectus.Gandalf.Api}/appsettings.Development.json (100%) rename src/dotnet/{Suspectus.GandalfReborn.Api => Suspectus.Gandalf.Api}/appsettings.json (100%) rename src/dotnet/{Suspectus.GandalfReborn.Data => Suspectus.Gandalf.Data}/Database/ApplicationContext.cs (97%) rename src/dotnet/{Suspectus.GandalfReborn.Data => Suspectus.Gandalf.Data}/Database/CoreContext.cs (94%) rename src/dotnet/{Suspectus.GandalfReborn.Data => Suspectus.Gandalf.Data}/Database/GrDbConnectionInterceptor.cs (89%) rename src/dotnet/{Suspectus.GandalfReborn.Data => Suspectus.Gandalf.Data}/Database/Repositories/AuthCodeRepository.cs (62%) rename src/dotnet/{Suspectus.GandalfReborn.Data => Suspectus.Gandalf.Data}/Database/Repositories/GrRepository.cs (96%) rename src/dotnet/{Suspectus.GandalfReborn.Data => Suspectus.Gandalf.Data}/Database/Repositories/IGrRepository.cs (85%) rename src/dotnet/{Suspectus.GandalfReborn.Data => Suspectus.Gandalf.Data}/Database/Repositories/SubjectRepository.cs (62%) rename src/dotnet/{Suspectus.GandalfReborn.Data => Suspectus.Gandalf.Data}/Database/Repositories/TokenMetadataRepository.cs (65%) rename src/dotnet/{Suspectus.GandalfReborn.Data => Suspectus.Gandalf.Data}/Dto/AuthCodeDto.cs (80%) rename src/dotnet/{Suspectus.GandalfReborn.Data => Suspectus.Gandalf.Data}/Dto/TokenDto.cs (75%) rename src/dotnet/{Suspectus.GandalfReborn.Data => Suspectus.Gandalf.Data}/Entities/App/AppRelationEntity.cs (70%) rename src/dotnet/{Suspectus.GandalfReborn.Data => Suspectus.Gandalf.Data}/Entities/App/AppSubjectRelationEntity.cs (71%) rename src/dotnet/{Suspectus.GandalfReborn.Data => Suspectus.Gandalf.Data}/Entities/Base/EntityVisibility.cs (60%) rename src/dotnet/{Suspectus.GandalfReborn.Data => Suspectus.Gandalf.Data}/Entities/Base/IEntity.cs (51%) create mode 100644 src/dotnet/Suspectus.Gandalf.Data/Entities/Base/IMappingEntity.cs rename src/dotnet/{Suspectus.GandalfReborn.Data => Suspectus.Gandalf.Data}/Entities/Base/IdData.cs (58%) rename src/dotnet/{Suspectus.GandalfReborn.Data => Suspectus.Gandalf.Data}/Entities/Base/SubjectData.cs (63%) rename src/dotnet/{Suspectus.GandalfReborn.Data => Suspectus.Gandalf.Data}/Entities/Base/TenantRelationData.cs (67%) rename src/dotnet/{Suspectus.GandalfReborn.Data => Suspectus.Gandalf.Data}/Entities/Base/VisibilityData.cs (67%) rename src/dotnet/{Suspectus.GandalfReborn.Data => Suspectus.Gandalf.Data}/Entities/ContentKeyAttribute.cs (65%) rename src/dotnet/{Suspectus.GandalfReborn.Data => Suspectus.Gandalf.Data}/Entities/Security/AppUserRelationInternalAuthorityRelationEntity.cs (75%) rename src/dotnet/{Suspectus.GandalfReborn.Data => Suspectus.Gandalf.Data}/Entities/Security/AuthCodeEntity.cs (76%) rename src/dotnet/{Suspectus.GandalfReborn.Data => Suspectus.Gandalf.Data}/Entities/Security/AuthorityEntity.cs (72%) create mode 100644 src/dotnet/Suspectus.Gandalf.Data/Entities/Security/AuthorityType.cs rename src/dotnet/{Suspectus.GandalfReborn.Data => Suspectus.Gandalf.Data}/Entities/Security/TenantSubjectRelationInternalAuthorityRelationEntity.cs (79%) rename src/dotnet/{Suspectus.GandalfReborn.Data => Suspectus.Gandalf.Data}/Entities/Security/TokenMetaDataEntity.cs (70%) create mode 100644 src/dotnet/Suspectus.Gandalf.Data/Entities/Security/TokenType.cs rename src/dotnet/{Suspectus.GandalfReborn.Data => Suspectus.Gandalf.Data}/Entities/Subject/SignIn/SignInEntity.cs (71%) create mode 100644 src/dotnet/Suspectus.Gandalf.Data/Entities/Subject/SignIn/SignInMethod.cs rename src/dotnet/{Suspectus.GandalfReborn.Data => Suspectus.Gandalf.Data}/Entities/Subject/SubjectEntity.cs (51%) create mode 100644 src/dotnet/Suspectus.Gandalf.Data/Entities/Tenant/OwnerData.cs rename src/dotnet/{Suspectus.GandalfReborn.Data => Suspectus.Gandalf.Data}/Entities/Tenant/TenantEntity.cs (76%) rename src/dotnet/{Suspectus.GandalfReborn.Data => Suspectus.Gandalf.Data}/Entities/Tenant/TenantSubjectRelationEntity.cs (75%) rename src/dotnet/{Suspectus.GandalfReborn.Data => Suspectus.Gandalf.Data}/Entities/Version/IVersionEntity.cs (66%) rename src/dotnet/{Suspectus.GandalfReborn.Data => Suspectus.Gandalf.Data}/Entities/Version/VersionAction.cs (58%) rename src/dotnet/{Suspectus.GandalfReborn.Data => Suspectus.Gandalf.Data}/Extensions/StringExtensions.cs (93%) rename src/dotnet/{Suspectus.GandalfReborn.Data => Suspectus.Gandalf.Data}/Mapper/AuthCodeDtoMappingProfile.cs (55%) rename src/dotnet/{Suspectus.GandalfReborn.Data => Suspectus.Gandalf.Data}/Migrations/20240903154112_sus.Designer.cs (99%) rename src/dotnet/{Suspectus.GandalfReborn.Data => Suspectus.Gandalf.Data}/Migrations/20240903154112_sus.cs (100%) rename src/dotnet/{Suspectus.GandalfReborn.Data => Suspectus.Gandalf.Data}/Migrations/20240914003536_addTokens.Designer.cs (99%) rename src/dotnet/{Suspectus.GandalfReborn.Data => Suspectus.Gandalf.Data}/Migrations/20240914003536_addTokens.cs (100%) rename src/dotnet/{Suspectus.GandalfReborn.Data => Suspectus.Gandalf.Data}/Migrations/20240914005530_affwaf.Designer.cs (99%) rename src/dotnet/{Suspectus.GandalfReborn.Data => Suspectus.Gandalf.Data}/Migrations/20240914005530_affwaf.cs (100%) rename src/dotnet/{Suspectus.GandalfReborn.Data => Suspectus.Gandalf.Data}/Migrations/20240914012943_fawfghh.Designer.cs (99%) rename src/dotnet/{Suspectus.GandalfReborn.Data => Suspectus.Gandalf.Data}/Migrations/20240914012943_fawfghh.cs (100%) rename src/dotnet/{Suspectus.GandalfReborn.Data => Suspectus.Gandalf.Data}/Migrations/20240914014850_gjjjjjj.Designer.cs (99%) rename src/dotnet/{Suspectus.GandalfReborn.Data => Suspectus.Gandalf.Data}/Migrations/20240914014850_gjjjjjj.cs (100%) rename src/dotnet/{Suspectus.GandalfReborn.Data => Suspectus.Gandalf.Data}/Migrations/20240914224344_jsoikgsoieg.Designer.cs (99%) rename src/dotnet/{Suspectus.GandalfReborn.Data => Suspectus.Gandalf.Data}/Migrations/20240914224344_jsoikgsoieg.cs (100%) rename src/dotnet/{Suspectus.GandalfReborn.Data => Suspectus.Gandalf.Data}/Migrations/20240919005908_afwawfawf.Designer.cs (99%) rename src/dotnet/{Suspectus.GandalfReborn.Data => Suspectus.Gandalf.Data}/Migrations/20240919005908_afwawfawf.cs (100%) rename src/dotnet/{Suspectus.GandalfReborn.Data => Suspectus.Gandalf.Data}/Migrations/20240919010339_ffffff.Designer.cs (99%) rename src/dotnet/{Suspectus.GandalfReborn.Data => Suspectus.Gandalf.Data}/Migrations/20240919010339_ffffff.cs (100%) rename src/dotnet/{Suspectus.GandalfReborn.Data => Suspectus.Gandalf.Data}/Migrations/20240919010748_jmäpromh.Designer.cs (99%) rename src/dotnet/{Suspectus.GandalfReborn.Data => Suspectus.Gandalf.Data}/Migrations/20240919010748_jmäpromh.cs (100%) rename src/dotnet/{Suspectus.GandalfReborn.Data => Suspectus.Gandalf.Data}/Migrations/20240919012025_fghdhhzttr.Designer.cs (99%) rename src/dotnet/{Suspectus.GandalfReborn.Data => Suspectus.Gandalf.Data}/Migrations/20240919012025_fghdhhzttr.cs (100%) rename src/dotnet/{Suspectus.GandalfReborn.Data => Suspectus.Gandalf.Data}/Migrations/20240921214234_klöhmpdmpmgr.Designer.cs (99%) rename src/dotnet/{Suspectus.GandalfReborn.Data => Suspectus.Gandalf.Data}/Migrations/20240921214234_klöhmpdmpmgr.cs (100%) rename src/dotnet/{Suspectus.GandalfReborn.Data => Suspectus.Gandalf.Data}/Migrations/ApplicationContextModelSnapshot.cs (99%) rename src/dotnet/{Suspectus.GandalfReborn.Data/Suspectus.GandalfReborn.Data.csproj => Suspectus.Gandalf.Data/Suspectus.Gandalf.Data.csproj} (81%) rename src/dotnet/{Suspectus.GandalfReborn.Security => Suspectus.Gandalf.Security}/GrAuthorizeAttribute.cs (94%) rename src/dotnet/{Suspectus.GandalfReborn.Security => Suspectus.Gandalf.Security}/Scheme/GandalfRebornJwtTokenAuthExtensions.cs (91%) rename src/dotnet/{Suspectus.GandalfReborn.Security => Suspectus.Gandalf.Security}/Scheme/GandalfRebornJwtTokenAuthSchemeHandler.cs (97%) rename src/dotnet/{Suspectus.GandalfReborn.Security => Suspectus.Gandalf.Security}/Scheme/GandalfRebornJwtTokenAuthSchemeOptions.cs (82%) rename src/dotnet/{Suspectus.GandalfReborn.Security/Suspectus.GandalfReborn.Security.csproj => Suspectus.Gandalf.Security/Suspectus.Gandalf.Security.csproj} (62%) delete mode 100644 src/dotnet/Suspectus.GandalfReborn.Data/Entities/Base/IMappingEntity.cs delete mode 100644 src/dotnet/Suspectus.GandalfReborn.Data/Entities/Security/AuthorityType.cs delete mode 100644 src/dotnet/Suspectus.GandalfReborn.Data/Entities/Security/TokenType.cs delete mode 100644 src/dotnet/Suspectus.GandalfReborn.Data/Entities/Subject/SignIn/SignInMethod.cs delete mode 100644 src/dotnet/Suspectus.GandalfReborn.Data/Entities/Tenant/OwnerData.cs rename src/dotnet/{Suspectus.GandalfReborn.sln => Suspectus.sln} (63%) diff --git a/src/dotnet/.idea/.idea.Suspectus.GandalfReborn/.idea/.gitignore b/src/dotnet/.idea/.idea.Suspectus/.idea/.gitignore similarity index 100% rename from src/dotnet/.idea/.idea.Suspectus.GandalfReborn/.idea/.gitignore rename to src/dotnet/.idea/.idea.Suspectus/.idea/.gitignore diff --git a/src/dotnet/.idea/.idea.Suspectus.GandalfReborn/.idea/indexLayout.xml b/src/dotnet/.idea/.idea.Suspectus/.idea/indexLayout.xml similarity index 100% rename from src/dotnet/.idea/.idea.Suspectus.GandalfReborn/.idea/indexLayout.xml rename to src/dotnet/.idea/.idea.Suspectus/.idea/indexLayout.xml diff --git a/src/dotnet/Suspectus.GandalfReborn.Abstractions/Invoker.cs b/src/dotnet/Suspectus.Gandalf.Abstractions/Invoker.cs similarity index 97% rename from src/dotnet/Suspectus.GandalfReborn.Abstractions/Invoker.cs rename to src/dotnet/Suspectus.Gandalf.Abstractions/Invoker.cs index c8f6d61..9f233d1 100644 --- a/src/dotnet/Suspectus.GandalfReborn.Abstractions/Invoker.cs +++ b/src/dotnet/Suspectus.Gandalf.Abstractions/Invoker.cs @@ -2,7 +2,7 @@ using System.Collections.Immutable; using System.Security.Claims; using System.Text.RegularExpressions; -namespace Suspectus.GandalfReborn.Abstractions; +namespace Suspectus.Gandalf.Abstractions; public partial class Invoker { diff --git a/src/dotnet/Suspectus.GandalfReborn.Abstractions/InvokerContext.cs b/src/dotnet/Suspectus.Gandalf.Abstractions/InvokerContext.cs similarity index 60% rename from src/dotnet/Suspectus.GandalfReborn.Abstractions/InvokerContext.cs rename to src/dotnet/Suspectus.Gandalf.Abstractions/InvokerContext.cs index 658f59d..b7f4e82 100644 --- a/src/dotnet/Suspectus.GandalfReborn.Abstractions/InvokerContext.cs +++ b/src/dotnet/Suspectus.Gandalf.Abstractions/InvokerContext.cs @@ -1,4 +1,4 @@ -namespace Suspectus.GandalfReborn.Abstractions; +namespace Suspectus.Gandalf.Abstractions; public class InvokerContext { diff --git a/src/dotnet/Suspectus.GandalfReborn.Abstractions/Suspectus.GandalfReborn.Abstractions.csproj b/src/dotnet/Suspectus.Gandalf.Abstractions/Suspectus.Gandalf.Abstractions.csproj similarity index 74% rename from src/dotnet/Suspectus.GandalfReborn.Abstractions/Suspectus.GandalfReborn.Abstractions.csproj rename to src/dotnet/Suspectus.Gandalf.Abstractions/Suspectus.Gandalf.Abstractions.csproj index 9cea2c7..25a728f 100644 --- a/src/dotnet/Suspectus.GandalfReborn.Abstractions/Suspectus.GandalfReborn.Abstractions.csproj +++ b/src/dotnet/Suspectus.Gandalf.Abstractions/Suspectus.Gandalf.Abstractions.csproj @@ -4,7 +4,7 @@ net9.0 enable enable - Suspectus.GandalfReborn.Abstractions + Suspectus.Gandalf.Abstractions diff --git a/src/dotnet/Suspectus.GandalfReborn.Api/Commands/AuthCodeRequestCommand.cs b/src/dotnet/Suspectus.Gandalf.Api/Commands/AuthCodeRequestCommand.cs similarity index 85% rename from src/dotnet/Suspectus.GandalfReborn.Api/Commands/AuthCodeRequestCommand.cs rename to src/dotnet/Suspectus.Gandalf.Api/Commands/AuthCodeRequestCommand.cs index ca5c3a9..2c6540a 100644 --- a/src/dotnet/Suspectus.GandalfReborn.Api/Commands/AuthCodeRequestCommand.cs +++ b/src/dotnet/Suspectus.Gandalf.Api/Commands/AuthCodeRequestCommand.cs @@ -1,7 +1,7 @@ using LanguageExt.Common; -using Suspectus.GandalfReborn.Data.Dto; +using Suspectus.Gandalf.Data.Dto; -namespace Suspectus.GandalfReborn.Commands; +namespace Suspectus.Gandalf.Api.Commands; public class AuthCodeRequestCommand : IGrCommand> { diff --git a/src/dotnet/Suspectus.GandalfReborn.Api/Commands/CreateAuthCodeCommand.cs b/src/dotnet/Suspectus.Gandalf.Api/Commands/CreateAuthCodeCommand.cs similarity index 75% rename from src/dotnet/Suspectus.GandalfReborn.Api/Commands/CreateAuthCodeCommand.cs rename to src/dotnet/Suspectus.Gandalf.Api/Commands/CreateAuthCodeCommand.cs index 562c251..71645f8 100644 --- a/src/dotnet/Suspectus.GandalfReborn.Api/Commands/CreateAuthCodeCommand.cs +++ b/src/dotnet/Suspectus.Gandalf.Api/Commands/CreateAuthCodeCommand.cs @@ -1,7 +1,7 @@ using LanguageExt.Common; -using Suspectus.GandalfReborn.Data.Dto; +using Suspectus.Gandalf.Data.Dto; -namespace Suspectus.GandalfReborn.Commands; +namespace Suspectus.Gandalf.Api.Commands; public class CreateAuthCodeCommand : IGrCommand> { diff --git a/src/dotnet/Suspectus.GandalfReborn.Api/Commands/CreateTokensCommand.cs b/src/dotnet/Suspectus.Gandalf.Api/Commands/CreateTokensCommand.cs similarity index 63% rename from src/dotnet/Suspectus.GandalfReborn.Api/Commands/CreateTokensCommand.cs rename to src/dotnet/Suspectus.Gandalf.Api/Commands/CreateTokensCommand.cs index 775a4dc..e97d0db 100644 --- a/src/dotnet/Suspectus.GandalfReborn.Api/Commands/CreateTokensCommand.cs +++ b/src/dotnet/Suspectus.Gandalf.Api/Commands/CreateTokensCommand.cs @@ -1,7 +1,7 @@ using LanguageExt.Common; -using Suspectus.GandalfReborn.Data.Dto; +using Suspectus.Gandalf.Data.Dto; -namespace Suspectus.GandalfReborn.Commands; +namespace Suspectus.Gandalf.Api.Commands; public class CreateTokensCommand : IGrCommand> { diff --git a/src/dotnet/Suspectus.GandalfReborn.Api/Commands/HashPasswordCommand.cs b/src/dotnet/Suspectus.Gandalf.Api/Commands/HashPasswordCommand.cs similarity index 76% rename from src/dotnet/Suspectus.GandalfReborn.Api/Commands/HashPasswordCommand.cs rename to src/dotnet/Suspectus.Gandalf.Api/Commands/HashPasswordCommand.cs index 3262406..5054df6 100644 --- a/src/dotnet/Suspectus.GandalfReborn.Api/Commands/HashPasswordCommand.cs +++ b/src/dotnet/Suspectus.Gandalf.Api/Commands/HashPasswordCommand.cs @@ -1,6 +1,6 @@ using LanguageExt.Common; -namespace Suspectus.GandalfReborn.Commands; +namespace Suspectus.Gandalf.Api.Commands; public class HashPasswordCommand : IGrCommand> { diff --git a/src/dotnet/Suspectus.GandalfReborn.Api/Commands/IGrCommand.cs b/src/dotnet/Suspectus.Gandalf.Api/Commands/IGrCommand.cs similarity index 60% rename from src/dotnet/Suspectus.GandalfReborn.Api/Commands/IGrCommand.cs rename to src/dotnet/Suspectus.Gandalf.Api/Commands/IGrCommand.cs index 76fa3ca..5ec3b0c 100644 --- a/src/dotnet/Suspectus.GandalfReborn.Api/Commands/IGrCommand.cs +++ b/src/dotnet/Suspectus.Gandalf.Api/Commands/IGrCommand.cs @@ -1,5 +1,5 @@ using MediatR; -namespace Suspectus.GandalfReborn.Commands; +namespace Suspectus.Gandalf.Api.Commands; public interface IGrCommand : IRequest; \ No newline at end of file diff --git a/src/dotnet/Suspectus.GandalfReborn.Api/Commands/RegisterCommand.cs b/src/dotnet/Suspectus.Gandalf.Api/Commands/RegisterCommand.cs similarity index 71% rename from src/dotnet/Suspectus.GandalfReborn.Api/Commands/RegisterCommand.cs rename to src/dotnet/Suspectus.Gandalf.Api/Commands/RegisterCommand.cs index 618e991..cd640d2 100644 --- a/src/dotnet/Suspectus.GandalfReborn.Api/Commands/RegisterCommand.cs +++ b/src/dotnet/Suspectus.Gandalf.Api/Commands/RegisterCommand.cs @@ -1,7 +1,7 @@ using LanguageExt.Common; -using Suspectus.GandalfReborn.Data.Entities.Subject; +using Suspectus.Gandalf.Data.Entities.Subject; -namespace Suspectus.GandalfReborn.Commands; +namespace Suspectus.Gandalf.Api.Commands; public class RegisterCommand : IGrCommand> { diff --git a/src/dotnet/Suspectus.GandalfReborn.Api/Controllers/AuthController.cs b/src/dotnet/Suspectus.Gandalf.Api/Controllers/AuthController.cs similarity index 92% rename from src/dotnet/Suspectus.GandalfReborn.Api/Controllers/AuthController.cs rename to src/dotnet/Suspectus.Gandalf.Api/Controllers/AuthController.cs index 64cc4cb..80ab3c9 100644 --- a/src/dotnet/Suspectus.GandalfReborn.Api/Controllers/AuthController.cs +++ b/src/dotnet/Suspectus.Gandalf.Api/Controllers/AuthController.cs @@ -1,8 +1,8 @@ using MediatR; using Microsoft.AspNetCore.Mvc; -using Suspectus.GandalfReborn.Commands; +using Suspectus.Gandalf.Api.Commands; -namespace Suspectus.GandalfReborn.Controllers; +namespace Suspectus.Gandalf.Api.Controllers; [ApiController] [Route("api/[controller]")] diff --git a/src/dotnet/Suspectus.GandalfReborn.Api/Extensions/ResultExtentions.cs b/src/dotnet/Suspectus.Gandalf.Api/Extensions/ResultExtentions.cs similarity index 94% rename from src/dotnet/Suspectus.GandalfReborn.Api/Extensions/ResultExtentions.cs rename to src/dotnet/Suspectus.Gandalf.Api/Extensions/ResultExtentions.cs index c4d432e..ce524d9 100644 --- a/src/dotnet/Suspectus.GandalfReborn.Api/Extensions/ResultExtentions.cs +++ b/src/dotnet/Suspectus.Gandalf.Api/Extensions/ResultExtentions.cs @@ -1,6 +1,6 @@ using LanguageExt.Common; -namespace Suspectus.GandalfReborn.Extensions; +namespace Suspectus.Gandalf.Api.Extensions; public static class ResultExtensions { diff --git a/src/dotnet/Suspectus.GandalfReborn.Api/Handlers/Commands/IGrCommandHandler.cs b/src/dotnet/Suspectus.Gandalf.Api/Handlers/Commands/IGrCommandHandler.cs similarity index 61% rename from src/dotnet/Suspectus.GandalfReborn.Api/Handlers/Commands/IGrCommandHandler.cs rename to src/dotnet/Suspectus.Gandalf.Api/Handlers/Commands/IGrCommandHandler.cs index 3856f27..1c90f6f 100644 --- a/src/dotnet/Suspectus.GandalfReborn.Api/Handlers/Commands/IGrCommandHandler.cs +++ b/src/dotnet/Suspectus.Gandalf.Api/Handlers/Commands/IGrCommandHandler.cs @@ -1,6 +1,6 @@ using MediatR; -using Suspectus.GandalfReborn.Commands; +using Suspectus.Gandalf.Api.Commands; -namespace Suspectus.GandalfReborn.Handlers.Commands; +namespace Suspectus.Gandalf.Api.Handlers.Commands; public interface IGrCommandHandler : IRequestHandler where TCommand : IGrCommand; \ No newline at end of file diff --git a/src/dotnet/Suspectus.GandalfReborn.Api/Handlers/Commands/RegisterCommandHandler.cs b/src/dotnet/Suspectus.Gandalf.Api/Handlers/Commands/RegisterCommandHandler.cs similarity index 78% rename from src/dotnet/Suspectus.GandalfReborn.Api/Handlers/Commands/RegisterCommandHandler.cs rename to src/dotnet/Suspectus.Gandalf.Api/Handlers/Commands/RegisterCommandHandler.cs index 8eb1e5f..100f715 100644 --- a/src/dotnet/Suspectus.GandalfReborn.Api/Handlers/Commands/RegisterCommandHandler.cs +++ b/src/dotnet/Suspectus.Gandalf.Api/Handlers/Commands/RegisterCommandHandler.cs @@ -1,13 +1,13 @@ using LanguageExt.Common; using MediatR; -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; +using Suspectus.Gandalf.Api.Commands; +using Suspectus.Gandalf.Api.Extensions; +using Suspectus.Gandalf.Data.Database.Repositories; +using Suspectus.Gandalf.Data.Entities.Base; +using Suspectus.Gandalf.Data.Entities.Subject; +using Suspectus.Gandalf.Data.Entities.Subject.SignIn; -namespace Suspectus.GandalfReborn.Handlers.Commands; +namespace Suspectus.Gandalf.Api.Handlers.Commands; public class RegisterCommandHandler(ISubjectRepository subjectRepository, IMediator mediator) : IGrCommandHandler> { diff --git a/src/dotnet/Suspectus.GandalfReborn.Api/Handlers/Security/AuthCodeRequestCommandHandler.cs b/src/dotnet/Suspectus.Gandalf.Api/Handlers/Security/AuthCodeRequestCommandHandler.cs similarity index 89% rename from src/dotnet/Suspectus.GandalfReborn.Api/Handlers/Security/AuthCodeRequestCommandHandler.cs rename to src/dotnet/Suspectus.Gandalf.Api/Handlers/Security/AuthCodeRequestCommandHandler.cs index 5ab5ec0..3a9bb6f 100644 --- a/src/dotnet/Suspectus.GandalfReborn.Api/Handlers/Security/AuthCodeRequestCommandHandler.cs +++ b/src/dotnet/Suspectus.Gandalf.Api/Handlers/Security/AuthCodeRequestCommandHandler.cs @@ -2,14 +2,14 @@ using LanguageExt.Common; using MediatR; using Microsoft.AspNetCore.Identity; using Microsoft.EntityFrameworkCore; -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; +using Suspectus.Gandalf.Api.Commands; +using Suspectus.Gandalf.Api.Extensions; +using Suspectus.Gandalf.Api.Handlers.Commands; +using Suspectus.Gandalf.Data.Database.Repositories; +using Suspectus.Gandalf.Data.Dto; +using Suspectus.Gandalf.Data.Entities.Subject.SignIn; -namespace Suspectus.GandalfReborn.Handlers.Security; +namespace Suspectus.Gandalf.Api.Handlers.Security; public class AuthCodeRequestCommandHandler(IPasswordHasher passwordHasher, ISubjectRepository subjectRepository, IMediator mediator) : IGrCommandHandler> { diff --git a/src/dotnet/Suspectus.GandalfReborn.Api/Handlers/Security/CreateAuthCodeCommandHandler.cs b/src/dotnet/Suspectus.Gandalf.Api/Handlers/Security/CreateAuthCodeCommandHandler.cs similarity index 80% rename from src/dotnet/Suspectus.GandalfReborn.Api/Handlers/Security/CreateAuthCodeCommandHandler.cs rename to src/dotnet/Suspectus.Gandalf.Api/Handlers/Security/CreateAuthCodeCommandHandler.cs index d443180..9c13459 100644 --- a/src/dotnet/Suspectus.GandalfReborn.Api/Handlers/Security/CreateAuthCodeCommandHandler.cs +++ b/src/dotnet/Suspectus.Gandalf.Api/Handlers/Security/CreateAuthCodeCommandHandler.cs @@ -1,13 +1,13 @@ using AutoMapper; using LanguageExt.Common; using Microsoft.AspNetCore.Identity; -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; +using Suspectus.Gandalf.Api.Commands; +using Suspectus.Gandalf.Api.Handlers.Commands; +using Suspectus.Gandalf.Data.Database.Repositories; +using Suspectus.Gandalf.Data.Dto; +using Suspectus.Gandalf.Data.Entities.Security; -namespace Suspectus.GandalfReborn.Handlers.Security; +namespace Suspectus.Gandalf.Api.Handlers.Security; public class CreateAuthCodeCommandHandler(IPasswordHasher passwordHasher, TimeProvider timeProvider, IAuthCodeRepository authCodeRepository, IMapper mapper) : IGrCommandHandler> { diff --git a/src/dotnet/Suspectus.GandalfReborn.Api/Handlers/Security/CreateTokensCommandHandler.cs b/src/dotnet/Suspectus.Gandalf.Api/Handlers/Security/CreateTokensCommandHandler.cs similarity index 86% rename from src/dotnet/Suspectus.GandalfReborn.Api/Handlers/Security/CreateTokensCommandHandler.cs rename to src/dotnet/Suspectus.Gandalf.Api/Handlers/Security/CreateTokensCommandHandler.cs index 7566ab5..7721686 100644 --- a/src/dotnet/Suspectus.GandalfReborn.Api/Handlers/Security/CreateTokensCommandHandler.cs +++ b/src/dotnet/Suspectus.Gandalf.Api/Handlers/Security/CreateTokensCommandHandler.cs @@ -3,15 +3,15 @@ using JWT.Algorithms; using JWT.Builder; using JWT.Serializers; using LanguageExt.Common; -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; +using Suspectus.Gandalf.Api.Commands; +using Suspectus.Gandalf.Api.Extensions; +using Suspectus.Gandalf.Api.Handlers.Commands; +using Suspectus.Gandalf.Data.Database.Repositories; +using Suspectus.Gandalf.Data.Dto; +using Suspectus.Gandalf.Data.Entities.Security; +using Suspectus.Gandalf.Security.Scheme; -namespace Suspectus.GandalfReborn.Handlers.Security; +namespace Suspectus.Gandalf.Api.Handlers.Security; public class CreateTokensCommandHandler(TimeProvider timeProvider, IConfiguration configuration, IHashids hashids, ITokenMetadataRepository tokenMetadataRepository) : IGrCommandHandler> { diff --git a/src/dotnet/Suspectus.GandalfReborn.Api/Handlers/Security/GetTokensCommandHandler.cs b/src/dotnet/Suspectus.Gandalf.Api/Handlers/Security/GetTokensCommandHandler.cs similarity index 87% rename from src/dotnet/Suspectus.GandalfReborn.Api/Handlers/Security/GetTokensCommandHandler.cs rename to src/dotnet/Suspectus.Gandalf.Api/Handlers/Security/GetTokensCommandHandler.cs index 451224a..aaf2edd 100644 --- a/src/dotnet/Suspectus.GandalfReborn.Api/Handlers/Security/GetTokensCommandHandler.cs +++ b/src/dotnet/Suspectus.Gandalf.Api/Handlers/Security/GetTokensCommandHandler.cs @@ -3,13 +3,13 @@ using System.Text; using LanguageExt.Common; using MediatR; using Microsoft.EntityFrameworkCore; -using Suspectus.GandalfReborn.Commands; -using Suspectus.GandalfReborn.Data.Database.Repositories; -using Suspectus.GandalfReborn.Data.Dto; -using Suspectus.GandalfReborn.Extensions; -using Suspectus.GandalfReborn.Handlers.Commands; +using Suspectus.Gandalf.Api.Commands; +using Suspectus.Gandalf.Api.Extensions; +using Suspectus.Gandalf.Api.Handlers.Commands; +using Suspectus.Gandalf.Data.Database.Repositories; +using Suspectus.Gandalf.Data.Dto; -namespace Suspectus.GandalfReborn.Handlers.Security; +namespace Suspectus.Gandalf.Api.Handlers.Security; public class GetTokensCommandHandler(IAuthCodeRepository authCodeRepository, TimeProvider timeProvider, IMediator mediator) : IGrCommandHandler> { diff --git a/src/dotnet/Suspectus.GandalfReborn.Api/Handlers/Security/PasswordHashingHandler.cs b/src/dotnet/Suspectus.Gandalf.Api/Handlers/Security/PasswordHashingHandler.cs similarity index 79% rename from src/dotnet/Suspectus.GandalfReborn.Api/Handlers/Security/PasswordHashingHandler.cs rename to src/dotnet/Suspectus.Gandalf.Api/Handlers/Security/PasswordHashingHandler.cs index c161691..cedab40 100644 --- a/src/dotnet/Suspectus.GandalfReborn.Api/Handlers/Security/PasswordHashingHandler.cs +++ b/src/dotnet/Suspectus.Gandalf.Api/Handlers/Security/PasswordHashingHandler.cs @@ -1,10 +1,10 @@ using LanguageExt.Common; using Microsoft.AspNetCore.Identity; -using Suspectus.GandalfReborn.Commands; -using Suspectus.GandalfReborn.Extensions; -using Suspectus.GandalfReborn.Handlers.Commands; +using Suspectus.Gandalf.Api.Commands; +using Suspectus.Gandalf.Api.Extensions; +using Suspectus.Gandalf.Api.Handlers.Commands; -namespace Suspectus.GandalfReborn.Handlers.Security; +namespace Suspectus.Gandalf.Api.Handlers.Security; public class PasswordHashingHandler(IPasswordHasher passwordHasher) : IGrCommandHandler> { diff --git a/src/dotnet/Suspectus.GandalfReborn.Api/Program.cs b/src/dotnet/Suspectus.Gandalf.Api/Program.cs similarity index 90% rename from src/dotnet/Suspectus.GandalfReborn.Api/Program.cs rename to src/dotnet/Suspectus.Gandalf.Api/Program.cs index 017b212..ec7f082 100644 --- a/src/dotnet/Suspectus.GandalfReborn.Api/Program.cs +++ b/src/dotnet/Suspectus.Gandalf.Api/Program.cs @@ -3,10 +3,10 @@ using System.Text.Json.Serialization; using HashidsNet; using Microsoft.AspNetCore.Identity; using Microsoft.EntityFrameworkCore; -using Suspectus.GandalfReborn.Abstractions; -using Suspectus.GandalfReborn.Data.Database; -using Suspectus.GandalfReborn.Data.Database.Repositories; -using Suspectus.GandalfReborn.Security.Scheme; +using Suspectus.Gandalf.Abstractions; +using Suspectus.Gandalf.Security.Scheme; +using Suspectus.Gandalf.Data.Database; +using Suspectus.Gandalf.Data.Database.Repositories; var builder = WebApplication.CreateBuilder(args); @@ -16,7 +16,7 @@ builder.Services.AddEndpointsApiExplorer(); builder.Services.AddDbContext(cfg => cfg .UseNpgsql( builder.Configuration.GetConnectionString("DefaultConnection"), - x => x.MigrationsAssembly("Suspectus.GandalfReborn.Data") + x => x.MigrationsAssembly("Suspectus.Gandalf.Data") ) ); diff --git a/src/dotnet/Suspectus.GandalfReborn.Api/Properties/launchSettings.json b/src/dotnet/Suspectus.Gandalf.Api/Properties/launchSettings.json similarity index 100% rename from src/dotnet/Suspectus.GandalfReborn.Api/Properties/launchSettings.json rename to src/dotnet/Suspectus.Gandalf.Api/Properties/launchSettings.json diff --git a/src/dotnet/Suspectus.GandalfReborn.Api/Suspectus.GandalfReborn.Api.csproj b/src/dotnet/Suspectus.Gandalf.Api/Suspectus.Gandalf.Api.csproj similarity index 79% rename from src/dotnet/Suspectus.GandalfReborn.Api/Suspectus.GandalfReborn.Api.csproj rename to src/dotnet/Suspectus.Gandalf.Api/Suspectus.Gandalf.Api.csproj index 81dc9f5..3f04e43 100644 --- a/src/dotnet/Suspectus.GandalfReborn.Api/Suspectus.GandalfReborn.Api.csproj +++ b/src/dotnet/Suspectus.Gandalf.Api/Suspectus.Gandalf.Api.csproj @@ -4,7 +4,7 @@ net9.0 enable enable - Suspectus.GandalfReborn + Suspectus.Gandalf.Api 12 @@ -23,8 +23,8 @@ - - + + diff --git a/src/dotnet/Suspectus.GandalfReborn.Api/TestController.cs b/src/dotnet/Suspectus.Gandalf.Api/TestController.cs similarity index 90% rename from src/dotnet/Suspectus.GandalfReborn.Api/TestController.cs rename to src/dotnet/Suspectus.Gandalf.Api/TestController.cs index 8b2f143..8311394 100644 --- a/src/dotnet/Suspectus.GandalfReborn.Api/TestController.cs +++ b/src/dotnet/Suspectus.Gandalf.Api/TestController.cs @@ -2,14 +2,14 @@ using HashidsNet; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Microsoft.EntityFrameworkCore; -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; +using Suspectus.Gandalf.Abstractions; +using Suspectus.Gandalf.Data.Database; +using Suspectus.Gandalf.Data.Entities.Base; +using Suspectus.Gandalf.Data.Entities.Security; +using Suspectus.Gandalf.Data.Entities.Tenant; +using Suspectus.Gandalf.Security; -namespace Suspectus.GandalfReborn; +namespace Suspectus.Gandalf.Api; [ApiController] [Route("api/[controller]")] diff --git a/src/dotnet/Suspectus.GandalfReborn.Api/appsettings.Development.json b/src/dotnet/Suspectus.Gandalf.Api/appsettings.Development.json similarity index 100% rename from src/dotnet/Suspectus.GandalfReborn.Api/appsettings.Development.json rename to src/dotnet/Suspectus.Gandalf.Api/appsettings.Development.json diff --git a/src/dotnet/Suspectus.GandalfReborn.Api/appsettings.json b/src/dotnet/Suspectus.Gandalf.Api/appsettings.json similarity index 100% rename from src/dotnet/Suspectus.GandalfReborn.Api/appsettings.json rename to src/dotnet/Suspectus.Gandalf.Api/appsettings.json diff --git a/src/dotnet/Suspectus.GandalfReborn.Data/Database/ApplicationContext.cs b/src/dotnet/Suspectus.Gandalf.Data/Database/ApplicationContext.cs similarity index 97% rename from src/dotnet/Suspectus.GandalfReborn.Data/Database/ApplicationContext.cs rename to src/dotnet/Suspectus.Gandalf.Data/Database/ApplicationContext.cs index a1badd4..bf9c8bc 100644 --- a/src/dotnet/Suspectus.GandalfReborn.Data/Database/ApplicationContext.cs +++ b/src/dotnet/Suspectus.Gandalf.Data/Database/ApplicationContext.cs @@ -1,9 +1,9 @@ using Microsoft.EntityFrameworkCore; -using Suspectus.GandalfReborn.Abstractions; -using Suspectus.GandalfReborn.Data.Entities.Base; -using Suspectus.GandalfReborn.Data.Entities.Version; +using Suspectus.Gandalf.Abstractions; +using Suspectus.Gandalf.Data.Entities.Base; +using Suspectus.Gandalf.Data.Entities.Version; -namespace Suspectus.GandalfReborn.Data.Database; +namespace Suspectus.Gandalf.Data.Database; public sealed class ApplicationContext(DbContextOptions options, InvokerContext invokerContext) : CoreContext(options) { diff --git a/src/dotnet/Suspectus.GandalfReborn.Data/Database/CoreContext.cs b/src/dotnet/Suspectus.Gandalf.Data/Database/CoreContext.cs similarity index 94% rename from src/dotnet/Suspectus.GandalfReborn.Data/Database/CoreContext.cs rename to src/dotnet/Suspectus.Gandalf.Data/Database/CoreContext.cs index 0c6e6d1..d49742b 100644 --- a/src/dotnet/Suspectus.GandalfReborn.Data/Database/CoreContext.cs +++ b/src/dotnet/Suspectus.Gandalf.Data/Database/CoreContext.cs @@ -1,12 +1,12 @@ using Microsoft.EntityFrameworkCore; -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; +using Suspectus.Gandalf.Data.Entities.App; +using Suspectus.Gandalf.Data.Entities.Base; +using Suspectus.Gandalf.Data.Entities.Security; +using Suspectus.Gandalf.Data.Entities.Subject; +using Suspectus.Gandalf.Data.Entities.Subject.SignIn; +using Suspectus.Gandalf.Data.Entities.Tenant; -namespace Suspectus.GandalfReborn.Data.Database; +namespace Suspectus.Gandalf.Data.Database; public abstract class CoreContext(DbContextOptions options) : DbContext(options) where T : DbContext { diff --git a/src/dotnet/Suspectus.GandalfReborn.Data/Database/GrDbConnectionInterceptor.cs b/src/dotnet/Suspectus.Gandalf.Data/Database/GrDbConnectionInterceptor.cs similarity index 89% rename from src/dotnet/Suspectus.GandalfReborn.Data/Database/GrDbConnectionInterceptor.cs rename to src/dotnet/Suspectus.Gandalf.Data/Database/GrDbConnectionInterceptor.cs index 6aac1d4..9e7528b 100644 --- a/src/dotnet/Suspectus.GandalfReborn.Data/Database/GrDbConnectionInterceptor.cs +++ b/src/dotnet/Suspectus.Gandalf.Data/Database/GrDbConnectionInterceptor.cs @@ -1,9 +1,9 @@ using System.Data; using System.Data.Common; using Microsoft.EntityFrameworkCore.Diagnostics; -using Suspectus.GandalfReborn.Abstractions; +using Suspectus.Gandalf.Abstractions; -namespace Suspectus.GandalfReborn.Data.Database; +namespace Suspectus.Gandalf.Data.Database; public class GrDbConnectionInterceptor(InvokerContext invokerContext) : IDbConnectionInterceptor { diff --git a/src/dotnet/Suspectus.GandalfReborn.Data/Database/Repositories/AuthCodeRepository.cs b/src/dotnet/Suspectus.Gandalf.Data/Database/Repositories/AuthCodeRepository.cs similarity index 62% rename from src/dotnet/Suspectus.GandalfReborn.Data/Database/Repositories/AuthCodeRepository.cs rename to src/dotnet/Suspectus.Gandalf.Data/Database/Repositories/AuthCodeRepository.cs index 276ee36..272cc6e 100644 --- a/src/dotnet/Suspectus.GandalfReborn.Data/Database/Repositories/AuthCodeRepository.cs +++ b/src/dotnet/Suspectus.Gandalf.Data/Database/Repositories/AuthCodeRepository.cs @@ -1,6 +1,6 @@ -using Suspectus.GandalfReborn.Data.Entities.Security; +using Suspectus.Gandalf.Data.Entities.Security; -namespace Suspectus.GandalfReborn.Data.Database.Repositories; +namespace Suspectus.Gandalf.Data.Database.Repositories; public class AuthCodeRepository(ApplicationContext context) : GrRepository(context), IAuthCodeRepository; diff --git a/src/dotnet/Suspectus.GandalfReborn.Data/Database/Repositories/GrRepository.cs b/src/dotnet/Suspectus.Gandalf.Data/Database/Repositories/GrRepository.cs similarity index 96% rename from src/dotnet/Suspectus.GandalfReborn.Data/Database/Repositories/GrRepository.cs rename to src/dotnet/Suspectus.Gandalf.Data/Database/Repositories/GrRepository.cs index 3d55dd2..80c4fa9 100644 --- a/src/dotnet/Suspectus.GandalfReborn.Data/Database/Repositories/GrRepository.cs +++ b/src/dotnet/Suspectus.Gandalf.Data/Database/Repositories/GrRepository.cs @@ -1,8 +1,8 @@ using LanguageExt.Common; using Microsoft.EntityFrameworkCore; -using Suspectus.GandalfReborn.Data.Entities.Base; +using Suspectus.Gandalf.Data.Entities.Base; -namespace Suspectus.GandalfReborn.Data.Database.Repositories; +namespace Suspectus.Gandalf.Data.Database.Repositories; public abstract class GrRepository(ApplicationContext context) : IGrRepository where TEntity : class, IEntity { diff --git a/src/dotnet/Suspectus.GandalfReborn.Data/Database/Repositories/IGrRepository.cs b/src/dotnet/Suspectus.Gandalf.Data/Database/Repositories/IGrRepository.cs similarity index 85% rename from src/dotnet/Suspectus.GandalfReborn.Data/Database/Repositories/IGrRepository.cs rename to src/dotnet/Suspectus.Gandalf.Data/Database/Repositories/IGrRepository.cs index 91db84f..2463c8f 100644 --- a/src/dotnet/Suspectus.GandalfReborn.Data/Database/Repositories/IGrRepository.cs +++ b/src/dotnet/Suspectus.Gandalf.Data/Database/Repositories/IGrRepository.cs @@ -1,7 +1,7 @@ using LanguageExt.Common; -using Suspectus.GandalfReborn.Data.Entities.Base; +using Suspectus.Gandalf.Data.Entities.Base; -namespace Suspectus.GandalfReborn.Data.Database.Repositories; +namespace Suspectus.Gandalf.Data.Database.Repositories; public interface IGrRepository where TEntity : class, IEntity { diff --git a/src/dotnet/Suspectus.GandalfReborn.Data/Database/Repositories/SubjectRepository.cs b/src/dotnet/Suspectus.Gandalf.Data/Database/Repositories/SubjectRepository.cs similarity index 62% rename from src/dotnet/Suspectus.GandalfReborn.Data/Database/Repositories/SubjectRepository.cs rename to src/dotnet/Suspectus.Gandalf.Data/Database/Repositories/SubjectRepository.cs index 12e5623..383c2d9 100644 --- a/src/dotnet/Suspectus.GandalfReborn.Data/Database/Repositories/SubjectRepository.cs +++ b/src/dotnet/Suspectus.Gandalf.Data/Database/Repositories/SubjectRepository.cs @@ -1,6 +1,6 @@ -using Suspectus.GandalfReborn.Data.Entities.Subject; +using Suspectus.Gandalf.Data.Entities.Subject; -namespace Suspectus.GandalfReborn.Data.Database.Repositories; +namespace Suspectus.Gandalf.Data.Database.Repositories; public class SubjectRepository(ApplicationContext context) : GrRepository(context), ISubjectRepository; diff --git a/src/dotnet/Suspectus.GandalfReborn.Data/Database/Repositories/TokenMetadataRepository.cs b/src/dotnet/Suspectus.Gandalf.Data/Database/Repositories/TokenMetadataRepository.cs similarity index 65% rename from src/dotnet/Suspectus.GandalfReborn.Data/Database/Repositories/TokenMetadataRepository.cs rename to src/dotnet/Suspectus.Gandalf.Data/Database/Repositories/TokenMetadataRepository.cs index 7b487df..7d47f94 100644 --- a/src/dotnet/Suspectus.GandalfReborn.Data/Database/Repositories/TokenMetadataRepository.cs +++ b/src/dotnet/Suspectus.Gandalf.Data/Database/Repositories/TokenMetadataRepository.cs @@ -1,7 +1,7 @@ -using Suspectus.GandalfReborn.Data.Entities.Security; +using Suspectus.Gandalf.Data.Entities.Security; -namespace Suspectus.GandalfReborn.Data.Database.Repositories; +namespace Suspectus.Gandalf.Data.Database.Repositories; public class TokenMetadataRepository(ApplicationContext context) : GrRepository(context), ITokenMetadataRepository; diff --git a/src/dotnet/Suspectus.GandalfReborn.Data/Dto/AuthCodeDto.cs b/src/dotnet/Suspectus.Gandalf.Data/Dto/AuthCodeDto.cs similarity index 80% rename from src/dotnet/Suspectus.GandalfReborn.Data/Dto/AuthCodeDto.cs rename to src/dotnet/Suspectus.Gandalf.Data/Dto/AuthCodeDto.cs index 4c67722..75d3ec4 100644 --- a/src/dotnet/Suspectus.GandalfReborn.Data/Dto/AuthCodeDto.cs +++ b/src/dotnet/Suspectus.Gandalf.Data/Dto/AuthCodeDto.cs @@ -1,4 +1,4 @@ -namespace Suspectus.GandalfReborn.Data.Dto; +namespace Suspectus.Gandalf.Data.Dto; public class AuthCodeDto { diff --git a/src/dotnet/Suspectus.GandalfReborn.Data/Dto/TokenDto.cs b/src/dotnet/Suspectus.Gandalf.Data/Dto/TokenDto.cs similarity index 75% rename from src/dotnet/Suspectus.GandalfReborn.Data/Dto/TokenDto.cs rename to src/dotnet/Suspectus.Gandalf.Data/Dto/TokenDto.cs index 00bb119..57a791d 100644 --- a/src/dotnet/Suspectus.GandalfReborn.Data/Dto/TokenDto.cs +++ b/src/dotnet/Suspectus.Gandalf.Data/Dto/TokenDto.cs @@ -1,4 +1,4 @@ -namespace Suspectus.GandalfReborn.Data.Dto; +namespace Suspectus.Gandalf.Data.Dto; public class TokenDto { diff --git a/src/dotnet/Suspectus.GandalfReborn.Data/Entities/App/AppRelationEntity.cs b/src/dotnet/Suspectus.Gandalf.Data/Entities/App/AppRelationEntity.cs similarity index 70% rename from src/dotnet/Suspectus.GandalfReborn.Data/Entities/App/AppRelationEntity.cs rename to src/dotnet/Suspectus.Gandalf.Data/Entities/App/AppRelationEntity.cs index 6b1f125..856279c 100644 --- a/src/dotnet/Suspectus.GandalfReborn.Data/Entities/App/AppRelationEntity.cs +++ b/src/dotnet/Suspectus.Gandalf.Data/Entities/App/AppRelationEntity.cs @@ -1,9 +1,9 @@ -using Suspectus.GandalfReborn.Data.Entities.Base; -using Suspectus.GandalfReborn.Data.Entities.Subject; -using Suspectus.GandalfReborn.Data.Entities.Tenant; -using Suspectus.GandalfReborn.Data.Entities.Version; +using Suspectus.Gandalf.Data.Entities.Base; +using Suspectus.Gandalf.Data.Entities.Subject; +using Suspectus.Gandalf.Data.Entities.Tenant; +using Suspectus.Gandalf.Data.Entities.Version; -namespace Suspectus.GandalfReborn.Data.Entities.App; +namespace Suspectus.Gandalf.Data.Entities.App; public class AppRelationEntity : AppRelationData, IVersionableEntity { diff --git a/src/dotnet/Suspectus.GandalfReborn.Data/Entities/App/AppSubjectRelationEntity.cs b/src/dotnet/Suspectus.Gandalf.Data/Entities/App/AppSubjectRelationEntity.cs similarity index 71% rename from src/dotnet/Suspectus.GandalfReborn.Data/Entities/App/AppSubjectRelationEntity.cs rename to src/dotnet/Suspectus.Gandalf.Data/Entities/App/AppSubjectRelationEntity.cs index e34c3d8..431209b 100644 --- a/src/dotnet/Suspectus.GandalfReborn.Data/Entities/App/AppSubjectRelationEntity.cs +++ b/src/dotnet/Suspectus.Gandalf.Data/Entities/App/AppSubjectRelationEntity.cs @@ -1,10 +1,10 @@ -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; +using Suspectus.Gandalf.Data.Entities.Base; +using Suspectus.Gandalf.Data.Entities.Security; +using Suspectus.Gandalf.Data.Entities.Subject; +using Suspectus.Gandalf.Data.Entities.Tenant; +using Suspectus.Gandalf.Data.Entities.Version; -namespace Suspectus.GandalfReborn.Data.Entities.App; +namespace Suspectus.Gandalf.Data.Entities.App; public class AppSubjectRelationEntity : AppSubjectRelationData, IMappingEntity, IVersionableEntity { diff --git a/src/dotnet/Suspectus.GandalfReborn.Data/Entities/Base/EntityVisibility.cs b/src/dotnet/Suspectus.Gandalf.Data/Entities/Base/EntityVisibility.cs similarity index 60% rename from src/dotnet/Suspectus.GandalfReborn.Data/Entities/Base/EntityVisibility.cs rename to src/dotnet/Suspectus.Gandalf.Data/Entities/Base/EntityVisibility.cs index 38ae099..2779a54 100644 --- a/src/dotnet/Suspectus.GandalfReborn.Data/Entities/Base/EntityVisibility.cs +++ b/src/dotnet/Suspectus.Gandalf.Data/Entities/Base/EntityVisibility.cs @@ -1,4 +1,4 @@ -namespace Suspectus.GandalfReborn.Data.Entities.Base; +namespace Suspectus.Gandalf.Data.Entities.Base; public enum EntityVisibility { diff --git a/src/dotnet/Suspectus.GandalfReborn.Data/Entities/Base/IEntity.cs b/src/dotnet/Suspectus.Gandalf.Data/Entities/Base/IEntity.cs similarity index 51% rename from src/dotnet/Suspectus.GandalfReborn.Data/Entities/Base/IEntity.cs rename to src/dotnet/Suspectus.Gandalf.Data/Entities/Base/IEntity.cs index c4565e9..5b1aa21 100644 --- a/src/dotnet/Suspectus.GandalfReborn.Data/Entities/Base/IEntity.cs +++ b/src/dotnet/Suspectus.Gandalf.Data/Entities/Base/IEntity.cs @@ -1,4 +1,4 @@ -namespace Suspectus.GandalfReborn.Data.Entities.Base; +namespace Suspectus.Gandalf.Data.Entities.Base; public interface IEntity { diff --git a/src/dotnet/Suspectus.Gandalf.Data/Entities/Base/IMappingEntity.cs b/src/dotnet/Suspectus.Gandalf.Data/Entities/Base/IMappingEntity.cs new file mode 100644 index 0000000..04a8138 --- /dev/null +++ b/src/dotnet/Suspectus.Gandalf.Data/Entities/Base/IMappingEntity.cs @@ -0,0 +1,3 @@ +namespace Suspectus.Gandalf.Data.Entities.Base; + +public interface IMappingEntity; \ No newline at end of file diff --git a/src/dotnet/Suspectus.GandalfReborn.Data/Entities/Base/IdData.cs b/src/dotnet/Suspectus.Gandalf.Data/Entities/Base/IdData.cs similarity index 58% rename from src/dotnet/Suspectus.GandalfReborn.Data/Entities/Base/IdData.cs rename to src/dotnet/Suspectus.Gandalf.Data/Entities/Base/IdData.cs index 12f6e5c..f3a6c6b 100644 --- a/src/dotnet/Suspectus.GandalfReborn.Data/Entities/Base/IdData.cs +++ b/src/dotnet/Suspectus.Gandalf.Data/Entities/Base/IdData.cs @@ -1,4 +1,4 @@ -namespace Suspectus.GandalfReborn.Data.Entities.Base; +namespace Suspectus.Gandalf.Data.Entities.Base; public abstract class IdData : IEntity { diff --git a/src/dotnet/Suspectus.GandalfReborn.Data/Entities/Base/SubjectData.cs b/src/dotnet/Suspectus.Gandalf.Data/Entities/Base/SubjectData.cs similarity index 63% rename from src/dotnet/Suspectus.GandalfReborn.Data/Entities/Base/SubjectData.cs rename to src/dotnet/Suspectus.Gandalf.Data/Entities/Base/SubjectData.cs index 92023ef..d96a1bc 100644 --- a/src/dotnet/Suspectus.GandalfReborn.Data/Entities/Base/SubjectData.cs +++ b/src/dotnet/Suspectus.Gandalf.Data/Entities/Base/SubjectData.cs @@ -1,4 +1,4 @@ -namespace Suspectus.GandalfReborn.Data.Entities.Base; +namespace Suspectus.Gandalf.Data.Entities.Base; public abstract class SubjectData : VisibilityData { diff --git a/src/dotnet/Suspectus.GandalfReborn.Data/Entities/Base/TenantRelationData.cs b/src/dotnet/Suspectus.Gandalf.Data/Entities/Base/TenantRelationData.cs similarity index 67% rename from src/dotnet/Suspectus.GandalfReborn.Data/Entities/Base/TenantRelationData.cs rename to src/dotnet/Suspectus.Gandalf.Data/Entities/Base/TenantRelationData.cs index 1551ab5..a8be6c4 100644 --- a/src/dotnet/Suspectus.GandalfReborn.Data/Entities/Base/TenantRelationData.cs +++ b/src/dotnet/Suspectus.Gandalf.Data/Entities/Base/TenantRelationData.cs @@ -1,4 +1,4 @@ -namespace Suspectus.GandalfReborn.Data.Entities.Base; +namespace Suspectus.Gandalf.Data.Entities.Base; public abstract class TenantRelationData : VisibilityData { diff --git a/src/dotnet/Suspectus.GandalfReborn.Data/Entities/Base/VisibilityData.cs b/src/dotnet/Suspectus.Gandalf.Data/Entities/Base/VisibilityData.cs similarity index 67% rename from src/dotnet/Suspectus.GandalfReborn.Data/Entities/Base/VisibilityData.cs rename to src/dotnet/Suspectus.Gandalf.Data/Entities/Base/VisibilityData.cs index 48c2cb5..22e7778 100644 --- a/src/dotnet/Suspectus.GandalfReborn.Data/Entities/Base/VisibilityData.cs +++ b/src/dotnet/Suspectus.Gandalf.Data/Entities/Base/VisibilityData.cs @@ -1,4 +1,4 @@ -namespace Suspectus.GandalfReborn.Data.Entities.Base; +namespace Suspectus.Gandalf.Data.Entities.Base; public abstract class VisibilityData : IdData { diff --git a/src/dotnet/Suspectus.GandalfReborn.Data/Entities/ContentKeyAttribute.cs b/src/dotnet/Suspectus.Gandalf.Data/Entities/ContentKeyAttribute.cs similarity index 65% rename from src/dotnet/Suspectus.GandalfReborn.Data/Entities/ContentKeyAttribute.cs rename to src/dotnet/Suspectus.Gandalf.Data/Entities/ContentKeyAttribute.cs index 04b9a4f..c2afb89 100644 --- a/src/dotnet/Suspectus.GandalfReborn.Data/Entities/ContentKeyAttribute.cs +++ b/src/dotnet/Suspectus.Gandalf.Data/Entities/ContentKeyAttribute.cs @@ -1,4 +1,4 @@ -namespace Suspectus.GandalfReborn.Data.Entities; +namespace Suspectus.Gandalf.Data.Entities; [AttributeUsage(AttributeTargets.Property)] public class ContentKeyAttribute : Attribute diff --git a/src/dotnet/Suspectus.GandalfReborn.Data/Entities/Security/AppUserRelationInternalAuthorityRelationEntity.cs b/src/dotnet/Suspectus.Gandalf.Data/Entities/Security/AppUserRelationInternalAuthorityRelationEntity.cs similarity index 75% rename from src/dotnet/Suspectus.GandalfReborn.Data/Entities/Security/AppUserRelationInternalAuthorityRelationEntity.cs rename to src/dotnet/Suspectus.Gandalf.Data/Entities/Security/AppUserRelationInternalAuthorityRelationEntity.cs index a63ca0f..cb57315 100644 --- a/src/dotnet/Suspectus.GandalfReborn.Data/Entities/Security/AppUserRelationInternalAuthorityRelationEntity.cs +++ b/src/dotnet/Suspectus.Gandalf.Data/Entities/Security/AppUserRelationInternalAuthorityRelationEntity.cs @@ -1,10 +1,10 @@ -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; +using Suspectus.Gandalf.Data.Entities.App; +using Suspectus.Gandalf.Data.Entities.Base; +using Suspectus.Gandalf.Data.Entities.Subject; +using Suspectus.Gandalf.Data.Entities.Tenant; +using Suspectus.Gandalf.Data.Entities.Version; -namespace Suspectus.GandalfReborn.Data.Entities.Security; +namespace Suspectus.Gandalf.Data.Entities.Security; public class AppSubjectRelationInternalAuthorityRelationEntity : AppSubjectRelationInternalAuthorityRelationData, IMappingEntity, IVersionableEntity { diff --git a/src/dotnet/Suspectus.GandalfReborn.Data/Entities/Security/AuthCodeEntity.cs b/src/dotnet/Suspectus.Gandalf.Data/Entities/Security/AuthCodeEntity.cs similarity index 76% rename from src/dotnet/Suspectus.GandalfReborn.Data/Entities/Security/AuthCodeEntity.cs rename to src/dotnet/Suspectus.Gandalf.Data/Entities/Security/AuthCodeEntity.cs index a14538c..93f2aec 100644 --- a/src/dotnet/Suspectus.GandalfReborn.Data/Entities/Security/AuthCodeEntity.cs +++ b/src/dotnet/Suspectus.Gandalf.Data/Entities/Security/AuthCodeEntity.cs @@ -1,6 +1,6 @@ -using Suspectus.GandalfReborn.Data.Entities.Base; +using Suspectus.Gandalf.Data.Entities.Base; -namespace Suspectus.GandalfReborn.Data.Entities.Security; +namespace Suspectus.Gandalf.Data.Entities.Security; public class AuthCodeEntity : IdData { diff --git a/src/dotnet/Suspectus.GandalfReborn.Data/Entities/Security/AuthorityEntity.cs b/src/dotnet/Suspectus.Gandalf.Data/Entities/Security/AuthorityEntity.cs similarity index 72% rename from src/dotnet/Suspectus.GandalfReborn.Data/Entities/Security/AuthorityEntity.cs rename to src/dotnet/Suspectus.Gandalf.Data/Entities/Security/AuthorityEntity.cs index 01f02c5..6c39d39 100644 --- a/src/dotnet/Suspectus.GandalfReborn.Data/Entities/Security/AuthorityEntity.cs +++ b/src/dotnet/Suspectus.Gandalf.Data/Entities/Security/AuthorityEntity.cs @@ -1,8 +1,8 @@ -using Suspectus.GandalfReborn.Data.Entities.App; -using Suspectus.GandalfReborn.Data.Entities.Base; -using Suspectus.GandalfReborn.Data.Entities.Tenant; +using Suspectus.Gandalf.Data.Entities.App; +using Suspectus.Gandalf.Data.Entities.Base; +using Suspectus.Gandalf.Data.Entities.Tenant; -namespace Suspectus.GandalfReborn.Data.Entities.Security; +namespace Suspectus.Gandalf.Data.Entities.Security; public class AuthorityEntity : IdData { diff --git a/src/dotnet/Suspectus.Gandalf.Data/Entities/Security/AuthorityType.cs b/src/dotnet/Suspectus.Gandalf.Data/Entities/Security/AuthorityType.cs new file mode 100644 index 0000000..9af45a1 --- /dev/null +++ b/src/dotnet/Suspectus.Gandalf.Data/Entities/Security/AuthorityType.cs @@ -0,0 +1,7 @@ +namespace Suspectus.Gandalf.Data.Entities.Security; + +public enum AuthorityType +{ + Tenant, + App +} \ No newline at end of file diff --git a/src/dotnet/Suspectus.GandalfReborn.Data/Entities/Security/TenantSubjectRelationInternalAuthorityRelationEntity.cs b/src/dotnet/Suspectus.Gandalf.Data/Entities/Security/TenantSubjectRelationInternalAuthorityRelationEntity.cs similarity index 79% rename from src/dotnet/Suspectus.GandalfReborn.Data/Entities/Security/TenantSubjectRelationInternalAuthorityRelationEntity.cs rename to src/dotnet/Suspectus.Gandalf.Data/Entities/Security/TenantSubjectRelationInternalAuthorityRelationEntity.cs index b79cda2..8991934 100644 --- a/src/dotnet/Suspectus.GandalfReborn.Data/Entities/Security/TenantSubjectRelationInternalAuthorityRelationEntity.cs +++ b/src/dotnet/Suspectus.Gandalf.Data/Entities/Security/TenantSubjectRelationInternalAuthorityRelationEntity.cs @@ -1,9 +1,9 @@ -using Suspectus.GandalfReborn.Data.Entities.Base; -using Suspectus.GandalfReborn.Data.Entities.Subject; -using Suspectus.GandalfReborn.Data.Entities.Tenant; -using Suspectus.GandalfReborn.Data.Entities.Version; +using Suspectus.Gandalf.Data.Entities.Base; +using Suspectus.Gandalf.Data.Entities.Subject; +using Suspectus.Gandalf.Data.Entities.Tenant; +using Suspectus.Gandalf.Data.Entities.Version; -namespace Suspectus.GandalfReborn.Data.Entities.Security; +namespace Suspectus.Gandalf.Data.Entities.Security; public class TenantSubjectRelationInternalAuthorityRelationEntity : TenantSubjectRelationInternalAuthorityRelationData, IMappingEntity, IVersionableEntity { diff --git a/src/dotnet/Suspectus.GandalfReborn.Data/Entities/Security/TokenMetaDataEntity.cs b/src/dotnet/Suspectus.Gandalf.Data/Entities/Security/TokenMetaDataEntity.cs similarity index 70% rename from src/dotnet/Suspectus.GandalfReborn.Data/Entities/Security/TokenMetaDataEntity.cs rename to src/dotnet/Suspectus.Gandalf.Data/Entities/Security/TokenMetaDataEntity.cs index e47f8bc..041a0f5 100644 --- a/src/dotnet/Suspectus.GandalfReborn.Data/Entities/Security/TokenMetaDataEntity.cs +++ b/src/dotnet/Suspectus.Gandalf.Data/Entities/Security/TokenMetaDataEntity.cs @@ -1,6 +1,6 @@ -using Suspectus.GandalfReborn.Data.Entities.Base; +using Suspectus.Gandalf.Data.Entities.Base; -namespace Suspectus.GandalfReborn.Data.Entities.Security; +namespace Suspectus.Gandalf.Data.Entities.Security; public class TokenMetadataEntity : IdData { diff --git a/src/dotnet/Suspectus.Gandalf.Data/Entities/Security/TokenType.cs b/src/dotnet/Suspectus.Gandalf.Data/Entities/Security/TokenType.cs new file mode 100644 index 0000000..01666db --- /dev/null +++ b/src/dotnet/Suspectus.Gandalf.Data/Entities/Security/TokenType.cs @@ -0,0 +1,7 @@ +namespace Suspectus.Gandalf.Data.Entities.Security; + +public enum TokenType +{ + Application, + User +} \ No newline at end of file diff --git a/src/dotnet/Suspectus.GandalfReborn.Data/Entities/Subject/SignIn/SignInEntity.cs b/src/dotnet/Suspectus.Gandalf.Data/Entities/Subject/SignIn/SignInEntity.cs similarity index 71% rename from src/dotnet/Suspectus.GandalfReborn.Data/Entities/Subject/SignIn/SignInEntity.cs rename to src/dotnet/Suspectus.Gandalf.Data/Entities/Subject/SignIn/SignInEntity.cs index 517813b..8902870 100644 --- a/src/dotnet/Suspectus.GandalfReborn.Data/Entities/Subject/SignIn/SignInEntity.cs +++ b/src/dotnet/Suspectus.Gandalf.Data/Entities/Subject/SignIn/SignInEntity.cs @@ -1,6 +1,6 @@ -using Suspectus.GandalfReborn.Data.Entities.Base; +using Suspectus.Gandalf.Data.Entities.Base; -namespace Suspectus.GandalfReborn.Data.Entities.Subject.SignIn; +namespace Suspectus.Gandalf.Data.Entities.Subject.SignIn; public class SignInEntity : SubjectData { diff --git a/src/dotnet/Suspectus.Gandalf.Data/Entities/Subject/SignIn/SignInMethod.cs b/src/dotnet/Suspectus.Gandalf.Data/Entities/Subject/SignIn/SignInMethod.cs new file mode 100644 index 0000000..3773f8f --- /dev/null +++ b/src/dotnet/Suspectus.Gandalf.Data/Entities/Subject/SignIn/SignInMethod.cs @@ -0,0 +1,8 @@ +namespace Suspectus.Gandalf.Data.Entities.Subject.SignIn; + +public enum SignInMethod +{ + Simple, + Google, + Steam +} \ No newline at end of file diff --git a/src/dotnet/Suspectus.GandalfReborn.Data/Entities/Subject/SubjectEntity.cs b/src/dotnet/Suspectus.Gandalf.Data/Entities/Subject/SubjectEntity.cs similarity index 51% rename from src/dotnet/Suspectus.GandalfReborn.Data/Entities/Subject/SubjectEntity.cs rename to src/dotnet/Suspectus.Gandalf.Data/Entities/Subject/SubjectEntity.cs index 7b8bbfe..a35afa7 100644 --- a/src/dotnet/Suspectus.GandalfReborn.Data/Entities/Subject/SubjectEntity.cs +++ b/src/dotnet/Suspectus.Gandalf.Data/Entities/Subject/SubjectEntity.cs @@ -1,9 +1,9 @@ -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; +using Suspectus.Gandalf.Data.Entities.App; +using Suspectus.Gandalf.Data.Entities.Base; +using Suspectus.Gandalf.Data.Entities.Subject.SignIn; +using Suspectus.Gandalf.Data.Entities.Tenant; -namespace Suspectus.GandalfReborn.Data.Entities.Subject; +namespace Suspectus.Gandalf.Data.Entities.Subject; public class SubjectEntity : VisibilityData { diff --git a/src/dotnet/Suspectus.Gandalf.Data/Entities/Tenant/OwnerData.cs b/src/dotnet/Suspectus.Gandalf.Data/Entities/Tenant/OwnerData.cs new file mode 100644 index 0000000..814cf57 --- /dev/null +++ b/src/dotnet/Suspectus.Gandalf.Data/Entities/Tenant/OwnerData.cs @@ -0,0 +1,8 @@ +using Suspectus.Gandalf.Data.Entities.Base; + +namespace Suspectus.Gandalf.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/Suspectus.GandalfReborn.Data/Entities/Tenant/TenantEntity.cs b/src/dotnet/Suspectus.Gandalf.Data/Entities/Tenant/TenantEntity.cs similarity index 76% rename from src/dotnet/Suspectus.GandalfReborn.Data/Entities/Tenant/TenantEntity.cs rename to src/dotnet/Suspectus.Gandalf.Data/Entities/Tenant/TenantEntity.cs index 0831d4f..ce0a845 100644 --- a/src/dotnet/Suspectus.GandalfReborn.Data/Entities/Tenant/TenantEntity.cs +++ b/src/dotnet/Suspectus.Gandalf.Data/Entities/Tenant/TenantEntity.cs @@ -1,8 +1,8 @@ -using Suspectus.GandalfReborn.Data.Entities.App; -using Suspectus.GandalfReborn.Data.Entities.Subject; -using Suspectus.GandalfReborn.Data.Entities.Version; +using Suspectus.Gandalf.Data.Entities.App; +using Suspectus.Gandalf.Data.Entities.Subject; +using Suspectus.Gandalf.Data.Entities.Version; -namespace Suspectus.GandalfReborn.Data.Entities.Tenant; +namespace Suspectus.Gandalf.Data.Entities.Tenant; public class TenantEntity : TenantData, IVersionableEntity { diff --git a/src/dotnet/Suspectus.GandalfReborn.Data/Entities/Tenant/TenantSubjectRelationEntity.cs b/src/dotnet/Suspectus.Gandalf.Data/Entities/Tenant/TenantSubjectRelationEntity.cs similarity index 75% rename from src/dotnet/Suspectus.GandalfReborn.Data/Entities/Tenant/TenantSubjectRelationEntity.cs rename to src/dotnet/Suspectus.Gandalf.Data/Entities/Tenant/TenantSubjectRelationEntity.cs index 73c9336..c7838f1 100644 --- a/src/dotnet/Suspectus.GandalfReborn.Data/Entities/Tenant/TenantSubjectRelationEntity.cs +++ b/src/dotnet/Suspectus.Gandalf.Data/Entities/Tenant/TenantSubjectRelationEntity.cs @@ -1,9 +1,9 @@ -using Suspectus.GandalfReborn.Data.Entities.Base; -using Suspectus.GandalfReborn.Data.Entities.Security; -using Suspectus.GandalfReborn.Data.Entities.Subject; -using Suspectus.GandalfReborn.Data.Entities.Version; +using Suspectus.Gandalf.Data.Entities.Base; +using Suspectus.Gandalf.Data.Entities.Security; +using Suspectus.Gandalf.Data.Entities.Subject; +using Suspectus.Gandalf.Data.Entities.Version; -namespace Suspectus.GandalfReborn.Data.Entities.Tenant; +namespace Suspectus.Gandalf.Data.Entities.Tenant; public class TenantSubjectRelationEntity : TenantSubjectRelationData, IMappingEntity, IVersionableEntity { diff --git a/src/dotnet/Suspectus.GandalfReborn.Data/Entities/Version/IVersionEntity.cs b/src/dotnet/Suspectus.Gandalf.Data/Entities/Version/IVersionEntity.cs similarity index 66% rename from src/dotnet/Suspectus.GandalfReborn.Data/Entities/Version/IVersionEntity.cs rename to src/dotnet/Suspectus.Gandalf.Data/Entities/Version/IVersionEntity.cs index b9f1e9f..de55c62 100644 --- a/src/dotnet/Suspectus.GandalfReborn.Data/Entities/Version/IVersionEntity.cs +++ b/src/dotnet/Suspectus.Gandalf.Data/Entities/Version/IVersionEntity.cs @@ -1,8 +1,8 @@ -using Suspectus.GandalfReborn.Data.Entities.Base; -using Suspectus.GandalfReborn.Data.Entities.Subject; -using Suspectus.GandalfReborn.Data.Entities.Tenant; +using Suspectus.Gandalf.Data.Entities.Base; +using Suspectus.Gandalf.Data.Entities.Subject; +using Suspectus.Gandalf.Data.Entities.Tenant; -namespace Suspectus.GandalfReborn.Data.Entities.Version; +namespace Suspectus.Gandalf.Data.Entities.Version; public interface IVersionableBase : IEntity, IVersionableEntity; diff --git a/src/dotnet/Suspectus.GandalfReborn.Data/Entities/Version/VersionAction.cs b/src/dotnet/Suspectus.Gandalf.Data/Entities/Version/VersionAction.cs similarity index 58% rename from src/dotnet/Suspectus.GandalfReborn.Data/Entities/Version/VersionAction.cs rename to src/dotnet/Suspectus.Gandalf.Data/Entities/Version/VersionAction.cs index 6eaea45..80a56b6 100644 --- a/src/dotnet/Suspectus.GandalfReborn.Data/Entities/Version/VersionAction.cs +++ b/src/dotnet/Suspectus.Gandalf.Data/Entities/Version/VersionAction.cs @@ -1,4 +1,4 @@ -namespace Suspectus.GandalfReborn.Data.Entities.Version; +namespace Suspectus.Gandalf.Data.Entities.Version; public enum VersionAction { diff --git a/src/dotnet/Suspectus.GandalfReborn.Data/Extensions/StringExtensions.cs b/src/dotnet/Suspectus.Gandalf.Data/Extensions/StringExtensions.cs similarity index 93% rename from src/dotnet/Suspectus.GandalfReborn.Data/Extensions/StringExtensions.cs rename to src/dotnet/Suspectus.Gandalf.Data/Extensions/StringExtensions.cs index fb32755..f0bbe81 100644 --- a/src/dotnet/Suspectus.GandalfReborn.Data/Extensions/StringExtensions.cs +++ b/src/dotnet/Suspectus.Gandalf.Data/Extensions/StringExtensions.cs @@ -1,6 +1,6 @@ using System.Text; -namespace Suspectus.GandalfReborn.Data.Extensions; +namespace Suspectus.Gandalf.Data.Extensions; public static class StringExtensions { diff --git a/src/dotnet/Suspectus.GandalfReborn.Data/Mapper/AuthCodeDtoMappingProfile.cs b/src/dotnet/Suspectus.Gandalf.Data/Mapper/AuthCodeDtoMappingProfile.cs similarity index 55% rename from src/dotnet/Suspectus.GandalfReborn.Data/Mapper/AuthCodeDtoMappingProfile.cs rename to src/dotnet/Suspectus.Gandalf.Data/Mapper/AuthCodeDtoMappingProfile.cs index 8cd7876..3eba13b 100644 --- a/src/dotnet/Suspectus.GandalfReborn.Data/Mapper/AuthCodeDtoMappingProfile.cs +++ b/src/dotnet/Suspectus.Gandalf.Data/Mapper/AuthCodeDtoMappingProfile.cs @@ -1,8 +1,8 @@ using AutoMapper; -using Suspectus.GandalfReborn.Data.Dto; -using Suspectus.GandalfReborn.Data.Entities.Security; +using Suspectus.Gandalf.Data.Dto; +using Suspectus.Gandalf.Data.Entities.Security; -namespace Suspectus.GandalfReborn.Data.Mapper; +namespace Suspectus.Gandalf.Data.Mapper; public class AuthCodeDtoMappingProfile : Profile { diff --git a/src/dotnet/Suspectus.GandalfReborn.Data/Migrations/20240903154112_sus.Designer.cs b/src/dotnet/Suspectus.Gandalf.Data/Migrations/20240903154112_sus.Designer.cs similarity index 99% rename from src/dotnet/Suspectus.GandalfReborn.Data/Migrations/20240903154112_sus.Designer.cs rename to src/dotnet/Suspectus.Gandalf.Data/Migrations/20240903154112_sus.Designer.cs index 132cd73..e9b698b 100644 --- a/src/dotnet/Suspectus.GandalfReborn.Data/Migrations/20240903154112_sus.Designer.cs +++ b/src/dotnet/Suspectus.Gandalf.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 Suspectus.GandalfReborn.Data.Database; +using Suspectus.Gandalf.Data.Database; #nullable disable diff --git a/src/dotnet/Suspectus.GandalfReborn.Data/Migrations/20240903154112_sus.cs b/src/dotnet/Suspectus.Gandalf.Data/Migrations/20240903154112_sus.cs similarity index 100% rename from src/dotnet/Suspectus.GandalfReborn.Data/Migrations/20240903154112_sus.cs rename to src/dotnet/Suspectus.Gandalf.Data/Migrations/20240903154112_sus.cs diff --git a/src/dotnet/Suspectus.GandalfReborn.Data/Migrations/20240914003536_addTokens.Designer.cs b/src/dotnet/Suspectus.Gandalf.Data/Migrations/20240914003536_addTokens.Designer.cs similarity index 99% rename from src/dotnet/Suspectus.GandalfReborn.Data/Migrations/20240914003536_addTokens.Designer.cs rename to src/dotnet/Suspectus.Gandalf.Data/Migrations/20240914003536_addTokens.Designer.cs index b52b63c..e0c548e 100644 --- a/src/dotnet/Suspectus.GandalfReborn.Data/Migrations/20240914003536_addTokens.Designer.cs +++ b/src/dotnet/Suspectus.Gandalf.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 Suspectus.GandalfReborn.Data.Database; +using Suspectus.Gandalf.Data.Database; #nullable disable diff --git a/src/dotnet/Suspectus.GandalfReborn.Data/Migrations/20240914003536_addTokens.cs b/src/dotnet/Suspectus.Gandalf.Data/Migrations/20240914003536_addTokens.cs similarity index 100% rename from src/dotnet/Suspectus.GandalfReborn.Data/Migrations/20240914003536_addTokens.cs rename to src/dotnet/Suspectus.Gandalf.Data/Migrations/20240914003536_addTokens.cs diff --git a/src/dotnet/Suspectus.GandalfReborn.Data/Migrations/20240914005530_affwaf.Designer.cs b/src/dotnet/Suspectus.Gandalf.Data/Migrations/20240914005530_affwaf.Designer.cs similarity index 99% rename from src/dotnet/Suspectus.GandalfReborn.Data/Migrations/20240914005530_affwaf.Designer.cs rename to src/dotnet/Suspectus.Gandalf.Data/Migrations/20240914005530_affwaf.Designer.cs index 23c3d8b..b5d1aad 100644 --- a/src/dotnet/Suspectus.GandalfReborn.Data/Migrations/20240914005530_affwaf.Designer.cs +++ b/src/dotnet/Suspectus.Gandalf.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 Suspectus.GandalfReborn.Data.Database; +using Suspectus.Gandalf.Data.Database; #nullable disable diff --git a/src/dotnet/Suspectus.GandalfReborn.Data/Migrations/20240914005530_affwaf.cs b/src/dotnet/Suspectus.Gandalf.Data/Migrations/20240914005530_affwaf.cs similarity index 100% rename from src/dotnet/Suspectus.GandalfReborn.Data/Migrations/20240914005530_affwaf.cs rename to src/dotnet/Suspectus.Gandalf.Data/Migrations/20240914005530_affwaf.cs diff --git a/src/dotnet/Suspectus.GandalfReborn.Data/Migrations/20240914012943_fawfghh.Designer.cs b/src/dotnet/Suspectus.Gandalf.Data/Migrations/20240914012943_fawfghh.Designer.cs similarity index 99% rename from src/dotnet/Suspectus.GandalfReborn.Data/Migrations/20240914012943_fawfghh.Designer.cs rename to src/dotnet/Suspectus.Gandalf.Data/Migrations/20240914012943_fawfghh.Designer.cs index 8ed53f3..674ff8b 100644 --- a/src/dotnet/Suspectus.GandalfReborn.Data/Migrations/20240914012943_fawfghh.Designer.cs +++ b/src/dotnet/Suspectus.Gandalf.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 Suspectus.GandalfReborn.Data.Database; +using Suspectus.Gandalf.Data.Database; #nullable disable diff --git a/src/dotnet/Suspectus.GandalfReborn.Data/Migrations/20240914012943_fawfghh.cs b/src/dotnet/Suspectus.Gandalf.Data/Migrations/20240914012943_fawfghh.cs similarity index 100% rename from src/dotnet/Suspectus.GandalfReborn.Data/Migrations/20240914012943_fawfghh.cs rename to src/dotnet/Suspectus.Gandalf.Data/Migrations/20240914012943_fawfghh.cs diff --git a/src/dotnet/Suspectus.GandalfReborn.Data/Migrations/20240914014850_gjjjjjj.Designer.cs b/src/dotnet/Suspectus.Gandalf.Data/Migrations/20240914014850_gjjjjjj.Designer.cs similarity index 99% rename from src/dotnet/Suspectus.GandalfReborn.Data/Migrations/20240914014850_gjjjjjj.Designer.cs rename to src/dotnet/Suspectus.Gandalf.Data/Migrations/20240914014850_gjjjjjj.Designer.cs index c6bd0b8..e797867 100644 --- a/src/dotnet/Suspectus.GandalfReborn.Data/Migrations/20240914014850_gjjjjjj.Designer.cs +++ b/src/dotnet/Suspectus.Gandalf.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 Suspectus.GandalfReborn.Data.Database; +using Suspectus.Gandalf.Data.Database; #nullable disable diff --git a/src/dotnet/Suspectus.GandalfReborn.Data/Migrations/20240914014850_gjjjjjj.cs b/src/dotnet/Suspectus.Gandalf.Data/Migrations/20240914014850_gjjjjjj.cs similarity index 100% rename from src/dotnet/Suspectus.GandalfReborn.Data/Migrations/20240914014850_gjjjjjj.cs rename to src/dotnet/Suspectus.Gandalf.Data/Migrations/20240914014850_gjjjjjj.cs diff --git a/src/dotnet/Suspectus.GandalfReborn.Data/Migrations/20240914224344_jsoikgsoieg.Designer.cs b/src/dotnet/Suspectus.Gandalf.Data/Migrations/20240914224344_jsoikgsoieg.Designer.cs similarity index 99% rename from src/dotnet/Suspectus.GandalfReborn.Data/Migrations/20240914224344_jsoikgsoieg.Designer.cs rename to src/dotnet/Suspectus.Gandalf.Data/Migrations/20240914224344_jsoikgsoieg.Designer.cs index b144a6a..fe1e37d 100644 --- a/src/dotnet/Suspectus.GandalfReborn.Data/Migrations/20240914224344_jsoikgsoieg.Designer.cs +++ b/src/dotnet/Suspectus.Gandalf.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 Suspectus.GandalfReborn.Data.Database; +using Suspectus.Gandalf.Data.Database; #nullable disable diff --git a/src/dotnet/Suspectus.GandalfReborn.Data/Migrations/20240914224344_jsoikgsoieg.cs b/src/dotnet/Suspectus.Gandalf.Data/Migrations/20240914224344_jsoikgsoieg.cs similarity index 100% rename from src/dotnet/Suspectus.GandalfReborn.Data/Migrations/20240914224344_jsoikgsoieg.cs rename to src/dotnet/Suspectus.Gandalf.Data/Migrations/20240914224344_jsoikgsoieg.cs diff --git a/src/dotnet/Suspectus.GandalfReborn.Data/Migrations/20240919005908_afwawfawf.Designer.cs b/src/dotnet/Suspectus.Gandalf.Data/Migrations/20240919005908_afwawfawf.Designer.cs similarity index 99% rename from src/dotnet/Suspectus.GandalfReborn.Data/Migrations/20240919005908_afwawfawf.Designer.cs rename to src/dotnet/Suspectus.Gandalf.Data/Migrations/20240919005908_afwawfawf.Designer.cs index 83af4fb..2f92664 100644 --- a/src/dotnet/Suspectus.GandalfReborn.Data/Migrations/20240919005908_afwawfawf.Designer.cs +++ b/src/dotnet/Suspectus.Gandalf.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 Suspectus.GandalfReborn.Data.Database; +using Suspectus.Gandalf.Data.Database; #nullable disable diff --git a/src/dotnet/Suspectus.GandalfReborn.Data/Migrations/20240919005908_afwawfawf.cs b/src/dotnet/Suspectus.Gandalf.Data/Migrations/20240919005908_afwawfawf.cs similarity index 100% rename from src/dotnet/Suspectus.GandalfReborn.Data/Migrations/20240919005908_afwawfawf.cs rename to src/dotnet/Suspectus.Gandalf.Data/Migrations/20240919005908_afwawfawf.cs diff --git a/src/dotnet/Suspectus.GandalfReborn.Data/Migrations/20240919010339_ffffff.Designer.cs b/src/dotnet/Suspectus.Gandalf.Data/Migrations/20240919010339_ffffff.Designer.cs similarity index 99% rename from src/dotnet/Suspectus.GandalfReborn.Data/Migrations/20240919010339_ffffff.Designer.cs rename to src/dotnet/Suspectus.Gandalf.Data/Migrations/20240919010339_ffffff.Designer.cs index 11a89d9..aaa9387 100644 --- a/src/dotnet/Suspectus.GandalfReborn.Data/Migrations/20240919010339_ffffff.Designer.cs +++ b/src/dotnet/Suspectus.Gandalf.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 Suspectus.GandalfReborn.Data.Database; +using Suspectus.Gandalf.Data.Database; #nullable disable diff --git a/src/dotnet/Suspectus.GandalfReborn.Data/Migrations/20240919010339_ffffff.cs b/src/dotnet/Suspectus.Gandalf.Data/Migrations/20240919010339_ffffff.cs similarity index 100% rename from src/dotnet/Suspectus.GandalfReborn.Data/Migrations/20240919010339_ffffff.cs rename to src/dotnet/Suspectus.Gandalf.Data/Migrations/20240919010339_ffffff.cs diff --git a/src/dotnet/Suspectus.GandalfReborn.Data/Migrations/20240919010748_jmäpromh.Designer.cs b/src/dotnet/Suspectus.Gandalf.Data/Migrations/20240919010748_jmäpromh.Designer.cs similarity index 99% rename from src/dotnet/Suspectus.GandalfReborn.Data/Migrations/20240919010748_jmäpromh.Designer.cs rename to src/dotnet/Suspectus.Gandalf.Data/Migrations/20240919010748_jmäpromh.Designer.cs index d575105..fd8c6b4 100644 --- a/src/dotnet/Suspectus.GandalfReborn.Data/Migrations/20240919010748_jmäpromh.Designer.cs +++ b/src/dotnet/Suspectus.Gandalf.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 Suspectus.GandalfReborn.Data.Database; +using Suspectus.Gandalf.Data.Database; #nullable disable diff --git a/src/dotnet/Suspectus.GandalfReborn.Data/Migrations/20240919010748_jmäpromh.cs b/src/dotnet/Suspectus.Gandalf.Data/Migrations/20240919010748_jmäpromh.cs similarity index 100% rename from src/dotnet/Suspectus.GandalfReborn.Data/Migrations/20240919010748_jmäpromh.cs rename to src/dotnet/Suspectus.Gandalf.Data/Migrations/20240919010748_jmäpromh.cs diff --git a/src/dotnet/Suspectus.GandalfReborn.Data/Migrations/20240919012025_fghdhhzttr.Designer.cs b/src/dotnet/Suspectus.Gandalf.Data/Migrations/20240919012025_fghdhhzttr.Designer.cs similarity index 99% rename from src/dotnet/Suspectus.GandalfReborn.Data/Migrations/20240919012025_fghdhhzttr.Designer.cs rename to src/dotnet/Suspectus.Gandalf.Data/Migrations/20240919012025_fghdhhzttr.Designer.cs index 6db7549..7d31685 100644 --- a/src/dotnet/Suspectus.GandalfReborn.Data/Migrations/20240919012025_fghdhhzttr.Designer.cs +++ b/src/dotnet/Suspectus.Gandalf.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 Suspectus.GandalfReborn.Data.Database; +using Suspectus.Gandalf.Data.Database; #nullable disable diff --git a/src/dotnet/Suspectus.GandalfReborn.Data/Migrations/20240919012025_fghdhhzttr.cs b/src/dotnet/Suspectus.Gandalf.Data/Migrations/20240919012025_fghdhhzttr.cs similarity index 100% rename from src/dotnet/Suspectus.GandalfReborn.Data/Migrations/20240919012025_fghdhhzttr.cs rename to src/dotnet/Suspectus.Gandalf.Data/Migrations/20240919012025_fghdhhzttr.cs diff --git a/src/dotnet/Suspectus.GandalfReborn.Data/Migrations/20240921214234_klöhmpdmpmgr.Designer.cs b/src/dotnet/Suspectus.Gandalf.Data/Migrations/20240921214234_klöhmpdmpmgr.Designer.cs similarity index 99% rename from src/dotnet/Suspectus.GandalfReborn.Data/Migrations/20240921214234_klöhmpdmpmgr.Designer.cs rename to src/dotnet/Suspectus.Gandalf.Data/Migrations/20240921214234_klöhmpdmpmgr.Designer.cs index f6b732d..09509f0 100644 --- a/src/dotnet/Suspectus.GandalfReborn.Data/Migrations/20240921214234_klöhmpdmpmgr.Designer.cs +++ b/src/dotnet/Suspectus.Gandalf.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 Suspectus.GandalfReborn.Data.Database; +using Suspectus.Gandalf.Data.Database; #nullable disable diff --git a/src/dotnet/Suspectus.GandalfReborn.Data/Migrations/20240921214234_klöhmpdmpmgr.cs b/src/dotnet/Suspectus.Gandalf.Data/Migrations/20240921214234_klöhmpdmpmgr.cs similarity index 100% rename from src/dotnet/Suspectus.GandalfReborn.Data/Migrations/20240921214234_klöhmpdmpmgr.cs rename to src/dotnet/Suspectus.Gandalf.Data/Migrations/20240921214234_klöhmpdmpmgr.cs diff --git a/src/dotnet/Suspectus.GandalfReborn.Data/Migrations/ApplicationContextModelSnapshot.cs b/src/dotnet/Suspectus.Gandalf.Data/Migrations/ApplicationContextModelSnapshot.cs similarity index 99% rename from src/dotnet/Suspectus.GandalfReborn.Data/Migrations/ApplicationContextModelSnapshot.cs rename to src/dotnet/Suspectus.Gandalf.Data/Migrations/ApplicationContextModelSnapshot.cs index 3a643c7..34e15ca 100644 --- a/src/dotnet/Suspectus.GandalfReborn.Data/Migrations/ApplicationContextModelSnapshot.cs +++ b/src/dotnet/Suspectus.Gandalf.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 Suspectus.GandalfReborn.Data.Database; +using Suspectus.Gandalf.Data.Database; #nullable disable diff --git a/src/dotnet/Suspectus.GandalfReborn.Data/Suspectus.GandalfReborn.Data.csproj b/src/dotnet/Suspectus.Gandalf.Data/Suspectus.Gandalf.Data.csproj similarity index 81% rename from src/dotnet/Suspectus.GandalfReborn.Data/Suspectus.GandalfReborn.Data.csproj rename to src/dotnet/Suspectus.Gandalf.Data/Suspectus.Gandalf.Data.csproj index a60450f..8f11913 100644 --- a/src/dotnet/Suspectus.GandalfReborn.Data/Suspectus.GandalfReborn.Data.csproj +++ b/src/dotnet/Suspectus.Gandalf.Data/Suspectus.Gandalf.Data.csproj @@ -4,7 +4,7 @@ net9.0 enable enable - Suspectus.GandalfReborn.Data + Suspectus.Gandalf.Data 12 @@ -22,7 +22,7 @@ - + diff --git a/src/dotnet/Suspectus.GandalfReborn.Security/GrAuthorizeAttribute.cs b/src/dotnet/Suspectus.Gandalf.Security/GrAuthorizeAttribute.cs similarity index 94% rename from src/dotnet/Suspectus.GandalfReborn.Security/GrAuthorizeAttribute.cs rename to src/dotnet/Suspectus.Gandalf.Security/GrAuthorizeAttribute.cs index b216aca..89ec0ae 100644 --- a/src/dotnet/Suspectus.GandalfReborn.Security/GrAuthorizeAttribute.cs +++ b/src/dotnet/Suspectus.Gandalf.Security/GrAuthorizeAttribute.cs @@ -2,10 +2,10 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.Filters; -using Suspectus.GandalfReborn.Abstractions; -using Suspectus.GandalfReborn.Data.Entities.Security; +using Suspectus.Gandalf.Abstractions; +using Suspectus.Gandalf.Data.Entities.Security; -namespace Suspectus.GandalfReborn.Security; +namespace Suspectus.Gandalf.Security; [AttributeUsage(AttributeTargets.Class | AttributeTargets.Method, AllowMultiple = true)] public class GrAuthorizeAttribute : Attribute, IAuthorizationFilter diff --git a/src/dotnet/Suspectus.GandalfReborn.Security/Scheme/GandalfRebornJwtTokenAuthExtensions.cs b/src/dotnet/Suspectus.Gandalf.Security/Scheme/GandalfRebornJwtTokenAuthExtensions.cs similarity index 91% rename from src/dotnet/Suspectus.GandalfReborn.Security/Scheme/GandalfRebornJwtTokenAuthExtensions.cs rename to src/dotnet/Suspectus.Gandalf.Security/Scheme/GandalfRebornJwtTokenAuthExtensions.cs index beae63c..354ee52 100644 --- a/src/dotnet/Suspectus.GandalfReborn.Security/Scheme/GandalfRebornJwtTokenAuthExtensions.cs +++ b/src/dotnet/Suspectus.Gandalf.Security/Scheme/GandalfRebornJwtTokenAuthExtensions.cs @@ -1,6 +1,6 @@ using Microsoft.Extensions.DependencyInjection; -namespace Suspectus.GandalfReborn.Security.Scheme; +namespace Suspectus.Gandalf.Security.Scheme; public static class GandalfRebornJwtTokenAuthExtensions { diff --git a/src/dotnet/Suspectus.GandalfReborn.Security/Scheme/GandalfRebornJwtTokenAuthSchemeHandler.cs b/src/dotnet/Suspectus.Gandalf.Security/Scheme/GandalfRebornJwtTokenAuthSchemeHandler.cs similarity index 97% rename from src/dotnet/Suspectus.GandalfReborn.Security/Scheme/GandalfRebornJwtTokenAuthSchemeHandler.cs rename to src/dotnet/Suspectus.Gandalf.Security/Scheme/GandalfRebornJwtTokenAuthSchemeHandler.cs index 415843b..cf255dd 100644 --- a/src/dotnet/Suspectus.GandalfReborn.Security/Scheme/GandalfRebornJwtTokenAuthSchemeHandler.cs +++ b/src/dotnet/Suspectus.Gandalf.Security/Scheme/GandalfRebornJwtTokenAuthSchemeHandler.cs @@ -15,10 +15,10 @@ using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; -using Suspectus.GandalfReborn.Abstractions; -using Suspectus.GandalfReborn.Data.Database; +using Suspectus.Gandalf.Abstractions; +using Suspectus.Gandalf.Data.Database; -namespace Suspectus.GandalfReborn.Security.Scheme; +namespace Suspectus.Gandalf.Security.Scheme; public class GandalfRebornJwtBody { diff --git a/src/dotnet/Suspectus.GandalfReborn.Security/Scheme/GandalfRebornJwtTokenAuthSchemeOptions.cs b/src/dotnet/Suspectus.Gandalf.Security/Scheme/GandalfRebornJwtTokenAuthSchemeOptions.cs similarity index 82% rename from src/dotnet/Suspectus.GandalfReborn.Security/Scheme/GandalfRebornJwtTokenAuthSchemeOptions.cs rename to src/dotnet/Suspectus.Gandalf.Security/Scheme/GandalfRebornJwtTokenAuthSchemeOptions.cs index 8b537c9..cb33070 100644 --- a/src/dotnet/Suspectus.GandalfReborn.Security/Scheme/GandalfRebornJwtTokenAuthSchemeOptions.cs +++ b/src/dotnet/Suspectus.Gandalf.Security/Scheme/GandalfRebornJwtTokenAuthSchemeOptions.cs @@ -1,6 +1,6 @@ using Microsoft.AspNetCore.Authentication; -namespace Suspectus.GandalfReborn.Security.Scheme; +namespace Suspectus.Gandalf.Security.Scheme; public class GandalfRebornJwtTokenAuthSchemeOptions : AuthenticationSchemeOptions { diff --git a/src/dotnet/Suspectus.GandalfReborn.Security/Suspectus.GandalfReborn.Security.csproj b/src/dotnet/Suspectus.Gandalf.Security/Suspectus.Gandalf.Security.csproj similarity index 62% rename from src/dotnet/Suspectus.GandalfReborn.Security/Suspectus.GandalfReborn.Security.csproj rename to src/dotnet/Suspectus.Gandalf.Security/Suspectus.Gandalf.Security.csproj index fecc83f..f7d2915 100644 --- a/src/dotnet/Suspectus.GandalfReborn.Security/Suspectus.GandalfReborn.Security.csproj +++ b/src/dotnet/Suspectus.Gandalf.Security/Suspectus.Gandalf.Security.csproj @@ -4,7 +4,7 @@ net9.0 enable enable - Suspectus.GandalfReborn.Security + Suspectus.Gandalf.Security @@ -14,8 +14,8 @@ - - + + diff --git a/src/dotnet/Suspectus.GandalfReborn.Data/Entities/Base/IMappingEntity.cs b/src/dotnet/Suspectus.GandalfReborn.Data/Entities/Base/IMappingEntity.cs deleted file mode 100644 index 0e86cdf..0000000 --- a/src/dotnet/Suspectus.GandalfReborn.Data/Entities/Base/IMappingEntity.cs +++ /dev/null @@ -1,3 +0,0 @@ -namespace Suspectus.GandalfReborn.Data.Entities.Base; - -public interface IMappingEntity; \ No newline at end of file diff --git a/src/dotnet/Suspectus.GandalfReborn.Data/Entities/Security/AuthorityType.cs b/src/dotnet/Suspectus.GandalfReborn.Data/Entities/Security/AuthorityType.cs deleted file mode 100644 index 7016152..0000000 --- a/src/dotnet/Suspectus.GandalfReborn.Data/Entities/Security/AuthorityType.cs +++ /dev/null @@ -1,7 +0,0 @@ -namespace Suspectus.GandalfReborn.Data.Entities.Security; - -public enum AuthorityType -{ - Tenant, - App -} \ No newline at end of file diff --git a/src/dotnet/Suspectus.GandalfReborn.Data/Entities/Security/TokenType.cs b/src/dotnet/Suspectus.GandalfReborn.Data/Entities/Security/TokenType.cs deleted file mode 100644 index c3e0a53..0000000 --- a/src/dotnet/Suspectus.GandalfReborn.Data/Entities/Security/TokenType.cs +++ /dev/null @@ -1,7 +0,0 @@ -namespace Suspectus.GandalfReborn.Data.Entities.Security; - -public enum TokenType -{ - Application, - User -} \ No newline at end of file diff --git a/src/dotnet/Suspectus.GandalfReborn.Data/Entities/Subject/SignIn/SignInMethod.cs b/src/dotnet/Suspectus.GandalfReborn.Data/Entities/Subject/SignIn/SignInMethod.cs deleted file mode 100644 index cbdcaed..0000000 --- a/src/dotnet/Suspectus.GandalfReborn.Data/Entities/Subject/SignIn/SignInMethod.cs +++ /dev/null @@ -1,8 +0,0 @@ -namespace Suspectus.GandalfReborn.Data.Entities.Subject.SignIn; - -public enum SignInMethod -{ - Simple, - Google, - Steam -} \ No newline at end of file diff --git a/src/dotnet/Suspectus.GandalfReborn.Data/Entities/Tenant/OwnerData.cs b/src/dotnet/Suspectus.GandalfReborn.Data/Entities/Tenant/OwnerData.cs deleted file mode 100644 index 18b47e2..0000000 --- a/src/dotnet/Suspectus.GandalfReborn.Data/Entities/Tenant/OwnerData.cs +++ /dev/null @@ -1,8 +0,0 @@ -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/src/dotnet/Suspectus.GandalfReborn.sln b/src/dotnet/Suspectus.sln similarity index 63% rename from src/dotnet/Suspectus.GandalfReborn.sln rename to src/dotnet/Suspectus.sln index 509b6a9..e2f4726 100644 --- a/src/dotnet/Suspectus.GandalfReborn.sln +++ b/src/dotnet/Suspectus.sln @@ -1,12 +1,16 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Suspectus.GandalfReborn.Api", "Suspectus.GandalfReborn.Api\Suspectus.GandalfReborn.Api.csproj", "{067494CB-FE63-42F0-A154-586E50442969}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Suspectus.Gandalf.Api", "Suspectus.Gandalf.Api\Suspectus.Gandalf.Api.csproj", "{067494CB-FE63-42F0-A154-586E50442969}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Suspectus.GandalfReborn.Data", "Suspectus.GandalfReborn.Data\Suspectus.GandalfReborn.Data.csproj", "{B4AF6985-3268-4C2E-9C50-D92DA7D3711D}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Suspectus.Gandalf.Data", "Suspectus.Gandalf.Data\Suspectus.Gandalf.Data.csproj", "{B4AF6985-3268-4C2E-9C50-D92DA7D3711D}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Suspectus.GandalfReborn.Security", "Suspectus.GandalfReborn.Security\Suspectus.GandalfReborn.Security.csproj", "{C8C3047B-ED0B-4516-A282-8B07E3EEB430}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Suspectus.Gandalf.Security", "Suspectus.Gandalf.Security\Suspectus.Gandalf.Security.csproj", "{C8C3047B-ED0B-4516-A282-8B07E3EEB430}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Suspectus.GandalfReborn.Abstractions", "Suspectus.GandalfReborn.Abstractions\Suspectus.GandalfReborn.Abstractions.csproj", "{44C283FD-2E01-496C-9E8F-4E43C26C9733}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Suspectus.Gandalf.Abstractions", "Suspectus.Gandalf.Abstractions\Suspectus.Gandalf.Abstractions.csproj", "{44C283FD-2E01-496C-9E8F-4E43C26C9733}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Mithrandir", "Mithrandir", "{D54D8A40-A5C3-4273-B4D7-F2B83056161B}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Gandalf", "Gandalf", "{A82EA24B-1379-41B2-A363-CDCBF9F18833}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -31,4 +35,10 @@ Global {44C283FD-2E01-496C-9E8F-4E43C26C9733}.Release|Any CPU.ActiveCfg = Release|Any CPU {44C283FD-2E01-496C-9E8F-4E43C26C9733}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {44C283FD-2E01-496C-9E8F-4E43C26C9733} = {A82EA24B-1379-41B2-A363-CDCBF9F18833} + {067494CB-FE63-42F0-A154-586E50442969} = {A82EA24B-1379-41B2-A363-CDCBF9F18833} + {B4AF6985-3268-4C2E-9C50-D92DA7D3711D} = {A82EA24B-1379-41B2-A363-CDCBF9F18833} + {C8C3047B-ED0B-4516-A282-8B07E3EEB430} = {A82EA24B-1379-41B2-A363-CDCBF9F18833} + EndGlobalSection EndGlobal