Merge pull request #37 from Altinn/feature/am-827_FixTtdAccessTokenEnvironmentKVMapping

Added own config value for mapping KV used for getting cert for TTD access tokens

Author: jonkjetiloye

TokenGenerator/Services/CertificateKeyVault.cs

@@ -70,12 +70,12 @@ public async Task<X509Certificate2> GetPlatformAccessTokenSigningCertificate(str
             }
             else if (issuer == settings.TtdAccessTokenIssuerName)
             {
-                if (string.IsNullOrEmpty(issuer) || settings.EnvironmentsApiTokenDict[environment] == null || settings.TtdAccessTokenSigningCertNamesDict[environment] == null)
+                if (string.IsNullOrEmpty(issuer) || settings.EnvironmentsTtdAccessTokenDict[environment] == null || settings.TtdAccessTokenSigningCertNamesDict[environment] == null)
                 {
                     throw new ArgumentException("Invalid environment or org issuer");
                 }
 
-                certificates = await GetCertificates(settings.EnvironmentsApiTokenDict[environment], settings.TtdAccessTokenSigningCertNamesDict[environment]);
+                certificates = await GetCertificates(settings.EnvironmentsTtdAccessTokenDict[environment], settings.TtdAccessTokenSigningCertNamesDict[environment]);
             }
             else
             {

TokenGenerator/Settings.cs

@@ -27,8 +27,10 @@ public class Settings
         public string TokenAuthorizationWellKnownEndpoint { get; set; }
         public string EnvironmentsApiToken { get; set; }
         public string EnvironmentsConsentToken { get; set; }
+        public string EnvironmentsTtdAccessToken { get; set; }
         public Dictionary<string, string> EnvironmentsApiTokenDict => GetKeyValuePairs(EnvironmentsApiToken);
         public Dictionary<string, string> EnvironmentsConsentTokenDict => GetKeyValuePairs(EnvironmentsConsentToken);
+        public Dictionary<string, string> EnvironmentsTtdAccessTokenDict => GetKeyValuePairs(EnvironmentsTtdAccessToken);
 
         private Dictionary<string, string> GetKeyValuePairs(string stringfieldToSpilt, char fieldSeparator = ';', char keyValueSeparator = ':')
         {

TokenGenerator/local.settings.json.COPYME

@@ -20,6 +20,7 @@
     "ConsentTokenSigningCertNames": "dev:altinn-testtools-consent-token-signing-cert",
     "EnvironmentsApiToken": "dev:altinn-testtools-kv",
     "EnvironmentsConsentToken": "dev:altinn-testtools-kv",
+    "EnvironmentsTtdAccessToken": "dev:altinn-testtools-kv",
     "TokenAuthorizationWellKnownEndpoint": "https://test.maskinporten.no/.well-known/oauth-authorization-server"
   }
 }