diff --git a/distribution/examples/oauth2/azure-ad-with-jwts/README.md b/distribution/examples/oauth2/azure-ad-with-jwts/README.md index c66d5d2f17..b135a39d15 100644 --- a/distribution/examples/oauth2/azure-ad-with-jwts/README.md +++ b/distribution/examples/oauth2/azure-ad-with-jwts/README.md @@ -4,7 +4,7 @@ This tutorial shows how to use Membrane API Gateway to validate Json Web Tokens Membrane API Gateway protects the Backend API. -![Overview](00-overview.png) +![Overview](./images/00-overview.png) 1. The client retrieves the token from Azure AD. 2. The JWT is issued by Azure AD and returned to the client @@ -12,7 +12,6 @@ Membrane API Gateway protects the Backend API. Membrane API Gateway exposes the Backend e.g. to the hostile internet. Only requests with a valid JWT are allowed to pass. - # Azure AD Setup Both the Client and the Backend are registered in Azure AD with an "App registration". Don't get confused. ;) @@ -27,7 +26,7 @@ Both the Client and the Backend are registered in Azure AD with an "App registra 5. Choose ``New registration``. 6. Enter a name (e.g. ``Demo Backend``) and click ``Register``. - ![Backend Registration](01-backend-registration.png) + ![Backend Registration](./images/01-backend-registration.png) 7. Next to *Application ID URI*, click on ``Add an Application ID URI``. 8. Next to *Application ID URI*, click on ``Set``. @@ -48,22 +47,22 @@ There are several possibilities of getting a valid token. For this demo, we use 1. Open https://aad.portal.azure.com/#view/Microsoft_AAD_IAM/ActiveDirectoryMenuBlade/~/RegisteredApps . 2. Choose ``New registration``. 3. Enter a name (e.g. ``Demo Client``) and click ``Register``. - ![Client Registration](03-client-registration.png) + ![Client Registration](./images/03-client-registration.png) 4. Take note of your ``Application (client) ID``. 5. Next to *Client credentials*, click on ``Add a certificate or secret``. 6. Click on ``New client secret``. - ![Creating a new client secret](04-client-secret-creation.png) + ![Creating a new client secret](https://www.membrane-api.io/security/azure-ad-jwt/04-client-secret-creation.png) 7. Enter ``Demo Secret`` as Description. 8. Click on ``Add``. 9. Take note of the ``Value``, also known as the ``client secret``. 10. Click on ``API permissions``. 11. Click on ``Add a permission``. - ![Adding a permission](05-client-permission-granting.png) + ![Adding a permission](./images/05-client-permission-granting.png) 13. Below ``My APIs``, choose ``Demo Backend``. - ![Adding a permission](06-client-permission-granting2.png) + ![Adding a permission](./images/06-client-permission-granting2.png) 14. Select the ``ReadWrite`` permission. - ![Adding a permission](07-client-permission-granting3.png) + ![Adding a permission](./images/07-client-permission-granting3.png) 15. Click on ``Add permission``. ### 2.b. Get a token diff --git a/distribution/examples/oauth2/azure-ad-with-jwts/images/00-overview.png b/distribution/examples/oauth2/azure-ad-with-jwts/images/00-overview.png new file mode 100644 index 0000000000..f03133cece Binary files /dev/null and b/distribution/examples/oauth2/azure-ad-with-jwts/images/00-overview.png differ diff --git a/distribution/examples/oauth2/azure-ad-with-jwts/images/01-backend-registration.png b/distribution/examples/oauth2/azure-ad-with-jwts/images/01-backend-registration.png new file mode 100644 index 0000000000..ef8c515d3d Binary files /dev/null and b/distribution/examples/oauth2/azure-ad-with-jwts/images/01-backend-registration.png differ diff --git a/distribution/examples/oauth2/azure-ad-with-jwts/images/03-client-registration.png b/distribution/examples/oauth2/azure-ad-with-jwts/images/03-client-registration.png new file mode 100644 index 0000000000..663ee2da5a Binary files /dev/null and b/distribution/examples/oauth2/azure-ad-with-jwts/images/03-client-registration.png differ diff --git a/distribution/examples/oauth2/azure-ad-with-jwts/images/04-client-secret-creation.png b/distribution/examples/oauth2/azure-ad-with-jwts/images/04-client-secret-creation.png new file mode 100644 index 0000000000..01f6d8bbd4 Binary files /dev/null and b/distribution/examples/oauth2/azure-ad-with-jwts/images/04-client-secret-creation.png differ diff --git a/distribution/examples/oauth2/azure-ad-with-jwts/images/05-client-permission-granting.png b/distribution/examples/oauth2/azure-ad-with-jwts/images/05-client-permission-granting.png new file mode 100644 index 0000000000..709b1dab21 Binary files /dev/null and b/distribution/examples/oauth2/azure-ad-with-jwts/images/05-client-permission-granting.png differ diff --git a/distribution/examples/oauth2/azure-ad-with-jwts/images/06-client-permission-granting2.png b/distribution/examples/oauth2/azure-ad-with-jwts/images/06-client-permission-granting2.png new file mode 100644 index 0000000000..866940b092 Binary files /dev/null and b/distribution/examples/oauth2/azure-ad-with-jwts/images/06-client-permission-granting2.png differ diff --git a/distribution/examples/oauth2/azure-ad-with-jwts/images/07-client-permission-granting3.png b/distribution/examples/oauth2/azure-ad-with-jwts/images/07-client-permission-granting3.png new file mode 100644 index 0000000000..b8db42dca8 Binary files /dev/null and b/distribution/examples/oauth2/azure-ad-with-jwts/images/07-client-permission-granting3.png differ diff --git a/pom.xml b/pom.xml index 4db379e1c7..2444eb3ef6 100644 --- a/pom.xml +++ b/pom.xml @@ -78,7 +78,7 @@ 17 17 2.17.1 - 6.1.9 + 6.1.10 2.0.13 2.23.1 5.10.0