Skip to content

Commit

Permalink
Merge pull request #211 from Netflix/require-modules
Browse files Browse the repository at this point in the history
Fix module organization.
  • Loading branch information
wmiaw authored Nov 8, 2017
2 parents 2b85e69 + c39de24 commit dd74ef8
Show file tree
Hide file tree
Showing 96 changed files with 1,015 additions and 1,006 deletions.
2 changes: 1 addition & 1 deletion core/src/main/javascript/crypto/JsonWebKeyAlgorithm.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
(function(require, module) {
"use strict";

var WebCryptoAlgorithm = require('../../../../../core/src/main/javascript/crypto/WebCryptoAlgorithm.js');
var WebCryptoAlgorithm = require('../crypto/WebCryptoAlgorithm.js');

/** JSON Web Key algorithms. */
var JsonWebKeyAlgorithm = module.exports = {
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/javascript/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "msl-core",
"version": "1.1216.0",
"version": "1.1216.1",
"description": "Message Security Layer",
"keywords": [
"msl",
Expand Down
20 changes: 10 additions & 10 deletions tests/src/main/javascript/crypto/NodeCrypto.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,16 +35,16 @@
"approached very carefully. We strongly advise against running MSL in a Node.js\n" +
"environment.\n");

var Arrays = require('../../../../../core/src/main/javascript/util/Arrays.js');
var WebCryptoAlgorithm = require('../../../../../core/src/main/javascript/crypto/WebCryptoAlgorithm.js');
var WebCryptoUsage = require('../../../../../core/src/main/javascript/crypto/WebCryptoUsage.js');
var JsonWebKeyAlgorithm = require('../../../../../core/src/main/javascript/crypto/JsonWebKeyAlgorithm.js');
var WebCryptoNamedCurve = require('../../../../../core/src/main/javascript/crypto/WebCryptoNamedCurve.js');
var KeyFormat = require('../../../../../core/src/main/javascript/crypto/KeyFormat.js');
var Base64 = require('../../../../../core/src/main/javascript/util/Base64.js');
var MslCrypto = require('../../../../../core/src/main/javascript/crypto/MslCrypto.js');
var MslUtils = require('../../../../../core/src/main/javascript/util/MslUtils.js');
var textEncoding = require('../../../../../core/src/main/javascript/lib/textEncoding.js');
var Arrays = require('msl-core/util/Arrays.js');
var WebCryptoAlgorithm = require('msl-core/crypto/WebCryptoAlgorithm.js');
var WebCryptoUsage = require('msl-core/crypto/WebCryptoUsage.js');
var JsonWebKeyAlgorithm = require('msl-core/crypto/JsonWebKeyAlgorithm.js');
var WebCryptoNamedCurve = require('msl-core/crypto/WebCryptoNamedCurve.js');
var KeyFormat = require('msl-core/crypto/KeyFormat.js');
var Base64 = require('msl-core/util/Base64.js');
var MslCrypto = require('msl-core/crypto/MslCrypto.js');
var MslUtils = require('msl-core/util/MslUtils.js');
var textEncoding = require('msl-core/lib/textEncoding.js');

var NodeCryptoKey = require('../crypto/NodeCryptoKey.js');

Expand Down
4 changes: 2 additions & 2 deletions tests/src/main/javascript/crypto/NodeCryptoKey.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
(function(require, module) {
"use strict";

var Class = require('../../../../../core/src/main/javascript/util/Class.js');
var Arrays = require('../../../../../core/src/main/javascript/util/Arrays.js');
var Class = require('msl-core/util/Class.js');
var Arrays = require('msl-core/util/Arrays.js');

/** Web Crypto key type. */
var KeyType = {
Expand Down
2 changes: 1 addition & 1 deletion tests/src/main/javascript/crypto/NodeRandom.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
(function(require, module) {
"use strict";

var Random = require('../../../../../core/src/main/javascript/util/Random.js');
var Random = require('msl-core/util/Random.js');

var crypto = require('crypto');

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,19 +16,19 @@
(function(require, module) {
"use strict";

var ConditionVariable = require('../../../../../core/src/main/javascript/util/ConditionVariable.js');
var EccAuthenticationFactory = require('../../../../../core/src/main/javascript/entityauth/EccAuthenticationFactory.js');
var AsyncExecutor = require('../../../../../core/src/main/javascript/util/AsyncExecutor.js');
var EccAuthenticationData = require('../../../../../core/src/main/javascript/entityauth/EccAuthenticationData.js');
var EccCryptoContext = require('../../../../../core/src/main/javascript/crypto/EccCryptoContext.js');
var WebCryptoAlgorithm = require('../../../../../core/src/main/javascript/crypto/WebCryptoAlgorithm.js');
var WebCryptoUsage = require('../../../../../core/src/main/javascript/crypto/WebCryptoUsage.js');
var WebCryptoNamedCurve = require('../../../../../core/src/main/javascript/crypto/WebCryptoNamedCurve.js');
var KeyFormat = require('../../../../../core/src/main/javascript/crypto/KeyFormat.js');
var MslInternalException = require('../../../../../core/src/main/javascript/MslInternalException.js');
var Base64 = require('../../../../../core/src/main/javascript/util/Base64.js');
var PublicKey = require('../../../../../core/src/main/javascript/crypto/PublicKey.js');
var PrivateKey = require('../../../../../core/src/main/javascript/crypto/PrivateKey.js');
var ConditionVariable = require('msl-core/util/ConditionVariable.js');
var EccAuthenticationFactory = require('msl-core/entityauth/EccAuthenticationFactory.js');
var AsyncExecutor = require('msl-core/util/AsyncExecutor.js');
var EccAuthenticationData = require('msl-core/entityauth/EccAuthenticationData.js');
var EccCryptoContext = require('msl-core/crypto/EccCryptoContext.js');
var WebCryptoAlgorithm = require('msl-core/crypto/WebCryptoAlgorithm.js');
var WebCryptoUsage = require('msl-core/crypto/WebCryptoUsage.js');
var WebCryptoNamedCurve = require('msl-core/crypto/WebCryptoNamedCurve.js');
var KeyFormat = require('msl-core/crypto/KeyFormat.js');
var MslInternalException = require('msl-core/MslInternalException.js');
var Base64 = require('msl-core/util/Base64.js');
var PublicKey = require('msl-core/crypto/PublicKey.js');
var PrivateKey = require('msl-core/crypto/PrivateKey.js');

/** ECC public key. */
var ECC_PUBKEY_JWK = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
(function(require, module) {
"use strict";

var ProvisionedAuthenticationFactory = require('../../../../../core/src/main/javascript/entityauth/ProvisionedAuthenticationFactory.js');
var ProvisionedAuthenticationFactory = require('msl-core/entityauth/ProvisionedAuthenticationFactory.js');

var MockIdentityProvisioningService = module.exports = ProvisionedAuthenticationFactory.IdentityProvisioningService.extend({
/**
Expand Down
2 changes: 1 addition & 1 deletion tests/src/main/javascript/entityauth/MockKeySetStore.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
(function(require, module) {
"use strict";

var KeySetStore = require('../../../../../core/src/main/javascript/entityauth/KeySetStore.js');
var KeySetStore = require('msl-core/entityauth/KeySetStore.js');

var MockKeySetStore = module.exports = KeySetStore.extend({
/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,17 +16,17 @@
(function (require, module) {
"use strict";

var ConditionVariable = require('../../../../../core/src/main/javascript/util/ConditionVariable.js');
var PresharedAuthenticationFactory = require('../../../../../core/src/main/javascript/entityauth/PresharedAuthenticationFactory.js');
var AsyncExecutor = require('../../../../../core/src/main/javascript/util/AsyncExecutor.js');
var MslInternalException = require('../../../../../core/src/main/javascript/MslInternalException.js');
var PresharedAuthenticationData = require('../../../../../core/src/main/javascript/entityauth/PresharedAuthenticationData.js');
var SymmetricCryptoContext = require('../../../../../core/src/main/javascript/crypto/SymmetricCryptoContext.js');
var MslEntityAuthException = require('../../../../../core/src/main/javascript/MslEntityAuthException.js');
var MslError = require('../../../../../core/src/main/javascript/MslError.js');
var SecretKey = require('../../../../../core/src/main/javascript/crypto/SecretKey.js');
var WebCryptoAlgorithm = require('../../../../../core/src/main/javascript/crypto/WebCryptoAlgorithm.js');
var WebCryptoUsage = require('../../../../../core/src/main/javascript/crypto/WebCryptoUsage.js');
var ConditionVariable = require('msl-core/util/ConditionVariable.js');
var PresharedAuthenticationFactory = require('msl-core/entityauth/PresharedAuthenticationFactory.js');
var AsyncExecutor = require('msl-core/util/AsyncExecutor.js');
var MslInternalException = require('msl-core/MslInternalException.js');
var PresharedAuthenticationData = require('msl-core/entityauth/PresharedAuthenticationData.js');
var SymmetricCryptoContext = require('msl-core/crypto/SymmetricCryptoContext.js');
var MslEntityAuthException = require('msl-core/MslEntityAuthException.js');
var MslError = require('msl-core/MslError.js');
var SecretKey = require('msl-core/crypto/SecretKey.js');
var WebCryptoAlgorithm = require('msl-core/crypto/WebCryptoAlgorithm.js');
var WebCryptoUsage = require('msl-core/crypto/WebCryptoUsage.js');

var MockKeySetStore = require('../entityauth/MockKeySetStore.js');
var MockAuthenticationUtils = require('../util/MockAuthenticationUtils.js');
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,17 +22,17 @@
(function(require, module) {
"use strict";

var ConditionVariable = require('../../../../../core/src/main/javascript/util/ConditionVariable.js');
var PresharedProfileAuthenticationFactory = require('../../../../../core/src/main/javascript/entityauth/PresharedProfileAuthenticationFactory.js');
var AsyncExecutor = require('../../../../../core/src/main/javascript/util/AsyncExecutor.js');
var MslInternalException = require('../../../../../core/src/main/javascript/MslInternalException.js');
var PresharedProfileAuthenticationData = require('../../../../../core/src/main/javascript/entityauth/PresharedProfileAuthenticationData.js');
var SymmetricCryptoContext = require('../../../../../core/src/main/javascript/crypto/SymmetricCryptoContext.js');
var MslEntityAuthException = require('../../../../../core/src/main/javascript/MslEntityAuthException.js');
var SecretKey = require('../../../../../core/src/main/javascript/crypto/SecretKey.js');
var WebCryptoAlgorithm = require('../../../../../core/src/main/javascript/crypto/WebCryptoAlgorithm.js');
var WebCryptoUsage = require('../../../../../core/src/main/javascript/crypto/WebCryptoUsage.js');
var MslError = require('../../../../../core/src/main/javascript/MslError.js');
var ConditionVariable = require('msl-core/util/ConditionVariable.js');
var PresharedProfileAuthenticationFactory = require('msl-core/entityauth/PresharedProfileAuthenticationFactory.js');
var AsyncExecutor = require('msl-core/util/AsyncExecutor.js');
var MslInternalException = require('msl-core/MslInternalException.js');
var PresharedProfileAuthenticationData = require('msl-core/entityauth/PresharedProfileAuthenticationData.js');
var SymmetricCryptoContext = require('msl-core/crypto/SymmetricCryptoContext.js');
var MslEntityAuthException = require('msl-core/MslEntityAuthException.js');
var SecretKey = require('msl-core/crypto/SecretKey.js');
var WebCryptoAlgorithm = require('msl-core/crypto/WebCryptoAlgorithm.js');
var WebCryptoUsage = require('msl-core/crypto/WebCryptoUsage.js');
var MslError = require('msl-core/MslError.js');

var MockKeySetStore = require('../entityauth/MockKeySetStore.js');
var MockAuthenticationUtils = require('../util/MockAuthenticationUtils.js');
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,18 @@
(function(require, module) {
"use strict";

var ConditionVariable = require('../../../../../core/src/main/javascript/util/ConditionVariable.js');
var RsaAuthenticationFactory = require('../../../../../core/src/main/javascript/entityauth/RsaAuthenticationFactory.js');
var AsyncExecutor = require('../../../../../core/src/main/javascript/util/AsyncExecutor.js');
var MslInternalException = require('../../../../../core/src/main/javascript/MslInternalException.js');
var RsaAuthenticationData = require('../../../../../core/src/main/javascript/entityauth/RsaAuthenticationData.js');
var RsaCryptoContext = require('../../../../../core/src/main/javascript/crypto/RsaCryptoContext.js');
var WebCryptoAlgorithm = require('../../../../../core/src/main/javascript/crypto/WebCryptoAlgorithm.js');
var WebCryptoUsage = require('../../../../../core/src/main/javascript/crypto/WebCryptoUsage.js');
var Base64 = require('../../../../../core/src/main/javascript/util/Base64.js');
var PublicKey = require('../../../../../core/src/main/javascript/crypto/PublicKey.js');
var PrivateKey = require('../../../../../core/src/main/javascript/crypto/PrivateKey.js');
var KeyFormat = require('../../../../../core/src/main/javascript/crypto/KeyFormat.js');
var ConditionVariable = require('msl-core/util/ConditionVariable.js');
var RsaAuthenticationFactory = require('msl-core/entityauth/RsaAuthenticationFactory.js');
var AsyncExecutor = require('msl-core/util/AsyncExecutor.js');
var MslInternalException = require('msl-core/MslInternalException.js');
var RsaAuthenticationData = require('msl-core/entityauth/RsaAuthenticationData.js');
var RsaCryptoContext = require('msl-core/crypto/RsaCryptoContext.js');
var WebCryptoAlgorithm = require('msl-core/crypto/WebCryptoAlgorithm.js');
var WebCryptoUsage = require('msl-core/crypto/WebCryptoUsage.js');
var Base64 = require('msl-core/util/Base64.js');
var PublicKey = require('msl-core/crypto/PublicKey.js');
var PrivateKey = require('msl-core/crypto/PrivateKey.js');
var KeyFormat = require('msl-core/crypto/KeyFormat.js');

var MslTestUtils = require('../util/MslTestUtils.js');

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@
(function(require, module) {
"use strict";

var UnauthenticatedAuthenticationFactory = require('../../../../../core/src/main/javascript/entityauth/UnauthenticatedAuthenticationFactory.js');
var UnauthenticatedAuthenticationData = require('../../../../../core/src/main/javascript/entityauth/UnauthenticatedAuthenticationData.js');
var MslEntityAuthException = require('../../../../../core/src/main/javascript/MslEntityAuthException.js');
var MslError = require('../../../../../core/src/main/javascript/MslError.js');
var UnauthenticatedAuthenticationFactory = require('msl-core/entityauth/UnauthenticatedAuthenticationFactory.js');
var UnauthenticatedAuthenticationData = require('msl-core/entityauth/UnauthenticatedAuthenticationData.js');
var MslEntityAuthException = require('msl-core/MslEntityAuthException.js');
var MslError = require('msl-core/MslError.js');

var MockAuthenticationUtils = require('../util/MockAuthenticationUtils.js');

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@
(function(require, module) {
"use strict";

var X509 = require('../../../../../core/src/main/javascript/crypto/X509.js');
var MslInternalException = require('../../../../../core/src/main/javascript/MslInternalException.js');
var X509AuthenticationFactory = require('../../../../../core/src/main/javascript/entityauth/X509AuthenticationFactory.js');
var X509AuthenticationData = require('../../../../../core/src/main/javascript/entityauth/X509AuthenticationData.js');
var RsaCryptoContext = require('../../../../../core/src/main/javascript/crypto/RsaCryptoContext.js');
var MslCryptoException = require('../../../../../core/src/main/javascript/MslCryptoException.js');
var MslError = require('../../../../../core/src/main/javascript/MslError.js');
var X509 = require('msl-core/crypto/X509.js');
var MslInternalException = require('msl-core/MslInternalException.js');
var X509AuthenticationFactory = require('msl-core/entityauth/X509AuthenticationFactory.js');
var X509AuthenticationData = require('msl-core/entityauth/X509AuthenticationData.js');
var RsaCryptoContext = require('msl-core/crypto/RsaCryptoContext.js');
var MslCryptoException = require('msl-core/MslCryptoException.js');
var MslError = require('msl-core/MslError.js');

/** X.509 private key. */
var X509_PRIVATE_KEY =
Expand Down
4 changes: 2 additions & 2 deletions tests/src/main/javascript/keyx/MockCryptoContextRepository.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
(function(require, module) {
"use strict";

var WrapCryptoContextRepository = require('../../../../../core/src/main/javascript/keyx/WrapCryptoContextRepository.js');
var Base64 = require('../../../../../core/src/main/javascript/util/Base64.js');
var WrapCryptoContextRepository = require('msl-core/keyx/WrapCryptoContextRepository.js');
var Base64 = require('msl-core/util/Base64.js');

var MockCryptoContextRepository = module.exports = WrapCryptoContextRepository.extend({
init: function init() {
Expand Down
4 changes: 2 additions & 2 deletions tests/src/main/javascript/keyx/MockDiffieHellmanParameters.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
(function(require, module) {
"use strict";

var DiffieHellmanParameters = require('../../../../../core/src/main/javascript/keyx/DiffieHellmanParameters.js');
var DhParameterSpec = require('../../../../../core/src/main/javascript/keyx/DhParameterSpec.js');
var DiffieHellmanParameters = require('msl-core/keyx/DiffieHellmanParameters.js');
var DhParameterSpec = require('msl-core/keyx/DhParameterSpec.js');

/** Default parameters. */
var p = new Uint8Array([23]);
Expand Down
4 changes: 2 additions & 2 deletions tests/src/main/javascript/lib/jasmine/msl-helpers.js
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,8 @@ if (isNodeJS) module.exports.xparameterize = xparameterize;
* @param {number} messageId expected MSL message ID.
*/
jasmine.Matchers.prototype.toThrow = function(expected, messageId) {
var MslException = require('../../../../../../core/src/main/javascript/MslException.js');
var MslError = require('../../../../../../core/src/main/javascript/MslError.js');
var MslException = require('msl-core/MslException.js');
var MslError = require('msl-core/MslError.js');

var result = false;
var exception;
Expand Down
22 changes: 11 additions & 11 deletions tests/src/main/javascript/msg/MockMessageContext.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,17 +26,17 @@
(function(require, module) {
"use strict";

var AsyncExecutor = require('../../../../../core/src/main/javascript/util/AsyncExecutor.js');
var SecretKey = require('../../../../../core/src/main/javascript/crypto/SecretKey.js');
var MessageContext = require('../../../../../core/src/main/javascript/msg/MessageContext.js');
var WebCryptoAlgorithm = require('../../../../../core/src/main/javascript/crypto/WebCryptoAlgorithm.js');
var WebCryptoUsage = require('../../../../../core/src/main/javascript/crypto/WebCryptoUsage.js');
var UserAuthenticationScheme = require('../../../../../core/src/main/javascript/userauth/UserAuthenticationScheme.js');
var EmailPasswordAuthenticationData = require('../../../../../core/src/main/javascript/userauth/EmailPasswordAuthenticationData.js');
var MslInternalException = require('../../../../../core/src/main/javascript/MslInternalException.js');
var AsymmetricWrappedExchange = require('../../../../../core/src/main/javascript/keyx/AsymmetricWrappedExchange.js');
var SymmetricWrappedExchange = require('../../../../../core/src/main/javascript/keyx/SymmetricWrappedExchange.js');
var SymmetricCryptoContext = require('../../../../../core/src/main/javascript/crypto/SymmetricCryptoContext.js');
var AsyncExecutor = require('msl-core/util/AsyncExecutor.js');
var SecretKey = require('msl-core/crypto/SecretKey.js');
var MessageContext = require('msl-core/msg/MessageContext.js');
var WebCryptoAlgorithm = require('msl-core/crypto/WebCryptoAlgorithm.js');
var WebCryptoUsage = require('msl-core/crypto/WebCryptoUsage.js');
var UserAuthenticationScheme = require('msl-core/userauth/UserAuthenticationScheme.js');
var EmailPasswordAuthenticationData = require('msl-core/userauth/EmailPasswordAuthenticationData.js');
var MslInternalException = require('msl-core/MslInternalException.js');
var AsymmetricWrappedExchange = require('msl-core/keyx/AsymmetricWrappedExchange.js');
var SymmetricWrappedExchange = require('msl-core/keyx/SymmetricWrappedExchange.js');
var SymmetricCryptoContext = require('msl-core/crypto/SymmetricCryptoContext.js');

var MockEmailPasswordAuthenticationFactory = require('../userauth/MockEmailPasswordAuthenticationFactory.js');
var MockRsaAuthenticationFactory = require('../entityauth/MockRsaAuthenticationFactory.js');
Expand Down
7 changes: 5 additions & 2 deletions tests/src/main/javascript/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "msl-tests",
"version": "1.1216.0",
"version": "1.1216.1",
"description": "Message Security Layer Tests",
"keywords": [
"msl",
Expand Down Expand Up @@ -41,11 +41,14 @@
"Buffer"
]
},
"dependencies": {
"msl-core": "^1.1216.1"
},
"devDependencies": {
"jsrsasign": "^7.2.2",
"ec-key": "0.0.2",
"elliptic": "^6.4.0",
"jshint": "^2.9.5",
"jsrsasign": "^7.2.2",
"ursa": "^0.9.4"
}
}
2 changes: 1 addition & 1 deletion tests/src/main/javascript/tokens/MockMslUser.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
(function(require, module) {
"use strict";

var MslUser = require('../../../../../core/src/main/javascript/tokens/MslUser.js');
var MslUser = require('msl-core/tokens/MslUser.js');

var MockMslUser = module.exports = MslUser.extend({
/**
Expand Down
Loading

0 comments on commit dd74ef8

Please sign in to comment.