feat: add admin url variable to separate authn and admin api urls #1129
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…on and admin api calls to the correct URL Signed-off-by: frpicard <[email protected]>
sschu
requested changes
Jun 19, 2025
| @@ -79,6 +79,7 @@ The following arguments are supported: | |||
|
|
|||
| - `client_id` - (Required) The `client_id` for the client that was created in the "Keycloak Setup" section. Use the `admin-cli` client if you are using the password grant. Defaults to the environment variable `KEYCLOAK_CLIENT_ID`. | |||
| - `url` - (Required) The URL of the Keycloak instance, before `/auth/admin`. Defaults to the environment variable `KEYCLOAK_URL`. | |||
| - `admin_url` - (Optional) The admin URL of the Keycloak instance if different from the main URL, before `/auth/admin`. Defaults to the environment variable `KEYCLOAK_ADMIN_URL`. | |||
There was a problem hiding this comment.
Suggested change
| - `admin_url` - (Optional) The admin URL of the Keycloak instance if different from the main URL, before `/auth/admin`. Defaults to the environment variable `KEYCLOAK_ADMIN_URL`. | |
| - `admin_url` - (Optional) The admin URL of the Keycloak instance if different from the base URL, before `/auth/admin`. Defaults to the environment variable `KEYCLOAK_ADMIN_URL`. |
Comment on lines
+87
to
+90
| baseUrl := url + basePath | ||
| if adminUrl != "" { | ||
| baseUrl = adminUrl + basePath | ||
| } |
There was a problem hiding this comment.
Suggested change
| baseUrl := url + basePath | |
| if adminUrl != "" { | |
| baseUrl = adminUrl + basePath | |
| } | |
| authUrl := url + basePath | |
| baseUrl := authUrl | |
| if adminUrl != "" { | |
| baseUrl = adminUrl + basePath | |
| } |
| @@ -26,6 +26,7 @@ import ( | |||
|
|
|||
| type KeycloakClient struct { | |||
| baseUrl string | |||
| authnUrl string | |||
There was a problem hiding this comment.
Suggested change
| authnUrl string | |
| authUrl string |
Comment on lines
+92
to
+93
| baseUrl: baseUrl, | ||
| authnUrl: url + basePath, |
There was a problem hiding this comment.
Suggested change
| baseUrl: baseUrl, | |
| authnUrl: url + basePath, | |
| baseUrl: baseUrl, | |
| authUrl: authUrl, |
| @@ -112,7 +117,7 @@ func NewKeycloakClient(ctx context.Context, url, basePath, clientId, clientSecre | |||
| } | |||
|
|
|||
| func (keycloakClient *KeycloakClient) login(ctx context.Context) error { | |||
| accessTokenUrl := fmt.Sprintf(tokenUrl, keycloakClient.baseUrl, keycloakClient.realm) | |||
| accessTokenUrl := fmt.Sprintf(tokenUrl, keycloakClient.authnUrl, keycloakClient.realm) | |||
There was a problem hiding this comment.
Suggested change
| accessTokenUrl := fmt.Sprintf(tokenUrl, keycloakClient.authnUrl, keycloakClient.realm) | |
| accessTokenUrl := fmt.Sprintf(tokenUrl, keycloakClient.authUrl, keycloakClient.realm) |
| @@ -203,7 +208,7 @@ func (keycloakClient *KeycloakClient) login(ctx context.Context) error { | |||
| } | |||
|
|
|||
| func (keycloakClient *KeycloakClient) Refresh(ctx context.Context) error { | |||
| refreshTokenUrl := fmt.Sprintf(tokenUrl, keycloakClient.baseUrl, keycloakClient.realm) | |||
| refreshTokenUrl := fmt.Sprintf(tokenUrl, keycloakClient.authnUrl, keycloakClient.realm) | |||
There was a problem hiding this comment.
Suggested change
| refreshTokenUrl := fmt.Sprintf(tokenUrl, keycloakClient.authnUrl, keycloakClient.realm) | |
| refreshTokenUrl := fmt.Sprintf(tokenUrl, keycloakClient.authUrl, keycloakClient.realm) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.