Merge branch 'main' into tannikaM-patch-1

FaithOmbongi · web-flow · commit 5222c673b3c2 · 2024-11-29T13:07:22.000+03:00
diff --git a/api-reference/beta/api/identitycontainer-post-identityproviders.md b/api-reference/beta/api/identitycontainer-post-identityproviders.md
@@ -91,15 +91,16 @@ All the properties listed in the following tables are required.
 ### oidcIdentityProvider object
 
 |Property|Type|Description|
-|:---------------|:--------|:----------|
-|displayName|String|The display name of the identity provider.|
+|:---|:---|:---|
+|clientAuthentication|[oidcClientAuthentication](../resources/oidcclientauthentication.md)|The client authentication settings.<li> Use the **oidcClientSecretAuthentication** derived complex type for setting up your identity provider with `client_secret_post` or `client_secret_jwt authentication` methods. <li> Use the **oidcPrivateJwtKeyClientAuthentication** type for setting up your identity provider with `private_key_jwt` authentication method. <br><br>Due to security reasons, `client_secret_basic` authentication method isn't supported.|
 |clientId|String|The client ID for the application obtained when registering the application with the identity provider.|
+|displayName|String|The display name of the identity provider. Inherited from [identityProviderBase](../resources/identityproviderbase.md).|
+|id|String|The identifier of the identity provider.Required. Inherited from [identityProviderBase](../resources/identityproviderbase.md). Inherits from [entity](../resources/entity.md)|
+|inboundClaimMapping|[oidcInboundClaimMappingOverride](../resources/oidcinboundclaimmappingoverride.md)|After the OIDC provider sends an ID token back to Microsoft Entra External ID, Microsoft Entra External ID needs to be able to map the claims from the received token to the claims that Microsoft Entra ID recognizes and uses. This complex type captures that mapping.|
 |issuer|String|The issuer URI. Issuer URI is a case-sensitive URL using https scheme contains scheme, host, and optionally, port number and path components and no query or fragment components.<br> **Note:** Configuring other Microsoft Entra tenants as an external identity provider is currently not supported. As a result, the `microsoftonline.com` domain in the issuer URI is not accepted.|
-|wellKnownEndpoint|String|The URL for the metadata document of the OpenID Connect identity provider. Every OpenID Connect identity provider describes a metadata document that contains most of the information required to perform sign-in. This includes information such as the URLs to use and the location of the service's public signing keys. The OpenID Connect metadata document is always located at an endpoint that ends in `.well-known/openid-configuration`.<br> **Note:** The metadata document should, at minimum, contain the following properties: `issuer`, `authorization_endpoint`, `token_endpoint`, `token_endpoint_auth_methods_supported`, `response_types_supported`, `subject_types_supported` and `jwks_uri`. Visit [OpenID Connect Discovery](https://openid.net/specs/openid-connect-discovery-1_0.html) specifications for more details.|
-|responseType|String|The response type describes the type of information sent back in the initial call to the authorization_endpoint of the custom identity provider. Possible values: <br>`code`: As per the authorization code flow, a code is returned back to Entra External ID. Entra External ID proceeds to call the token_endpoint to exchange the code for the token.<br>`id_token`:  An ID token is returned back to Entra External ID from the custom identity provider. (This value is not supported at the moment).<br>`token`: An access token is returned back to Entra External ID from the custom identity provider. (This value is not supported at the moment).|
+|responseType|oidcResponseType|The response type describes the type of information sent back in the initial call to the authorization_endpoint of the custom identity provider. Possible values: <li>`code`: As per the authorization code flow, a code is returned back to Entra External ID. Entra External ID proceeds to call the token_endpoint to exchange the code for the token.<li>`id_token`:  An ID token is returned back to Entra External ID from the custom identity provider. (This value is not supported at the moment).<li>`token`: An access token is returned back to Entra External ID from the custom identity provider. This value is currently unsupported.|
 |scope|String|Scope defines the information and permissions you are looking to gather from your custom identity provider.|
-|clientAuthentication|[clientAuthentication](../resources/oidcclientauthentication.md)|The client authentication settings.<br> use **`oidcClientSecretAuthentication`** type for setting up your identity provider with `client_secret_post` or `client_secret_jwt authentication` methods. <br> use **`oidcPrivateJwtKeyClientAuthentication`** type for setting up your identity provider with `private_key_jwt` authentication method. <br>Due to security reasons, `client_secret_basic` authentication method is not supported.|
-|inboundclaimMapping|[inboundclaimMapping](../resources/oidcinboundclaimmappingoverride.md)|After the OIDC provider sends an ID token back to Microsoft Entra External ID, Microsoft Entra External ID needs to be able to map the claims from the received token to the claims that Microsoft Entra ID recognizes and uses. This complex type captures that mapping.|
+|wellKnownEndpoint|String|The URL for the metadata document of the OpenID Connect identity provider. Every OpenID Connect identity provider describes a metadata document that contains most of the information required to perform sign-in. This includes information such as the URLs to use and the location of the service's public signing keys. The OpenID Connect metadata document is always located at an endpoint that ends in `.well-known/openid-configuration`.<br> **Note:** The metadata document should, at minimum, contain the following properties: `issuer`, `authorization_endpoint`, `token_endpoint`, `token_endpoint_auth_methods_supported`, `response_types_supported`, `subject_types_supported` and `jwks_uri`. Visit [OpenID Connect Discovery](https://openid.net/specs/openid-connect-discovery-1_0.html) specifications for more details.|
 
 ## Response
 
diff --git a/api-reference/beta/api/identityproviderbase-get.md b/api-reference/beta/api/identityproviderbase-get.md
@@ -374,22 +374,20 @@ Content-type: application/json
 }
 ```
 
-### Example 5: Retrieve an **OpenID Connect identity provider** (external tenant)
+### Example 5: Retrieve an **OIDC identity provider** (External tenant)
 
 #### Request
 
 The following example shows a request.
 
 <!-- {
   "blockType": "request",
-  "name": "get_applemanagedidentityprovider_from_identityproviderbase",
-  "sampleKeys": ["Apple-Managed-OIDC"]
-}
+  "name": "get_oidcidentityprovider_from_identityproviderbase",
+}    
 -->
-
 ``` http
 GET https://graph.microsoft.com/beta/identity/identityProviders/12345678-abcd-1234-cdef-aaaaaaaaaaaa
----
+```
 
 #### Response
 
diff --git a/api-reference/beta/resources/socialidentityprovider.md b/api-reference/beta/resources/socialidentityprovider.md
@@ -27,7 +27,7 @@ Inherits from [identityProviderBase](../resources/identityproviderbase.md).
 
 ## Methods
 
-None. 
+None.
 
 For the list of API operations for managing social identity providers, see the [identityProviderBase](../resources/identityproviderbase.md) resource type.
 
