Merge pull request #196 from Netflix/simpleclient-nodejs

Update simple client example to work with Node.js-compatible JavaScript stack.

examples/simple/src/main/javascript/client/App.js

@@ -1,3 +1,19 @@
+/**
+ * Copyright (c) 2016-2017 Netflix, Inc.  All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 function getQueryParam(key, defaultValue) {
     var queryString = window.location.search;
     var regex = new RegExp(key + '=([^&?]*)');
@@ -108,7 +124,7 @@ function addRsaKey() {
     keyB64 = keyB64.replace(/\s+/g, '');
 
     // Import the public key.
-    PublicKey$import(keyB64, WebCryptoAlgorithm.RSASSA_SHA256, WebCryptoUsage.VERIFY, KeyFormat.SPKI, {
+    PublicKey.import(keyB64, WebCryptoAlgorithm.RSASSA_SHA256, WebCryptoUsage.VERIFY, KeyFormat.SPKI, {
         result: function (pubkey) {
             client.addRsaPublicKey(identity, pubkey);
             keyform.style.visibility = 'hidden';
@@ -233,7 +249,7 @@ function sendRequest() {
             var isIntegrityProtected = document.getElementById('integrity-protected').checked;
             var isNonReplayable = document.getElementById('non-replayable').checked;
             var isRequestingTokens = document.getElementById('requesting-tokens').checked;
-            var data = textEncoding$getBytes(document.getElementById('data').value);
+            var data = textEncoding.getBytes(document.getElementById('data').value);
             request = new AdvancedRequest(recipient, isEncrypted, isIntegrityProtected, isNonReplayable, isRequestingTokens, data);
             break;
         default:
@@ -303,15 +319,15 @@ function showResponse(mis) {
                 return;
 
             // Convert the bytes to text and update the response field.
-            var s = textEncoding$getString(bytes, MslConstants$DEFAULT_CHARSET);
+            var s = textEncoding.getString(bytes, MslConstants.DEFAULT_CHARSET);
             responseText.innerHTML += s;
 
             // Continue reading.
             showResponse(mis);
         },
         timeout: function(bytes) {
             // Convert the bytes to text and update the response field.
-            var s = textEncoding$getString(bytes, MslConstants$DEFAULT_CHARSET);
+            var s = textEncoding.getString(bytes, MslConstants.DEFAULT_CHARSET);
             responseText.innerHTML += s;
 
             // Notify of timeout.

examples/simple/src/main/javascript/client/SimpleClient.js

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014 Netflix, Inc.  All rights reserved.
+ * Copyright (c) 2014-2017 Netflix, Inc.  All rights reserved.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,7 +22,7 @@ var SimpleClient$create;
     /**
      * <p>An HTTP location that is implemented using XMLHttpRequest.</p>
      */
-    var Xhr = IHttpLocation.extend({
+    var Xhr = Url.IHttpLocation.extend({
         /**
          * <p>Create a new XHR pointing at the specified endpoint.
          * 
@@ -58,7 +58,7 @@ var SimpleClient$create;
      *
      * @author Wesley Miaw <[email protected]>
      */
-    SimpleClient = util.Class.create({
+    SimpleClient = Class.create({
         /**
          * <p>Create a new client.</p>
          *
@@ -73,13 +73,13 @@ var SimpleClient$create;
             var self = this;
 
             // Import the server RSA public key.
-            PublicKey$import(SimpleConstants.RSA_PUBKEY_B64, WebCryptoAlgorithm.RSASSA_SHA256, WebCryptoUsage.VERIFY, KeyFormat.SPKI, {
+            PublicKey.import(SimpleConstants.RSA_PUBKEY_B64, WebCryptoAlgorithm.RSASSA_SHA256, WebCryptoUsage.VERIFY, KeyFormat.SPKI, {
                 result: function(publicKey) {
                 	AsyncExecutor(callback, function() {
 	                    // Create the key manager.
-	                	var mechanism = (MslCrypto$getWebCryptoVersion() == MslCrypto$WebCryptoVersion.LEGACY)
-	                		? AsymmetricWrappedExchange$Mechanism.JWE_RSA
-	                		: AsymmetricWrappedExchange$Mechanism.JWK_RSA;
+	                	var mechanism = (MslCrypto.getWebCryptoVersion() == MslCrypto.WebCryptoVersion.LEGACY)
+	                		? AsymmetricWrappedExchange.Mechanism.JWE_RSA
+	                		: AsymmetricWrappedExchange.Mechanism.JWK_RSA;
 	                    SimpleKeyxManager$create(mechanism, {
 	                        result: function(keyxMgr) {
 	                            AsyncExecutor(callback, function() {

examples/simple/src/main/javascript/client/keyx/SimpleKeyxManager.js

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014 Netflix, Inc.  All rights reserved.
+ * Copyright (c) 2014-2017 Netflix, Inc.  All rights reserved.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,7 +25,7 @@ var SimpleKeyxManager$KeyPair;
      * 
      * @author Wesley Miaw <[email protected]>
      */
-    var KeyPair = SimpleKeyxManager$KeyPair = util.Class.create({
+    var KeyPair = SimpleKeyxManager$KeyPair = Class.create({
         /**
          * <p>Create a new key pair.</p>
          * 
@@ -50,12 +50,12 @@ var SimpleKeyxManager$KeyPair;
      * 
      * @author Wesley Miaw <[email protected]>
      */
-    SimpleKeyxManager = util.Class.create({
+    SimpleKeyxManager = Class.create({
         /**
          * <p>Create a new asymmetric wrapped key exchange manager. A pair of
          * initial keys will be generated.</p>
          * 
-         * @param {AsymmetricWrappedExchange$Mechanism} mechanism the key
+         * @param {AsymmetricWrappedExchange.Mechanism} mechanism the key
          *        mechanism to use.
          * @param {{result: function(SimpleKeyxManager), error: function(Error)}}
          *        callback the callback that will receive the key manager or
@@ -87,7 +87,7 @@ var SimpleKeyxManager$KeyPair;
         /**
          * <p>Return the key exchange mechanism.</p>
          * 
-         * @return {AsymmetricWrappedExchange$Mechanism} the key exchange
+         * @return {AsymmetricWrappedExchange.Mechanism} the key exchange
          *         mechanism.
          */
         getMechanism: function getMechanism() {
@@ -115,9 +115,9 @@ var SimpleKeyxManager$KeyPair;
 
             AsyncExecutor(callback, function() {
                 var oncomplete = function(result) {
-                    PrivateKey$create(result.privateKey, {
+                    PrivateKey.create(result.privateKey, {
                         result: function(privateKey) {
-                            PublicKey$create(result.publicKey, {
+                            PublicKey.create(result.publicKey, {
                                 result: function(publicKey) {
                                     AsyncExecutor(callback, function() {
                                         this._pubkey = publicKey;
@@ -151,7 +151,7 @@ var SimpleKeyxManager$KeyPair;
      * <p>Create a new asymmetric wrapped key exchange manager. A pair of
      * initial keys will be generated.</p>
      * 
-     * @param {AsymmetricWrappedExchange$Mechanism} mechanism the key
+     * @param {AsymmetricWrappedExchange.Mechanism} mechanism the key
      *        mechanism to use.
      * @param {{result: function(SimpleKeyxManager), error: function(Error)}}
      *        callback the callback that will receive the key manager or

examples/simple/src/main/javascript/client/msg/AdvancedRequest.js

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015 Netflix, Inc.  All rights reserved.
+ * Copyright (c) 2015-2017 Netflix, Inc.  All rights reserved.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,7 +27,7 @@ var AdvancedRequest;
 (function() {
     "use strict";
 
-    AdvancedRequest = util.Class.create({
+    AdvancedRequest = Class.create({
         /**
          * <p>Create an advanced request with the specified message properties
          * and application data.</p>

examples/simple/src/main/javascript/client/msg/AdvancedRequestMessageContext.js

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015 Netflix, Inc.  All rights reserved.
+ * Copyright (c) 2015-2017 Netflix, Inc.  All rights reserved.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,8 +19,8 @@ var AdvancedRequestMessageContext;
     "use strict";
 
     // Shortcuts.
-    var Mechanism = AsymmetricWrappedExchange$Mechanism;
-    var RequestData = AsymmetricWrappedExchange$RequestData;
+    var Mechanism = AsymmetricWrappedExchange.Mechanism;
+    var RequestData = AsymmetricWrappedExchange.RequestData;
 
     /**
      * <p>Example client message context for sending advanced requests.</p>

examples/simple/src/main/javascript/client/msg/SimpleFilterStreamFactory.js

@@ -69,7 +69,7 @@ var SimpleFilterStreamFactory;
                 	AsyncExecutor(callback, function() {
                 		try {
 		                    if (data)
-		                        self._target.innerHTML += textEncoding$getString(data, MslConstants$DEFAULT_CHARSET);
+		                        self._target.innerHTML += textEncoding.getString(data, MslConstants.DEFAULT_CHARSET);
 		                    return data;
                 		} catch (e) {
                 			throw new MslIoException("Error encoding data into string.", e);
@@ -80,7 +80,7 @@ var SimpleFilterStreamFactory;
                 	AsyncExecutor(callback, function() {
                 		try {
 		                    if (data)
-		                        self._target.innerHTML += textEncoding$getString(data, MslConstants$DEFAULT_CHARSET);
+		                        self._target.innerHTML += textEncoding.getString(data, MslConstants.DEFAULT_CHARSET);
 		                    return data;
                 		} catch (e) {
                 			throw new MslIoException("Error encoding data into string.", e);
@@ -124,7 +124,7 @@ var SimpleFilterStreamFactory;
         	var self = this;
         	AsyncExecutor(callback, function() {
         		try {
-        			this._target.innerHTML += textEncoding$getString(data.subarray(off, off + len), MslConstants$DEFAULT_CHARSET);
+        			this._target.innerHTML += textEncoding.getString(data.subarray(off, off + len), MslConstants.DEFAULT_CHARSET);
         		} catch (e) {
         			throw new MslIoException("Error encoding data into string.", e);
         		}

examples/simple/src/main/javascript/client/msg/SimpleRequest.js

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014 Netflix, Inc.  All rights reserved.
+ * Copyright (c) 2014-2017 Netflix, Inc.  All rights reserved.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -57,7 +57,7 @@ var SimpleRequest$Type;
         QUIT: "QUIT",
     };
 
-    SimpleRequest = util.Class.create({
+    SimpleRequest = Class.create({
         /**
          * <p>Create a simple request.</p>
          * 

examples/simple/src/main/javascript/client/msg/SimpleRequestMessageContext.js

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014 Netflix, Inc.  All rights reserved.
+ * Copyright (c) 2014-2017 Netflix, Inc.  All rights reserved.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,8 +20,8 @@ var SimpleRequestMessageContext;
 
     // Shortcuts.
     var Type = SimpleRequest$Type;
-    var Mechanism = AsymmetricWrappedExchange$Mechanism;
-    var RequestData = AsymmetricWrappedExchange$RequestData;
+    var Mechanism = AsymmetricWrappedExchange.Mechanism;
+    var RequestData = AsymmetricWrappedExchange.RequestData;
 
     /**
      * <p>Example client message context for sending request messages.</p>
@@ -145,7 +145,7 @@ var SimpleRequestMessageContext;
         write: function(output, timeout, callback) {
             AsyncExecutor(callback, function() {
                 var json = JSON.stringify(this._request);
-                var jsonBytes = textEncoding$getBytes(json, MslConstants$DEFAULT_CHARSET);
+                var jsonBytes = textEncoding.getBytes(json, MslConstants.DEFAULT_CHARSET);
                 output.write(jsonBytes, 0, jsonBytes.length, timeout, {
                     result: function(numWritten) {
                         // Technically we should check that numWritten is equal

examples/simple/src/main/javascript/client/util/SimpleMslContext.js

@@ -96,7 +96,7 @@ var SimpleMslContext;
          */
         init: function init(clientId, rsaStore, keyxMgr, errorCallback) {
             // Message capabilities.
-            var compressionAlgos = [ MslConstants$CompressionAlgorithm.LZW ];
+            var compressionAlgos = [ MslConstants.CompressionAlgorithm.LZW ];
             var languages = [ "US_en" ];
             var encoderFormats = [ MslEncoderFormat.JSON ];
             var msgCaps = new MessageCapabilities(compressionAlgos, languages, encoderFormats);
@@ -167,7 +167,7 @@ var SimpleMslContext;
 
         /** @inheritDoc */
         getEntityAuthenticationScheme: function getEntityAuthenticationScheme(name) {
-            return EntityAuthenticationScheme$getScheme(name);
+            return EntityAuthenticationScheme.getScheme(name);
         },
 
         /** @inheritDoc */
@@ -179,7 +179,7 @@ var SimpleMslContext;
 
         /** @inheritDoc */
         getUserAuthenticationScheme: function getUserAuthenticationScheme(name) {
-            return UserAuthenticationScheme$getScheme(name);
+            return UserAuthenticationScheme.getScheme(name);
         },
 
         /** @inheritDoc */
@@ -194,7 +194,7 @@ var SimpleMslContext;
 
         /** @inheritDoc */
         getKeyExchangeScheme: function getKeyExchangeScheme(name) {
-            return KeyExchangeScheme$getScheme(name);
+            return KeyExchangeScheme.getScheme(name);
         },
 
         /** @inheritDoc */

tests/src/test/javascript/msltests.html

@@ -51,6 +51,11 @@
 <script type="text/javascript" src="../../../../core/src/main/javascript/MslMessageException.js"></script>
 <script type="text/javascript" src="../../../../core/src/main/javascript/MslUserAuthException.js"></script>
 <script type="text/javascript" src="../../../../core/src/main/javascript/MslUserIdTokenException.js"></script>
+<script type="text/javascript" src="../../../../core/src/main/javascript/io/InputStream.js"></script>
+<script type="text/javascript" src="../../../../core/src/main/javascript/io/OutputStream.js"></script>
+<script type="text/javascript" src="../../../../core/src/main/javascript/io/ByteArrayInputStream.js"></script>
+<script type="text/javascript" src="../../../../core/src/main/javascript/io/ByteArrayOutputStream.js"></script>
+<script type="text/javascript" src="../../../../core/src/main/javascript/io/BufferedInputStream.js"></script>
 <script type="text/javascript" src="../../../../core/src/main/javascript/io/MslEncodable.js"></script>
 <script type="text/javascript" src="../../../../core/src/main/javascript/io/MslEncoderException.js"></script>
 <script type="text/javascript" src="../../../../core/src/main/javascript/io/MslEncoderFormat.js"></script>
@@ -88,17 +93,13 @@
 <script type="text/javascript" src="../../../../core/src/main/javascript/crypto/MslCiphertextEnvelope.js"></script>
 <script type="text/javascript" src="../../../../core/src/main/javascript/crypto/MslSignatureEnvelope.js"></script>
 <script type="text/javascript" src="../../../../core/src/main/javascript/crypto/ICryptoContext.js"></script>
+<script type="text/javascript" src="../../../../core/src/main/javascript/crypto/ClientMslCryptoContext.js"></script>
 <script type="text/javascript" src="../../../../core/src/main/javascript/crypto/EccCryptoContext.js"></script>
 <script type="text/javascript" src="../../../../core/src/main/javascript/crypto/JsonWebEncryptionCryptoContext.js"></script>
 <script type="text/javascript" src="../../../../core/src/main/javascript/crypto/NullCryptoContext.js"></script>
 <script type="text/javascript" src="../../../../core/src/main/javascript/crypto/RsaCryptoContext.js"></script>
 <script type="text/javascript" src="../../../../core/src/main/javascript/crypto/SymmetricCryptoContext.js"></script>
 <script type="text/javascript" src="../../../../core/src/main/javascript/crypto/SessionCryptoContext.js"></script>
-<script type="text/javascript" src="../../../../core/src/main/javascript/io/InputStream.js"></script>
-<script type="text/javascript" src="../../../../core/src/main/javascript/io/OutputStream.js"></script>
-<script type="text/javascript" src="../../../../core/src/main/javascript/io/BufferedInputStream.js"></script>
-<script type="text/javascript" src="../../../../core/src/main/javascript/io/ByteArrayInputStream.js"></script>
-<script type="text/javascript" src="../../../../core/src/main/javascript/io/ByteArrayOutputStream.js"></script>
 <script type="text/javascript" src="../../../../core/src/main/javascript/io/ClarinetParser.js"></script>
 <script type="text/javascript" src="../../../../core/src/main/javascript/io/JsonMslArray.js"></script>
 <script type="text/javascript" src="../../../../core/src/main/javascript/io/JsonMslObject.js"></script>