Skip to content

Commit

Permalink
Merge pull request #93 from keshavprasadms/kc-7.0.1
Browse files Browse the repository at this point in the history 
feat: TG-797 Keycloak 7 upgrade
  • Loading branch information
AMIT KUMAR authored Mar 5, 2021
2 parents a54bd6a + 9ba4467 commit 67e685a
Show file tree
Hide file tree
Showing 19 changed files with 87 additions and 186 deletions.
3 changes: 3 additions & 0 deletions .idea/.gitignore
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions .idea/modules.xml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions .idea/sunbird-auth.iml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/vcs.xml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

29 changes: 0 additions & 29 deletions keycloak/scripts/pipelines/keycloak-build/Jenkinsfile.dev
View file

This file was deleted.

29 changes: 0 additions & 29 deletions keycloak/scripts/pipelines/keycloak-build/JenkinsfileConfig.dev
View file

This file was deleted.

27 changes: 0 additions & 27 deletions keycloak/scripts/pipelines/keycloak-build/deploy.sh
View file

This file was deleted.

1 change: 0 additions & 1 deletion keycloak/scripts/pipelines/keycloak-build/installDeps.sh
View file

This file was deleted.

6 changes: 3 additions & 3 deletions keycloak/scripts/pipelines/sunbird-auth-build/Jenkinsfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,13 @@ node('build-slave') {
stage('Build') {
sh """
mkdir sunbird_auth_1.0v
wget https://sunbirdpublic.blob.core.windows.net/installation/keycloak-3.2.0.Final.tar.gz
tar -xvf keycloak-3.2.0.Final.tar.gz --strip 1 -C sunbird_auth_1.0v
wget -q https://downloads.jboss.org/keycloak/7.0.1/keycloak-7.0.1.tar.gz
tar -xvf keycloak-7.0.1.tar.gz --strip 1 -C sunbird_auth_1.0v
mkdir -p sunbird_auth_1.0v/providers
mkdir -p sunbird_auth_1.0v/modules/system/layers/keycloak/org/postgresql/main
mkdir -p sunbird_auth_1.0v/themes/sunbird/login
wget https://jdbc.postgresql.org/download/postgresql-9.4.1212.jar
mv postgresql-9.4.1212.jar sunbird_auth_1.0v/modules/system/layers/keycloak/org/postgresql/main
mv postgresql-9.4.1212.jar sunbird_auth_1.0v/modules/system/layers/keycloak/org/postgresql/main
cd keycloak/sms-provider
mvn package
cp target/keycloak-email-phone-autthenticator-1.0-SNAPSHOT.jar $WORKSPACE/sunbird_auth_1.0v/providers
Expand Down
21 changes: 21 additions & 0 deletions keycloak/sms-provider/.gitignore
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
/target/
project/project
project/target
target
tmp
.history
dist
/.idea
/*.iml
*.iml
*.log
RUNNING_PID
/out
/.idea_modules
/.classpath
/.project
/.settings
/.target/
/bin/
/logs
*.zip
40 changes: 18 additions & 22 deletions keycloak/sms-provider/dependency-reduced-pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
<dependency>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-core</artifactId>
<version>3.2.0.Final</version>
<version>7.0.1</version>
<scope>provided</scope>
<exclusions>
<exclusion>
Expand All @@ -55,45 +55,39 @@
<dependency>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-server-spi</artifactId>
<version>3.2.0.Final</version>
<version>7.0.1</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-server-spi-private</artifactId>
<version>3.2.0.Final</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging</artifactId>
<version>3.3.1.Final</version>
<version>7.0.1</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-services</artifactId>
<version>3.2.0.Final</version>
<version>7.0.1</version>
<scope>provided</scope>
<exclusions>
<exclusion>
<artifactId>javax.mail-api</artifactId>
<groupId>javax.mail</groupId>
</exclusion>
<exclusion>
<artifactId>jboss-servlet-api_3.0_spec</artifactId>
<artifactId>javax.json</artifactId>
<groupId>org.glassfish</groupId>
</exclusion>
<exclusion>
<artifactId>jboss-servlet-api_4.0_spec</artifactId>
<groupId>org.jboss.spec.javax.servlet</groupId>
</exclusion>
<exclusion>
<artifactId>twitter4j-core</artifactId>
<groupId>org.twitter4j</groupId>
</exclusion>
<exclusion>
<artifactId>resteasy-jaxrs</artifactId>
<groupId>org.jboss.resteasy</groupId>
</exclusion>
<exclusion>
<artifactId>jboss-jaxrs-api_2.0_spec</artifactId>
<artifactId>jboss-jaxrs-api_2.1_spec</artifactId>
<groupId>org.jboss.spec.javax.ws.rs</groupId>
</exclusion>
<exclusion>
Expand All @@ -104,10 +98,18 @@
<artifactId>resteasy-multipart-provider</artifactId>
<groupId>org.jboss.resteasy</groupId>
</exclusion>
<exclusion>
<artifactId>owasp-java-html-sanitizer</artifactId>
<groupId>com.googlecode.owasp-java-html-sanitizer</groupId>
</exclusion>
<exclusion>
<artifactId>javase</artifactId>
<groupId>com.google.zxing</groupId>
</exclusion>
<exclusion>
<artifactId>openshift-restclient-java</artifactId>
<groupId>com.openshift</groupId>
</exclusion>
<exclusion>
<artifactId>bcprov-jdk15on</artifactId>
<groupId>org.bouncycastle</groupId>
Expand Down Expand Up @@ -139,12 +141,6 @@
<artifactId>junit</artifactId>
<version>4.12</version>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>hamcrest-core</artifactId>
<groupId>org.hamcrest</groupId>
</exclusion>
</exclusions>
</dependency>
</dependencies>
<properties>
Expand Down
64 changes: 0 additions & 64 deletions keycloak/sms-provider/keycloak-email-phone-autthenticator.iml
View file

This file was deleted.

24 changes: 16 additions & 8 deletions keycloak/sms-provider/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,32 +46,40 @@
<groupId>org.keycloak</groupId>
<artifactId>keycloak-core</artifactId>
<scope>provided</scope>
<version>3.2.0.Final</version>
<version>7.0.1</version>
</dependency>

<!-- https://mvnrepository.com/artifact/org.keycloak/keycloak-server-spi -->
<dependency>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-server-spi</artifactId>
<version>7.0.1</version>
<scope>provided</scope>
<version>3.2.0.Final</version>
</dependency>

<!-- https://mvnrepository.com/artifact/org.keycloak/keycloak-server-spi-private -->
<dependency>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-server-spi-private</artifactId>
<version>7.0.1</version>
<scope>provided</scope>
<version>3.2.0.Final</version>
</dependency>

<!-- https://mvnrepository.com/artifact/org.jboss.logging/jboss-logging -->
<dependency>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging</artifactId>
<scope>provided</scope>
<version>3.3.1.Final</version>
<version>3.4.1.Final</version>
</dependency>

<!-- https://mvnrepository.com/artifact/org.keycloak/keycloak-services -->
<dependency>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-services</artifactId>
<version>7.0.1</version>
<scope>provided</scope>
<version>3.2.0.Final</version>
</dependency>

<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
Expand All @@ -86,7 +94,7 @@
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>2.3.1</version>
<version>2.8.5</version>
</dependency>
<dependency>
<groupId>junit</groupId>
Expand Down Expand Up @@ -114,4 +122,4 @@
</dependency>

</dependencies>
</project>
</project>
2 changes: 1 addition & 1 deletion ...ovider/src/main/java/org/sunbird/keycloak/login/phone/AbstractPhoneFormAuthenticator.java
100755 → 100644
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public boolean validateUserAndPassword(AuthenticationFlowContext context,

if (username == null) {
context.getEvent().error(Errors.USER_NOT_FOUND);
Response challengeResponse = invalidUser(context);
Response challengeResponse = challenge(context, Messages.INVALID_USER);
context.failureChallenge(AuthenticationFlowError.INVALID_USER, challengeResponse);
return false;
}
Expand Down
Empty file modified keycloak/sms-provider/src/main/java/org/sunbird/keycloak/login/phone/PhonePasswordForm.java
100755 → 100644
View file
Empty file.
Empty file modified ...sms-provider/src/main/java/org/sunbird/keycloak/login/phone/PhonePasswordFormFactory.java
100755 → 100644
View file
Empty file.
Loading

0 comments on commit 67e685a

Please sign in to comment.