From e173bf33baa327e5292ae93efc8bd115dc30c222 Mon Sep 17 00:00:00 2001 From: w9n Date: Fri, 25 Aug 2017 08:16:01 +0200 Subject: [PATCH] auth is already part of the serverBaseUri (#4418) --- .../DockerRegistryConfigFileInstallationProvider.java | 4 ++-- .../DockerVariableOverrideInstallationProvider.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/services/src/main/java/org/keycloak/protocol/docker/installation/DockerRegistryConfigFileInstallationProvider.java b/services/src/main/java/org/keycloak/protocol/docker/installation/DockerRegistryConfigFileInstallationProvider.java index ba4440a21c..e84b4d4750 100644 --- a/services/src/main/java/org/keycloak/protocol/docker/installation/DockerRegistryConfigFileInstallationProvider.java +++ b/services/src/main/java/org/keycloak/protocol/docker/installation/DockerRegistryConfigFileInstallationProvider.java @@ -43,9 +43,9 @@ public class DockerRegistryConfigFileInstallationProvider implements ClientInsta public Response generateInstallation(final KeycloakSession session, final RealmModel realm, final ClientModel client, final URI serverBaseUri) { final StringBuilder responseString = new StringBuilder("auth:\n") .append(" token:\n") - .append(" realm: ").append(serverBaseUri).append("/auth/realms/").append(realm.getName()).append("/protocol/").append(DockerAuthV2Protocol.LOGIN_PROTOCOL).append("/auth\n") + .append(" realm: ").append(serverBaseUri).append("/realms/").append(realm.getName()).append("/protocol/").append(DockerAuthV2Protocol.LOGIN_PROTOCOL).append("/auth\n") .append(" service: ").append(client.getClientId()).append("\n") - .append(" issuer: ").append(serverBaseUri).append("/auth/realms/").append(realm.getName()).append("\n"); + .append(" issuer: ").append(serverBaseUri).append("/realms/").append(realm.getName()).append("\n"); return Response.ok(responseString.toString(), MediaType.TEXT_PLAIN_TYPE).build(); } diff --git a/services/src/main/java/org/keycloak/protocol/docker/installation/DockerVariableOverrideInstallationProvider.java b/services/src/main/java/org/keycloak/protocol/docker/installation/DockerVariableOverrideInstallationProvider.java index 055d9ac043..967879310b 100644 --- a/services/src/main/java/org/keycloak/protocol/docker/installation/DockerVariableOverrideInstallationProvider.java +++ b/services/src/main/java/org/keycloak/protocol/docker/installation/DockerVariableOverrideInstallationProvider.java @@ -43,9 +43,9 @@ public class DockerVariableOverrideInstallationProvider implements ClientInstall @Override public Response generateInstallation(final KeycloakSession session, final RealmModel realm, final ClientModel client, final URI serverBaseUri) { final StringBuilder builder = new StringBuilder() - .append("-e REGISTRY_AUTH_TOKEN_REALM=").append(serverBaseUri).append("/auth/realms/").append(realm.getName()).append("/protocol/").append(DockerAuthV2Protocol.LOGIN_PROTOCOL).append("/auth \\\n") + .append("-e REGISTRY_AUTH_TOKEN_REALM=").append(serverBaseUri).append("/realms/").append(realm.getName()).append("/protocol/").append(DockerAuthV2Protocol.LOGIN_PROTOCOL).append("/auth \\\n") .append("-e REGISTRY_AUTH_TOKEN_SERVICE=").append(client.getClientId()).append(" \\\n") - .append("-e REGISTRY_AUTH_TOKEN_ISSUER=").append(serverBaseUri).append("/auth/realms/").append(realm.getName()).append(" \\\n"); + .append("-e REGISTRY_AUTH_TOKEN_ISSUER=").append(serverBaseUri).append("/realms/").append(realm.getName()).append(" \\\n"); return Response.ok(builder.toString(), MediaType.TEXT_PLAIN_TYPE).build(); }