From 4bb2375ed0bc8d91188820d9f4c7d50336c81cf5 Mon Sep 17 00:00:00 2001
From: Gustavo Maximiliano Cortez <cmgustavo83@gmail.com>
Date: Wed, 10 Aug 2016 16:08:11 -0300
Subject: [PATCH] Ref and add pbkdf2 as angular module

---
 .gitignore                             |  1 +
 Gruntfile.js                           |  4 +++-
 angular-bitcore-wallet-client/index.js |  2 --
 angular-pbkdf2/index.js                | 18 ++++++++++++++++++
 src/js/app.js                          |  1 +
 src/js/controllers/bitpayCard.js       |  4 ++--
 test/karma.conf.js                     |  1 +
 7 files changed, 26 insertions(+), 5 deletions(-)
 create mode 100644 angular-pbkdf2/index.js

diff --git a/.gitignore b/.gitignore
index 4a30d65d8..62753becd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -59,6 +59,7 @@ build/Release
 node_modules
 bower_components
 angular-bitcore-wallet-client/angular-bitcore-wallet-client.js
+angular-pbkdf2/angular-pbkdf2.js
 
 # Users Environment Variables
 .lock-wscript
diff --git a/Gruntfile.js b/Gruntfile.js
index 3fd51b784..5691b2f4e 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -105,6 +105,7 @@ module.exports = function(grunt) {
           'bower_components/angular-sanitize/angular-sanitize.js',
           'bower_components/ng-csv/build/ng-csv.js',
           'bower_components/angular-mocks/angular-mocks.js',
+          'angular-pbkdf2/angular-pbkdf2.js',
           'angular-bitcore-wallet-client/angular-bitcore-wallet-client.js'
         ],
         dest: 'public/lib/angular.js'
@@ -260,7 +261,8 @@ module.exports = function(grunt) {
     browserify: {
       dist: {
         files: {
-          'angular-bitcore-wallet-client/angular-bitcore-wallet-client.js': ['angular-bitcore-wallet-client/index.js']
+          'angular-bitcore-wallet-client/angular-bitcore-wallet-client.js': ['angular-bitcore-wallet-client/index.js'],
+          'angular-pbkdf2/angular-pbkdf2.js': ['angular-pbkdf2/index.js']
         },
       }
     }
diff --git a/angular-bitcore-wallet-client/index.js b/angular-bitcore-wallet-client/index.js
index 4174e65e1..a7d0c09d6 100644
--- a/angular-bitcore-wallet-client/index.js
+++ b/angular-bitcore-wallet-client/index.js
@@ -1,6 +1,5 @@
 var bwcModule = angular.module('bwcModule', []);
 var Client = require('../node_modules/bitcore-wallet-client');
-var pbkdf2Sync = require('pbkdf2').pbkdf2Sync;
 
 bwcModule.constant('MODULE_VERSION', '1.0.0');
 
@@ -25,7 +24,6 @@ bwcModule.provider("bwcService", function() {
     service.buildTx = Client.buildTx;
     service.parseSecret = Client.parseSecret;
     service.Client = Client;
-    service.pbkdf2Sync = pbkdf2Sync;
 
     service.getUtils = function() {
       return Client.Utils;
diff --git a/angular-pbkdf2/index.js b/angular-pbkdf2/index.js
new file mode 100644
index 000000000..4e1e0d9b9
--- /dev/null
+++ b/angular-pbkdf2/index.js
@@ -0,0 +1,18 @@
+var pbkdf2Module = angular.module('pbkdf2Module', []);
+var pbkdf2Sync = require('../node_modules/pbkdf2').pbkdf2Sync;
+
+pbkdf2Module.constant('MODULE_VERSION', '1.0.0');
+
+pbkdf2Module.provider("pbkdf2Service", function() {
+  var provider = {};
+
+  provider.$get = function() {
+    var service = {};
+
+    service.pbkdf2Sync = pbkdf2Sync;
+
+    return service;
+  };
+
+  return provider;
+});
diff --git a/src/js/app.js b/src/js/app.js
index d0f6268cd..b9a2b4aba 100644
--- a/src/js/app.js
+++ b/src/js/app.js
@@ -10,6 +10,7 @@ var modules = [
   'ngSanitize',
   'ngCsv',
   'bwcModule',
+  'pbkdf2Module',
   'copayApp.filters',
   'copayApp.services',
   'copayApp.controllers',
diff --git a/src/js/controllers/bitpayCard.js b/src/js/controllers/bitpayCard.js
index 1a76e8e4c..e4d35f8f0 100644
--- a/src/js/controllers/bitpayCard.js
+++ b/src/js/controllers/bitpayCard.js
@@ -1,6 +1,6 @@
 'use strict';
 
-angular.module('copayApp.controllers').controller('bitpayCardController', function($scope, $rootScope, $timeout, $log, $ionicModal, lodash, bitpayCardService, configService, profileService, walletService, fingerprintService, ongoingProcess, bwcError, bitcore, bwcService, moment, platformInfo) {
+angular.module('copayApp.controllers').controller('bitpayCardController', function($scope, $rootScope, $timeout, $log, $ionicModal, lodash, bitpayCardService, configService, profileService, walletService, fingerprintService, ongoingProcess, bwcError, bitcore, pbkdf2Service, moment, platformInfo) {
 
   var self = this;
   var client;
@@ -295,7 +295,7 @@ angular.module('copayApp.controllers').controller('bitpayCardController', functi
 
     var data = {
       emailAddress : $scope.email,
-      hashedPassword : bwcService.pbkdf2Sync($scope.password, '..............', 200, 64).toString('hex')
+      hashedPassword : pbkdf2Service.pbkdf2Sync($scope.password, '..............', 200, 64).toString('hex')
     };
 
     // POST /authenticate
diff --git a/test/karma.conf.js b/test/karma.conf.js
index ad396bdd6..17ac204fa 100644
--- a/test/karma.conf.js
+++ b/test/karma.conf.js
@@ -27,6 +27,7 @@ module.exports = function(config) {
       'bower_components/angular-sanitize/angular-sanitize.js',
       'bower_components/ng-csv/build/ng-csv.js',
       'bower_components/angular-mocks/angular-mocks.js',
+      'angular-pbkdf2/angular-pbkdf2.js',
       'angular-bitcore-wallet-client/angular-bitcore-wallet-client.js',
       'src/js/**/*.js',
       'test/helpers.js',