Merge pull request #151 from WeBankFinTech/release/1.6.0

Merge back to develop branch

.github/CONTRIBUTING.md

@@ -29,7 +29,7 @@
 
 #### 代码规范
 
-建议先浏览 [WeIdentity 代码规范](https://github.com/WeBankFinTech/weid-doc/blob/master/docs/zh_CN/docs/styleguides/styleguides.md)。
+建议先浏览 [WeIdentity 代码规范](https://weidentity.readthedocs.io/zh_CN/latest/docs/styleguides/styleguides.html)。
 
 #### 测试
 

CHANGELOG.md

@@ -1,3 +1,13 @@
+### V1.6.0 (2020-03-24)
+- Features:
+1. Endpoint service now supports reentrance and whitelist for remote servers.
+2. Extra values in Evidence is now as log append-only style. The R/W efficiency of Evidence is also improved.
+3. Data authorization scheme based on Endpoint service.
+4. A new WeIdAuth module to support build of authenticated trusted channel between communicating parties.
+5. Transportation module now supports Bar Codes and is refactored.
+6. WeIdentity smart contracts deployment now supports CNS management.
+7. A new Transmission module to support Cross-process Remote Method Invocation.
+
 ### V1.5.2 (2020-02-24)
 - Features:
 1. PDF Transportation now forbids content tampering during transportation.

build.gradle

@@ -36,7 +36,7 @@ if (!gradle.startParameter.isOffline()) {
 
 group 'com.webank'
 
-version = "1.5.2"
+version = "1.6.0"
 
 // Specify JDK version - may vary in different scenarios
 sourceCompatibility = 1.8
@@ -47,7 +47,6 @@ targetCompatibility = 1.8
 repositories {
     if (!gradle.startParameter.isOffline()) {
         mavenLocal()
-        maven { url "https://oss.sonatype.org/content/groups/public/" }
         mavenCentral()
         maven { url "https://dl.bintray.com/ethereum/maven/" }
     } else {
@@ -138,7 +137,7 @@ dependencies {
                 exclude group: "org.fisco-bcos", module: "web3sdk"
                 exclude group: "org.slf4j", module: "slf4j-log4j12"
             }
-            compile("org.fisco-bcos:web3sdk:2.1.2-0312-SNAPSHOT"){
+            compile("org.fisco-bcos:web3sdk:2.1.3"){
                 exclude group:"io.netty"
                 exclude group: "org.slf4j", module: "slf4j-log4j12"
             }
@@ -159,7 +158,7 @@ dependencies {
                 exclude group: "org.fisco-bcos", module: "web3sdk"
                 exclude group: "org.slf4j", module: "slf4j-log4j12"
             }
-            compile("org.fisco-bcos:web3sdk:2.1.2-0312-SNAPSHOT"){
+            compile("org.fisco-bcos:web3sdk:2.1.3"){
                 exclude group:"io.netty"
                 exclude group: "org.slf4j", module: "slf4j-log4j12"
             }

src/main/java/com/webank/weid/service/impl/CredentialPojoServiceImpl.java

@@ -1977,11 +1977,8 @@ private void processMetaDisclosedValue(CredentialPojo credential,
     public ResponseData<CredentialPojo> createDataAuthToken(
         Cpt101 authInfo,
         WeIdAuthentication weIdAuthentication) {
-        ErrorCode innerErrorCode = verifyAuthInfo(authInfo);
-        if (innerErrorCode != ErrorCode.SUCCESS) {
-            return new ResponseData<>(null, innerErrorCode);
-        }
-        innerErrorCode = CredentialPojoUtils.isWeIdAuthenticationValid(weIdAuthentication);
+        ErrorCode innerErrorCode =
+            CredentialPojoUtils.isWeIdAuthenticationValid(weIdAuthentication);
         if (innerErrorCode != ErrorCode.SUCCESS) {
             return new ResponseData<>(null, innerErrorCode);
         }
@@ -1999,7 +1996,12 @@ public ResponseData<CredentialPojo> createDataAuthToken(
         args.setIssuer(keyWeId);
         args.setIssuanceDate(DateUtils.getNoMillisecondTimeStamp());
         args.setExpirationDate(args.getIssuanceDate() + authInfo.getDuration());
-        return this.createCredential(args);
+        ResponseData<CredentialPojo> resp = this.createCredential(args);
+        innerErrorCode = verifyAuthClaim(resp.getResult());
+        if (innerErrorCode != ErrorCode.SUCCESS) {
+            return new ResponseData<>(null, innerErrorCode);
+        }
+        return resp;
     }
 
     /**