Skip to content

Commit 05d1fdb

Browse files
committed
Fix #30915: re-enable GitHub social
1 parent a518fa8 commit 05d1fdb

2 files changed

Lines changed: 12 additions & 19 deletions

File tree

pom.xml

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -58,16 +58,10 @@
5858
<id>clojars</id>
5959
<url>https://clojars.org/repo/</url>
6060
</repository>
61-
<!-- <repository>-->
62-
<!-- &lt;!&ndash; Currently used only for the opensaml dependency &ndash;&gt;-->
63-
<!-- <id>shibboleth</id>-->
64-
<!-- <url>https://build.shibboleth.net/nexus/content/repositories/releases/</url>-->
65-
<!-- </repository>-->
66-
<!-- <repository>-->
67-
<!-- &lt;!&ndash; Currently used only for the spring-social-github 1.0.0.M4 dependency &ndash;&gt;-->
68-
<!-- <id>spring</id>-->
69-
<!-- <url>https://repo.spring.io/ui/plugins-release/</url>-->
70-
<!-- </repository>-->
61+
<repository>
62+
<id>oa-nexus-releases</id>
63+
<url>https://nexus.openanalytics.eu/repository/releases</url>
64+
</repository>
7165
</repositories>
7266

7367
<dependencies>
@@ -212,11 +206,11 @@
212206
<artifactId>spring-social-linkedin</artifactId>
213207
<version>1.0.2.RELEASE</version>
214208
</dependency>
215-
<!-- <dependency>-->
216-
<!-- <groupId>org.springframework.social</groupId>-->
217-
<!-- <artifactId>spring-social-github</artifactId>-->
218-
<!-- <version>1.0.0.M4</version>-->
219-
<!-- </dependency>-->
209+
<dependency>
210+
<groupId>org.springframework.social</groupId>
211+
<artifactId>spring-social-github</artifactId>
212+
<version>1.0.0.M4</version>
213+
</dependency>
220214
<dependency>
221215
<groupId>com.github.spring-social</groupId>
222216
<artifactId>spring-social-google</artifactId>

src/main/java/eu/openanalytics/containerproxy/security/SocialSecurityConfig.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,7 @@
5858
import org.springframework.social.connect.web.ProviderSignInController;
5959
import org.springframework.social.connect.web.SignInAdapter;
6060
import org.springframework.social.facebook.connect.FacebookConnectionFactory;
61-
//import org.springframework.social.github.connect.GitHubConnectionFactory;
62-
//import org.springframework.social.github.connect.GitHubConnectionFactory;
61+
import org.springframework.social.github.connect.GitHubConnectionFactory;
6362
import org.springframework.social.google.connect.GoogleConnectionFactory;
6463
import org.springframework.social.linkedin.connect.LinkedInConnectionFactory;
6564
import org.springframework.social.twitter.connect.TwitterConnectionFactory;
@@ -153,8 +152,8 @@ public ConnectionFactory<?> createConnectionFactory(String appId, String appSecr
153152
return factory;
154153
case linkedin:
155154
return new LinkedInConnectionFactory(appId, appSecret);
156-
//// case github:
157-
// return new GitHubConnectionFactory(appId, appSecret);
155+
case github:
156+
return new GitHubConnectionFactory(appId, appSecret);
158157
default:
159158
return null;
160159
}

0 commit comments

Comments
 (0)