fix: fix CasdoorUser serializable method to ObjectMapper & the entity…

… annotation lose (#32)
casdoor · Sep 8, 2022 · c94a4e2 · c94a4e2
1 parent 57b3199
commit c94a4e2
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 11 deletions.
diff --git a/src/main/java/org/casbin/casdoor/entity/CasdoorPermission.java b/src/main/java/org/casbin/casdoor/entity/CasdoorPermission.java
@@ -14,6 +14,7 @@
 
 package org.casbin.casdoor.entity;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -38,5 +39,6 @@ public class CasdoorPermission implements Serializable {
     private String[] resources;
     private String[] actions;
     private String effect;
+    @JsonProperty("isEnabled")
     private boolean isEnabled;
 }
diff --git a/src/main/java/org/casbin/casdoor/entity/CasdoorRole.java b/src/main/java/org/casbin/casdoor/entity/CasdoorRole.java
@@ -14,6 +14,7 @@
 
 package org.casbin.casdoor.entity;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -33,5 +34,6 @@ public class CasdoorRole implements Serializable {
     private String displayName;
     private String[] users;
     private String[] roles;
+    @JsonProperty("isEnabled")
     private boolean isEnabled;
 }
diff --git a/src/main/java/org/casbin/casdoor/service/CasdoorAuthService.java b/src/main/java/org/casbin/casdoor/service/CasdoorAuthService.java
@@ -14,11 +14,14 @@
 
 package org.casbin.casdoor.service;
 
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.nimbusds.jose.JOSEException;
 import com.nimbusds.jose.JWSVerifier;
+import com.nimbusds.jose.Payload;
 import com.nimbusds.jose.crypto.RSASSAVerifier;
 import com.nimbusds.jwt.SignedJWT;
-import org.apache.commons.beanutils.BeanUtils;
 import org.apache.oltu.oauth2.client.OAuthClient;
 import org.apache.oltu.oauth2.client.URLConnectionClient;
 import org.apache.oltu.oauth2.client.request.OAuthClientRequest;
@@ -33,21 +36,21 @@
 
 import java.io.ByteArrayInputStream;
 import java.io.UnsupportedEncodingException;
-import java.lang.reflect.InvocationTargetException;
 import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
 import java.security.cert.CertificateException;
 import java.security.cert.CertificateFactory;
 import java.security.cert.X509Certificate;
 import java.security.interfaces.RSAPublicKey;
 import java.text.ParseException;
-import java.util.Map;
 
 public class CasdoorAuthService {
     private final CasdoorConfig casdoorConfig;
+    final private ObjectMapper objectMapper = new ObjectMapper();
 
-    public CasdoorAuthService(CasdoorConfig casdoorConfig){
+    public CasdoorAuthService(CasdoorConfig casdoorConfig) {
         this.casdoorConfig = casdoorConfig;
+        objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
     }
 
     public String getOAuthToken(String code, String state) {
@@ -71,14 +74,11 @@ public String getOAuthToken(String code, String state) {
     public CasdoorUser parseJwtToken(String token) {
         // parse jwt token
         SignedJWT parseJwt = null;
-        Map<String, Object> claims = null;
         try {
             parseJwt = SignedJWT.parse(token);
-            claims = parseJwt.getJWTClaimsSet().getClaims();
         } catch (ParseException e) {
             throw new CasdoorAuthException("Cannot parse jwt token.", e);
         }
-
         // verify the jwt public key
         try {
             CertificateFactory cf = CertificateFactory.getInstance("X.509");
@@ -95,10 +95,9 @@ public CasdoorUser parseJwtToken(String token) {
 
         // convert to CasdoorUser
         try {
-            CasdoorUser casdoorUser = new CasdoorUser();
-            BeanUtils.copyProperties(casdoorUser, claims);
-            return casdoorUser;
-        } catch (IllegalAccessException | InvocationTargetException e) {
+            Payload payloadJson = parseJwt.getPayload();
+            return objectMapper.readValue(payloadJson.toString(), CasdoorUser.class);
+        } catch (JsonProcessingException e) {
             throw new CasdoorAuthException("Cannot convert claims to CasdoorUser", e);
         }
     }