updated using afdbd38

README.md

@@ -27,7 +27,7 @@ The **Authorization Registry** is a role for which iSHARE Certification (iSHARE)
 ### Setup the development environment
 
 1. Create environment variable 'ENVIRONMENT' with the value 'Development'
-2. Navigate to NLIP.iShare.AuthorizationRegistry.Api and create a new file named 'appsettings.Development.json'
+2. Navigate to iSHARE.AuthorizationRegistry.Api and create a new file named 'appsettings.Development.json'
 3. Copy the content of 'appsettings.Development.json.template' into 'appsettings.Development.json' and complete all fields with the necessary information and save the changes
 
 ## Build API
@@ -39,13 +39,13 @@ Navigate to the local Authorization Registry repository and run `dotnet build`
 Authorization Registry is using a SQL database that is created at runtime.
 Various test records are inserted from JSON files present here
 
-- `NLIP.iShare.AuthorizationRegistry.Api\Seed\Identity\Development`
-- `NLIP.iShare.AuthorizationRegistry.Api\Seed\IdentityServer\Development`
-- `NLIP.iShare.AuthorizationRegistry.Data\Migrations\Seed\Development`
+- `iSHARE.AuthorizationRegistry.Api\Seed\Identity\Development`
+- `iSHARE.AuthorizationRegistry.Api\Seed\IdentityServer\Development`
+- `iSHARE.AuthorizationRegistry.Data\Migrations\Seed\Development`
 
 ## Run process
 
-1. Navigate to the local Authorization Registry repository, into NLIP.iShare.AuthorizationRegistry.Api folder and run `dotnet run`
+1. Navigate to the local Authorization Registry repository, into iSHARE.AuthorizationRegistry.Api folder and run `dotnet run`
 2. Open a browser tab and navigate to `localhost:61433/swagger`
 
 ## Installation for SPA
@@ -59,7 +59,7 @@ The software you'll need before installing Authorization Registry SPA:
 
 ### Install dependencies
 
-Run `npm install` inside NLIP.iShare.AuthorizationRegistry.SPA folder to get all dependencies downloaded locally.
+Run `npm install` inside iSHARE.AuthorizationRegistry.SPA folder to get all dependencies downloaded locally.
 
 ### Run process
 

NLIP.iShare.Abstractions/Email/EmailAddress.cs → iSHARE.Abstractions/Email/EmailAddress.cs

