bug fixes

asa-manager/WebService/Runtime/Config.cs

@@ -51,7 +51,7 @@ namespace Microsoft.Azure.IoTSolutions.AsaManager.WebService.Runtime
         private const string JWT_KEY = APPLICATION_KEY + "ClientAuth:JWT:";
         private const string JWT_ALGOS_KEY = JWT_KEY + "allowedAlgorithms";
         private const string JWT_ISSUER_KEY = JWT_KEY + "authIssuer";
-        private const string JWT_AUDIENCE_KEY = JWT_KEY + "aadTenantId";
+        private const string JWT_AUDIENCE_KEY = JWT_KEY + "aadAppId";
         private const string JWT_CLOCK_SKEW_KEY = JWT_KEY + "clockSkewSeconds";
 
         private const string EVENTHUB_KEY = APPLICATION_KEY + "EventHub:";

storage-adapter/Services/Runtime/ConfigData.cs

@@ -106,10 +106,6 @@ namespace Microsoft.Azure.IoTSolutions.StorageAdapter.Services.Runtime
             return !string.IsNullOrEmpty(value) ? value : defaultValue;
         }
 
-        private string GetSecretsFromKeyVault(string key) {
-            return this.keyVault.GetKeyVaultSecret(key);
-        }
-
         private string GetLocalVariable(string key, string defaultValue = "")
         {
             return this.configuration.GetValue(key, defaultValue);

storage-adapter/Services/Runtime/KeyVault.cs

@@ -45,7 +45,7 @@ namespace Microsoft.Azure.IoTSolutions.StorageAdapter.Services.Runtime
             {
                 return this.keyVaultClient.GetSecretAsync(uri).Result.Value;
             }
-            catch (Exception)
+            catch (Exception e)
             {
                 this.log.Debug($"Secret {secretKey} not found in Key Vault.", () => { });
                 return null;

storage-adapter/WebService/Properties/launchSettings.json

@@ -1,20 +1,23 @@
 {
-    "iisSettings": {
-        "windowsAuthentication": false,
-        "anonymousAuthentication": true,
-        "iisExpress": {
-            "applicationUrl": "http://localhost:9022/",
-            "sslPort": 0
-        }
-    },
-    "profiles": {
-        "WebService": {
-            "commandName": "Project",
-            "launchBrowser": true,
-            "launchUrl": "http://localhost:9022/v1/status",
-            "environmentVariables": {
-            },
-            "applicationUrl": "http://localhost:9022/v1/status"
-        }
+  "iisSettings": {
+    "windowsAuthentication": false,
+    "anonymousAuthentication": true,
+    "iisExpress": {
+      "applicationUrl": "http://localhost:9022/",
+      "sslPort": 0
     }
-}
+  },
+  "profiles": {
+    "WebService": {
+      "commandName": "Project",
+      "launchBrowser": true,
+      "launchUrl": "http://localhost:9022/v1/status",
+      "environmentVariables": {
+        "PCS_KEYVAULT_NAME": "keyvault-fk4ri",
+        "PCS_AAD_APPID": "241383fa-fe9b-4aae-a07a-f73bdb28f595",
+        "PCS_AAD_APPSECRET": "N4xjGzdUeWMC7BkM3hBwCRJDFYe0k2ygNWeSKfxv"
+      },
+      "applicationUrl": "http://localhost:9022/v1/status"
+    }
+  }
+}