Skip to content

Commit

Permalink
feat: update to keycloak 22.0.1 (Support new admin console)
Browse files Browse the repository at this point in the history
  • Loading branch information
wadahiro committed Aug 11, 2023
1 parent 15c27a9 commit 4edd73f
Show file tree
Hide file tree
Showing 8 changed files with 34 additions and 177 deletions.
8 changes: 4 additions & 4 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<packaging>jar</packaging>

<properties>
<version.keycloak>17.0.0</version.keycloak>
<version.keycloak>22.0.1</version.keycloak>
</properties>

<dependencies>
Expand Down Expand Up @@ -46,10 +46,10 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>2.3.2</version>
<version>3.11.0</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
<source>17</source>
<target>17</target>
</configuration>
</plugin>
</plugins>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
package org.keycloak.social.discord;

import com.fasterxml.jackson.databind.JsonNode;
import jakarta.ws.rs.core.Response;
import org.jboss.logging.Logger;
import org.keycloak.broker.oidc.AbstractOAuth2IdentityProvider;
import org.keycloak.broker.oidc.mappers.AbstractJsonUserAttributeMapper;
Expand All @@ -30,7 +31,6 @@
import org.keycloak.services.ErrorPageException;
import org.keycloak.services.messages.Messages;

import javax.ws.rs.core.Response;
import java.util.Set;

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@

package org.keycloak.social.discord;

import org.keycloak.broker.oidc.OAuth2IdentityProviderConfig;
import org.keycloak.models.IdentityProviderModel;

import java.util.Arrays;
import java.util.Collections;
import java.util.Set;
import java.util.stream.Collectors;

import org.keycloak.broker.oidc.OAuth2IdentityProviderConfig;
import org.keycloak.models.IdentityProviderModel;

/**
* @author <a href="mailto:[email protected]">Hiroyuki Wada</a>
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,14 @@

package org.keycloak.social.discord;

import org.keycloak.broker.oidc.OAuth2IdentityProviderConfig;
import org.keycloak.broker.provider.AbstractIdentityProviderFactory;
import org.keycloak.broker.social.SocialIdentityProviderFactory;
import org.keycloak.models.IdentityProviderModel;
import org.keycloak.models.KeycloakSession;
import org.keycloak.provider.ProviderConfigProperty;
import org.keycloak.provider.ProviderConfigurationBuilder;

import java.util.List;

/**
* @author <a href="mailto:[email protected]">Hiroyuki Wada</a>
Expand All @@ -46,6 +49,18 @@ public DiscordIdentityProviderConfig createConfig() {
return new DiscordIdentityProviderConfig();
}

@Override
public List<ProviderConfigProperty> getConfigProperties() {
return ProviderConfigurationBuilder.create()
.property()
.name("allowedGuilds")
.type(ProviderConfigProperty.STRING_TYPE)
.label("Guild Id(s) to allow federation")
.helpText("If you want to allow federation for specific guild, enter the guild id. Please use a comma as a separator for multiple guilds.")
.add()
.build();
}

@Override
public String getId() {
return PROVIDER_ID;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,21 +21,21 @@

/**
* User attribute mapper.
*
*
* @author dannyAAM
*/
public class DiscordUserAttributeMapper extends AbstractJsonUserAttributeMapper {

private static final String[] cp = new String[] { DiscordIdentityProviderFactory.PROVIDER_ID };
private static final String[] cp = new String[]{DiscordIdentityProviderFactory.PROVIDER_ID};

@Override
public String[] getCompatibleProviders() {
return cp;
}
@Override
public String[] getCompatibleProviders() {
return cp;
}

@Override
public String getId() {
return "discord-user-attribute-mapper";
}
@Override
public String getId() {
return "discord-user-attribute-mapper";
}

}

This file was deleted.

This file was deleted.

This file was deleted.

0 comments on commit 4edd73f

Please sign in to comment.