change subject getCredentials() to getCredential(),make credential single (#59)

core/src/main/java/com/usthe/sureness/processor/support/DigestProcessor.java

@@ -53,7 +53,7 @@ public class DigestProcessor extends BaseProcessor {
 
     @Override
     public Subject authenticated(Subject var) throws SurenessAuthenticationException {
-        if (var.getPrincipal() == null || var.getCredentials() == null) {
+        if (var.getPrincipal() == null || var.getCredential() == null) {
             String authenticate = getAuthenticate();
             throw new NeedDigestInfoException("you should try once with digest auth information", authenticate);
         }
@@ -74,7 +74,7 @@ public class DigestProcessor extends BaseProcessor {
         //response = MD5("A1:nonce:nc:cNonce:qop:A2");
         String oriResponse = calcDigest(a1, digestSubject.getNonce(), digestSubject.getNc(), digestSubject.getCnonce(),
                 digestSubject.getQop(), a2);
-        if (!oriResponse.equals(digestSubject.getCredentials())) {
+        if (!oriResponse.equals(digestSubject.getCredential())) {
             throw new IncorrectCredentialsException("incorrect password");
         }
         if (account.isDisabledAccount()) {

core/src/main/java/com/usthe/sureness/processor/support/JwtProcessor.java

@@ -41,7 +41,7 @@ public class JwtProcessor extends BaseProcessor {
     @Override
     @SuppressWarnings("unchecked")
     public Subject authenticated(Subject var) throws SurenessAuthenticationException {
-        String jwt = (String) var.getCredentials();
+        String jwt = (String) var.getCredential();
         if (JsonWebTokenUtil.isNotJsonWebToken(jwt)) {
             throw new  IncorrectCredentialsException("this jwt credential is illegal");
         }

core/src/main/java/com/usthe/sureness/processor/support/PasswordProcessor.java

@@ -51,8 +51,8 @@ public class PasswordProcessor extends BaseProcessor {
             }
             throw new  UnknownAccountException("do not exist the account: " + appId);
         }
-        if (var.getCredentials() != null && account.getPassword() != null) {
-            String password = String.valueOf(var.getCredentials());
+        if (var.getCredential() != null && account.getPassword() != null) {
+            String password = String.valueOf(var.getCredential());
             if (account.getSalt() != null && !"".equals(account.getSalt())) {
                 password = Md5Util.md5( password + account.getSalt());
             }

core/src/main/java/com/usthe/sureness/subject/Subject.java

@@ -25,7 +25,7 @@ public interface Subject extends Serializable {
      *
      * @return credential
      */
-    Object getCredentials();
+    Object getCredential();
 
     /**
      * get the roles owned by this account

core/src/main/java/com/usthe/sureness/subject/support/DigestSubject.java

@@ -76,7 +76,7 @@ public class DigestSubject implements Subject {
     }
 
     @Override
-    public Object getCredentials() {
+    public Object getCredential() {
         return response;
     }
 
@@ -165,7 +165,7 @@ public class DigestSubject implements Subject {
         @SuppressWarnings("unchecked")
         public Builder(Subject subject) {
             this.appId = String.valueOf(subject.getPrincipal());
-            this.response = String.valueOf(subject.getCredentials());
+            this.response = String.valueOf(subject.getCredential());
             this.ownRoles = (List<String>) subject.getOwnRoles();
             this.targetUri = String.valueOf(subject.getTargetResource());
             this.supportRoles = (List<String>) subject.getSupportRoles();

core/src/main/java/com/usthe/sureness/subject/support/JwtSubject.java

@@ -50,7 +50,7 @@ public class JwtSubject implements Subject {
     }
 
     @Override
-    public Object getCredentials() {
+    public Object getCredential() {
         return this.jwt;
     }
 
@@ -108,7 +108,7 @@ public class JwtSubject implements Subject {
         @SuppressWarnings("unchecked")
         public Builder(Subject subject) {
             this.appId = String.valueOf(subject.getPrincipal());
-            this.jwt = String.valueOf(subject.getCredentials());
+            this.jwt = String.valueOf(subject.getCredential());
             this.ownRoles = (List<String>) subject.getOwnRoles();
             this.targetUri = String.valueOf(subject.getTargetResource());
             this.supportRoles = (List<String>) subject.getSupportRoles();

core/src/main/java/com/usthe/sureness/subject/support/NoneSubject.java

@@ -38,7 +38,7 @@ public class NoneSubject implements Subject {
     }
 
     @Override
-    public Object getCredentials() {
+    public Object getCredential() {
         return null;
     }
 

core/src/main/java/com/usthe/sureness/subject/support/PasswordSubject.java

@@ -47,7 +47,7 @@ public class PasswordSubject implements Subject {
     }
 
     @Override
-    public Object getCredentials() {
+    public Object getCredential() {
         return this.password;
     }
 
@@ -97,7 +97,7 @@ public class PasswordSubject implements Subject {
         @SuppressWarnings("unchecked")
         public Builder(Subject subject) {
             this.appId = String.valueOf(subject.getPrincipal());
-            this.password = String.valueOf(subject.getCredentials());
+            this.password = String.valueOf(subject.getCredential());
             this.ownRoles = (List<String>) subject.getOwnRoles();
             this.targetUri = String.valueOf(subject.getTargetResource());
             this.supportRoles = (List<String>) subject.getSupportRoles();

sample-tom/src/main/java/com/usthe/sureness/sample/tom/sureness/processor/CustomTokenProcessor.java

@@ -42,7 +42,7 @@ public class CustomTokenProcessor extends BaseProcessor {
     @Override
     @SuppressWarnings("unchecked")
     public Subject authenticated(Subject var) throws SurenessAuthenticationException {
-        String token = (String) var.getCredentials();
+        String token = (String) var.getCredential();
         String[] tokenArr = token.split(TOKEN_SPLIT);
         if (TokenStorage.matchToken(tokenArr[0], token)) {
             // auth passed

sample-tom/src/main/java/com/usthe/sureness/sample/tom/sureness/subject/CustomTokenSubject.java

@@ -50,7 +50,7 @@ public class CustomTokenSubject implements Subject {
     }
 
     @Override
-    public Object getCredentials() {
+    public Object getCredential() {
         return this.token;
     }
 
@@ -108,7 +108,7 @@ public class CustomTokenSubject implements Subject {
         @SuppressWarnings("unchecked")
         public Builder(Subject subject) {
             this.appId = String.valueOf(subject.getPrincipal());
-            this.token = String.valueOf(subject.getCredentials());
+            this.token = String.valueOf(subject.getCredential());
             this.ownRoles = (List<String>) subject.getOwnRoles();
             this.targetUri = String.valueOf(subject.getTargetResource());
             this.supportRoles = (List<String>) subject.getSupportRoles();