libre.sh/keycloak-scim
3
0
Fork 0
Code Issues 15 Pull requests Releases Packages Activity Actions

Merge pull request #411 from stianst/master

Browse source 
Twitter fix and read keycloak-sever.json from standalone/configuration
This commit is contained in:
Stian Thorgersen 2014-05-21 09:35:49 +01:00
commit 64a36aee03
8 changed files with 38 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
distribution/appliance-dist/assembly.xml
View file

@ -38,6 +38,13 @@
<exclude>keycloak-ds.xml</exclude>
</excludes>
</fileSet>
<fileSet>
<directory>${project.build.directory}/unpacked/deployments/auth-server.war/WEB-INF/classes/META-INF</directory>
<outputDirectory>keycloak/standalone/configuration</outputDirectory>
<includes>
<include>keycloak-server.json</include>
</includes>
</fileSet>
<fileSet>
<directory>${project.build.directory}/unpacked/themes</directory>
<outputDirectory>keycloak/standalone/configuration/themes</outputDirectory>

7
distribution/war-zip/assembly.xml
View file

@ -19,5 +19,12 @@
</includes>
<outputDirectory>deployments</outputDirectory>
</fileSet>
<fileSet>
<directory>${project.build.directory}/unpacked/deployments/auth-server.war/WEB-INF/classes/META-INF</directory>
<outputDirectory>configuration</outputDirectory>
<includes>
<include>keycloak-server.json</include>
</includes>
</fileSet>
</fileSets>
</assembly>

2
docbook/reference/en/en-US/modules/social-twitter.xml
View file

@ -33,8 +33,6 @@
<para>
Twitter doesn't allow <literal>localhost</literal> in the redirect URI. To test on a local server
replace <literal>localhost</literal> with <literal>127.0.0.1</literal>.
Twitter also restricts connection to TLS/SSL connections only, so you are required to use HTTPS to access
Keycloak to enable log in with Twitter.
</para>
</tip>
</section>

4
forms/common-themes/src/main/resources/theme/login/patternfly/resources/css/login.css
View file

@ -186,6 +186,10 @@ ol#kc-totp-settings li:first-of-type {
width: 125px;
}
.zocial:hover {
color: #fff !important;
}
.zocial.facebook,
.zocial.github,
.zocial.google,

2
services/src/main/java/org/keycloak/services/DefaultProviderSessionFactory.java
View file

@ -33,7 +33,6 @@ public class DefaultProviderSessionFactory implements ProviderSessionFactory {
ProviderFactory factory = loadProviderFactory(spi, provider);
Config.Scope scope = Config.scope(spi.getName(), provider);
factory.init(scope);
log.debug("Initialized " + factory.getClass().getName() + " (config = " + scope + ")");
factories.put(factory.getId(), factory);
@ -42,7 +41,6 @@ public class DefaultProviderSessionFactory implements ProviderSessionFactory {
for (ProviderFactory factory : ServiceLoader.load(spi.getProviderFactoryClass())) {
Config.Scope scope = Config.scope(spi.getName(), factory.getId());
factory.init(scope);
log.debug("Initialized " + factory.getClass().getName() + " (config = " + scope + ")");
factories.put(factory.getId(), factory);
}

16
services/src/main/java/org/keycloak/services/resources/KeycloakApplication.java
View file

@ -108,7 +108,19 @@ public class KeycloakApplication extends Application {
protected void loadConfig() {
try {
URL config = Thread.currentThread().getContextClassLoader().getResource("META-INF/keycloak-server.json");
URL config = null;
String configDir = System.getProperty("jboss.server.config.dir");
if (configDir != null) {
File f = new File(configDir + File.separator + "keycloak-server.json");
if (f.isFile()) {
config = f.toURI().toURL();
}
}
if (config == null) {
config = Thread.currentThread().getContextClassLoader().getResource("META-INF/keycloak-server.json");
}
if (config != null) {
JsonNode node = new ObjectMapper().readTree(config);
@ -116,6 +128,8 @@ public class KeycloakApplication extends Application {
log.info("Loaded config from " + config);
return;
} else {
log.warn("Config 'keycloak-server.json' not found");
}
} catch (IOException e) {
throw new RuntimeException("Failed to load config", e);

8
services/src/main/java/org/keycloak/services/util/JsonConfigProvider.java
View file

@ -74,11 +74,11 @@ public class JsonConfigProvider implements Config.ConfigProvider {
if (n == null) {
return null;
} else if (n.isArray()) {
ArrayList<String> l = new ArrayList<String>();
for (JsonNode e : n) {
l.add(StringPropertyReplacer.replaceProperties(e.getTextValue()));
String[] a = new String[n.size()];
for (int i = 0; i < a.length; i++) {
a[i] = StringPropertyReplacer.replaceProperties(n.get(i).getTextValue());
}
return (String[]) l.toArray();
return a;
} else {
return new String[] { StringPropertyReplacer.replaceProperties(n.getTextValue()) };
}

5
social/twitter/src/main/java/org/keycloak/social/twitter/TwitterProvider.java
View file

@ -48,10 +48,7 @@ public class TwitterProvider implements SocialProvider {
Twitter twitter = new TwitterFactory().getInstance();
twitter.setOAuthConsumer(config.getKey(), config.getSecret());
String redirectUri = config.getCallbackUrl();
redirectUri = redirectUri.replace("//localhost", "//127.0.0.1");
RequestToken requestToken = twitter.getOAuthRequestToken(redirectUri);
RequestToken requestToken = twitter.getOAuthRequestToken(config.getCallbackUrl());
return AuthRequest.create(requestToken.getToken(), requestToken.getAuthenticationURL())
.setAttribute("token", requestToken.getToken()).setAttribute("tokenSecret", requestToken.getTokenSecret())