Merge branch '6.x' into 7.x

Author: Davidmattei

src/elasticms-web/security.md

@@ -136,21 +136,33 @@ These clients are just an implementation of
 
 ### Keycloak
 
-| Name                              | Description                      |
-| --------------------------------- | -------------------------------- |
-| EMSCH_OAUTH2                      | bool for enabling OAUTH2         |
-| EMSCH_OAUTH2_AUTH_SERVER          | Keycloak server url              |
-| EMSCH_OAUTH2_REALM                | Keycloak REALM                   |
-| EMSCH_OAUTH2_CLIENT_ID            | Keycloak client id               |
-| EMSCH_OAUTH2_CLIENT_SECRET        | Keycloak client secret           |
-| EMSCH_OAUTH2_REDIRECT_URI         | <https://mywebsite/callback-url> |
-| EMSCH_OAUTH2_VERSION              | Optional: keycloak version       |
-| EMSCH_OAUTH2_ENCRYPTION_ALGORITHM | Optional: RS256,ES256,...        |
-| EMSCH_OAUTH2_ENCRYPTION_KEY       | Optional: base64 encode          |
+| Name                              | Description                        |
+| --------------------------------- | ---------------------------------- |
+| EMSCH_OAUTH2                      | bool for enabling OAUTH2           |
+| EMSCH_OAUTH2_AUTH_SERVER          | Keycloak server url                |
+| EMSCH_OAUTH2_REALM                | Keycloak REALM                     |
+| EMSCH_OAUTH2_CLIENT_ID            | Keycloak client id                 |
+| EMSCH_OAUTH2_CLIENT_SECRET        | Keycloak client secret             |
+| EMSCH_OAUTH2_REDIRECT_URI         | <https://mywebsite/oauth2/connect> |
+| EMSCH_OAUTH2_VERSION              | Optional: keycloak version         |
+| EMSCH_OAUTH2_ENCRYPTION_ALGORITHM | Optional: RS256,ES256,...          |
+| EMSCH_OAUTH2_ENCRYPTION_KEY       | Optional: base64 encode            |
 
 > For encryption see
 > [Identity provider (IDP) (Keycloak)](http://localhost:3000/#/getting-started/dev-env?id=identity-provider-idp-keycloak)
 
+### Ping Identity
+
+| Name                       | Description                            |
+| -------------------------- | -------------------------------------- |
+| EMSCH_OAUTH2               | bool for enabling OAUTH2               |
+| EMSCH_OAUTH2_PROVIDER      | 'ping_identity' (default = 'keycloak') |
+| EMSCH_OAUTH2_ISSUER        | ping identity issuer url               |
+| EMSCH_OAUTH2_CLIENT_ID     | client id                              |
+| EMSCH_OAUTH2_CLIENT_SECRET | client secret                          |
+| EMSCH_OAUTH2_REDIRECT_URI  | <https://mywebsite/oauth2/connect>     |
+| EMSCH_OAUTH2_SCOPES        | default openid profile email           |
+
 ### Azure
 
 | Name                       | Description                                           |
@@ -160,7 +172,7 @@ These clients are just an implementation of
 | EMSCH_OAUTH2_REALM         | Tenant id                                             |
 | EMSCH_OAUTH2_CLIENT_ID     | Client id                                             |
 | EMSCH_OAUTH2_CLIENT_SECRET | Client secret value                                   |
-| EMSCH_OAUTH2_REDIRECT_URI  | <https://mywebsite/callback-url>                      |
+| EMSCH_OAUTH2_REDIRECT_URI  | <https://mywebsite/oauth2/connect>                    |
 | EMSCH_OAUTH2_VERSION       | Default value = 2.0                                   |
 | EMSCH_OAUTH2_SCOPES        | Default value = ["openid","profile","offline_access"] |
 

src/upgrade.md

@@ -29,21 +29,26 @@ outline: [2, 2]
 
 ### Removed deprecations
 
-- The `EMS\ClientHelperBundle\Controller\AssetController` has been removed: was only containing 3 proxy methods by
-  calling removed emsUnzip functionality. Should be replace by `EMS\CommonBundle\Controller\FileController`.
+- The `EMS\ClientHelperBundle\Controller\AssetController` has been removed: was only containing 3
+  proxy methods by calling removed emsUnzip functionality. Should be replace by
+  `EMS\CommonBundle\Controller\FileController`.
 - The route `ems_core_asset_proxy` route has been removed.
-- Removed `EMS_WEBALIZE_DASHABLE_REGEX` and `EMS_WEBALIZE_REMOVABLE_REGEX` environment variables: was used for
-  `ems_webalize` which has been removed for `ems_slug`.
-- Support for `%locale%` in skeleton routes and search configuration has been removed. Please use `%_locale%` instead.
+- Removed `EMS_WEBALIZE_DASHABLE_REGEX` and `EMS_WEBALIZE_REMOVABLE_REGEX` environment variables:
+  was used for `ems_webalize` which has been removed for `ems_slug`.
+- Support for `%locale%` in skeleton routes and search configuration has been removed. Please use
+  `%_locale%` instead.
 - Web search config removed `facets` config, use filter(s) instead.
 - Web search config `sizes` and `sorts` options only accepts predefined values.
 - Web search config `nested_path` option removed, use `parent_field`.
 - Admin media library `nested_path` option removed, use `parent_field`.
 - Common coreApi remove methods: hashFile, initUpload, addChunk. Use the file endpoint instead.
 - Common remove `_type` fallback for EMSLink and document, use `_contenttype`.
-- Remove `EMS\\CommonBundle\\Controller\\FileController::download` use the ems_asset twig filter to generate the route.
-- Remove `EMS\\CommonBundle\\Controller\\FileController::view` use the ems_asset twig filter to generate the route.
-- Remove form field `SendConfirmation`, use numberType or HiddenType with VerificationCode validator.
+- Remove `EMS\\CommonBundle\\Controller\\FileController::download` use the ems_asset twig filter to
+  generate the route.
+- Remove `EMS\\CommonBundle\\Controller\\FileController::view` use the ems_asset twig filter to
+  generate the route.
+- Remove form field `SendConfirmation`, use numberType or HiddenType with VerificationCode
+  validator.
 
 #### Twig