From 2d1a131d6bc24477750e780c70ad4384e6e5927d Mon Sep 17 00:00:00 2001
From: yugangw-msft <yugangw@microsoft.com>
Date: Mon, 19 Nov 2018 17:26:56 -0800
Subject: [PATCH 1/3] add customKeyIdentifier to password credential

---
 specification/graphrbac/data-plane/stable/1.6/graphrbac.json | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/specification/graphrbac/data-plane/stable/1.6/graphrbac.json b/specification/graphrbac/data-plane/stable/1.6/graphrbac.json
index eaedd961a2bf..9ac927bb9567 100644
--- a/specification/graphrbac/data-plane/stable/1.6/graphrbac.json
+++ b/specification/graphrbac/data-plane/stable/1.6/graphrbac.json
@@ -2494,6 +2494,11 @@
         "value": {
           "type": "string",
           "description": "Key value."
+        },
+        "customKeyIdentifier": {
+          "type": "string",
+          "format": "byte",
+          "description": "Custom Key Identifier"
         }
       },
       "additionalProperties": {

From 1c42b12d70502f95d2f42f1d421ce53f425e7ef6 Mon Sep 17 00:00:00 2001
From: Yugang Wang <yugangw@microsoft.com>
Date: Sat, 24 Nov 2018 18:54:48 -0800
Subject: [PATCH 2/3] add creds in app object

---
 .../data-plane/stable/1.6/graphrbac.json       | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/specification/graphrbac/data-plane/stable/1.6/graphrbac.json b/specification/graphrbac/data-plane/stable/1.6/graphrbac.json
index 9ac927bb9567..93e7929ecde5 100644
--- a/specification/graphrbac/data-plane/stable/1.6/graphrbac.json
+++ b/specification/graphrbac/data-plane/stable/1.6/graphrbac.json
@@ -2740,16 +2740,30 @@
           "type": "string",
           "description": "The home page of the application."
         },
-        "oauth2AllowImplicitFlow" : {
+        "oauth2AllowImplicitFlow": {
           "type": "boolean",
           "description": "Whether to allow implicit grant flow for OAuth2"
         },
-        "requiredResourceAccess" : {
+        "requiredResourceAccess": {
           "type": "array",
           "items": {
             "$ref": "#/definitions/RequiredResourceAccess"
           },
           "description": "Specifies resources that this application requires access to and the set of OAuth permission scopes and application roles that it needs under each of those resources. This pre-configuration of required resource access drives the consent experience."
+        },
+        "keyCredentials": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/KeyCredential"
+          },
+          "description": "A collection of KeyCredential objects."
+        },
+        "passwordCredentials": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/PasswordCredential"
+          },
+          "description": "A collection of PasswordCredential objects"
         }
       },
       "description": "Active Directory application information."

From 74a0ba38241f5574f515beb159638e286b44bd6f Mon Sep 17 00:00:00 2001
From: Yugang Wang <yugangw@microsoft.com>
Date: Sun, 25 Nov 2018 13:52:27 -0800
Subject: [PATCH 3/3] custom id(thumbprint) for cert creds should be string
 type

---
 specification/graphrbac/data-plane/stable/1.6/graphrbac.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/specification/graphrbac/data-plane/stable/1.6/graphrbac.json b/specification/graphrbac/data-plane/stable/1.6/graphrbac.json
index 93e7929ecde5..e679678e640f 100644
--- a/specification/graphrbac/data-plane/stable/1.6/graphrbac.json
+++ b/specification/graphrbac/data-plane/stable/1.6/graphrbac.json
@@ -2465,7 +2465,6 @@
         },
         "customKeyIdentifier": {
           "type":"string",
-          "format": "byte",
           "description": "Custom Key Identifier"
         }
       },