From de95c0db8b27315e808e3a778377c1c8270b6a7a Mon Sep 17 00:00:00 2001 From: Laurent Mazuel Date: Thu, 21 Sep 2017 15:10:45 -0700 Subject: [PATCH] Fix #1282 - missing fields in GraphRbac (#1716) --- .../graphrbac/data-plane/1.6/graphrbac.json | 109 ++++++++++++++---- 1 file changed, 84 insertions(+), 25 deletions(-) diff --git a/specification/graphrbac/data-plane/1.6/graphrbac.json b/specification/graphrbac/data-plane/1.6/graphrbac.json index 71b3c6f7bad..3a31c195d55 100644 --- a/specification/graphrbac/data-plane/1.6/graphrbac.json +++ b/specification/graphrbac/data-plane/1.6/graphrbac.json @@ -2400,7 +2400,44 @@ ], "description": "The password profile associated with a user." }, + "UserBase": { + "properties": { + "immutableId": { + "type": "string", + "description": "This must be specified if you are using a federated domain for the user's userPrincipalName (UPN) property when creating a new user account. It is used to associate an on-premises Active Directory user account with their Azure AD user object." + }, + "usageLocation": { + "type": "string", + "description": "A two letter country code (ISO standard 3166). Required for users that will be assigned licenses due to legal requirement to check for availability of services in countries. Examples include: \"US\", \"JP\", and \"GB\"." + }, + "givenName": { + "type": "string", + "description": "The given name for the user." + }, + "surname": { + "type": "string", + "description": "The user's surname (family name or last name)." + }, + "userType": { + "type": "string", + "description": "A string value that can be used to classify user types in your directory, such as 'Member' and 'Guest'.", + "enum": [ + "Member", + "Guest" + ], + "x-ms-enum": { + "name": "UserType", + "modelAsString": true + } + } + } + }, "UserCreateParameters": { + "allOf": [ + { + "$ref": "#/definitions/UserBase" + } + ], "properties": { "accountEnabled": { "type": "boolean", @@ -2422,13 +2459,9 @@ "type": "string", "description": "The mail alias for the user." }, - "immutableId": { - "type": "string", - "description": "This must be specified if you are using a federated domain for the user's userPrincipalName (UPN) property when creating a new user account. It is used to associate an on-premises Active Directory user account with their Azure AD user object." - }, - "usageLocation": { + "mail": { "type": "string", - "description": "A two letter country code (ISO standard 3166). Required for users that will be assigned licenses due to legal requirement to check for availability of services in countries. Examples include: \"US\", \"JP\", and \"GB\"." + "description": "The primary email address of the user." } }, "required": [ @@ -2441,6 +2474,11 @@ "description": "Request parameters for creating a new work or school account user." }, "UserUpdateParameters": { + "allOf": [ + { + "$ref": "#/definitions/UserBase" + } + ], "properties": { "accountEnabled": { "type": "boolean", @@ -2454,54 +2492,75 @@ "$ref": "#/definitions/PasswordProfile", "description": "The password profile of the user." }, - "mailNickname": { + "userPrincipalName": { "type": "string", - "description": "The mail alias for the user." + "description": "The user principal name (someuser@contoso.com). It must contain one of the verified domains for the tenant." }, - "usageLocation": { + "mailNickname": { "type": "string", - "description": "A two letter country code (ISO standard 3166). Required for users that will be assigned licenses due to legal requirement to check for availability of services in countries. Examples include: \"US\", \"JP\", and \"GB\"." + "description": "The mail alias for the user." } }, "description": "Request parameters for updating an existing work or school account user." }, "User": { + "allOf": [ + { + "$ref": "#/definitions/UserBase" + } + ], "properties": { - "objectId": { - "type": "string", - "description": "The object ID." + "accountEnabled": { + "type": "boolean", + "description": "Whether the account is enabled." }, - "objectType": { + "displayName": { "type": "string", - "description": "The object type." + "description": "The display name of the user." }, "userPrincipalName": { "type": "string", "description": "The principal name of the user." }, - "displayName": { - "type": "string", - "description": "The display name of the user." - }, - "signInName": { + "mailNickname": { "type": "string", - "description": "The sign-in name of the user." + "description": "The mail alias for the user." }, "mail": { "type": "string", "description": "The primary email address of the user." }, - "mailNickname": { + "objectId": { "type": "string", - "description": "The mail alias for the user." + "description": "The object ID." }, - "usageLocation": { + "objectType": { "type": "string", - "description": "A two letter country code (ISO standard 3166). Required for users that will be assigned licenses due to legal requirement to check for availability of services in countries. Examples include: \"US\", \"JP\", and \"GB\"." + "description": "The object type." + }, + "signInNames": { + "type": "array", + "items": { + "$ref": "#/definitions/SignInName" + }, + "description": "The sign-in names of the user." } }, "description": "Active Directory user information." }, + "SignInName": { + "properties": { + "type": { + "type": "string", + "description": "A string value that can be used to classify user sign-in types in your directory, such as 'emailAddress' or 'userName'." + }, + "value": { + "type": "string", + "description": "The sign-in used by the local account. Must be unique across the company/tenant. For example, 'johnc@example.com'." + } + }, + "description": "Contains information about a sign-in name of a local account user in an Azure Active Directory B2C tenant." + }, "UserGetMemberGroupsParameters": { "properties": { "securityEnabledOnly": {