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

chore(resource-adm): do not exchange maskinporten token to altinn token when publishing resource #14097

Merged
merged 3 commits into from
Nov 21, 2024
Merged

chore(resource-adm): do not exchange maskinporten token to altinn token when publishing resource #14097

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7e442a9
dot not exchange maskinporten token to altinn token before publishing…
mgunnerud Nov 18, 2024
6ae0c99
remove double service registration
mgunnerud Nov 18, 2024
12c60cc
Merge branch 'main' into chore/publish-resource-fix
mgunnerud Nov 20, 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
1 change: 0 additions & 1 deletion backend/src/Designer/Infrastructure/ServiceRegistration.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,6 @@ public static IServiceCollection RegisterServiceImplementations(this IServiceCol
services.AddTransient<IAppDevelopmentService, AppDevelopmentService>();
services.AddTransient<IPreviewService, PreviewService>();
services.AddTransient<IDataService, DataService>();
services.AddTransient<IResourceRegistry, ResourceRegistryService>();
services.AddTransient<IProcessModelingService, ProcessModelingService>();
services.AddTransient<IImagesService, ImagesService>();
services.RegisterDatamodeling(configuration);
Expand Down
2 changes: 1 addition & 1 deletion backend/src/Designer/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@
services.Configure<MaskinportenClientSettings>(configuration.GetSection("MaskinportenClientSettings"));
var maskinPortenClientName = "MaskinportenClient";
services.RegisterMaskinportenClientDefinition<MaskinPortenClientDefinition>(maskinPortenClientName, configuration.GetSection("MaskinportenClientSettings"));
services.AddHttpClient<IResourceRegistry, ResourceRegistryService>().AddMaskinportenHttpMessageHandler<MaskinPortenClientDefinition>(maskinPortenClientName);
services.AddHttpClient<IResourceRegistry, ResourceRegistryService>();

var maskinportenSettings = new MaskinportenClientSettings();
configuration.GetSection("MaskinportenClientSettings").Bind(maskinportenSettings);
Expand Down Expand Up @@ -355,7 +355,7 @@
}
}

static string GetXmlCommentsPathForControllers()

Check warning on line 358 in backend/src/Designer/Program.cs

View workflow job for this annotation

GitHub Actions / Analyze 

The local function 'GetXmlCommentsPathForControllers' is declared but never used

Check warning on line 358 in backend/src/Designer/Program.cs

View workflow job for this annotation

GitHub Actions / Run dotnet build and test (ubuntu-latest) 

The local function 'GetXmlCommentsPathForControllers' is declared but never used

Check warning on line 358 in backend/src/Designer/Program.cs

View workflow job for this annotation

GitHub Actions / Run dotnet build and test (windows-latest) 

The local function 'GetXmlCommentsPathForControllers' is declared but never used
{
// locate the xml file being generated by .NET
string xmlFile = $"{Assembly.GetExecutingAssembly().GetName().Name}.XML";
Expand Down
1 change: 0 additions & 1 deletion backend/src/Designer/Services/Implementation/ResourceRegistryService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,6 @@ public async Task<ActionResult> PublishServiceResource(ServiceResource serviceRe
{
publishResourceToResourceRegistryUrl = $"{GetResourceRegistryBaseUrl(env)}{_platformSettings.ResourceRegistryUrl}";
getResourceRegistryUrl = $"{publishResourceToResourceRegistryUrl}/{serviceResource.Identifier}";
tokenResponse = await _maskinPortenService.ExchangeToAltinnToken(tokenResponse, env);
fullWritePolicyToResourceRegistryUrl = $"{GetResourceRegistryBaseUrl(env)}{_platformSettings.ResourceRegistryUrl}/{serviceResource.Identifier}/policy";
}
else
Expand Down
Loading