fix the issue of not auto-fill the content of service endpoints

elastos · Feb 24, 2020 · 0f40a5e · 0f40a5e
1 parent ace975a
commit 0f40a5e
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/SDK/Plugin/Transaction/Payload/DIDInfo.cpp b/SDK/Plugin/Transaction/Payload/DIDInfo.cpp
@@ -340,6 +340,12 @@ namespace Elastos {
 			return _serviceEndpoint;
 		}
 
+		void ServiceEndpoint::AutoFill(const std::string &did) {
+			if (_id[0] == '#') {
+				_id = did + _id;
+			}
+		}
+
 		void ServiceEndpoint::ToOrderedJson(JsonGenerator *generator) const {
 			JsonGenerator_WriteStartObject(generator);
 
@@ -434,11 +440,12 @@ namespace Elastos {
 			}
 
 			_credentialSubject.AutoFill(did);
-			_proof.AutoFill(did);
 
 			if (_issuer.empty()) {
-				_issuer = did;
+				_issuer = _credentialSubject.ID();
 			}
+
+			_proof.AutoFill(_issuer);
 		}
 
 		void VerifiableCredential::ToOrderedJson(JsonGenerator *generator) const {
@@ -861,6 +868,7 @@ namespace Elastos {
 				for (nlohmann::json::iterator it = jservices.begin(); it != jservices.end(); ++it) {
 					ServiceEndpoint serviceEndpoint;
 					serviceEndpoint.FromJson(*it, version);
+					serviceEndpoint.AutoFill(_id);
 					_services.push_back(serviceEndpoint);
 				}
 			}

diff --git a/SDK/Plugin/Transaction/Payload/DIDInfo.h b/SDK/Plugin/Transaction/Payload/DIDInfo.h
@@ -192,6 +192,8 @@
 			void SetService(const std::string &service);
 
 			const std::string &GetService() const;
+
+			void AutoFill(const std::string &did);
 		public:
 
 			virtual nlohmann::json ToJson(uint8_t version) const;