Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Korko
SecretSanta.fr
Commits
9e8e6a80
Verified
Commit
9e8e6a80
authored
Dec 04, 2020
by
Korko
Browse files
Add expiration on the purge link to prevent XSS, plus better manager errors
parent
7f0124a9
Pipeline
#369363
failed with stages
in 1 minute and 50 seconds
Changes
10
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
app/Exceptions/Handler.php
View file @
9e8e6a80
...
...
@@ -2,7 +2,10 @@
namespace
App\Exceptions
;
use
App\Exceptions\SolverException
;
use
Illuminate\Foundation\Exceptions\Handler
as
ExceptionHandler
;
use
Illuminate\Routing\Exceptions\InvalidSignatureException
;
use
Illuminate\Validation\ValidationException
;
use
Throwable
;
class
Handler
extends
ExceptionHandler
...
...
@@ -25,4 +28,34 @@ class Handler extends ExceptionHandler
'password'
,
'password_confirmation'
,
];
/**
* Render an exception into an HTTP response.
*
* @param \Illuminate\Http\Request $request
* @param \Throwable $exception
* @return \Illuminate\Http\Response
*/
public
function
render
(
$request
,
Throwable
$exception
)
{
if
(
$exception
instanceof
ValidationException
)
{
return
response
()
->
json
([
'message'
=>
trans
(
'error.validation'
),
],
500
);
}
if
(
$exception
instanceof
SolverException
)
{
return
response
()
->
json
([
'message'
=>
trans
(
'error.solution'
)
],
500
);
}
if
(
$exception
instanceof
InvalidSignatureException
)
{
return
response
()
->
json
([
'message'
=>
trans
(
'error.signature'
),
],
500
);
}
return
parent
::
render
(
$request
,
$exception
);
}
}
app/Http/Controllers/RandomFormController.php
View file @
9e8e6a80
...
...
@@ -2,7 +2,6 @@
namespace
App\Http\Controllers
;
use
App\Exceptions\SolverException
;
use
App\Http\Requests\RandomFormRequest
;
use
Arr
;
use
DrawHandler
;
...
...
@@ -17,17 +16,11 @@ class RandomFormController extends Controller
public
function
handle
(
RandomFormRequest
$request
)
{
try
{
$this
->
drawAndInform
(
$request
);
$this
->
drawAndInform
(
$request
);
return
response
()
->
json
([
'message'
=>
trans
(
'message.sent'
)
]);
}
catch
(
SolverException
$e
)
{
return
response
()
->
json
([
'message'
=>
trans
(
'error.solution'
)
],
500
);
}
return
response
()
->
json
([
'message'
=>
trans
(
'message.sent'
)
]);
}
protected
function
drawAndInform
(
Request
$request
)
...
...
public/js/dearSanta.js
View file @
9e8e6a80
...
...
@@ -19650,11 +19650,17 @@ __webpack_require__.r(__webpack_exports__);
/* harmony import */ var core_js_modules_es_object_get_own_property_descriptors__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_object_get_own_property_descriptors__WEBPACK_IMPORTED_MODULE_4__);
/* harmony import */ var core_js_modules_es_object_keys__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! core-js/modules/es.object.keys */ "./node_modules/core-js/modules/es.object.keys.js");
/* harmony import */ var core_js_modules_es_object_keys__WEBPACK_IMPORTED_MODULE_5___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_object_keys__WEBPACK_IMPORTED_MODULE_5__);
/* harmony import */ var core_js_modules_web_dom_collections_for_each__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! core-js/modules/web.dom-collections.for-each */ "./node_modules/core-js/modules/web.dom-collections.for-each.js");
/* harmony import */ var core_js_modules_web_dom_collections_for_each__WEBPACK_IMPORTED_MODULE_6___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_web_dom_collections_for_each__WEBPACK_IMPORTED_MODULE_6__);
/* harmony import */ var axios__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! axios */ "./node_modules/axios/index.js");
/* harmony import */ var axios__WEBPACK_IMPORTED_MODULE_7___default = /*#__PURE__*/__webpack_require__.n(axios__WEBPACK_IMPORTED_MODULE_7__);
/* harmony import */ var _partials_alertify_js__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ../partials/alertify.js */ "./resources/js/partials/alertify.js");
/* harmony import */ var core_js_modules_es_object_to_string__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! core-js/modules/es.object.to-string */ "./node_modules/core-js/modules/es.object.to-string.js");
/* harmony import */ var core_js_modules_es_object_to_string__WEBPACK_IMPORTED_MODULE_6___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_object_to_string__WEBPACK_IMPORTED_MODULE_6__);
/* harmony import */ var core_js_modules_es_promise__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! core-js/modules/es.promise */ "./node_modules/core-js/modules/es.promise.js");
/* harmony import */ var core_js_modules_es_promise__WEBPACK_IMPORTED_MODULE_7___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_promise__WEBPACK_IMPORTED_MODULE_7__);
/* harmony import */ var core_js_modules_web_dom_collections_for_each__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! core-js/modules/web.dom-collections.for-each */ "./node_modules/core-js/modules/web.dom-collections.for-each.js");
/* harmony import */ var core_js_modules_web_dom_collections_for_each__WEBPACK_IMPORTED_MODULE_8___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_web_dom_collections_for_each__WEBPACK_IMPORTED_MODULE_8__);
/* harmony import */ var axios__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! axios */ "./node_modules/axios/index.js");
/* harmony import */ var axios__WEBPACK_IMPORTED_MODULE_9___default = /*#__PURE__*/__webpack_require__.n(axios__WEBPACK_IMPORTED_MODULE_9__);
/* harmony import */ var _partials_alertify_js__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! ../partials/alertify.js */ "./resources/js/partials/alertify.js");
...
...
@@ -19675,7 +19681,7 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
* CSRF token as a header based on the value of the "XSRF" token cookie.
*/
axios__WEBPACK_IMPORTED_MODULE_
7
___default.a.defaults.headers.common['X-Requested-With'] = 'XMLHttpRequest';
axios__WEBPACK_IMPORTED_MODULE_
9
___default.a.defaults.headers.common['X-Requested-With'] = 'XMLHttpRequest';
/**
* Transmit Hash Key via request headers
*/
...
...
@@ -19683,40 +19689,40 @@ axios__WEBPACK_IMPORTED_MODULE_7___default.a.defaults.headers.common['X-Requeste
var key = window.location.hash.substr(1);
if (key) {
axios__WEBPACK_IMPORTED_MODULE_
7
___default.a.defaults.headers.common['X-HASH-KEY'] = key;
axios__WEBPACK_IMPORTED_MODULE_
9
___default.a.defaults.headers.common['X-HASH-KEY'] = key;
}
axios__WEBPACK_IMPORTED_MODULE_
7
___default.a.interceptors.response.use(function (response) {
axios__WEBPACK_IMPORTED_MODULE_
9
___default.a.interceptors.response.use(function (response) {
var _response$data;
if ((_response$data = response.data) === null || _response$data === void 0 ? void 0 : _response$data.message) _partials_alertify_js__WEBPACK_IMPORTED_MODULE_
8
__["default"].success(response.data.message);
if ((_response$data = response.data) === null || _response$data === void 0 ? void 0 : _response$data.message) _partials_alertify_js__WEBPACK_IMPORTED_MODULE_
10
__["default"].success(response.data.message);
return response;
}, function (error) {
var _error$response, _error$response$data;
if ((_error$response = error.response) === null || _error$response === void 0 ? void 0 : (_error$response$data = _error$response.data) === null || _error$response$data === void 0 ? void 0 : _error$response$data.
error
) _partials_alertify_js__WEBPACK_IMPORTED_MODULE_
8
__["default"].errorAlert(error.response.data.
error
);
return error;
if ((_error$response = error.response) === null || _error$response === void 0 ? void 0 : (_error$response$data = _error$response.data) === null || _error$response$data === void 0 ? void 0 : _error$response$data.
message
) _partials_alertify_js__WEBPACK_IMPORTED_MODULE_
10
__["default"].errorAlert(error.response.data.
message
);
return
Promise.reject(
error
)
;
});
['get', 'delete', 'head', 'options'].forEach(function (method) {
axios__WEBPACK_IMPORTED_MODULE_
7
___default.a[method] = function (url, config) {
return axios__WEBPACK_IMPORTED_MODULE_
7
___default()(_objectSpread({
axios__WEBPACK_IMPORTED_MODULE_
9
___default.a[method] = function (url, config) {
return axios__WEBPACK_IMPORTED_MODULE_
9
___default()(_objectSpread({
method: method,
url: url
}, config));
};
});
['post', 'put', 'patch'].forEach(function (method) {
axios__WEBPACK_IMPORTED_MODULE_
7
___default.a[method] = function (url, data, config) {
return axios__WEBPACK_IMPORTED_MODULE_
7
___default()(_objectSpread({
axios__WEBPACK_IMPORTED_MODULE_
9
___default.a[method] = function (url, data, config) {
return axios__WEBPACK_IMPORTED_MODULE_
9
___default()(_objectSpread({
method: method,
url: url,
data: data
}, config));
};
});
axios__WEBPACK_IMPORTED_MODULE_
7
___default.a.request = axios__WEBPACK_IMPORTED_MODULE_
7
___default.a;
/* harmony default export */ __webpack_exports__["default"] = (axios__WEBPACK_IMPORTED_MODULE_
7
___default.a);
axios__WEBPACK_IMPORTED_MODULE_
9
___default.a.request = axios__WEBPACK_IMPORTED_MODULE_
9
___default.a;
/* harmony default export */ __webpack_exports__["default"] = (axios__WEBPACK_IMPORTED_MODULE_
9
___default.a);
/***/ }),
...
...
public/js/organizer.js
View file @
9e8e6a80
...
...
@@ -2092,14 +2092,12 @@ __webpack_require__.r(__webpack_exports__);
/* harmony import */ var vuelidate__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! vuelidate */ "./node_modules/vuelidate/lib/index.js");
/* harmony import */ var vuelidate__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(vuelidate__WEBPACK_IMPORTED_MODULE_3__);
/* harmony import */ var _mixins_stateMachine_js__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../mixins/stateMachine.js */ "./resources/js/mixins/stateMachine.js");
/* harmony import */ var _partials_axios_js__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ../partials/axios.js */ "./resources/js/partials/axios.js");
vue__WEBPACK_IMPORTED_MODULE_2___default.a.use(vuelidate__WEBPACK_IMPORTED_MODULE_3___default.a);
/* harmony default export */ __webpack_exports__["default"] = ({
mixins: [_mixins_stateMachine_js__WEBPACK_IMPORTED_MODULE_4__["default"]],
inheritAttrs: false,
...
...
@@ -22170,11 +22168,17 @@ __webpack_require__.r(__webpack_exports__);
/* harmony import */ var core_js_modules_es_object_get_own_property_descriptors__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_object_get_own_property_descriptors__WEBPACK_IMPORTED_MODULE_4__);
/* harmony import */ var core_js_modules_es_object_keys__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! core-js/modules/es.object.keys */ "./node_modules/core-js/modules/es.object.keys.js");
/* harmony import */ var core_js_modules_es_object_keys__WEBPACK_IMPORTED_MODULE_5___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_object_keys__WEBPACK_IMPORTED_MODULE_5__);
/* harmony import */ var core_js_modules_web_dom_collections_for_each__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! core-js/modules/web.dom-collections.for-each */ "./node_modules/core-js/modules/web.dom-collections.for-each.js");
/* harmony import */ var core_js_modules_web_dom_collections_for_each__WEBPACK_IMPORTED_MODULE_6___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_web_dom_collections_for_each__WEBPACK_IMPORTED_MODULE_6__);
/* harmony import */ var axios__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! axios */ "./node_modules/axios/index.js");
/* harmony import */ var axios__WEBPACK_IMPORTED_MODULE_7___default = /*#__PURE__*/__webpack_require__.n(axios__WEBPACK_IMPORTED_MODULE_7__);
/* harmony import */ var _partials_alertify_js__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ../partials/alertify.js */ "./resources/js/partials/alertify.js");
/* harmony import */ var core_js_modules_es_object_to_string__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! core-js/modules/es.object.to-string */ "./node_modules/core-js/modules/es.object.to-string.js");
/* harmony import */ var core_js_modules_es_object_to_string__WEBPACK_IMPORTED_MODULE_6___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_object_to_string__WEBPACK_IMPORTED_MODULE_6__);
/* harmony import */ var core_js_modules_es_promise__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! core-js/modules/es.promise */ "./node_modules/core-js/modules/es.promise.js");
/* harmony import */ var core_js_modules_es_promise__WEBPACK_IMPORTED_MODULE_7___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_promise__WEBPACK_IMPORTED_MODULE_7__);
/* harmony import */ var core_js_modules_web_dom_collections_for_each__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! core-js/modules/web.dom-collections.for-each */ "./node_modules/core-js/modules/web.dom-collections.for-each.js");
/* harmony import */ var core_js_modules_web_dom_collections_for_each__WEBPACK_IMPORTED_MODULE_8___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_web_dom_collections_for_each__WEBPACK_IMPORTED_MODULE_8__);
/* harmony import */ var axios__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! axios */ "./node_modules/axios/index.js");
/* harmony import */ var axios__WEBPACK_IMPORTED_MODULE_9___default = /*#__PURE__*/__webpack_require__.n(axios__WEBPACK_IMPORTED_MODULE_9__);
/* harmony import */ var _partials_alertify_js__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! ../partials/alertify.js */ "./resources/js/partials/alertify.js");
...
...
@@ -22195,7 +22199,7 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
* CSRF token as a header based on the value of the "XSRF" token cookie.
*/
axios__WEBPACK_IMPORTED_MODULE_
7
___default.a.defaults.headers.common['X-Requested-With'] = 'XMLHttpRequest';
axios__WEBPACK_IMPORTED_MODULE_
9
___default.a.defaults.headers.common['X-Requested-With'] = 'XMLHttpRequest';
/**
* Transmit Hash Key via request headers
*/
...
...
@@ -22203,40 +22207,40 @@ axios__WEBPACK_IMPORTED_MODULE_7___default.a.defaults.headers.common['X-Requeste
var key = window.location.hash.substr(1);
if (key) {
axios__WEBPACK_IMPORTED_MODULE_
7
___default.a.defaults.headers.common['X-HASH-KEY'] = key;
axios__WEBPACK_IMPORTED_MODULE_
9
___default.a.defaults.headers.common['X-HASH-KEY'] = key;
}
axios__WEBPACK_IMPORTED_MODULE_
7
___default.a.interceptors.response.use(function (response) {
axios__WEBPACK_IMPORTED_MODULE_
9
___default.a.interceptors.response.use(function (response) {
var _response$data;
if ((_response$data = response.data) === null || _response$data === void 0 ? void 0 : _response$data.message) _partials_alertify_js__WEBPACK_IMPORTED_MODULE_
8
__["default"].success(response.data.message);
if ((_response$data = response.data) === null || _response$data === void 0 ? void 0 : _response$data.message) _partials_alertify_js__WEBPACK_IMPORTED_MODULE_
10
__["default"].success(response.data.message);
return response;
}, function (error) {
var _error$response, _error$response$data;
if ((_error$response = error.response) === null || _error$response === void 0 ? void 0 : (_error$response$data = _error$response.data) === null || _error$response$data === void 0 ? void 0 : _error$response$data.
error
) _partials_alertify_js__WEBPACK_IMPORTED_MODULE_
8
__["default"].errorAlert(error.response.data.
error
);
return error;
if ((_error$response = error.response) === null || _error$response === void 0 ? void 0 : (_error$response$data = _error$response.data) === null || _error$response$data === void 0 ? void 0 : _error$response$data.
message
) _partials_alertify_js__WEBPACK_IMPORTED_MODULE_
10
__["default"].errorAlert(error.response.data.
message
);
return
Promise.reject(
error
)
;
});
['get', 'delete', 'head', 'options'].forEach(function (method) {
axios__WEBPACK_IMPORTED_MODULE_
7
___default.a[method] = function (url, config) {
return axios__WEBPACK_IMPORTED_MODULE_
7
___default()(_objectSpread({
axios__WEBPACK_IMPORTED_MODULE_
9
___default.a[method] = function (url, config) {
return axios__WEBPACK_IMPORTED_MODULE_
9
___default()(_objectSpread({
method: method,
url: url
}, config));
};
});
['post', 'put', 'patch'].forEach(function (method) {
axios__WEBPACK_IMPORTED_MODULE_
7
___default.a[method] = function (url, data, config) {
return axios__WEBPACK_IMPORTED_MODULE_
7
___default()(_objectSpread({
axios__WEBPACK_IMPORTED_MODULE_
9
___default.a[method] = function (url, data, config) {
return axios__WEBPACK_IMPORTED_MODULE_
9
___default()(_objectSpread({
method: method,
url: url,
data: data
}, config));
};
});
axios__WEBPACK_IMPORTED_MODULE_
7
___default.a.request = axios__WEBPACK_IMPORTED_MODULE_
7
___default.a;
/* harmony default export */ __webpack_exports__["default"] = (axios__WEBPACK_IMPORTED_MODULE_
7
___default.a);
axios__WEBPACK_IMPORTED_MODULE_
9
___default.a.request = axios__WEBPACK_IMPORTED_MODULE_
9
___default.a;
/* harmony default export */ __webpack_exports__["default"] = (axios__WEBPACK_IMPORTED_MODULE_
9
___default.a);
/***/ }),
...
...
public/js/randomForm.js
View file @
9e8e6a80
...
...
@@ -11335,11 +11335,17 @@ __webpack_require__.r(__webpack_exports__);
/* harmony import */ var core_js_modules_es_object_get_own_property_descriptors__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_object_get_own_property_descriptors__WEBPACK_IMPORTED_MODULE_4__);
/* harmony import */ var core_js_modules_es_object_keys__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! core-js/modules/es.object.keys */ "./node_modules/core-js/modules/es.object.keys.js");
/* harmony import */ var core_js_modules_es_object_keys__WEBPACK_IMPORTED_MODULE_5___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_object_keys__WEBPACK_IMPORTED_MODULE_5__);
/* harmony import */ var core_js_modules_web_dom_collections_for_each__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! core-js/modules/web.dom-collections.for-each */ "./node_modules/core-js/modules/web.dom-collections.for-each.js");
/* harmony import */ var core_js_modules_web_dom_collections_for_each__WEBPACK_IMPORTED_MODULE_6___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_web_dom_collections_for_each__WEBPACK_IMPORTED_MODULE_6__);
/* harmony import */ var axios__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! axios */ "./node_modules/axios/index.js");
/* harmony import */ var axios__WEBPACK_IMPORTED_MODULE_7___default = /*#__PURE__*/__webpack_require__.n(axios__WEBPACK_IMPORTED_MODULE_7__);
/* harmony import */ var _partials_alertify_js__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ../partials/alertify.js */ "./resources/js/partials/alertify.js");
/* harmony import */ var core_js_modules_es_object_to_string__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! core-js/modules/es.object.to-string */ "./node_modules/core-js/modules/es.object.to-string.js");
/* harmony import */ var core_js_modules_es_object_to_string__WEBPACK_IMPORTED_MODULE_6___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_object_to_string__WEBPACK_IMPORTED_MODULE_6__);
/* harmony import */ var core_js_modules_es_promise__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! core-js/modules/es.promise */ "./node_modules/core-js/modules/es.promise.js");
/* harmony import */ var core_js_modules_es_promise__WEBPACK_IMPORTED_MODULE_7___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_promise__WEBPACK_IMPORTED_MODULE_7__);
/* harmony import */ var core_js_modules_web_dom_collections_for_each__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! core-js/modules/web.dom-collections.for-each */ "./node_modules/core-js/modules/web.dom-collections.for-each.js");
/* harmony import */ var core_js_modules_web_dom_collections_for_each__WEBPACK_IMPORTED_MODULE_8___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_web_dom_collections_for_each__WEBPACK_IMPORTED_MODULE_8__);
/* harmony import */ var axios__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! axios */ "./node_modules/axios/index.js");
/* harmony import */ var axios__WEBPACK_IMPORTED_MODULE_9___default = /*#__PURE__*/__webpack_require__.n(axios__WEBPACK_IMPORTED_MODULE_9__);
/* harmony import */ var _partials_alertify_js__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! ../partials/alertify.js */ "./resources/js/partials/alertify.js");
...
...
@@ -11360,7 +11366,7 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
* CSRF token as a header based on the value of the "XSRF" token cookie.
*/
axios__WEBPACK_IMPORTED_MODULE_
7
___default.a.defaults.headers.common['X-Requested-With'] = 'XMLHttpRequest';
axios__WEBPACK_IMPORTED_MODULE_
9
___default.a.defaults.headers.common['X-Requested-With'] = 'XMLHttpRequest';
/**
* Transmit Hash Key via request headers
*/
...
...
@@ -11368,40 +11374,40 @@ axios__WEBPACK_IMPORTED_MODULE_7___default.a.defaults.headers.common['X-Requeste
var key = window.location.hash.substr(1);
if (key) {
axios__WEBPACK_IMPORTED_MODULE_
7
___default.a.defaults.headers.common['X-HASH-KEY'] = key;
axios__WEBPACK_IMPORTED_MODULE_
9
___default.a.defaults.headers.common['X-HASH-KEY'] = key;
}
axios__WEBPACK_IMPORTED_MODULE_
7
___default.a.interceptors.response.use(function (response) {
axios__WEBPACK_IMPORTED_MODULE_
9
___default.a.interceptors.response.use(function (response) {
var _response$data;
if ((_response$data = response.data) === null || _response$data === void 0 ? void 0 : _response$data.message) _partials_alertify_js__WEBPACK_IMPORTED_MODULE_
8
__["default"].success(response.data.message);
if ((_response$data = response.data) === null || _response$data === void 0 ? void 0 : _response$data.message) _partials_alertify_js__WEBPACK_IMPORTED_MODULE_
10
__["default"].success(response.data.message);
return response;
}, function (error) {
var _error$response, _error$response$data;
if ((_error$response = error.response) === null || _error$response === void 0 ? void 0 : (_error$response$data = _error$response.data) === null || _error$response$data === void 0 ? void 0 : _error$response$data.
error
) _partials_alertify_js__WEBPACK_IMPORTED_MODULE_
8
__["default"].errorAlert(error.response.data.
error
);
return error;
if ((_error$response = error.response) === null || _error$response === void 0 ? void 0 : (_error$response$data = _error$response.data) === null || _error$response$data === void 0 ? void 0 : _error$response$data.
message
) _partials_alertify_js__WEBPACK_IMPORTED_MODULE_
10
__["default"].errorAlert(error.response.data.
message
);
return
Promise.reject(
error
)
;
});
['get', 'delete', 'head', 'options'].forEach(function (method) {
axios__WEBPACK_IMPORTED_MODULE_
7
___default.a[method] = function (url, config) {
return axios__WEBPACK_IMPORTED_MODULE_
7
___default()(_objectSpread({
axios__WEBPACK_IMPORTED_MODULE_
9
___default.a[method] = function (url, config) {
return axios__WEBPACK_IMPORTED_MODULE_
9
___default()(_objectSpread({
method: method,
url: url
}, config));
};
});
['post', 'put', 'patch'].forEach(function (method) {
axios__WEBPACK_IMPORTED_MODULE_
7
___default.a[method] = function (url, data, config) {
return axios__WEBPACK_IMPORTED_MODULE_
7
___default()(_objectSpread({
axios__WEBPACK_IMPORTED_MODULE_
9
___default.a[method] = function (url, data, config) {
return axios__WEBPACK_IMPORTED_MODULE_
9
___default()(_objectSpread({
method: method,
url: url,
data: data
}, config));
};
});
axios__WEBPACK_IMPORTED_MODULE_
7
___default.a.request = axios__WEBPACK_IMPORTED_MODULE_
7
___default.a;
/* harmony default export */ __webpack_exports__["default"] = (axios__WEBPACK_IMPORTED_MODULE_
7
___default.a);
axios__WEBPACK_IMPORTED_MODULE_
9
___default.a.request = axios__WEBPACK_IMPORTED_MODULE_
9
___default.a;
/* harmony default export */ __webpack_exports__["default"] = (axios__WEBPACK_IMPORTED_MODULE_
9
___default.a);
/***/ }),
...
...
resources/js/components/inputEdit.vue
View file @
9e8e6a80
...
...
@@ -6,8 +6,6 @@
import
StateMachine
from
'
../mixins/stateMachine.js
'
;
import
axios
from
'
../partials/axios.js
'
;
export
default
{
mixins
:
[
StateMachine
],
inheritAttrs
:
false
,
...
...
resources/js/components/organizerForm.vue
View file @
9e8e6a80
...
...
@@ -118,7 +118,8 @@
message
.
body
=
this
.
$t
(
'
organizer.purge.confirm.body_nofinal
'
);
// Won't be able to download recap anymore + Dearsanta
}
this
.
$dialog
.
confirm
(
message
,
options
)
this
.
$dialog
.
confirm
(
message
,
options
)
.
then
(
this
.
purge
);
},
purge
()
{
...
...
resources/js/partials/axios.js
View file @
9e8e6a80
...
...
@@ -23,10 +23,10 @@ axios.interceptors.response.use(function (response) {
return
response
;
},
function
(
error
)
{
if
(
error
.
response
?.
data
?.
error
)
alertify
.
errorAlert
(
error
.
response
.
data
.
error
);
if
(
error
.
response
?.
data
?.
message
)
alertify
.
errorAlert
(
error
.
response
.
data
.
message
);
return
error
;
return
Promise
.
reject
(
error
)
;
});
[
'
get
'
,
'
delete
'
,
'
head
'
,
'
options
'
].
forEach
(
method
=>
{
...
...
resources/lang/fr/error.php
View file @
9e8e6a80
<?php
return
[
'solution'
=>
'Les exclusions que vous avez choisies ne permettent pas d\'attribuer une cible par participant.'
,
'csrf'
=>
'Le formulaire a expiré pour cause d\'inactitivé. Veuillez recommencer.'
,
'validation'
=>
'Les données remplies ne sont pas valides'
,
'solution'
=>
'Les exclusions que vous avez choisies ne permettent pas d\'attribuer une cible par participant.'
,
'csrf'
=>
'Le formulaire a expiré pour cause d\'inactitivé. Veuillez recommencer.'
,
'signature'
=>
'L\'action demandée n\'a pas pu être effectuée. Veuillez rafraichir la page avant de retenter.'
,
];
resources/views/organizer.blade.php
View file @
9e8e6a80
...
...
@@ -7,7 +7,7 @@
'routes'
=>
[
'csvInitUrl'
=>
URL
::
signedRoute
(
'organizerPanel.csvInit'
,
[
'draw'
=>
$draw
]),
'csvFinalUrl'
=>
URL
::
signedRoute
(
'organizerPanel.csvFinal'
,
[
'draw'
=>
$draw
]),
'deleteUrl'
=>
URL
::
s
ignedRoute
(
'organizerPanel.delete'
,
[
'draw'
=>
$draw
]),
'deleteUrl'
=>
URL
::
temporaryS
ignedRoute
(
'organizerPanel.delete'
,
3600
,
[
'draw'
=>
$draw
]),
// 1h validity
'fetchStateUrl'
=>
URL
::
signedRoute
(
'organizerPanel.fetchState'
,
[
'draw'
=>
$draw
]),
]
])
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment