cssd-doc/cssd-back
1
0
Fork 0
mirror of https://git.meshkee.com/cssd/cssd-back.git synced 2026-10-13 21:31:07 +03:30
Code Issues Packages Projects Releases Wiki Activity

Edit number 2

Browse Source
This commit is contained in:
saeid_01
2019-04-17 10:01:49 +04:30
parent ee6c36ade3
commit a20768868d
8 changed files with 164 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/vue/js/app.js
Vendored
+116 -42
View File
@@ -8129,7 +8129,7 @@ exports.push([module.i, "/*!\n* Vuetify v1.5.11\n* Forged by John Leider\n* Rele
exports = module.exports = __webpack_require__(/*! ../../../../../node_modules/css-loader/dist/runtime/api.js */ "./node_modules/css-loader/dist/runtime/api.js")(false);
// Module
exports.push([module.i, "\n#core-footer {\r\n z-index: 0;\n}\r\n", ""]);
exports.push([module.i, "\n#core-footer {\n z-index: 0;\n}\n", ""]);
@@ -60798,7 +60798,7 @@ var ApiService = {
break;
}
if (!error.config.url.includes('auth/login')) {
if (!error.config.url.includes('login')) {
_context.next = 6;
break;
}
@@ -60810,7 +60810,7 @@ var ApiService = {
case 6:
_context.prev = 6;
_context.next = 9;
return _store__WEBPACK_IMPORTED_MODULE_3__["default"].dispatch('auth/refreshToken');
return _store__WEBPACK_IMPORTED_MODULE_3__["default"].dispatch('refreshToken');
case 9:
return _context.abrupt("return", _this.customRequest({
@@ -60972,7 +60972,8 @@ var UserService = {
var _login = _asyncToGenerator(
/*#__PURE__*/
_babel_runtime_regenerator__WEBPACK_IMPORTED_MODULE_0___default.a.mark(function _callee(cell_number, password) {
var requestData, response;
var requestData, _response;
return _babel_runtime_regenerator__WEBPACK_IMPORTED_MODULE_0___default.a.wrap(function _callee$(_context) {
while (1) {
switch (_context.prev = _context.next) {
@@ -60986,8 +60987,8 @@ var UserService = {
grant_type: 'password'
},
auth: {
username: Object({"MIX_APP_ROOT_API":"https://www.cssd-doc.com/api/","MIX_PUSHER_APP_CLUSTER":"mt1","MIX_PUSHER_APP_KEY":"","NODE_ENV":"development"}).VUE_APP_CLIENT_ID,
password: Object({"MIX_APP_ROOT_API":"https://www.cssd-doc.com/api/","MIX_PUSHER_APP_CLUSTER":"mt1","MIX_PUSHER_APP_KEY":"","NODE_ENV":"development"}).VUE_APP_CLIENT_SECRET
username: Object({"MIX_PUSHER_APP_KEY":"","MIX_PUSHER_APP_CLUSTER":"mt1","MIX_APP_ROOT_API":"https://www.cssd-doc.com/api/","NODE_ENV":"development"}).MIX_APP_CLIENT_ID,
password: Object({"MIX_PUSHER_APP_KEY":"","MIX_PUSHER_APP_CLUSTER":"mt1","MIX_APP_ROOT_API":"https://www.cssd-doc.com/api/","NODE_ENV":"development"}).MIX_APP_CLIENT_SECRET
}
};
_context.prev = 1;
@@ -60995,14 +60996,14 @@ var UserService = {
return _api_service__WEBPACK_IMPORTED_MODULE_1__["default"].customRequest(requestData);
case 4:
response = _context.sent;
_storage_service__WEBPACK_IMPORTED_MODULE_2__["TokenService"].saveToken(response.data.token);
_storage_service__WEBPACK_IMPORTED_MODULE_2__["TokenService"].saveRefreshToken(response.data.token);
_response = _context.sent;
_storage_service__WEBPACK_IMPORTED_MODULE_2__["TokenService"].saveToken(_response.data.access_token);
_storage_service__WEBPACK_IMPORTED_MODULE_2__["TokenService"].saveRefreshToken(_response.data.refresh_token);
_api_service__WEBPACK_IMPORTED_MODULE_1__["default"].setHeader(); // NOTE: We haven't covered this yet in our ApiService
// but don't worry about this just yet - I'll come back to it later
_api_service__WEBPACK_IMPORTED_MODULE_1__["default"].mount401Interceptor();
return _context.abrupt("return", response.data.token);
return _context.abrupt("return", _response.data.access_token);
case 12:
_context.prev = 12;
@@ -61034,7 +61035,8 @@ var UserService = {
var _forgotPassword = _asyncToGenerator(
/*#__PURE__*/
_babel_runtime_regenerator__WEBPACK_IMPORTED_MODULE_0___default.a.mark(function _callee2(cell_number) {
var requestData, response;
var requestData, _response2;
return _babel_runtime_regenerator__WEBPACK_IMPORTED_MODULE_0___default.a.wrap(function _callee2$(_context2) {
while (1) {
switch (_context2.prev = _context2.next) {
@@ -61046,8 +61048,8 @@ var UserService = {
cell_number: cell_number
},
auth: {
username: Object({"MIX_APP_ROOT_API":"https://www.cssd-doc.com/api/","MIX_PUSHER_APP_CLUSTER":"mt1","MIX_PUSHER_APP_KEY":"","NODE_ENV":"development"}).VUE_APP_CLIENT_ID,
password: Object({"MIX_APP_ROOT_API":"https://www.cssd-doc.com/api/","MIX_PUSHER_APP_CLUSTER":"mt1","MIX_PUSHER_APP_KEY":"","NODE_ENV":"development"}).VUE_APP_CLIENT_SECRET
username: Object({"MIX_PUSHER_APP_KEY":"","MIX_PUSHER_APP_CLUSTER":"mt1","MIX_APP_ROOT_API":"https://www.cssd-doc.com/api/","NODE_ENV":"development"}).MIX_APP_CLIENT_ID,
password: Object({"MIX_PUSHER_APP_KEY":"","MIX_PUSHER_APP_CLUSTER":"mt1","MIX_APP_ROOT_API":"https://www.cssd-doc.com/api/","NODE_ENV":"development"}).MIX_APP_CLIENT_SECRET
}
};
_context2.prev = 1;
@@ -61055,9 +61057,9 @@ var UserService = {
return _api_service__WEBPACK_IMPORTED_MODULE_1__["default"].customRequest(requestData);
case 4:
response = _context2.sent;
_response2 = _context2.sent;
_api_service__WEBPACK_IMPORTED_MODULE_1__["default"].setHeader();
return _context2.abrupt("return", response.data);
return _context2.abrupt("return", _response2.data);
case 9:
_context2.prev = 9;
@@ -61089,7 +61091,8 @@ var UserService = {
var _verifyCode2 = _asyncToGenerator(
/*#__PURE__*/
_babel_runtime_regenerator__WEBPACK_IMPORTED_MODULE_0___default.a.mark(function _callee3(_verifyCode) {
var requestData, response;
var requestData, _response3;
return _babel_runtime_regenerator__WEBPACK_IMPORTED_MODULE_0___default.a.wrap(function _callee3$(_context3) {
while (1) {
switch (_context3.prev = _context3.next) {
@@ -61101,8 +61104,8 @@ var UserService = {
verifyCode: _verifyCode
},
auth: {
username: Object({"MIX_APP_ROOT_API":"https://www.cssd-doc.com/api/","MIX_PUSHER_APP_CLUSTER":"mt1","MIX_PUSHER_APP_KEY":"","NODE_ENV":"development"}).VUE_APP_CLIENT_ID,
password: Object({"MIX_APP_ROOT_API":"https://www.cssd-doc.com/api/","MIX_PUSHER_APP_CLUSTER":"mt1","MIX_PUSHER_APP_KEY":"","NODE_ENV":"development"}).VUE_APP_CLIENT_SECRET
username: Object({"MIX_PUSHER_APP_KEY":"","MIX_PUSHER_APP_CLUSTER":"mt1","MIX_APP_ROOT_API":"https://www.cssd-doc.com/api/","NODE_ENV":"development"}).MIX_APP_CLIENT_ID,
password: Object({"MIX_PUSHER_APP_KEY":"","MIX_PUSHER_APP_CLUSTER":"mt1","MIX_APP_ROOT_API":"https://www.cssd-doc.com/api/","NODE_ENV":"development"}).MIX_APP_CLIENT_SECRET
}
};
_context3.prev = 1;
@@ -61110,9 +61113,9 @@ var UserService = {
return _api_service__WEBPACK_IMPORTED_MODULE_1__["default"].customRequest(requestData);
case 4:
response = _context3.sent;
_response3 = _context3.sent;
_api_service__WEBPACK_IMPORTED_MODULE_1__["default"].setHeader();
return _context3.abrupt("return", response.data);
return _context3.abrupt("return", _response3.data);
case 9:
_context3.prev = 9;
@@ -61141,7 +61144,8 @@ var UserService = {
var _refreshToken = _asyncToGenerator(
/*#__PURE__*/
_babel_runtime_regenerator__WEBPACK_IMPORTED_MODULE_0___default.a.mark(function _callee4() {
var refreshToken, requestData, response;
var refreshToken, requestData, _response4;
return _babel_runtime_regenerator__WEBPACK_IMPORTED_MODULE_0___default.a.wrap(function _callee4$(_context4) {
while (1) {
switch (_context4.prev = _context4.next) {
@@ -61155,8 +61159,8 @@ var UserService = {
refresh_token: refreshToken
},
auth: {
username: Object({"MIX_APP_ROOT_API":"https://www.cssd-doc.com/api/","MIX_PUSHER_APP_CLUSTER":"mt1","MIX_PUSHER_APP_KEY":"","NODE_ENV":"development"}).VUE_APP_CLIENT_ID,
password: Object({"MIX_APP_ROOT_API":"https://www.cssd-doc.com/api/","MIX_PUSHER_APP_CLUSTER":"mt1","MIX_PUSHER_APP_KEY":"","NODE_ENV":"development"}).VUE_APP_CLIENT_SECRET
username: Object({"MIX_PUSHER_APP_KEY":"","MIX_PUSHER_APP_CLUSTER":"mt1","MIX_APP_ROOT_API":"https://www.cssd-doc.com/api/","NODE_ENV":"development"}).MIX_APP_CLIENT_ID,
password: Object({"MIX_PUSHER_APP_KEY":"","MIX_PUSHER_APP_CLUSTER":"mt1","MIX_APP_ROOT_API":"https://www.cssd-doc.com/api/","NODE_ENV":"development"}).MIX_APP_CLIENT_SECRET
}
};
_context4.prev = 2;
@@ -61164,12 +61168,12 @@ var UserService = {
return _api_service__WEBPACK_IMPORTED_MODULE_1__["default"].customRequest(requestData);
case 5:
response = _context4.sent;
_storage_service__WEBPACK_IMPORTED_MODULE_2__["TokenService"].saveToken(response.data.token);
_storage_service__WEBPACK_IMPORTED_MODULE_2__["TokenService"].saveRefreshToken(response.data.token); // Update the header in ApiService
_response4 = _context4.sent;
_storage_service__WEBPACK_IMPORTED_MODULE_2__["TokenService"].saveToken(_response4.data.access_token);
_storage_service__WEBPACK_IMPORTED_MODULE_2__["TokenService"].saveRefreshToken(_response4.data.refresh_token); // Update the header in ApiService
_api_service__WEBPACK_IMPORTED_MODULE_1__["default"].setHeader();
return _context4.abrupt("return", response.data.token);
return _context4.abrupt("return", _response4.data.access_token);
case 12:
_context4.prev = 12;
@@ -61196,14 +61200,55 @@ var UserService = {
*
* Will also remove `Authorization Bearer <token>` header from future requests.
**/
logout: function logout() {
// Remove the token and remove Authorization header from Api Service as well
_storage_service__WEBPACK_IMPORTED_MODULE_2__["TokenService"].removeToken();
_storage_service__WEBPACK_IMPORTED_MODULE_2__["TokenService"].removeRefreshToken();
_api_service__WEBPACK_IMPORTED_MODULE_1__["default"].removeHeader(); // NOTE: Again, we'll cover the 401 Interceptor a bit later.
logout: function () {
var _logout = _asyncToGenerator(
/*#__PURE__*/
_babel_runtime_regenerator__WEBPACK_IMPORTED_MODULE_0___default.a.mark(function _callee5() {
var requestData;
return _babel_runtime_regenerator__WEBPACK_IMPORTED_MODULE_0___default.a.wrap(function _callee5$(_context5) {
while (1) {
switch (_context5.prev = _context5.next) {
case 0:
requestData = {
method: 'post',
url: "logout",
auth: {
username: Object({"MIX_PUSHER_APP_KEY":"","MIX_PUSHER_APP_CLUSTER":"mt1","MIX_APP_ROOT_API":"https://www.cssd-doc.com/api/","NODE_ENV":"development"}).MIX_APP_CLIENT_ID,
password: Object({"MIX_PUSHER_APP_KEY":"","MIX_PUSHER_APP_CLUSTER":"mt1","MIX_APP_ROOT_API":"https://www.cssd-doc.com/api/","NODE_ENV":"development"}).MIX_APP_CLIENT_SECRET
}
};
_context5.prev = 1;
_context5.next = 4;
return _api_service__WEBPACK_IMPORTED_MODULE_1__["default"].customRequest(requestData);
_api_service__WEBPACK_IMPORTED_MODULE_1__["default"].unmount401Interceptor();
}
case 4:
// Remove the token and remove Authorization header from Api Service as well
_storage_service__WEBPACK_IMPORTED_MODULE_2__["TokenService"].removeToken();
_storage_service__WEBPACK_IMPORTED_MODULE_2__["TokenService"].removeRefreshToken();
_api_service__WEBPACK_IMPORTED_MODULE_1__["default"].removeHeader(); // NOTE: Again, we'll cover the 401 Interceptor a bit later.
_api_service__WEBPACK_IMPORTED_MODULE_1__["default"].unmount401Interceptor();
return _context5.abrupt("return", response.data);
case 11:
_context5.prev = 11;
_context5.t0 = _context5["catch"](1);
throw new AuthenticationError(_context5.t0.response.status, _context5.t0.response.data.detail);
case 14:
case "end":
return _context5.stop();
}
}
}, _callee5, null, [[1, 11]]);
}));
function logout() {
return _logout.apply(this, arguments);
}
return logout;
}()
};
/* harmony default export */ __webpack_exports__["default"] = (UserService);
@@ -61214,7 +61259,7 @@ var UserService = {
/*!********************************************!*\
!*** ./resources/js/vue/services/index.js ***!
\********************************************/
/*! exports provided: ApiService, TokenService, UserService, AuthenticationError */
/*! exports provided: TokenService, UserService, AuthenticationError, ApiService */
/***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict";
@@ -61405,6 +61450,8 @@ __webpack_require__.r(__webpack_exports__);
/* 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 _services_auth_user_service__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! @/services/auth/user.service */ "./resources/js/vue/services/auth/user.service.js");
/* harmony import */ var _router__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! @/router */ "./resources/js/vue/router/index.js");
/* harmony import */ var axios__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! axios */ "./node_modules/axios/index.js");
/* harmony import */ var axios__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(axios__WEBPACK_IMPORTED_MODULE_3__);
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); } }
@@ -61413,6 +61460,7 @@ function _asyncToGenerator(fn) { return function () { var self = this, args = ar
/* harmony default export */ __webpack_exports__["default"] = ({
login: function () {
var _login = _asyncToGenerator(
@@ -61526,12 +61574,38 @@ function _asyncToGenerator(fn) { return function () { var self = this, args = ar
return verifyCodeSMS;
}(),
logout: function logout(_ref7) {
var commit = _ref7.commit;
_services_auth_user_service__WEBPACK_IMPORTED_MODULE_1__["UserService"].logout();
commit('logoutSuccess');
_router__WEBPACK_IMPORTED_MODULE_2__["default"].push('/login');
},
logout: function () {
var _logout = _asyncToGenerator(
/*#__PURE__*/
_babel_runtime_regenerator__WEBPACK_IMPORTED_MODULE_0___default.a.mark(function _callee4(_ref7) {
var commit, result;
return _babel_runtime_regenerator__WEBPACK_IMPORTED_MODULE_0___default.a.wrap(function _callee4$(_context4) {
while (1) {
switch (_context4.prev = _context4.next) {
case 0:
commit = _ref7.commit;
_context4.next = 3;
return _services_auth_user_service__WEBPACK_IMPORTED_MODULE_1__["UserService"].logout();
case 3:
result = _context4.sent;
commit('logoutSuccess');
_router__WEBPACK_IMPORTED_MODULE_2__["default"].push('/login');
case 6:
case "end":
return _context4.stop();
}
}
}, _callee4);
}));
function logout(_x7) {
return _logout.apply(this, arguments);
}
return logout;
}(),
refreshToken: function refreshToken(_ref8) {
var commit = _ref8.commit,
state = _ref8.state;
@@ -61919,7 +61993,7 @@ module.exports = webpackAsyncContext;
/*! no static exports found */
/***/ (function(module, exports, __webpack_require__) {
module.exports = __webpack_require__(/*! D:\Atom\Git\Laravel_CSSD\resources\js\vue\main.js */"./resources/js/vue/main.js");
module.exports = __webpack_require__(/*! /home/saeid/Projects/Git/CSSD/resources/js/vue/main.js */"./resources/js/vue/main.js");
/***/ })