diff --git a/.idea/.idea.Flawless-Version-Control/.idea/dataSources.xml b/.idea/.idea.Flawless-Version-Control/.idea/dataSources.xml index 6d274ce..ed749a3 100644 --- a/.idea/.idea.Flawless-Version-Control/.idea/dataSources.xml +++ b/.idea/.idea.Flawless-Version-Control/.idea/dataSources.xml @@ -1,15 +1,15 @@ - + postgresql true - true org.postgresql.Driver - jdbc:postgresql://localhost:5432/postgres + jdbc:postgresql://192.168.10.172:5432/postgres + $ProjectFileDir$ diff --git a/Flawless-Version-Control.sln.DotSettings.user b/Flawless-Version-Control.sln.DotSettings.user index 2ad4c03..2e49b5b 100644 --- a/Flawless-Version-Control.sln.DotSettings.user +++ b/Flawless-Version-Control.sln.DotSettings.user @@ -59,13 +59,13 @@ <Assembly Path="C:\Users\Cardi\.nuget\packages\irihi.ursa.themes.semi\1.10.0\lib\netstandard2.0\Ursa.Themes.Semi.dll" /> <Assembly Path="C:\Users\Cardi\.nuget\packages\reactiveui\20.1.1\lib\net8.0\ReactiveUI.dll" /> </AssemblyExplorer> - <SessionState ContinuousTestingMode="0" IsActive="True" IsLocked="True" Name="PathValidationTest" xmlns="urn:schemas-jetbrains-com:jetbrains-ut-session"> - <TestAncestor> - <TestId>MSTest::5B1CB26D-99F5-491A-B368-7E3552FE67E9::net9.0::Flawless.Abstract.Test.WorkPathTestUnit</TestId> - </TestAncestor> + <SessionState ContinuousTestingMode="0" IsActive="True" IsLocked="True" Name="PathValidationTest" xmlns="urn:schemas-jetbrains-com:jetbrains-ut-session"> + <TestAncestor> + <TestId>MSTest::5B1CB26D-99F5-491A-B368-7E3552FE67E9::net9.0::Flawless.Abstract.Test.WorkPathTestUnit</TestId> + </TestAncestor> </SessionState> - <SessionState ContinuousTestingMode="0" Name="PathValidationTest #2" xmlns="urn:schemas-jetbrains-com:jetbrains-ut-session"> - <TestAncestor> - <TestId>MSTest::5B1CB26D-99F5-491A-B368-7E3552FE67E9::net9.0::Flawless.Abstract.Test.WorkPathTestUnit.PathValidationTest</TestId> - </TestAncestor> + <SessionState ContinuousTestingMode="0" Name="PathValidationTest #2" xmlns="urn:schemas-jetbrains-com:jetbrains-ut-session"> + <TestAncestor> + <TestId>MSTest::5B1CB26D-99F5-491A-B368-7E3552FE67E9::net9.0::Flawless.Abstract.Test.WorkPathTestUnit.PathValidationTest</TestId> + </TestAncestor> </SessionState> \ No newline at end of file diff --git a/Flawless.Client/Service/RepositoryService.cs b/Flawless.Client/Service/RepositoryService.cs index 0b63be8..12ebae2 100644 --- a/Flawless.Client/Service/RepositoryService.cs +++ b/Flawless.Client/Service/RepositoryService.cs @@ -1274,7 +1274,7 @@ public class RepositoryService : BaseService } } - // Point to newest state. + // Point to latest state. localDb.RepoAccessor = accessor; localDb.CurrentCommit = rsp.CommitId; localDb.LocalAccessor.SetBaseline(accessor); diff --git a/Flawless.Server/Controllers/AuthenticationController.cs b/Flawless.Server/Controllers/AuthenticationController.cs index 2c7466d..8b8c05f 100644 --- a/Flawless.Server/Controllers/AuthenticationController.cs +++ b/Flawless.Server/Controllers/AuthenticationController.cs @@ -48,6 +48,7 @@ public class AuthenticationController( Email = r.AdminEmail, EmailConfirmed = true, CreatedOn = DateTime.UtcNow, + Admin = true }; user.RenewSecurityStamp(); diff --git a/Flawless.Server/Controllers/RepositoryInnieController.cs b/Flawless.Server/Controllers/RepositoryInnieController.cs index 95125d9..8387eb1 100644 --- a/Flawless.Server/Controllers/RepositoryInnieController.cs +++ b/Flawless.Server/Controllers/RepositoryInnieController.cs @@ -34,7 +34,7 @@ public class RepositoryInnieController( { var u = (await userManager.GetUserAsync(HttpContext.User))!; var grantIssue = await ValidateRepositoryAsync(userName, repositoryName, u, RepositoryRole.Guest); - if (grantIssue is not Repository) return (ActionResult) grantIssue; + if (grantIssue is not Repository rp) return (ActionResult) grantIssue; await using (var t = await dbContext.Database.BeginTransactionAsync()) { @@ -43,10 +43,22 @@ public class RepositoryInnieController( .Include(x => x.Depots) .Include(x => x.Members) .Include(x => x.Locked) - .FirstAsync(x => x.Name == repositoryName && x.Owner.UserName == userName); + .FirstAsync(x => x == rp); try { + await dbContext.Webhooks + .Where(x => x.Repository == rp) + .ExecuteDeleteAsync(); + + await dbContext.RepositoryIssues + .Where(x => x.Repository == rp) + .SelectMany(x => x.Contents).ExecuteDeleteAsync(); + + await dbContext.RepositoryIssues + .Where(x => x.Repository == rp) + .ExecuteDeleteAsync(); + set.Commits.Clear(); set.Depots.Clear(); set.Members.Clear(); diff --git a/Flawless.Server/appsettings.Development.json b/Flawless.Server/appsettings.Development.json index 5b1be17..1ad22a3 100644 --- a/Flawless.Server/appsettings.Development.json +++ b/Flawless.Server/appsettings.Development.json @@ -7,7 +7,7 @@ }, "AllowedHosts": "*", "ConnectionStrings": { - "CoreDb": "Server=localhost;Port=5432;User Id=postgres;Password=postgres;Database=flawless" + "CoreDb": "Server=192.168.10.172;Port=5432;User Id=postgres;Password=postgres;Database=flawless" }, "LocalStoragePath": "./data/development", "User": { diff --git a/Flawless.Server/appsettings.json b/Flawless.Server/appsettings.json index 96b602d..1ad22a3 100644 --- a/Flawless.Server/appsettings.json +++ b/Flawless.Server/appsettings.json @@ -5,17 +5,18 @@ "Microsoft.AspNetCore": "Warning" } }, - "AllowedHosts": "*", + "AllowedHosts": "*", "ConnectionStrings": { - "CoreDb": "Server=localhost;Port=5432;User Id=postgres;Password=postgres;Database=flawless" + "CoreDb": "Server=192.168.10.172;Port=5432;User Id=postgres;Password=postgres;Database=flawless" }, - "LocalStoragePath": "./data/production", + "LocalStoragePath": "./data/development", "User": { - "PublicRegister": false + "PublicRegister": true }, "Jwt": { "SecretKey": "your_256bit_security_key_at_here_otherwise_not_bootable", "Issuer": "test", - "ExpiresIn": 30 + "ExpiresIn": 30, + "RefreshTokenLifeTime": 7 } }