From e4c16b2d6910a8bc6877f2f1d78c4e306e6724df Mon Sep 17 00:00:00 2001
From: Samir Solanki <samirsolanki@outlook.com>
Date: Wed, 26 Aug 2020 17:16:57 -0700
Subject: [PATCH 1/2] Oauth server secrets contract

---
 .../apimauthorizationservers.json             |  2 +-
 .../2020-06-01-preview/definitions.json       | 19 +++++++++++++++++++
 ...agementAuthorizationServerListSecrets.json |  4 +++-
 3 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2020-06-01-preview/apimauthorizationservers.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2020-06-01-preview/apimauthorizationservers.json
index 1975c09201dc..32e766c4c6c2 100644
--- a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2020-06-01-preview/apimauthorizationservers.json
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2020-06-01-preview/apimauthorizationservers.json
@@ -403,7 +403,7 @@
           "200": {
             "description": "Gets the secrets of the specified authorization server.",
             "schema": {
-              "$ref": "./definitions.json#/definitions/ClientSecretContract"
+              "$ref": "./definitions.json#/definitions/AuthorizationServerSecretsContract"
             },
             "headers": {
               "ETag": {
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2020-06-01-preview/definitions.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2020-06-01-preview/definitions.json
index 51dfac6d821d..1d7eb88b46ad 100644
--- a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2020-06-01-preview/definitions.json
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2020-06-01-preview/definitions.json
@@ -1168,6 +1168,25 @@
       ],
       "description": "External OAuth authorization server Update settings contract."
     },
+    "AuthorizationServerSecretsContract": {
+      "properties": {
+        "clientSecret": {
+          "x-ms-secret": true,
+          "type": "string",
+          "description": "oAuth Authorization Server Secrets."
+        },
+        "resourceOwnerUsername": {
+          "type": "string",
+          "description": "Can be optionally specified when resource owner password grant type is supported by this authorization server. Default resource owner username."
+        },
+        "resourceOwnerPassword": {
+          "x-ms-secret": true,
+          "type": "string",
+          "description": "Can be optionally specified when resource owner password grant type is supported by this authorization server. Default resource owner password."
+        }
+      },
+      "description": "OAuth Server Secrets Contract."
+    },
     "BackendAuthorizationHeaderCredentials": {
       "properties": {
         "scheme": {
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2020-06-01-preview/examples/ApiManagementAuthorizationServerListSecrets.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2020-06-01-preview/examples/ApiManagementAuthorizationServerListSecrets.json
index 48d65212ec60..41d62225bcbb 100644
--- a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2020-06-01-preview/examples/ApiManagementAuthorizationServerListSecrets.json
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2020-06-01-preview/examples/ApiManagementAuthorizationServerListSecrets.json
@@ -9,7 +9,9 @@
   "responses": {
     "200": {
       "body": {
-        "clientSecret": "2"
+        "clientSecret": "2",
+        "resourceOwnerUsername": "un",
+        "resourceOwnerPassword": "pwd"
       }
     }
   }

From f1a724e5470640ad6110a67ac494fe8dc3322b7e Mon Sep 17 00:00:00 2001
From: Samir Solanki <samirsolanki@outlook.com>
Date: Sun, 30 Aug 2020 15:18:05 -0700
Subject: [PATCH 2/2] fix azureMonitor enum

---
 .../preview/2020-06-01-preview/definitions.json            | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2020-06-01-preview/definitions.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2020-06-01-preview/definitions.json
index 1d7eb88b46ad..9481f9eac178 100644
--- a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2020-06-01-preview/definitions.json
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2020-06-01-preview/definitions.json
@@ -2767,7 +2767,8 @@
           "description": "Logger type.",
           "enum": [
             "azureEventHub",
-            "applicationInsights"
+            "applicationInsights",
+            "azureMonitor"
           ],
           "x-ms-enum": {
             "name": "LoggerType",
@@ -2780,6 +2781,10 @@
               {
                 "value": "applicationInsights",
                 "description": "Azure Application Insights as log destination."
+              },
+              {
+                "value": "azureMonitor",
+                "description": "Azure Monitor"
               }
             ]
           }