merged from master

sails/cron/README.md

+Estos son scripts de automatización para las siguientes tareas en el servidor:
+
+- Renovación de certificados
+- Backup automático
+
+## Renovación de certificados
+
+Ver [letsencrypt.md](http://gitlab.ujaen.es/yotta/pictogram/blob/master/sails/src/config/ssl/letsencrypt.md)
+
+## Backup automático
+
+### Dependencias:
+
+- Se está usando el script [ec2-automate-backup](https://github.com/colinbjohnson/aws-missing-tools/tree/master/ec2-automate-backup).
+- Es necesario, para su uso, instalar [AWS-CLI](http://docs.aws.amazon.com/cli/latest/userguide/installing.html)
+
+### Configuración:
+
+Desde AWS IAM, debemos crear un usuario dentro de un grupo. Los permisos son los siguientes:
+
+```
+"Version": "2012-10-17",
+"Statement": [
+    {
+            "Sid": "Stmt1489386668000",
+	    "Effect": "Allow",
+	    "Action": [
+	        "ec2:CreateSnapshot",
+	        "ec2:CreateTags",
+	        "ec2:DeleteSnapshot",
+	        "ec2:DeleteTags",
+	        "ec2:DescribeSnapshotAttribute",
+	        "ec2:DescribeSnapshots",
+	        "ec2:DescribeVolumes",
+	        "ec2:ModifySnapshotAttribute"
+	     ],
+														               "Resource": "*"
+	}
+]
+}
+```
+
+El comando cron que hay de muestra en `crontab` se encargará de hacer una copia cada día, para los últimos 30 días.
\ No newline at end of file

sails/cron/backpredb.sh

+#!/bin/bash
+# This script is to be run in a remote machine with access to pre
+
+DUMPFILE=/home/ubuntu/backup/`date +%d`-mysqldump.sql.gz
+ssh pre "nice mysqldump -u root -p'r00...Tt' pictodb | gzip > $DUMPFILE"
+scp pre:$DUMPFILE /home/amontejo/backup

sails/cron/cron-primer.sh

+#!/bin/bash -
+# export PATH=/bin is required for cut, date, grep
+# export PATH=/usr/bin is required for AWS Command Line Interface tools
+export PATH=/bin:/usr/bin:/home/ubuntu/.local/bin
+
+# AWS_ACCESS_KEY_ID and AWS_SECRET_ACCESS_KEY needed for AWS CLI tools
+export AWS_ACCESS_KEY_ID=AKIAJJZNE3V5QMKSMU6A
+export AWS_SECRET_ACCESS_KEY=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
+
+# AWS_CONFIG_FILE required for AWS Command Line Interface tools (f.e. ".aws")
+export AWS_CONFIG_FILE=/root/.aws/config

sails/cron/crontab

+@reboot /home/ubuntu/pictogram/sails/bootstrap.sh
+
+# Let's encrypt certs autorenew
+@monthly /home/ubuntu/cron/renewcerts.sh
+
+# AWS Volume backups
+@daily /home/ubuntu/cron/aws-missing-tools/ec2-automate-backup/ec2-automate-backup.sh -c /home/ubuntu/cron/cron-primer.sh -v vol-0cd5c496 -k 30 -p -u -r "eu-central-1"
+

sails/cron/renewcerts.sh

+#!/bin/bash
+
+# Renew certs
+/home/ubuntu/letsencrypt/letsencrypt-auto --config /etc/letsencrypt/cli.ini -d login.pictogramweb.com -d api.pictogramweb.com -d app.pictogramweb.com -d pre.yottacode.com -d pictogram.yottacode.com -d apk.pictogramweb.com certonly
+
+# Reload Sails
+(cd /home/ubuntu/pictogram/sails/src; /usr/bin/forever stopall; /usr/bin/forever start app.js)
+

sails/roles/database/files/pictodb-schema.sql

@@ -309,6 +309,7 @@ CREATE TABLE IF NOT EXISTS `license` (
   `activation_ts` datetime NULL,
   `expiration_ts` datetime NULL,
   `duration` int(11) DEFAULT 0,
+  `creator` varchar(40) DEFAULT NULL,
   PRIMARY KEY (`id`),
   UNIQUE KEY `number` (`number`),
   KEY `id_stu` (`id_stu`)

sails/src/CHANGES.md

@@ -33,6 +33,9 @@ Changes to be performed manually in servers to upgrade
 
 (already done in dev & pre)
 
+- add new column to license:
+  `alter table license add column creator varchar(40) DEFAULT NULL;`
+
 - add arasaac to source table
   `INSERT INTO `source` (`id`, `name`, `description`) VALUES (3, 'Arasaac', 'Arasaac pictograms collection');`
 - alter table supervisor add arasaac license:

sails/src/api/controllers/AdminController.js

@@ -2,39 +2,44 @@
  * AdminController which manages the administration login and login
  * @type {Object}
  */
+
+const bcrypt = require('bcrypt-nodejs');
+
 module.exports = {
 
-	// @TODO ¿?¿?
   login: function (req, res) {
-	    var bcrypt = require('bcrypt-nodejs');
 	    var email = req.body.email;
 	    var password = req.body.password;
 
 	    // no credentials
 	    if (!email || !password)
-	    	return res.json(401, {error: 'No credentials sent'});
+	    	return res.badRequest('No credentials sent');
 
 	    // Check email
-	    if (email != sails.config.pictogram.admin.email)
-	        return res.json(401, {error: 'User not found'});
+      var admin = sails.config.pictogram.admins.find((a) => a.email == email);
+	    if (typeof admin == 'undefined')
+	      return res.badRequest('User not found');
 
       // if found, check password in encrypted form
-	    bcrypt.compare(password, sails.config.pictogram.admin.password, function (err, match) {
+	    bcrypt.compare(password, admin.password, function (err, match) {
       	if (err)
-	          	return res.json(500, { error: 'Server error' });
+          	return res.serverError('Server error' + err);
         if (!match) // password do not match
-	  	        return res.json(401, { error: 'Invalid password' });
+  	        return res.unauthorized('Invalid password');
 
     	  // credentials are valid, return token with max life span
-        	return res.json(200, {
-        		token: sailsTokenAuth.issueToken({'isAdmin': true}, sails.config.jwt.expiresInMinutes)});
+		var returned_admin = (JSON.parse(JSON.stringify(admin)));
+		delete returned_admin.password;
+      	return res.ok({
+      		token: sailsTokenAuth.issueToken({'isAdmin': true, 'email': email}, sails.config.jwt.expiresInMinutes),
+          user: returned_admin
+        });
       });
 	},
 
-	// @TODO 357
 	logout: function (req, res) {
 		delete req.token;
-		res.json(200, {notice: 'Session closed'});
+		res.ok('Session closed');
 	}
 
 };

sails/src/api/controllers/LicenseController.js

@@ -8,6 +8,24 @@
 module.exports = {
 
   /**
+  * Get all the licenses for the given creator
+  * @param {request} req
+  *   {
+  *      email (creator email)
+  *   }
+  * @param {response} res
+  *   [list of licenses]
+  */
+  getByEmail: function (req, res) {
+    if (!req.params.email)
+      return res.badRequest("No email provided");
+
+    License.find({creator: req.params.email})
+    .then((l) => res.ok(l))
+    .catch((e) => res.serverError(e));
+  },
+
+  /**
    * Create a new Instruction, which is associated to the given method
    * @param  {request} req
    *   {
@@ -67,7 +85,8 @@ module.exports = {
     get_new_random_license(function (license) {
       License.create({
         number: license,
-        duration: params.duration
+        duration: params.duration,
+        creator: req.token.email
       })
       .then((l) => {
         if (l) {

sails/src/api/controllers/StudentController.js

@@ -1169,6 +1169,7 @@ module.exports = {
           }
 
             student.pic = newAvatarFileName;
+	    delete student.password;
           student.save(function (updateStudentError) {
             if (updateStudentError) {
               throw updateStudentError;

sails/src/api/models/License.js

@@ -48,6 +48,10 @@ module.exports = {
       size: 16,
       unique: true
     },
+    creator: {
+      columnName: "creator",
+      type: "string",
+    },
     toJSON: function () {
       var l = this.toObject();
       delete l.id;

sails/src/api/services/mailService.js

@@ -2,7 +2,7 @@ var mailerService = require('sails-service-mailer');
 
 module.exports.mailer = function() {
   return mailerService('sendmail', {
-    from: 'no-reply@yottacode.com',
+    from: 'no-reply@pictogramweb.com',
     subject: sails.__('notification_from_pictogram'),
     provider: {
       path: '/usr/sbin/sendmail'

sails/src/assets/app/i18n/en-gb.json

@@ -11,6 +11,7 @@
     "action-tryend": "Try end",
     "action-tryinit": "Try begin",
     "action-unshow": "Writing mode",
+    "activation": "Activation",
     "add": "Add",
     "add_expression": "Add expression",
     "add_instruction": "Add instruction",
@@ -77,6 +78,7 @@
     "country_office_requested": "Country for office/center is mandatory",
     "create_account": "Create account",
     "create_an_account": "Create an account",
+    "creation": "Creation",
     "credentials": "Credentials",
     "crop_image": "Crop image",
     "data_no_saved": "Data can't be saved",
@@ -178,6 +180,7 @@
     "legend_normal":"Normal legend",
     "legend_full":"Only legend",
     "legend_size": "Legend size",
+    "license": "License",
     "licenses": "Licenses",
     "license_already_activated": "License already activated",
     "license_created": "License created",

sails/src/assets/app/i18n/es-es.json

@@ -11,6 +11,7 @@
     "action-tryend": "Fin de ensayo",
     "action-tryinit": "Inicio de ensayo",
     "action-unshow": "Modo escritura",
+    "activation": "Activación",
     "add": "Añadir",
     "add_expression": "Añadir expresión",
     "add_instruction": "Añadir instrucción",
@@ -77,6 +78,7 @@
     "country_office_requested": "Debe especificar el país del gabinete/centro",
     "create_account": "Crear cuenta",
     "create_an_account": "Crear una cuenta",
+    "creation": "Creación",
     "credentials": "Credenciales",
     "crop_image": "Recortar imagen",
     "data_no_saved": "Los datos no se han podido guardar",
@@ -178,6 +180,7 @@
     "legend_full":"Sólo leyenda",
     "legend_apply_all":"Aplicar a todos los pictogramas",
     "legend_size": "Tamaño de la leyenda",
+    "license": "Licencia",
     "licenses": "Licencias",
     "licenses_left": "{{number}} licencias disponibles",
     "license_already_activated": "Licencia ya activada previamente",

sails/src/assets/scripts/modules/admin/controllers/admin.js

@@ -3,11 +3,10 @@
 //-------------------
 // Admin Controller
 //-------------------
-dashboardControllers.controller('AdminCtrl', function AdminCtrl($scope) {
+dashboardControllers.controller('AdminCtrl', function AdminCtrl($scope, $window) {
   // The last parameter, config, is injected from config.js (defined in dashboardConfig module)
 
   // Assign values this way (like an object) to ensure it's the parent scope  $scope.user.name ='Super';
-  $scope.user.surname = 'Admin';
-  $scope.user.pic ='img/arturo.jpg';
+  $scope.user = JSON.parse($window.sessionStorage.user);
 
 });

sails/src/assets/scripts/modules/admin/controllers/licenses.js

@@ -10,9 +10,20 @@ dashboardControllers.controller('AdminLicensesCtrl', function AdminLicensesCtrl(
   $scope.showmessagesupervisor = false;
   $scope.new_numbers = [];
   $scope.formdatalicense = {
-    duration: 1,
+    duration: 3,
     repeat: 1
   };
+  $scope.licenses = [];
+
+  // Get all licenses for the user
+  $http
+  .get(config.backend + '/license/' + $scope.user.email)
+  .success(function(data, status, headers, config) {
+    $scope.licenses = data;
+  })
+  .error(function(data, status, headers, config) {
+    ngToast.danger({content: $translate.instant('error_general')});
+  });
 
   // This generates a new license and registers it in the database
   $scope.create_licenses = function(supervisor) {
@@ -21,14 +32,15 @@ dashboardControllers.controller('AdminLicensesCtrl', function AdminLicensesCtrl(
       $http
         .post(config.backend+'/license', $scope.formdatalicense)
         .success(function(data, status, headers, config) {
-          $scope.new_numbers.push(data.number.substr(0,4) +
+          /*$scope.new_numbers.push(data.number.substr(0,4) +
             "-" + data.number.substr(4,4) +
             "-" + data.number.substr(8,4) +
             "-" + data.number.substr(12,4));
+            */
+            $scope.new_numbers.push(data.number);
         })
         .error(function(data, status, headers, config) {
           ngToast.danger({content: $translate.instant('error_general')});
-          console.log("Error from API: " + data.error);
         });
     }
     $scope.duration_registered = $scope.formdatalicense.duration;

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

@@ -15,8 +15,9 @@ dashboardControllers.controller('LoginAdminCtrl', function LoginAdminCtrl($scope
     $http
     .post(config.backend+'/admin/login', $scope.credentials)
     .success(function(data, status, headers, config) {
-      // Save token and user data y sessionStorage
+      // Save token, user data in sessionStorage
       $window.sessionStorage.token = data.token;
+      $window.sessionStorage.user = JSON.stringify(data.user);
 
       // Redirect to admin panel
       $location.path('/admin/licenses');
@@ -28,6 +29,10 @@ dashboardControllers.controller('LoginAdminCtrl', function LoginAdminCtrl($scope
     .error(function(data, status, headers, config) {
       // Delete token if user fails to login
       delete $window.sessionStorage.token;
+      delete $window.sessionStorage.user;
+
+      // Redirect to admin panel
+      $location.path('/admin/login');
 
       $translate('login_fail').then(function(translation) {
         ngToast.danger({ content: translation });

sails/src/assets/scripts/modules/admin/views/header.html

@@ -21,7 +21,7 @@
         </div>
 
         <div class="nav navbar-nav navbar-right navbar-text">
-            <h4 class="text-right">{{user.getFullName()}}</h4> 
+            <h4 class="text-right">{{ user.email }}</h4> 
             <p class="text-right">
 
               <!-- Botón salir -->

sails/src/assets/scripts/modules/admin/views/licenses.html

@@ -2,13 +2,10 @@
 
 <div class="row">
 
-  <div class="col-md-2">
-  </div>
-
-  <div class="col-md-4">
-
     <h3 translate>licenses</h3>
 
+      <div class="col-md-5">
+
     <form role="form" ng-submit="create_licenses()">
 
     <div class="form-group">
@@ -27,9 +24,6 @@
 
   </form>
 
-  </div>
-
-  <div class="col-md-4">
   <div ng-show="new_numbers.length > 0" class="alert alert-info">
     <p>{{ 'licenses_created' | translate }}:</p><p>&nbsp;</p>
     <div ng-repeat="number in new_numbers track by $index">
@@ -37,8 +31,33 @@
     </div>
     <p>{{ 'duration_in_months' | translate }}: {{ duration_registered }}</p>
   </div>
+
   </div>
 
   <div class="col-md-2">
   </div>
+
+  <div class="col-md-5">
+
+    <p> {{ 'licenses_created' | translate }}: {{ licenses.length }}</p>
+
+    <div class="pre-scrollable">
+      <table class="table table-striped">
+        <thead>
+        <tr>
+          <th>{{ 'license' | translate }}</th>
+          <th>{{ 'creation' | translate }}</th>
+          <th>{{ 'activation' | translate }}</th>
+        </tr>
+        </thead>
+        <tbody>
+        <tr ng-repeat="l in licenses | orderBy : 'creation_ts' : true" ng-class-odd="'striped'">
+          <td><tt>{{ l.number }}</tt></a></td>
+          <td>{{ l.creation_ts | date : "dd/MM/y" }}</td>
+          <td>{{ l.activation_ts | date : "dd/MM/y" }}</td>
+        </tr>
+        </tbody>
+      </table>
+    </div>
+  </div>
 </div>

sails/src/assets/scripts/modules/translate/views/footer_translate.html

@@ -11,12 +11,12 @@
     </div>
     <div class="col-xs-4">
       <div class="languages-margin text-center text-muted">
-        Powered by &nbsp; <a href="http://www.yottacode.com"><img src="img/logo_pictogram.png" width="40px" alt="Pictogram" title="Pictogram" /></a>
+        Powered by &nbsp; <a href="http://www.pictogramweb.com"><img src="img/logo_pictogram.png" width="40px" alt="Pictogram" title="Pictogram" /></a>
       </div>
     </div>
     <div class="col-xs-4">
       <div class="languages-margin text-right text-muted">
-	<a href="mailto:soporte@yottacode.com" translate>support</a> |
+	<a href="mailto:soporte@pictogramweb.com" translate>support</a> |
 	<a href='/app/#/disclaimer' target='_blank' translate>disclaimer</a>
       </div>
     </div>

sails/src/assets/styles/main.css

@@ -59,6 +59,10 @@
     margin-top: 7px;
 }
 
+.table .table-striped .striped {
+  background-color: lightgray !important;
+}
+
 
 /* Evitar scrolling horizontal */
 body{

sails/src/config/pictogram.js

@@ -6,10 +6,18 @@ var UPLOAD_PATH = path.join(__dirname, '..', '..', 'upload');
 
 module.exports.pictogram = {
   version: "1.1", // actual version of the server, to be checked by the client
-  admin: {
+  admins: [
+    {
       email: 'amontejo@ujaen.es',
-    password: '$2a$06$flEEOc15SerMeYWARrN9w.KSpJuM.jDsaTgrtD0ESzbxKHPl0f/zq' //y00ttaa!!
+      password: '$2a$06$flEEOc15SerMeYWARrN9w.KSpJuM.jDsaTgrtD0ESzbxKHPl0f/zq', //y00ttaa!!
+      lang: "es-es"
     },
+    {
+      email: 'luisballesteros@editorialcepe.es',
+      password: '$2a$10$Re9LxejAm6GjYLvw7LCbQeLiNn4HDGxjQMbZxg0paP3SGIJI6Rn52', //ba!!3sTe;0s
+      lang: "es-es"
+    }
+  ],
   serialSize: 10, // number of characters in generated serial numbers
   pageLimit: 10, // number of elements per "page"
 

sails/src/config/policies.js

@@ -121,8 +121,9 @@ module.exports.policies = {
   LicenseController: {
   //  create: ['tokenAuth', 'isAdmin'],
   //  activate: ['tokenAuth']
-  create: true,
-  activate: true
+    create: ['tokenAuth'],
+    activate: ['tokenAuth'],
+    getByEmail: ['tokenAuth']
   },
 
   SupervisorController: {

sails/src/config/routes.js

@@ -39,6 +39,7 @@ module.exports.routes = {
   'POST /instruction/template': 'MetaInstructionController.create',
   'DELETE /instruction/template/:id': 'MetaInstructionController.destroy',
 
+  'GET /license/:email': 'LicenseController.getByEmail',
   'POST /license': 'LicenseController.create',
   'PUT /license/:number': 'LicenseController.activate',