Bladeren bron

updated paths

mserranom 6 jaren geleden
bovenliggende
commit
c8617ff55e

+ 0 - 18
libraries/access-token-encryptor/.gitignore

@@ -36,26 +36,8 @@ Icon?
 Thumbs.db
 Thumbs.db
 
 
 /node_modules/*
 /node_modules/*
-test/IntergrationTests/js/*
 data/*/*
 data/*/*
 
 
-app.js
-app/js/*
-lib/js/*
-test/IntergrationTests/js/*
-test/UnitTests/js/*
-cookies.txt
-uploads/*
-public/js/editor.js
-public/js/home.js
-public/js/forms.js
-public/js/gui.js
-public/js/admin.js
-public/stylesheets/mainStyle.css
-public/minjs/
-test/unit/js/
-test/acceptance/js
-
 **.swp
 **.swp
 
 
 /log.json
 /log.json

+ 1 - 23
libraries/access-token-encryptor/Gruntfile.coffee

@@ -2,36 +2,14 @@ spawn = require("child_process").spawn
 
 
 module.exports = (grunt) ->
 module.exports = (grunt) ->
 	grunt.initConfig
 	grunt.initConfig
-		coffee:
-			# app_src:
-			# 	expand: true,
-			# 	cwd: "app/coffee"
-			# 	src: ['**/*.coffee'],
-			# 	dest: 'app/js/',
-			# 	ext: '.js'
-
-			# app:
-			# 	src: "app.coffee"
-			# 	dest: "app.js"
 
 
 			unit_tests:
 			unit_tests:
 				expand: true
 				expand: true
-				cwd:  "test/unit/coffee"
+				cwd:  "test/unit/js"
 				src: ["**/*.coffee"]
 				src: ["**/*.coffee"]
 				dest: "test/unit/js/"
 				dest: "test/unit/js/"
 				ext:  ".js"
 				ext:  ".js"
 
 
-			# acceptance_tests:
-			# 	expand: true
-			# 	cwd:  "test/acceptance/coffee"
-			# 	src: ["**/*.coffee"]
-			# 	dest: "test/acceptance/js/"
-			# 	ext:  ".js"
-
-		clean:
-			app: ["lib/js/"]
-			unit_tests: ["test/unit/js"]
-
 		mochaTest:
 		mochaTest:
 			unit:
 			unit:
 				options:
 				options:

+ 2 - 0
libraries/access-token-encryptor/lib/coffee/AccessTokenEncryptor.js → libraries/access-token-encryptor/lib/js/AccessTokenEncryptor.js

@@ -9,6 +9,8 @@
  */
  */
 const crypto = require('crypto');
 const crypto = require('crypto');
 
 
+const Buffer = require('buffer').Buffer;
+
 const ALGORITHM = 'aes-256-ctr';
 const ALGORITHM = 'aes-256-ctr';
 
 
 const keyFn = (password, salt, callback)=> crypto.pbkdf2(password, salt, 10000, 64, 'sha1', callback);
 const keyFn = (password, salt, callback)=> crypto.pbkdf2(password, salt, 10000, 64, 'sha1', callback);

+ 0 - 0
libraries/access-token-encryptor/test/unit/coffee/AccessTokenEncryptorTests.js → libraries/access-token-encryptor/test/unit/js/AccessTokenEncryptorTests.js