cuongpv/faveo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update v1.0.7.9 R.C.

Browse Source 
This is a Release Candidate. We are still testing.
This commit is contained in:
Sujit Prasad
2016-08-03 20:04:36 +05:30
parent 8b6b924d09
commit ffa56a43cb
3830 changed files with 181529 additions and 495353 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
app/Http/Controllers/Api/v1/TokenAuthController.php
View File

@@ -50,7 +50,7 @@ class TokenAuthController extends Controller
//$credentials = $request->only('email', 'password');
try {
if (!$token = JWTAuth::attempt([$field => $usernameinput, 'password' => $password])) {
if (!$token = JWTAuth::attempt([$field => $usernameinput, 'password' => $password,'active'=>1])) {
return response()->json(['error' => 'invalid_credentials', 'status_code' => 401]);
}
} catch (JWTException $e) {
@@ -100,30 +100,30 @@ class TokenAuthController extends Controller
*
* @return type json
*/
public function register(Request $request)
{
try {
$v = \Validator::make($request->all(), [
'email' => 'required|email|unique:users',
'password' => 'required',
]);
if ($v->fails()) {
$error = $v->errors();
return response()->json(compact('error'));
}
$newuser = $request->all();
$password = Hash::make($request->input('password'));
$newuser['password'] = $password;
return User::create($newuser);
} catch (\Exception $e) {
$error = $e->getMessage();
return response()->json(compact('error'));
}
}
// public function register(Request $request)
// {
// try {
// $v = \Validator::make($request->all(), [
// 'email' => 'required|email|unique:users',
// 'password' => 'required',
// ]);
// if ($v->fails()) {
// $error = $v->errors();
//
// return response()->json(compact('error'));
// }
// $newuser = $request->all();
// $password = Hash::make($request->input('password'));
//
// $newuser['password'] = $password;
//
// return User::create($newuser);
// } catch (\Exception $e) {
// $error = $e->getMessage();
//
// return response()->json(compact('error'));
// }
// }
/**
* verify the url is existing or not.