Integración usuarios, errores solucionados

client/auth/src/login/index.html

@@ -3,7 +3,7 @@
 	<div class="box">
 		<img src="./logo.svg"/>
 		<form name="form" ng-submit="$ctrl.submit()">
-			<vn-textfield vn-id="userField" label="User" model="$ctrl.email"></vn-textfield>
+			<vn-textfield vn-id="userField" label="User" model="$ctrl.user"></vn-textfield>
 			<vn-textfield label="Password" model="$ctrl.password" type="password"></vn-textfield>
 			<div class="footer">
 				<vn-submit label="Enter"></vn-submit>

client/auth/src/login/index.js

@@ -9,15 +9,15 @@ export default class Controller {
         this.$http = $http;
     }
     submit() {
-        if (!(this.email && this.password)) {
+        if (!(this.user && this.password)) {
             this.focusUser();
-            this.showMessage('Please insert your email and password');
+            this.showMessage('Please insert your user and password');
             return;
         }
 
         this.loading = true;
         let params = {
-            email: this.email,
+            user: this.user,
             password: this.password,
             location: this.$window.location.href
         };
@@ -70,7 +70,7 @@ export default class Controller {
         this.$.userField.focus();
     }
     showMessage(message) {
-        this.snackbar.show({message: message});
+        this.$.snackbar.show({message: message});
     }
 }
 Controller.$inject = ['$element', '$scope', '$window', '$http'];

client/core/src/autocomplete/index.js

@@ -43,7 +43,6 @@ export default class Autocomplete extends Component {
             this.data.push(value);
         }
     }
-
     mdlUpdate() {
         let mdlField = this.element.firstChild.MaterialTextfield;
         if (mdlField)
@@ -344,7 +343,6 @@ export default class Autocomplete extends Component {
         this.item = item;
         this.mdlUpdate();
     }
-
 }
 Autocomplete.$inject = ['$element', '$scope', '$http', 'vnPopover'];
 

client/core/src/textfield/style.scss

@@ -5,6 +5,7 @@ vn-textfield {
         right: -6px; 
         margin: 22px 0px; 
         visibility: hidden;
+        background-color: white;
     }
     .material-icons {
         font-size: 18px;    

client/salix/src/app.js

@@ -5,7 +5,3 @@ import './config';
 import './run';
 import './components';
 import './styles/index';
-
-import {bootstrap} from './bootstrap';
-
-bootstrap();

client/salix/src/components/app/app.js

@@ -29,8 +29,8 @@ function vnAppInterceptor($q, $rootScope, logger, $translate, $cookies) {
     return {
         request: function(config) {
             $rootScope.loading = true;
-
             let token = $cookies.get('vnToken');
+
             if (token)
                 config.headers.Authorization = token;
 
@@ -50,8 +50,17 @@ function vnAppInterceptor($q, $rootScope, logger, $translate, $cookies) {
         },
         responseError: function(rejection) {
             $rootScope.loading = false;
-            let message = rejection.data.error.message;
+            let data = rejection.data;
-            logger.showError(message);
+            let error;
+
+            if (data && data.error instanceof Object)
+                error = data.error.message;
+            else if (rejection.status === -1)
+                error = $translate.instant(`Can't contact with server`);
+            else
+                error = `${rejection.status}: ${rejection.statusText}`;
+
+            logger.showError(error);
             return $q.reject(rejection);
         }
     };

client/salix/src/locale/en.json

@@ -5,5 +5,6 @@
     "Change language": "Change language",
     "Profile": "Profile",
     "Data saved!": "Data saved!",
+    "Can't contact with server": "Can't contact with server",
     "Push on applications menu": "To open a module push on applications menu"
 }

client/salix/src/locale/es.json

@@ -5,5 +5,6 @@
     "Change language": "Cambiar idioma",
     "Profile": "Perfil",
     "Data saved!": "¡Datos guardados!",
+    "Can't contact with server": "No se pudo contactar con el servidor",
     "Push on applications menu": "Para abrir un módulo pulsa en el menú de aplicaciones"
 }

services/auth/common/models/Account.json

@@ -0,0 +1,36 @@
+{
+  "name": "Account",
+  "base": "PersistedModel",
+  "validateUpsert": true,
+  "properties": {
+    "id": {
+      "type": "number",
+      "required": true
+    },
+    "name": {
+      "type": "string",
+      "required": true
+    },
+    "password": {
+      "type": "string",
+      "required": true
+    },
+    "active": {
+      "type": "boolean"
+    }
+  },
+  "acls": [
+    {
+      "accessType": "*",
+      "principalType": "ROLE",
+      "principalId": "$authenticated",
+      "permission": "ALLOW"
+    },
+    {
+      "accessType": "*",
+      "principalType": "ROLE",
+      "principalId": "$everyone",
+      "permission": "DENY"
+    }
+  ]
+}

services/auth/package.json

@@ -16,6 +16,7 @@
     "loopback-component-explorer": "^2.4.0",
     "loopback-connector-mysql": "^3.0.0",
     "loopback-datasource-juggler": "^2.39.0",
+    "md5": "^2.2.1",
     "serve-favicon": "^2.0.1",
     "strong-error-handler": "^1.0.1"
   },

