Skip to content
This repository has been archived by the owner on Feb 1, 2024. It is now read-only.

Commit

Permalink
Merge pull request #12 from erpya/feature/Add-support-to-JWT-validati…
Browse files Browse the repository at this point in the history
…on-token

Add support to JWT validation from adempiere-jwt-token
  • Loading branch information
yamelsenih authored Jun 27, 2023
2 parents a6ab82a + 63de0b0 commit f4b93e0
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 180 deletions.
6 changes: 3 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -137,9 +137,9 @@ dependencies {
implementation "${baseGroupId}:telegram-notifier:${baseVersion}"
implementation "${baseGroupId}:tools:${baseVersion}"
implementation "${baseGroupId}:jasperreports:${baseVersion}"
implementation "${baseGroupId}:adempiere-business-processors:1.0.0"
implementation "${baseGroupId}:adempiere-jwt-token:1.0.0"
implementation "${baseGroupId}:adempiere-dashboard-improvements:1.0.0"
implementation "${baseGroupId}:adempiere-business-processors:1.0.6"
implementation "${baseGroupId}:adempiere-jwt-token:1.0.2"
implementation "${baseGroupId}:adempiere-dashboard-improvements:1.0.7"
implementation "${baseGroupId}:adempiere-pos-improvements:1.0.0"
// Others
compileOnly 'org.apache.tomcat:annotations-api:6.0.53'
Expand Down
176 changes: 0 additions & 176 deletions src/main/java/org/spin/authentication/LoginTokenAccess.java

This file was deleted.

5 changes: 4 additions & 1 deletion src/main/java/org/spin/authentication/SessionManager.java
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
import org.compiere.util.Ini;
import org.compiere.util.TimeUtil;
import org.compiere.util.Util;
import org.spin.eca52.security.JWT;
import org.spin.model.MADToken;
import org.spin.model.MADTokenDefinition;
import org.spin.util.IThirdPartyAccessGenerator;
Expand Down Expand Up @@ -125,8 +126,10 @@ public static MADToken getSessionFromToken(String tokenValue) {
String [] values = tokenValue.split("[.]");
// Is a JWT
if(values != null && values.length == 3) {
IThirdPartyAccessGenerator generator = new LoginTokenAccess();
JWT generator = new JWT();
generator.validateToken(tokenValue);
Env.setContext(Env.getCtx(), Env.LANGUAGE, ContextManager.getDefaultLanguage(generator.getLanguage()));
Env.setContext(Env.getCtx(), "#AD_Session_ID", generator.getSessionId());
return generator.getToken();
} else {
ITokenGenerator generator = TokenGeneratorHandler.getInstance().getTokenGenerator(MADTokenDefinition.TOKENTYPE_ThirdPartyAccess);
Expand Down

0 comments on commit f4b93e0

Please sign in to comment.