Merge branch 'dev-0.2' of github.com:reTHINK-project/dev-runtime-core into dev-0.2

Vitor Silva · Vitor Silva · commit 018bc3d500dc · 2016-01-05T16:37:12.000Z
diff --git a/src/graphconnector/GraphConnector.js b/src/graphconnector/GraphConnector.js
@@ -116,7 +116,7 @@ class GraphConnector {
     // generate GUID
     let iterations = 10000;
     let guidBitArray = sjcl.misc.pbkdf2(this.globalRegistryRecord.publicKeyPEM, salt, iterations);
-    let guid = sjcl.codec.base64.fromBits(guidBitArray);
+    let guid = sjcl.codec.base64url.fromBits(guidBitArray);
     this.globalRegistryRecord.guid = guid;
   }
 

Original file line number	Diff line number	Diff line change
`@@ -116,7 +116,7 @@ class GraphConnector {`
`116`	`116`	`// generate GUID`
`117`	`117`	`let iterations = 10000;`
`118`	`118`	`let guidBitArray = sjcl.misc.pbkdf2(this.globalRegistryRecord.publicKeyPEM, salt, iterations);`
`119`		`- let guid = sjcl.codec.base64.fromBits(guidBitArray);`
	`119`	`+ let guid = sjcl.codec.base64url.fromBits(guidBitArray);`
`120`	`120`	`this.globalRegistryRecord.guid = guid;`
`121`	`121`	`}`
`122`	`122`