v1.4.1 update

This commit is contained in:
carodej
2020-05-04 11:45:13 +02:00
parent b2db3755d8
commit ce2daaf6c4
29 changed files with 677 additions and 60 deletions
+11 -16
View File
@@ -2,20 +2,13 @@
namespace App\Http\Controllers\Auth;
use App\ClientProfile;
use App\Models\User\UserAttribute;
use App\Models\User\UserNotificationSetting;
use App\ProviderProfile;
use App\Http\Requests\Auth\CheckAccountRequest;
use App\User;
use GuzzleHttp\Client;
use Illuminate\Http\Request;
use App\Http\Controllers\Controller;
use Illuminate\Http\Response;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\Cookie;
use Illuminate\Support\Facades\Hash;
use Illuminate\Support\Facades\Route;
use Illuminate\Support\Facades\Validator;
class AuthController extends Controller
{
@@ -26,12 +19,7 @@ class AuthController extends Controller
* @param Request $request
* @return mixed
*/
public function check_account(Request $request) {
// Validate request
$request->validate([
'email' => ['required', 'string', 'email'],
]);
public function check_account(CheckAccountRequest $request) {
// Get User
$user = User::where('email', $request->input('email'))->select(['name', 'avatar'])->first();
@@ -111,6 +99,12 @@ class AuthController extends Controller
*/
public function logout()
{
// Demo preview
if (is_demo( Auth::id())) {
return response('Logout successfull', 204)
->cookie('access_token', '', -1);
}
// Get user tokens and remove it
auth()->user()->tokens()->each(function ($token) {
@@ -118,7 +112,8 @@ class AuthController extends Controller
$token->delete();
});
return response('Logout successfull', 200)->cookie('access_token', '', -1);
return response('Logout successfull', 204)
->cookie('access_token', '', -1);
}
/**
@@ -128,7 +123,7 @@ class AuthController extends Controller
* @param string $provider
* @return Request
*/
private static function make_request(Request $request)
private static function make_request($request)
{
$request->request->add([
'grant_type' => 'password',
@@ -2,6 +2,7 @@
namespace App\Http\Controllers\FileBrowser;
use App\Http\Requests\FileBrowser\SearchRequest;
use Illuminate\Support\Facades\Validator;
use Illuminate\Support\Facades\Auth;
use App\Http\Controllers\Controller;
@@ -154,16 +155,8 @@ class BrowseController extends Controller
* @param Request $request
* @return \Illuminate\Database\Eloquent\Collection
*/
public function search(Request $request)
public function search(SearchRequest $request)
{
// Validate request
$validator = Validator::make($request->all(), [
'query' => 'required|string',
]);
// Return error
if ($validator->fails()) abort(400, 'Bad input');
// Get user
$user_id = Auth::id();
@@ -0,0 +1,30 @@
<?php
namespace App\Http\Requests\Auth;
use Illuminate\Foundation\Http\FormRequest;
class CheckAccountRequest extends FormRequest
{
/**
* Determine if the user is authorized to make this request.
*
* @return bool
*/
public function authorize()
{
return true;
}
/**
* Get the validation rules that apply to the request.
*
* @return array
*/
public function rules()
{
return [
'email' => 'required|string|email',
];
}
}
@@ -0,0 +1,30 @@
<?php
namespace App\Http\Requests\FileBrowser;
use Illuminate\Foundation\Http\FormRequest;
class SearchRequest extends FormRequest
{
/**
* Determine if the user is authorized to make this request.
*
* @return bool
*/
public function authorize()
{
return true;
}
/**
* Get the validation rules that apply to the request.
*
* @return array
*/
public function rules()
{
return [
'query' => 'required|string',
];
}
}
+9
View File
@@ -11,6 +11,15 @@ use Illuminate\Support\Facades\Storage;
use Illuminate\Support\Str;
use Intervention\Image\ImageManagerStatic as Image;
/**
* Get app version from config
*
* @return \Illuminate\Config\Repository|mixed
*/
function get_version() {
return config('vuefilemanager.version');
}
/**
* Check if is demo
*