@@ -1,4 +1,4 @@
-namespace NLIP.iShare.Abstractions.Email
+namespace iSHARE.Abstractions.Email
 {
     public class EmailAddress
     {

NLIP.iShare.Abstractions/Email/EmailTemplatesData.cs → iSHARE.Abstractions/Email/EmailTemplatesData.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace NLIP.iShare.Abstractions.Email
+namespace iSHARE.Abstractions.Email
 {
     public class EmailTemplatesData
     {

NLIP.iShare.Abstractions/Email/IEmailClient.cs → iSHARE.Abstractions/Email/IEmailClient.cs

@@ -1,6 +1,6 @@
 using System.Threading.Tasks;
 
-namespace NLIP.iShare.Abstractions.Email
+namespace iSHARE.Abstractions.Email
 {
     /// <summary>
     /// Send an email to a recipient

NLIP.iShare.Abstractions/Email/ITemplateService.cs → iSHARE.Abstractions/Email/ITemplateService.cs

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 
-namespace NLIP.iShare.Abstractions.Email
+namespace iSHARE.Abstractions.Email
 {
     public interface ITemplateService
     {

NLIP.iShare.Abstractions/Extensions.cs → iSHARE.Abstractions/Extensions.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 
-namespace NLIP.iShare.Abstractions
+namespace iSHARE.Abstractions
 {
     public static class Extensions
     {

NLIP.iShare.Abstractions/IResponseJwtBuilder.cs → iSHARE.Abstractions/IResponseJwtBuilder.cs

@@ -1,6 +1,6 @@
 using Newtonsoft.Json.Serialization;
 
-namespace NLIP.iShare.Abstractions
+namespace iSHARE.Abstractions
 {
     /// <summary>
     /// Builds a JWT from the given delegation evidence

NLIP.iShare.Abstractions/LinqExtensions.cs → iSHARE.Abstractions/LinqExtensions.cs

@@ -3,7 +3,7 @@
 using System.Linq;
 using System.Linq.Expressions;
 
-namespace NLIP.iShare.Abstractions
+namespace iSHARE.Abstractions
 {
     public static class LinqExtensions
     {

NLIP.iShare.Abstractions/PagedResult.cs → iSHARE.Abstractions/PagedResult.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace NLIP.iShare.Abstractions
+namespace iSHARE.Abstractions
 {
     public class PagedResult<T>
     {

NLIP.iShare.Abstractions/Query.cs → iSHARE.Abstractions/Query.cs

@@ -1,4 +1,4 @@
-namespace NLIP.iShare.Abstractions
+namespace iSHARE.Abstractions
 {
     public class Query
     {

NLIP.iShare.Abstractions/SortOrder.cs → iSHARE.Abstractions/SortOrder.cs

@@ -1,4 +1,4 @@
-namespace NLIP.iShare.Abstractions
+namespace iSHARE.Abstractions
 {
     public enum SortOrder
     {

NLIP.iShare.Abstractions/NLIP.iShare.Abstractions.csproj → iSHARE.Abstractions/iSHARE.Abstractions.csproj

@@ -6,11 +6,11 @@
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
-    <CodeAnalysisRuleSet>NLIP.iShare.Abstractions.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRuleSet>iSHARE.Abstractions.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <CodeAnalysisRuleSet>NLIP.iShare.Abstractions.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRuleSet>iSHARE.Abstractions.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
 
   <ItemGroup>

NLIP.iShare.Api/ApplicationInsights/CloudRoleNameInitializer.cs → iSHARE.Api/ApplicationInsights/CloudRoleNameInitializer.cs

@@ -2,7 +2,7 @@
 using Microsoft.ApplicationInsights.Extensibility;
 using System.Diagnostics;
 
-namespace NLIP.iShare.Api.ApplicationInsights
+namespace iSHARE.Api.ApplicationInsights
 {
     internal class CloudRoleNameInitializer : ITelemetryInitializer
     {

NLIP.iShare.Api/ApplicationInsights/ConfigurationExtensions.cs → iSHARE.Api/ApplicationInsights/ConfigurationExtensions.cs

@@ -2,7 +2,7 @@
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace NLIP.iShare.Api.ApplicationInsights
+namespace iSHARE.Api.ApplicationInsights
 {
     public static class ConfigurationExtensions
     {

NLIP.iShare.Api/ApplicationInsights/EoriInitializer.cs → iSHARE.Api/ApplicationInsights/EoriInitializer.cs

@@ -4,9 +4,9 @@
 using Microsoft.AspNetCore.Http;
 using System.Collections.Generic;
 using System.Diagnostics;
-using NLIP.iShare.Models;
+using iSHARE.Models;
 
-namespace NLIP.iShare.Api.ApplicationInsights
+namespace iSHARE.Api.ApplicationInsights
 {
     internal class EoriInitializer : ITelemetryInitializer
     {

NLIP.iShare.Api/Configuration.cs → iSHARE.Api/Configuration.cs

@@ -1,11 +1,11 @@
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
-using NLIP.iShare.Api.Validation;
-using NLIP.iShare.IdentityServer.Validation.Interfaces;
-using NLIP.iShare.SchemeOwner.Client;
+using iSHARE.Api.Validation;
+using iSHARE.IdentityServer.Validation.Interfaces;
+using iSHARE.SchemeOwner.Client;
 
-namespace NLIP.iShare.Api
+namespace iSHARE.Api
 {
     public static class Configuration
     {

NLIP.iShare.Api/Configurations/ExceptionHandler.cs → iSHARE.Api/Configurations/ExceptionHandler.cs

@@ -11,7 +11,7 @@
 using System.Net;
 using System.Text;
 
-namespace NLIP.iShare.Api.Configurations
+namespace iSHARE.Api.Configurations
 {
     public static class ExceptionHandler
     {

NLIP.iShare.Api/Configurations/FileProvider.cs → iSHARE.Api/Configurations/FileProvider.cs

@@ -1,17 +1,23 @@
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.FileProviders;
-using System;
+using System;
 using System.IO;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.FileProviders;
+using iSHARE.Api.Interfaces;
+using iSHARE.Api.Services;
 
-namespace NLIP.iShare.Api.Configurations
+namespace iSHARE.Api.Configurations
 {
     public static class FileProvider
     {
-        public static IServiceCollection AddFileProvider(this IServiceCollection services)
+        public static IServiceCollection AddFileProvider(this IServiceCollection services, IHostingEnvironment environment)
         {
             services.AddSingleton<Func<string, IFileInfo>>(srv => filename =>
             {
-                IFileProvider fileProvider = new PhysicalFileProvider(Path.Combine(Directory.GetCurrentDirectory(), "Resources"));
+                IFileProvider fileProvider = new PhysicalFileProvider(Path.Combine(
+                    Directory.GetCurrentDirectory(), 
+                    "Resources",
+                     environment.EnvironmentName ?? "Development"));
 
                 var file = fileProvider.GetFileInfo(filename);
                 if (!file.Exists)
@@ -21,6 +27,8 @@ public static IServiceCollection AddFileProvider(this IServiceCollection service
 
                 return file;
             });
+            services.AddSingleton<ICapabilitiesService, CapabilitiesService>();
+
             return services;
         }
     }

NLIP.iShare.Api/Configurations/HostingEnvironment.cs → iSHARE.Api/Configurations/HostingEnvironment.cs

@@ -1,7 +1,7 @@
 using Microsoft.AspNetCore.Hosting;
 using System;
 
-namespace NLIP.iShare.Api.Configurations
+namespace iSHARE.Api.Configurations
 {
     public static class HostingEnvironment
     {

NLIP.iShare.Api/Configurations/JsonSchema.cs → iSHARE.Api/Configurations/JsonSchema.cs

@@ -4,7 +4,7 @@
 using System;
 using System.IO;
 
-namespace NLIP.iShare.Api.Configurations
+namespace iSHARE.Api.Configurations
 {
     public static class JsonSchema
     {

NLIP.iShare.Api/Configurations/JsonSettings.cs → iSHARE.Api/Configurations/JsonSettings.cs

@@ -2,7 +2,7 @@
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
 
-namespace NLIP.iShare.Api.Configurations
+namespace iSHARE.Api.Configurations
 {
     public static class JsonSettings
     {

NLIP.iShare.Api/Configurations/JwtAuthentication.cs → iSHARE.Api/Configurations/JwtAuthentication.cs

@@ -1,23 +1,23 @@
-using Microsoft.AspNetCore.Authentication.JwtBearer;
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.Extensions.DependencyInjection;
-using NLIP.iShare.Configuration.Configurations;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Net.Http;
 using System.Security.Cryptography;
 using Microsoft.AspNetCore.Authentication;
+using Microsoft.AspNetCore.Authentication.JwtBearer;
+using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Configuration;
-using NLIP.iShare.Configuration;
-using AuthenticationOptions = NLIP.iShare.Configuration.AuthenticationOptions;
+using Microsoft.Extensions.DependencyInjection;
+using iSHARE.Configuration;
+using iSHARE.Configuration.Configurations;
+using AuthenticationOptions = iSHARE.Configuration.AuthenticationOptions;
 
-namespace NLIP.iShare.Api.Configurations
+namespace iSHARE.Api.Configurations
 {
     public static class JwtAuthentication
     {
         public static IServiceCollection AddJwtAuthentication(this IServiceCollection services,
             IHostingEnvironment hostingEnvironment,
-            string[] audiences, IConfiguration configuration)
+            IConfiguration configuration)
         {
             services.ConfigureRuntimeOptions(configuration, "Auth", new AuthenticationOptions());
             services
@@ -26,12 +26,11 @@ public static class JwtAuthentication
                 {
                     var partyDetailsOptions = services.BuildServiceProvider().GetRequiredService<PartyDetailsOptions>();
                     options.Authority = partyDetailsOptions.BaseUri;
-
                     // name of the API resource
                     options.TokenValidationParameters = new Microsoft.IdentityModel.Tokens.TokenValidationParameters
                     {
                         ValidateIssuer = true,
-                        ValidAudiences = new List<string>(audiences)
+                        ValidAudiences = new List<string> { partyDetailsOptions.ClientId }
                     };
                     options.RequireHttpsMetadata = !hostingEnvironment.IsDevelopment();
                     options.IncludeErrorDetails = !hostingEnvironment.IsDevelopment();