us1zcljz
/
eShopOnAbp
forked from tsai/eShopOnAbp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Updated library, added audiences

gterdem/swagger_update
Galip Tolga Erdem 4 years ago
parent
c4ff32c46f
commit
498fc03e89
4 changed files with 28 additions and 44 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 15
      apps/public-web/src/EShopOnAbp.PublicWeb/EShopOnAbpPublicWebModule.cs
  2. 3
      shared/EShopOnAbp.Keycloak.DbMigrator/EShopOnAbp.Keycloak.DbMigrator.csproj
  3. 50
      shared/EShopOnAbp.Keycloak.DbMigrator/KeycloakDataSeeder.cs
  4. 4
      shared/EShopOnAbp.Shared.Hosting.Microservices/JwtBearerConfigurationHelper.cs

15
apps/public-web/src/EShopOnAbp.PublicWeb/EShopOnAbpPublicWebModule.cs
View File

@ -154,14 +154,13 @@ public class EShopOnAbpPublicWebModule : AbpModule
options.Scope.Add("phone");
options.Scope.Add("roles");
options.Scope.Add("offline_access");
// Audiences couldn't be seeded -> TODO: Update when library is updated
// options.Scope.Add("AccountService");
// options.Scope.Add("AdministrationService");
// options.Scope.Add("BasketService");
// options.Scope.Add("CatalogService");
// options.Scope.Add("PaymentService");
// options.Scope.Add("OrderingService");
// options.Scope.Add("CmskitService");
options.Scope.Add("AdministrationService");
options.Scope.Add("BasketService");
options.Scope.Add("CatalogService");
options.Scope.Add("PaymentService");
options.Scope.Add("OrderingService");
options.Scope.Add("CmskitService");
options.SaveTokens = true;
//Token response type, will sometimes need to be changed to IdToken, depending on config.

3
shared/EShopOnAbp.Keycloak.DbMigrator/EShopOnAbp.Keycloak.DbMigrator.csproj
View File

@ -8,12 +8,11 @@
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Hosting" Version="6.0.1" />
<PackageReference Include="Keycloak.v19.Net" Version="1.0.0" />
<PackageReference Include="Keycloak.Net.Core" Version="1.0.20" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\EShopOnAbp.Shared.Hosting\EShopOnAbp.Shared.Hosting.csproj" />
<!-- <ProjectReference Include="..\..\..\Keycloak.Net\src\Keycloak.Net.Core\Keycloak.Net.Core.csproj" />-->
</ItemGroup>
<ItemGroup>

50
shared/EShopOnAbp.Keycloak.DbMigrator/KeycloakDataSeeder.cs
View File

@ -43,7 +43,6 @@ public class KeyCloakDataSeeder : IDataSeedContributor, ITransientDependency
private async Task CreateClientScopesAsync()
{
await CreateScopeAsync("AccountService");
await CreateScopeAsync("AdministrationService");
await CreateScopeAsync("IdentityService");
await CreateScopeAsync("BasketService");
@ -78,16 +77,11 @@ public class KeyCloakDataSeeder : IDataSeedContributor, ITransientDependency
Name = scopeName,
Protocol = "openid-connect",
_ProtocolMapper = "oidc-audience-mapper",
// Config = new Dictionary<string, string>() //TODO: Update when //https://github.com/AnderssonPeter/Keycloak.Net/pull/5 is merged
// {
// { "id.token.claim", "false" },
// { "access.token.claim", "true" },
// { "included.custom.audience", scopeName }
// }
Config = new Config() // This should be dictionary -> Outdated library
Config = new Dictionary<string, string>() //TODO: Update when //https://github.com/AnderssonPeter/Keycloak.Net/pull/5 is merged
{
AccessTokenClaim = "true",
IdTokenClaim = "false"
{ "id.token.claim", "false" },
{ "access.token.claim", "true" },
{ "included.custom.audience", scopeName }
}
}
}
@ -133,15 +127,14 @@ public class KeyCloakDataSeeder : IDataSeedContributor, ITransientDependency
await _keycloakClient.CreateClientAsync(_keycloakOptions.RealmName, webClient);
//TODO: Update when //https://github.com/AnderssonPeter/Keycloak.Net/pull/5 is merged
// await AddOptionalClientScopesAsync(
// "PublicWeb",
// new List<string>
// {
// "AdministrationService", "IdentityService", "BasketService", "CatalogService",
// "OrderingService", "PaymentService", "CmskitService"
// }
// );
await AddOptionalClientScopesAsync(
"PublicWeb",
new List<string>
{
"AdministrationService", "IdentityService", "BasketService", "CatalogService",
"OrderingService", "PaymentService", "CmskitService"
}
);
}
}
@ -219,15 +212,14 @@ public class KeyCloakDataSeeder : IDataSeedContributor, ITransientDependency
await _keycloakClient.CreateClientAsync(_keycloakOptions.RealmName, publicWebClient);
//TODO: Update when //https://github.com/AnderssonPeter/Keycloak.Net/pull/5 is merged
// await AddOptionalClientScopesAsync(
// "PublicWeb",
// new List<string>
// {
// "AdministrationService", "IdentityService", "BasketService", "CatalogService",
// "OrderingService", "PaymentService", "CmskitService"
// }
// );
await AddOptionalClientScopesAsync(
"PublicWeb",
new List<string>
{
"AdministrationService", "IdentityService", "BasketService", "CatalogService",
"OrderingService", "PaymentService", "CmskitService"
}
);
}
}
@ -264,8 +256,6 @@ public class KeyCloakDataSeeder : IDataSeedContributor, ITransientDependency
var adminUser = users.FirstOrDefault();
if (adminUser == null)
{
_logger.LogError(
"Keycloak admin user is not provided, check if KEYCLOAK_ADMIN environment variable is passed properly.");
throw new Exception(
"Keycloak admin user is not provided, check if KEYCLOAK_ADMIN environment variable is passed properly.");
}

4
shared/EShopOnAbp.Shared.Hosting.Microservices/JwtBearerConfigurationHelper.cs
View File

@ -20,10 +20,6 @@ public static class JwtBearerConfigurationHelper
options.Authority = configuration["AuthServer:Authority"];
options.RequireHttpsMetadata = Convert.ToBoolean(configuration["AuthServer:RequireHttpsMetadata"]);
options.Audience = audience;
options.TokenValidationParameters = new TokenValidationParameters()
{
ValidateAudience = false //Disabled since seeding audience is not possible with the current keycloak.net library version
};
});
}
}
Write Preview
Loading…
Cancel
Save