From 28e29a740906b18b05d844130244ec4c3e637662 Mon Sep 17 00:00:00 2001 From: caoshengdong Date: Fri, 27 May 2022 16:21:59 +0800 Subject: [PATCH] fix: fixed JSON deserialization of the fields named "isXxx" in CasdoorUser (#21) --- .../casbin/casdoor/entity/CasdoorUser.java | 47 +++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/src/main/java/org/casbin/casdoor/entity/CasdoorUser.java b/src/main/java/org/casbin/casdoor/entity/CasdoorUser.java index fadc857..b77a29c 100644 --- a/src/main/java/org/casbin/casdoor/entity/CasdoorUser.java +++ b/src/main/java/org/casbin/casdoor/entity/CasdoorUser.java @@ -14,6 +14,9 @@ package org.casbin.casdoor.entity; +import com.fasterxml.jackson.annotation.JsonGetter; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonSetter; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; @@ -52,9 +55,13 @@ public class CasdoorUser implements Serializable { private String language; private int score; private int ranking; + @JsonProperty("isOnline") private boolean isOnline; + @JsonProperty("isAdmin") private boolean isAdmin; + @JsonProperty("isGlobalAdmin") private boolean isGlobalAdmin; + @JsonProperty("isForbidden") private boolean isForbidden; private String signupApplication; private String hash; @@ -73,4 +80,44 @@ public class CasdoorUser implements Serializable { private String gitlab; private String ldap; private Map properties; + + @JsonGetter("isOnline") + public boolean isOnline() { + return isOnline; + } + + @JsonSetter("setOnline") + public void setOnline(boolean online) { + isOnline = online; + } + + @JsonGetter("isAdmin") + public boolean isAdmin() { + return isAdmin; + } + + @JsonSetter("isAdmin") + public void setAdmin(boolean admin) { + isAdmin = admin; + } + + @JsonGetter("isGlobalAdmin") + public boolean isGlobalAdmin() { + return isGlobalAdmin; + } + + @JsonSetter("setGlobalAdmin") + public void setGlobalAdmin(boolean globalAdmin) { + isGlobalAdmin = globalAdmin; + } + + @JsonGetter("isForbidden") + public boolean isForbidden() { + return isForbidden; + } + + @JsonSetter("setForbidden") + public void setForbidden(boolean forbidden) { + isForbidden = forbidden; + } }