notazof/yavsc
1
0
Fork 0
Code Issues Pull requests Projects 1 Releases 3 Packages Wiki Activity Actions

fixes the current date at testing phase

Browse source
This commit is contained in:
Paul Schneider 2026-04-19 19:14:37 +01:00
commit 65db349c0a
5 changed files with 46 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Directory.Packages.props
View file

@ -33,6 +33,7 @@
<PackageVersion Include="Microsoft.AspNetCore.StaticFiles" Version="2.3.9" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.7" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.InMemory" Version="9.0.7" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite" Version="9.0.7" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="9.0.7" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.Tools" Version="10.0.6" />
<PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="10.0.6" />

8
src/Yavsc.Org/Extensions/HostingExtensions.cs
View file

@ -152,7 +152,7 @@ public static class HostingExtensions
if (useInMemory)
{
services.AddDbContext<ApplicationDbContext>(options =>
options.UseInMemoryDatabase("YavscInMemory"));
options.UseSqlite("Data Source=file::memory:?cache=shared"));
}
else
{
@ -281,7 +281,7 @@ public static class HostingExtensions
var migrationsAssembly = typeof(Program).GetTypeInfo().Assembly.GetName().Name;
var connectionString = builder.Configuration.GetConnectionString(Constants.YavscConnectionStringName);
bool useInMemory = builder.Configuration.GetValue<bool>("UseInMemoryDatabase", false);
string inMemoryDatabaseName = "YavscInMemory";
string sqliteInMemoryConnectionString = "Data Source=file::memory:?cache=shared";
var identityServerBuilder = builder.Services.AddIdentityServer(options =>
{
@ -303,7 +303,7 @@ public static class HostingExtensions
{
if (useInMemory)
{
options.ConfigureDbContext = b => b.UseInMemoryDatabase(inMemoryDatabaseName);
options.ConfigureDbContext = b => b.UseSqlite(sqliteInMemoryConnectionString);
}
else
{
@ -328,7 +328,7 @@ public static class HostingExtensions
{
if (useInMemory)
{
options.ConfigureDbContext = b => b.UseInMemoryDatabase(inMemoryDatabaseName);
options.ConfigureDbContext = b => b.UseSqlite(sqliteInMemoryConnectionString);
}
else
{

1
src/Yavsc.Org/Yavsc.Org.csproj
View file

@ -32,6 +32,7 @@
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" />
<PackageReference Include="Google.Apis.Compute.v1" />

16
src/Yavsc.Server/Models/ApplicationDbContext.cs
View file

@ -42,18 +42,30 @@ namespace Yavsc.Models
}
public ApplicationDbContext(DbContextOptions<ApplicationDbContext> options) : base(options)
{
if (Database.IsRelational())
{
Database.SetCommandTimeout(180);
}
}
protected override void OnModelCreating(ModelBuilder builder)
{
base.OnModelCreating(builder);
if (Database.IsNpgsql())
{
NOW_SQL="LOCALTIMESTAMP";
}
else
{
NOW_SQL="CURRENT_TIMESTAMP";
}
builder.UseIdentityByDefaultColumns();
// Customize the ASP.NET Identity model and override the defaults if needed.
// For example, you can rename the ASP.NET Identity table names and more.
// Add your customizations after calling base.OnModelCreating(builder);
builder.Entity<Contact>().HasKey(x => new { x.OwnerId, x.UserId });
builder.Entity<DeviceDeclaration>().Property(x => x.DeclarationDate).HasDefaultValueSql("LOCALTIMESTAMP");
builder.Entity<DeviceDeclaration>().Property(x => x.DeclarationDate).HasDefaultValueSql(NOW_SQL);
builder.Entity<BlogTag>().HasKey(x => new { x.PostId, x.TagId });
builder.Entity<ApplicationUser>().Property(u => u.FullName).IsRequired(false);
@ -337,6 +349,6 @@ namespace Yavsc.Models
public DbSet<DeviceFlowCodes> DeviceFlowCodes { get; set; }
public DbSet<YavscApiScope> YavscApiScopes { get; set; }
public string NOW_SQL { get; private set; }
}
}

42
test/yavscTests/WebServerFixture.cs
View file

@ -1,3 +1,4 @@
using IdentityServer8.EntityFramework.DbContexts;
using IdentityServer8.EntityFramework.Entities;
using IdentityServer8.Models;
using Microsoft.AspNetCore.Builder;
@ -136,6 +137,12 @@ namespace isnd.tests
var builder = WebApplication.CreateBuilder();
builder.Environment.EnvironmentName = "Development";
// Set ContentRoot to the Yavsc.Org project directory so WebRootPath resolves correctly
var testAssemblyLocation = AppDomain.CurrentDomain.BaseDirectory;
var yavscOrgPath = Path.GetFullPath(Path.Combine(testAssemblyLocation, "../../src/Yavsc.Org"));
builder.Environment.ContentRootPath = yavscOrgPath;
ConfigureLogger();
builder.Configuration
.AddJsonFile("appsettings.json", optional: false, reloadOnChange: false)
@ -260,8 +267,10 @@ namespace isnd.tests
private void AddAuthorizedClient(IServiceScope scope, string testClientId, string testClientSecret)
{
var configDb = scope.ServiceProvider.GetRequiredService<ConfigurationDbContext>();
if (configDb == null)
throw new InvalidOperationException("ConfigurationDbContext is not available for IdentityServer client seeding.");
var db = scope.ServiceProvider.GetRequiredService<ApplicationDbContext>();
Client testingClient = new Client
{
ClientId = testClientId,
@ -269,57 +278,58 @@ namespace isnd.tests
AccessTokenType = 1,
BackChannelLogoutUri = SiteSettings!.Audience,
ClientName = "Testing client",
Enabled = true
Enabled = true,
RequireClientSecret = true
};
db.Clients.Add(testingClient);
db.SaveChanges();
configDb.Clients.Add(testingClient);
configDb.SaveChanges();
ClientSecret secret = new ClientSecret
{
Value = testClientSecret.Sha256(),
Type = IdentityServer8.IdentityServerConstants.SecretTypes.SharedSecret,
ClientId = testingClient.Id
};
db.ClientSecrets.Add(secret);
configDb.Set<ClientSecret>().Add(secret);
var testOrigin = new ClientCorsOrigin
configDb.Set<ClientCorsOrigin>().Add(new ClientCorsOrigin
{
ClientId = testingClient.Id,
Origin = SiteSettings!.Audience
});
};
db.ClientCorsOrigins.Add(testOrigin);
db.ClientGrantTypes.Add(new ClientGrantType
configDb.Set<ClientGrantType>().Add(new ClientGrantType
{
ClientId = testingClient.Id,
GrantType = "client_credentials"
});
db.ClientGrantTypes.Add(new ClientGrantType
configDb.Set<ClientGrantType>().Add(new ClientGrantType
{
ClientId = testingClient.Id,
GrantType = "password"
});
db.ClientGrantTypes.Add(new ClientGrantType
configDb.Set<ClientGrantType>().Add(new ClientGrantType
{
ClientId = testingClient.Id,
GrantType = "code"
});
db.ClientScopes.Add(new ClientScope
configDb.Set<ClientScope>().Add(new ClientScope
{
ClientId = testingClient.Id,
Scope = "test"
});
db.ApiScopes.Add(new IdentityServer8.EntityFramework.Entities.ApiScope
configDb.Set<IdentityServer8.EntityFramework.Entities.ApiScope>().Add(new IdentityServer8.EntityFramework.Entities.ApiScope
{
Name = "test",
Enabled = true
});
db.ClientRedirectUris.Add(new ClientRedirectUri
configDb.Set<ClientRedirectUri>().Add(new ClientRedirectUri
{
ClientId = testingClient.Id,
RedirectUri = SiteSettings!.Audience
});
db.SaveChanges();
configDb.SaveChanges();
}
public void EnsureUser(string testingUserName, string password, string email, IServiceScope scope)