recaptcha module integrated, testing...

sails/src/api/controllers/StudentController.js

@@ -1162,7 +1162,7 @@ module.exports = {
    *    "attributes": {
    *    "attributes": {
    *      "id_stu": <id_stu>,
    *      "id_stu": <id_stu>,
    *      "timestamp": <timestamp_string_in_ISO_format> (e.g.: "2016-07-13 17:50:00.224+0200"),
    *      "timestamp": <timestamp_string_in_ISO_format> (e.g.: "2016-07-13 17:50:00.224+0200"),
-   *      "picto": {...}
+   *      "pictos": {...}
    *    }
    *    }
    *  }
    *  }
    * @param  {response} res {<action_created>}
    * @param  {response} res {<action_created>}

sails/src/assets/app/bower.json

@@ -29,7 +29,8 @@
     "angular-chart.js": "latest",
     "angular-chart.js": "latest",
     "ng-lodash": "~0.3.0",
     "ng-lodash": "~0.3.0",
     "bootstrap-filestyle": "~1.2.1",
     "bootstrap-filestyle": "~1.2.1",
-    "ngMask": "angular-mask#~3.1.1"
+    "ngMask": "angular-mask#~3.1.1",
+    "angular-recaptcha": "~4.0.1"
   },
   },
   "resolutions": {
   "resolutions": {
     "angular": ">=1 <1.3.0",
     "angular": ">=1 <1.3.0",

sails/src/assets/scripts/app.js

@@ -8,7 +8,8 @@ var dashboardApp = angular.module('dashboardApp', [
   'dashboardServices',
   'dashboardServices',
   'dashboardDirectives',
   'dashboardDirectives',
   'pascalprecht.translate',
   'pascalprecht.translate',
-  'reCAPTCHA',
+  'reCAPTCHA', // TODO: delete after testing vsRecaptcha
+  'vcRecaptcha',
   'ui.bootstrap',
   'ui.bootstrap',
   'angularFileUpload',
   'angularFileUpload',
   'angular.filter',
   'angular.filter',
@@ -177,14 +178,6 @@ dashboardApp.config(function ($stateProvider, $urlRouterProvider) {
   $urlRouterProvider.otherwise('/login');
   $urlRouterProvider.otherwise('/login');
 });
 });
 
 
-/* reCAPTCHA */
-dashboardApp.config(function (reCAPTCHAProvider) {
-  reCAPTCHAProvider.setPublicKey('6LdkZwMTAAAAANDR_7_y9_ifEve1gLPcgneM_50o');
-  reCAPTCHAProvider.setOptions({
-    theme: 'clean'
-  });
-});
-
 //
 //
 // New confirm service to avoid Firefox buggy confirm dialog window (which
 // New confirm service to avoid Firefox buggy confirm dialog window (which
 // results in rootScope.inprog errors)
 // results in rootScope.inprog errors)

sails/src/assets/scripts/modules/login/controllers/signin.js

@@ -8,7 +8,6 @@ dashboardControllers.controller('SignInCtrl',
 function SignInCtrl($scope,
 function SignInCtrl($scope,
   $http,
   $http,
   $window,
   $window,
-  reCAPTCHA,
   $translate,
   $translate,
   config,
   config,
   CONSTANTS,
   CONSTANTS,
@@ -27,10 +26,8 @@ function SignInCtrl($scope,
       password_confirm: '',
       password_confirm: '',
       lang: 'es-es'
       lang: 'es-es'
     };
     };
-    $scope.captcha = '';
   };
   };
 
 
-  reCAPTCHA.setPublicKey('6LdLjh0TAAAAANblo_KUGNnmRZuIetOkdjdhj1b6');
   $scope.reset();
   $scope.reset();
 
 
   // Form submit
   // Form submit

sails/src/assets/scripts/modules/login/views/signin.html

 <!-- SigningCtrl controls here, see app.js -->
 <!-- SigningCtrl controls here, see app.js -->
+<div ng-controller="RecaptchaCtrl"></div> <!-- add reCaptcha controller -->
 <div class="container">
 <div class="container">
 
 
   <div class="row">
   <div class="row">
@@ -79,7 +80,14 @@
 
 
           <div class="form-group">
           <div class="form-group">
             <label>Captcha*</label>
             <label>Captcha*</label>
-            <div re-captcha ng-model="captcha"></div>
+            <div
+                vc-recaptcha
+                on-create="recaptcha.setWidgetId(recaptcha.widgetId)"
+                on-success="recaptcha.setResponse(recaptcha.response)"
+                on-expire="recaptcha.cbExpiration()"
+                lang="recaptcha.lang"
+            ></div>
+
           </div>
           </div>
 
 
           <div class="form-group">
           <div class="form-group">

sails/src/assets/scripts/modules/student/controllers/session.js

@@ -173,6 +173,7 @@ dashboardControllers.controller('StudentSessionCtrl', function StudentSessionCtr
         function(data, status, headers, config) {
         function(data, status, headers, config) {
           $scope.wsessions[0].end = data.data.end;
           $scope.wsessions[0].end = data.data.end;
           $scope.ws_recover=false;
           $scope.ws_recover=false;
+          $sessionRunning = false;
         }
         }
         ,function(data, status, headers, config) {
         ,function(data, status, headers, config) {
         }
         }
@@ -408,6 +409,13 @@ dashboardControllers.controller('StudentSessionCtrl', function StudentSessionCtr
 
 
     }
     }
 
 
+    /*
+    * A session has been initialized out from PDB, reload to notify it
+    */
+    if (data.action == "initsession") {
+      $scope.reload();
+    }
+
     $scope.$apply();
     $scope.$apply();
   });
   });
 
 

sails/src/tasks/config/concat.js

@@ -7,7 +7,8 @@ module.exports = function (grunt) {
     'assets/app/bower_components/angular-ui-router/release/angular-ui-router.js',
     'assets/app/bower_components/angular-ui-router/release/angular-ui-router.js',
     'assets/app/bower_components/angular-translate/angular-translate.js',
     'assets/app/bower_components/angular-translate/angular-translate.js',
     'assets/app/bower_components/angular-translate-loader-static-files/angular-translate-loader-static-files.js',
     'assets/app/bower_components/angular-translate-loader-static-files/angular-translate-loader-static-files.js',
-    'assets/app/bower_components/angular-re-captcha/angular-re-captcha.js',
+    'assets/app/bower_components/angular-re-captcha/angular-re-captcha.js', // TODO: delete after testing angular-recaptcha
+    'assets/app/bower_components/angular-recaptcha/release/angular-recaptcha.min.js',
     'assets/app/bower_components/ng-file-upload/angular-file-upload.js',
     'assets/app/bower_components/ng-file-upload/angular-file-upload.js',
     'assets/app/bower_components/angular-filter/dist/angular-filter.js',
     'assets/app/bower_components/angular-filter/dist/angular-filter.js',
 
 
@@ -35,6 +36,7 @@ module.exports = function (grunt) {
     'assets/scripts/config.js',
     'assets/scripts/config.js',
     'assets/scripts/controllers/controllers.js',
     'assets/scripts/controllers/controllers.js',
     'assets/scripts/controllers/main.js',
     'assets/scripts/controllers/main.js',
+    'assets/scripts/controllers/recaptcha.js',
 
 
     'assets/scripts/modules/login/controllers/login.js',
     'assets/scripts/modules/login/controllers/login.js',
     'assets/scripts/modules/login/controllers/login_setting_password.js',
     'assets/scripts/modules/login/controllers/login_setting_password.js',