This commit is contained in:
saeid
2019-05-06 21:48:46 +04:30
parent 5d8500dafd
commit f6d7277ddc
14 changed files with 268 additions and 168 deletions
Vendored
+51 -12
View File
@@ -9,7 +9,15 @@
"use strict";
__webpack_require__.r(__webpack_exports__);
/* harmony import */ var vuex__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! vuex */ "./node_modules/vuex/dist/vuex.esm.js");
/* harmony import */ var _babel_runtime_regenerator__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @babel/runtime/regenerator */ "./node_modules/@babel/runtime/regenerator/index.js");
/* harmony import */ var _babel_runtime_regenerator__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_babel_runtime_regenerator__WEBPACK_IMPORTED_MODULE_0__);
/* harmony import */ var vuex__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! vuex */ "./node_modules/vuex/dist/vuex.esm.js");
function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; var ownKeys = Object.keys(source); if (typeof Object.getOwnPropertySymbols === 'function') { ownKeys = ownKeys.concat(Object.getOwnPropertySymbols(source).filter(function (sym) { return Object.getOwnPropertyDescriptor(source, sym).enumerable; })); } ownKeys.forEach(function (key) { _defineProperty(target, key, source[key]); }); } return target; }
function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
@@ -90,18 +98,49 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
}
};
},
computed: _objectSpread({}, Object(vuex__WEBPACK_IMPORTED_MODULE_0__["mapGetters"])('auth', ['authenticating', 'authenticationError', 'authenticationErrorCode'])),
methods: _objectSpread({}, Object(vuex__WEBPACK_IMPORTED_MODULE_0__["mapActions"])('auth', ['login']), {
handleSubmit: function handleSubmit() {
// Perform a simple validation that cell_number and password have been typed in
if (this.$refs.form.validate()) {
this.login({
cell_number: this.cell_number,
password: this.password
});
this.password = "";
computed: _objectSpread({}, Object(vuex__WEBPACK_IMPORTED_MODULE_1__["mapGetters"])('auth', ['authenticating', 'authenticationError', 'authenticationErrorCode'])),
methods: _objectSpread({}, Object(vuex__WEBPACK_IMPORTED_MODULE_1__["mapActions"])('auth', ['login']), {
handleSubmit: function () {
var _handleSubmit = _asyncToGenerator(
/*#__PURE__*/
_babel_runtime_regenerator__WEBPACK_IMPORTED_MODULE_0___default.a.mark(function _callee() {
var response;
return _babel_runtime_regenerator__WEBPACK_IMPORTED_MODULE_0___default.a.wrap(function _callee$(_context) {
while (1) {
switch (_context.prev = _context.next) {
case 0:
if (!this.$refs.form.validate()) {
_context.next = 5;
break;
}
_context.next = 3;
return this.login({
cell_number: this.cell_number,
password: this.password
});
case 3:
response = _context.sent;
if (!response.status || response.status !== 200) {
this.password = "";
}
case 5:
case "end":
return _context.stop();
}
}
}, _callee, this);
}));
function handleSubmit() {
return _handleSubmit.apply(this, arguments);
}
}
return handleSubmit;
}()
})
});
+1 -5
View File
@@ -1,7 +1,3 @@
{
<<<<<<< HEAD
"/vue/js/app.js": "/vue/js/app.js?id=834d97fecc500a7e0804"
=======
"/vue/js/app.js": "/vue/js/app.js?id=24a7b3a8d1891f421dee"
>>>>>>> d147ecaacb2020c2dedb3090eb9bcb56de3f6c95
"/vue/js/app.js": "/vue/js/app.js?id=753975375c400e12c93b"
}
+9 -10
View File
@@ -3366,11 +3366,7 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
};
},
methods: _objectSpread({}, Object(vuex__WEBPACK_IMPORTED_MODULE_0__["mapActions"])('auth', ['changePassword']), {
<<<<<<< HEAD
submitVerifyCode: function submitVerifyCode() {
=======
submitChangePassword: function submitChangePassword() {
>>>>>>> d147ecaacb2020c2dedb3090eb9bcb56de3f6c95
if (this.form.code != '') {
this.changePassword({
form: this.form
@@ -62931,6 +62927,7 @@ __webpack_require__.r(__webpack_exports__);
/* harmony import */ var _global_api_service__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../global/api.service */ "./resources/js/vue/services/global/api.service.js");
/* harmony import */ var _storage_service__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./storage.service */ "./resources/js/vue/services/auth/storage.service.js");
/* harmony import */ var _config_urls__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! @/config/urls */ "./resources/js/vue/config/urls.js");
/* harmony import */ var _global_toast_service__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../global/toast.service */ "./resources/js/vue/services/global/toast.service.js");
function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
@@ -62963,6 +62960,7 @@ function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.g
var AuthenticationError =
/*#__PURE__*/
function (_Error) {
@@ -63024,14 +63022,15 @@ var UserService = {
// but don't worry about this just yet - I'll come back to it later
_global_api_service__WEBPACK_IMPORTED_MODULE_1__["ApiService"].mount401Interceptor();
return _context.abrupt("return", response.data.access_token);
return _context.abrupt("return", response);
case 12:
_context.prev = 12;
_context.t0 = _context["catch"](1);
_global_toast_service__WEBPACK_IMPORTED_MODULE_4__["default"].error('Username Or Password Is Incorrect', 'Error');
throw new AuthenticationError(_context.t0.response.status, _context.t0.response.data.detail);
case 15:
case 16:
case "end":
return _context.stop();
}
@@ -63703,7 +63702,7 @@ function _asyncToGenerator(fn) { return function () { var self = this, args = ar
var _login = _asyncToGenerator(
/*#__PURE__*/
_babel_runtime_regenerator__WEBPACK_IMPORTED_MODULE_0___default.a.mark(function _callee(_ref, _ref2) {
var commit, dispatch, cell_number, password, token;
var commit, dispatch, cell_number, password, response;
return _babel_runtime_regenerator__WEBPACK_IMPORTED_MODULE_0___default.a.wrap(function _callee$(_context) {
while (1) {
switch (_context.prev = _context.next) {
@@ -63716,14 +63715,14 @@ function _asyncToGenerator(fn) { return function () { var self = this, args = ar
return _services__WEBPACK_IMPORTED_MODULE_1__["UserService"].login(cell_number, password);
case 6:
token = _context.sent;
commit('loginSuccess', token); // Redirect the user to the page he first tried to visit or to the home view
response = _context.sent;
commit('loginSuccess', response.data.access_token); // Redirect the user to the page he first tried to visit or to the home view
_router__WEBPACK_IMPORTED_MODULE_2__["default"].push(_router__WEBPACK_IMPORTED_MODULE_2__["default"].history.current.query.redirect || '/');
dispatch('info', {}, {
root: true
});
return _context.abrupt("return", true);
return _context.abrupt("return", response);
case 13:
_context.prev = 13;