From 5cfdd51cf404e14b66434f14b088c069dcc35097 Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Sun, 21 May 2017 18:36:07 +0200 Subject: [PATCH] =?UTF-8?q?Integraci=C3=B3n=20usuarios,=20errores=20soluci?= =?UTF-8?q?onados?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client/auth/src/login/index.html | 2 +- client/auth/src/login/index.js | 8 +- client/core/src/autocomplete/index.js | 2 - client/core/src/textfield/style.scss | 1 + client/salix/src/app.js | 4 - client/salix/src/components.js | 2 +- client/salix/src/components/app/app.js | 15 +++- client/salix/src/locale/en.json | 1 + client/salix/src/locale/es.json | 1 + services/auth/common/models/Account.json | 36 +++++++++ services/auth/package.json | 1 + services/auth/server/boot/routes.js | 86 ++++++++++++++------- services/auth/server/datasources.json | 3 +- services/auth/server/model-config.json | 3 + services/client/common/models/Account.json | 4 + services/client/common/models/Employee.json | 2 +- services/client/server/model-config.json | 6 +- services/salix/client/index.ejs | 7 +- services/salix/server/boot/routes.js | 3 +- 19 files changed, 135 insertions(+), 52 deletions(-) create mode 100644 services/auth/common/models/Account.json diff --git a/client/auth/src/login/index.html b/client/auth/src/login/index.html index ab26e44bb..07623fff9 100755 --- a/client/auth/src/login/index.html +++ b/client/auth/src/login/index.html @@ -3,7 +3,7 @@
- +
diff --git a/client/auth/src/login/index.js b/client/auth/src/login/index.js index c07bb558d..7c7447d73 100644 --- a/client/auth/src/login/index.js +++ b/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']; diff --git a/client/core/src/autocomplete/index.js b/client/core/src/autocomplete/index.js index 422db8d42..4acf3c790 100644 --- a/client/core/src/autocomplete/index.js +++ b/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']; diff --git a/client/core/src/textfield/style.scss b/client/core/src/textfield/style.scss index 239068d67..77693efd5 100644 --- a/client/core/src/textfield/style.scss +++ b/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; diff --git a/client/salix/src/app.js b/client/salix/src/app.js index 13f3f09cd..0f5d3edb5 100644 --- a/client/salix/src/app.js +++ b/client/salix/src/app.js @@ -5,7 +5,3 @@ import './config'; import './run'; import './components'; import './styles/index'; - -import {bootstrap} from './bootstrap'; - -bootstrap(); diff --git a/client/salix/src/components.js b/client/salix/src/components.js index 905f67603..f726f89da 100644 --- a/client/salix/src/components.js +++ b/client/salix/src/components.js @@ -4,4 +4,4 @@ export {NAME as ACTIONS, COMPONENT as ACTIONS_COMPONENT} from './components/left export {NAME as LEFT_MENU, COMPONENT as LEFTMENU_COMPONENT} from './components/left-menu/left-menu'; export {NAME as MENU_ITEM, COMPONENT as MENU_ITEM_COMPONENT} from './components/left-menu/menu-item'; export {NAME as TOPBAR, COMPONENT as TOPBAR_COMPONENT} from './components/topbar/topbar'; -export {NAME as SEARCHBAR, COMPONENT as SEARCHBAR_COMPONENT} from './components/searchbar/searchbar'; \ No newline at end of file +export {NAME as SEARCHBAR, COMPONENT as SEARCHBAR_COMPONENT} from './components/searchbar/searchbar'; diff --git a/client/salix/src/components/app/app.js b/client/salix/src/components/app/app.js index 040635229..2021b277c 100644 --- a/client/salix/src/components/app/app.js +++ b/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; - logger.showError(message); + let data = rejection.data; + 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); } }; diff --git a/client/salix/src/locale/en.json b/client/salix/src/locale/en.json index 8b8e23ed6..a589c5a3f 100644 --- a/client/salix/src/locale/en.json +++ b/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" } \ No newline at end of file diff --git a/client/salix/src/locale/es.json b/client/salix/src/locale/es.json index 55e5dbab3..ea9d57354 100644 --- a/client/salix/src/locale/es.json +++ b/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" } \ No newline at end of file diff --git a/services/auth/common/models/Account.json b/services/auth/common/models/Account.json new file mode 100644 index 000000000..1691ef130 --- /dev/null +++ b/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" + } + ] +} diff --git a/services/auth/package.json b/services/auth/package.json index 372b00e70..cc2ba6428 100644 --- a/services/auth/package.json +++ b/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" }, diff --git a/services/auth/server/boot/routes.js b/services/auth/server/boot/routes.js index dd022bdcc..032d2cfda 100644 --- a/services/auth/server/boot/routes.js +++ b/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,36 +10,66 @@ module.exports = function(app) { }); app.post('/login', function(req, res) { - app.models.User.login({ - email: req.body.email, - password: req.body.password - }, 'user', function(err, token) { - if (err) { - res.status (401); - res.send(JSON.stringify({ - title: 'Login failed', - content: err, - redirectTo: '/', - redirectToLinkText: 'Try again' - })); - } else { - let query = url.parse(req.body.location, true).query; - let loginUrl = applications[query.apiKey]; - if (!loginUrl) - loginUrl = applications.default; + let user = req.body.user; + let password = req.body.password; + let syncOnFail = true; - res.send(JSON.stringify({ - token: token.id, - continue: query.continue, - loginUrl: loginUrl, - })); + login(); + + function login() { + let loginInfo = { + username: user, + password: password + }; + User.login(loginInfo, 'user', loginCb); + } + function loginCb(err, token) { + if (err) { + if(syncOnFail) { + syncOnFail = false; + let filter = {where: {name: user}}; + app.models.Account.findOne(filter, findCb); + } + else + badLogin(); + return; } - }); + + let query = url.parse(req.body.location, true).query; + let loginUrl = applications[query.apiKey]; + if (!loginUrl) + loginUrl = applications.default; + + res.send(JSON.stringify({ + token: token.id, + continue: query.continue, + 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) { - res.redirect('/'); - }); + User.logout(req.accessToken.id, + () => res.redirect('/')); }); }; diff --git a/services/auth/server/datasources.json b/services/auth/server/datasources.json index ea04dddf1..562cd0e62 100644 --- a/services/auth/server/datasources.json +++ b/services/auth/server/datasources.json @@ -1,7 +1,8 @@ { "db": { "name": "db", - "connector": "memory" + "connector": "memory", + "file": "db.json" }, "auth": { "name": "mysql", diff --git a/services/auth/server/model-config.json b/services/auth/server/model-config.json index 4593f87fb..7aafa7b3f 100644 --- a/services/auth/server/model-config.json +++ b/services/auth/server/model-config.json @@ -27,5 +27,8 @@ }, "Role": { "dataSource": "auth" + }, + "Account": { + "dataSource": "auth" } } \ No newline at end of file diff --git a/services/client/common/models/Account.json b/services/client/common/models/Account.json index f20699c3e..1691ef130 100644 --- a/services/client/common/models/Account.json +++ b/services/client/common/models/Account.json @@ -11,6 +11,10 @@ "type": "string", "required": true }, + "password": { + "type": "string", + "required": true + }, "active": { "type": "boolean" } diff --git a/services/client/common/models/Employee.json b/services/client/common/models/Employee.json index b9dd42b69..db460e755 100644 --- a/services/client/common/models/Employee.json +++ b/services/client/common/models/Employee.json @@ -34,4 +34,4 @@ "permission": "DENY" } ] -} +} \ No newline at end of file diff --git a/services/client/server/model-config.json b/services/client/server/model-config.json index e6440b478..94c9b2657 100644 --- a/services/client/server/model-config.json +++ b/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" }, diff --git a/services/salix/client/index.ejs b/services/salix/client/index.ejs index 83060a29a..6217c3a45 100644 --- a/services/salix/client/index.ejs +++ b/services/salix/client/index.ejs @@ -4,8 +4,8 @@ Salix - - + + @@ -16,8 +16,7 @@ src="/static/bundle.vendor.js"> diff --git a/services/salix/server/boot/routes.js b/services/salix/server/boot/routes.js index 9d2b46078..7d2bf17e0 100644 --- a/services/salix/server/boot/routes.js +++ b/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; }