Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[ADMINAPI-1056] - Version upgrade for OpenIddict.EntityFrameworkCore and Microsoft.Enti… #170

Merged
merged 7 commits into from
Sep 26, 2024
Merged

[ADMINAPI-1056] - Version upgrade for OpenIddict.EntityFrameworkCore and Microsoft.Enti… #170

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
458f9ac
Version upgrade for OpenIddict.EntityFrameworkCore and Microsoft.Enti…
DavidJGapCR Sep 23, 2024
16a0b32
Packages updates.
DavidJGapCR Sep 24, 2024
2eb9caf
Version number update
DavidJGapCR Sep 24, 2024
316d2bc
Trying to fix e2e tests.
DavidJGapCR Sep 26, 2024
aba3292
Trying to fix e2e tests.
DavidJGapCR Sep 26, 2024
df419f8
Trying to fix e2e tests.
DavidJGapCR Sep 26, 2024
17000a9
Undoing previous change
DavidJGapCR Sep 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions Application/EdFi.Ods.AdminApi/Artifacts/MsSql/Structure/Admin/00003-EditApiAuthTables.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
-- SPDX-License-Identifier: Apache-2.0
-- Licensed to the Ed-Fi Alliance under one or more agreements.
-- The Ed-Fi Alliance licenses this file to you under the Apache License, Version 2.0.
-- See the LICENSE and NOTICES files in the project root for more information.

IF EXISTS (SELECT 1 FROM [INFORMATION_SCHEMA].[TABLES] WHERE TABLE_SCHEMA = 'adminapi' and TABLE_NAME = 'Applications')
BEGIN
ALTER TABLE adminapi.Applications
ADD
[ApplicationType] NVARCHAR(MAX) NULL,
[JsonWebKeySet] NVARCHAR(MAX) NULL,
[Settings] NVARCHAR(MAX) NULL;
END

IF EXISTS (SELECT 1 FROM [INFORMATION_SCHEMA].[TABLES] WHERE TABLE_SCHEMA = 'adminapi' and TABLE_NAME = 'Applications')
BEGIN
EXEC sp_rename 'adminapi.Applications.Type', 'ClientType', 'COLUMN';
END
15 changes: 15 additions & 0 deletions Application/EdFi.Ods.AdminApi/Artifacts/PgSql/Structure/Admin/00003-EditApiAuthTables.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
-- SPDX-License-Identifier: Apache-2.0
-- Licensed to the Ed-Fi Alliance under one or more agreements.
-- The Ed-Fi Alliance licenses this file to you under the Apache License, Version 2.0.
-- See the LICENSE and NOTICES files in the project root for more information.

ALTER TABLE adminapi.Applications
ADD COLUMN
ApplicationType VARCHAR NULL,
ADD COLUMN
JsonWebKeySet VARCHAR NULL,
ADD COLUMN
Settings VARCHAR NULL;

ALTER TABLE adminapi.Applications
RENAME COLUMN Type TO ClientType;
8 changes: 4 additions & 4 deletions Application/EdFi.Ods.AdminApi/EdFi.Ods.AdminApi.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,13 @@
<PackageReference Include="NJsonSchema" Version="11.0.2" />
<PackageReference Include="Npgsql" Version="8.0.3" />
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.0" />
<PackageReference Include="OpenIddict.AspNetCore" Version="4.4.0" />
<PackageReference Include="OpenIddict.EntityFrameworkCore" Version="4.4.0" />
<PackageReference Include="OpenIddict.AspNetCore" Version="5.7.1" />
<PackageReference Include="OpenIddict.EntityFrameworkCore" Version="5.7.1" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
<PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="6.5.0" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.7" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.4" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.4" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.6" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.6" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion Docker/dbadmin.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ FROM base AS setup
USER root
RUN dos2unix /docker-entrypoint-initdb.d/3-run-adminapi-migrations.sh && \
dos2unix /tmp/AdminApiScripts/PgSql/* && \
chmod -R 600 /tmp/AdminApiScripts/PgSql/*
chmod -R 777 /tmp/AdminApiScripts/PgSql/*
USER postgres

EXPOSE 5432
Expand Down
Loading