Browse Source

Update to Keycloak 22.0.1

pull/58/head
Ike Johnson-Woods 2 years ago
parent
commit
f41b7b047a
  1. 10
      pom.xml
  2. 2
      src/main/java/org/keycloak/social/discord/DiscordIdentityProvider.java
  3. 25
      src/main/java/org/keycloak/social/discord/DiscordIdentityProviderFactory.java

10
pom.xml

@ -7,11 +7,11 @@
<groupId>org.keycloak.extensions</groupId> <groupId>org.keycloak.extensions</groupId>
<artifactId>keycloak-discord</artifactId> <artifactId>keycloak-discord</artifactId>
<version>0.4.2-SNAPSHOT</version>
<version>0.5.1-SNAPSHOT</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<properties> <properties>
<version.keycloak>20.0.0</version.keycloak>
<version.keycloak>22.0.1</version.keycloak>
</properties> </properties>
<dependencies> <dependencies>
@ -46,10 +46,10 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<version>2.3.2</version>
<version>3.11.0</version>
<configuration> <configuration>
<source>1.8</source>
<target>1.8</target>
<source>17</source>
<target>17</target>
</configuration> </configuration>
</plugin> </plugin>
</plugins> </plugins>

2
src/main/java/org/keycloak/social/discord/DiscordIdentityProvider.java

@ -33,7 +33,7 @@ import org.keycloak.models.KeycloakSession;
import org.keycloak.services.ErrorPageException; import org.keycloak.services.ErrorPageException;
import org.keycloak.services.messages.Messages; import org.keycloak.services.messages.Messages;
import javax.ws.rs.core.Response;
import jakarta.ws.rs.core.Response;
import java.util.HashMap; import java.util.HashMap;
import java.util.HashSet; import java.util.HashSet;
import java.util.Map; import java.util.Map;

25
src/main/java/org/keycloak/social/discord/DiscordIdentityProviderFactory.java

@ -1,3 +1,4 @@
/* /*
* Copyright 2018 Red Hat, Inc. and/or its affiliates * Copyright 2018 Red Hat, Inc. and/or its affiliates
* and other contributors as indicated by the @author tags. * and other contributors as indicated by the @author tags.
@ -17,11 +18,14 @@
package org.keycloak.social.discord; package org.keycloak.social.discord;
import org.keycloak.broker.oidc.OAuth2IdentityProviderConfig;
import org.keycloak.broker.provider.AbstractIdentityProviderFactory; import org.keycloak.broker.provider.AbstractIdentityProviderFactory;
import org.keycloak.broker.social.SocialIdentityProviderFactory; import org.keycloak.broker.social.SocialIdentityProviderFactory;
import org.keycloak.models.IdentityProviderModel; import org.keycloak.models.IdentityProviderModel;
import org.keycloak.models.KeycloakSession; import org.keycloak.models.KeycloakSession;
import org.keycloak.provider.ProviderConfigProperty;
import org.keycloak.provider.ProviderConfigurationBuilder;
import java.util.List;
/** /**
* @author <a href="mailto:wadahiro@gmail.com">Hiroyuki Wada</a> * @author <a href="mailto:wadahiro@gmail.com">Hiroyuki Wada</a>
@ -46,6 +50,25 @@ public class DiscordIdentityProviderFactory extends AbstractIdentityProviderFact
return new DiscordIdentityProviderConfig(); 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()
// .create()
.property()
.name("mappedRoles")
.type(ProviderConfigProperty.STRING_TYPE)
.label("Discord Roles mapping")
.helpText("Map Discord roles to Keycloak groups. The expected format is '<guild_id>:<role_id>:<group_name>'. Use a comma as a separator for multiple mappings.")
.add()
.build();
}
@Override @Override
public String getId() { public String getId() {
return PROVIDER_ID; return PROVIDER_ID;

Loading…
Cancel
Save