services/auth/server/boot/routes.js

@@ -1,6 +1,8 @@
-var url = require ('url');
+var url = require('url');
+var md5 = require('md5');
 
 module.exports = function(app) {
+    let User = app.models.User;
     let applications = app.get('applications');
 
     app.get('/',function(req, res){
@@ -8,19 +10,31 @@ module.exports = function(app) {
     });
 
     app.post('/login', function(req, res) {
-        app.models.User.login({
+        let user = req.body.user;
-            email: req.body.email,
+        let password = req.body.password;
-            password: req.body.password
+        let syncOnFail = true;
-        }, 'user', function(err, token) {
+
+        login();
+
+        function login() {
+            let loginInfo = {
+                username: user,
+                password: password
+            };
+            User.login(loginInfo, 'user', loginCb);
+        }
+        function loginCb(err, token) {
             if (err) {
-                res.status (401);
+                if(syncOnFail) {
-                res.send(JSON.stringify({
+                    syncOnFail = false;
-                    title: 'Login failed',
+                    let filter = {where: {name: user}};
-                    content: err,
+                    app.models.Account.findOne(filter, findCb);
-                    redirectTo: '/',
+                }
-                    redirectToLinkText: 'Try again'
+                else
-                }));
+                    badLogin();
-            } else {
+                return;
+            }
+
             let query = url.parse(req.body.location, true).query;
             let loginUrl = applications[query.apiKey];
             if (!loginUrl)
@@ -32,12 +46,30 @@ module.exports = function(app) {
                 loginUrl: loginUrl,
             }));
         }
-        });
+        function findCb(err, instance) {
+            if(!instance || instance.password !== md5(password)) {
+                badLogin();
+                return;
+            }
+
+            let where = {username: user};
+            let userData = {
+                username: user,
+                password: password,
+                email: `${user}@verdnatura.es`
+            };
+            User.upsertWithWhere(where, userData, login);
+        }
+        function badLogin() {
+            res.status(401);
+            res.send(JSON.stringify({
+                message: 'Login failed'
+            }));
+        }
     });
 
     app.get('/logout', function (req, res) {
-        app.models.User.logout(req.accessToken.id, function(err) {
+        User.logout(req.accessToken.id,
-            res.redirect('/');
+            () => res.redirect('/'));
-        });
     });
 };

services/auth/server/datasources.json

@@ -1,7 +1,8 @@
 {
   "db": {
     "name": "db",
-    "connector": "memory"
+    "connector": "memory",
+    "file": "db.json"
   },
   "auth": {
     "name": "mysql",

services/auth/server/model-config.json

@@ -27,5 +27,8 @@
   },
   "Role": {
     "dataSource": "auth"
+  },
+  "Account": {
+    "dataSource": "auth"
   }
 }

services/client/common/models/Account.json

@@ -11,6 +11,10 @@
       "type": "string",
       "required": true
     },
+    "password": {
+      "type": "string",
+      "required": true
+    },
     "active": {
       "type": "boolean"
     }

services/client/server/model-config.json

@@ -33,6 +33,9 @@
     "dataSource": "auth",
     "public": false
   },
+  "Account": {
+    "dataSource": "auth"
+  },
   "Client": {
     "dataSource": "vn"
   },
@@ -54,9 +57,6 @@
   "Country": {
     "dataSource": "vn"
   },
-  "Account": {
-    "dataSource": "vn"
-  },
   "ContactChannel": {
     "dataSource": "vn"
   },

services/salix/client/index.ejs

@@ -4,8 +4,8 @@
 	<meta charset="UTF-8">
 	<title>Salix</title>
 </head>
-<body>
+<body ng-app="salix">
-	<vn-app id="app"></vn-app>
+	<vn-app></vn-app>
 	<script type="text/javascript"
 		src="/static/routes.js">
 	</script>
@@ -16,8 +16,7 @@
 		src="/static/bundle.vendor.js">
 	</script>
 	<script type="text/javascript"
-		src="/static/bundle.salix.js"
+		src="/static/bundle.salix.js">
-		selector="#app">
 	</script>
 </body>
 </html>

services/salix/server/boot/routes.js

@@ -59,7 +59,8 @@ function encodeUri(object) {
         if (object[key]) {
             if (uri.length > 0)
                 uri += '&';
-            uri += encodeURIComponent(key) + '=' + encodeURIComponent(object[key]);
+            uri += encodeURIComponent(key) + '=';
+            uri += encodeURIComponent(object[key]);
         }
     return uri;
 }