Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/izyim-api into Aqeeb/company

# Conflicts:
#	routes/web.php

app/Http/Controllers/AuthController.php

@@ -41,16 +41,21 @@ class AuthController extends Controller
         $user->save();
 
         // create token if not exist, update if exist
-        $token = mt_rand(0000,9999);
+        $token = mt_rand(0000,9999); 
+
+        // for testing 
+        if($request->phone == '0123456789'){
+            $token = "1234";
+        }
+        
         $user_verification = $user->phoneVerification()->firstOrNew([
             'user_id' => $user->id,
         ]);
         $user_verification->token = $token;
         $user_verification->save();
 
-        // send token to phone
-        // ** switching to nexmo **
-        //$message = "IZYIM verification code : ". $token;
+        // TODO:  send token to phone 
+        //$message = "RM0.00 IZYIM: Verification code : ". $token;
         //$twilio = new Twilio(env('TWILIO_ACC'), env('TWILIO_TOKEN'), env('TWILIO_NUMBER'));
         //$twilio->message($request->phone, $message);
         return response()->json(['success'=> true, 'message'=> 'A verification code has been send to your mobile number.' ]);
@@ -63,7 +68,7 @@ class AuthController extends Controller
      * @param Request $request
      * @return \Illuminate\Http\JsonResponse
      */
-    public function verifyUser(Request $request)
+    public function verifyPhone(Request $request)
     {
         $credentials = $request->only('phone', 'token');
 
@@ -94,8 +99,12 @@ class AuthController extends Controller
             if (!$userToken=JWTAuth::fromUser($check_user)) {
                 return response()->json(['error' => 'invalid_credentials'], 401);
             }
+           
+            $expiration = JWTAuth::setToken($userToken)->getPayload()->get('exp');
             // all good so return the token
-            return response()->json(['success' => true, 'data'=> [ 'token' => $userToken ]]);
+            return response()->json(['success' => true, 'token' => $userToken,
+            'token_type' => 'bearer',
+            'expires_in' => $expiration - time()]);
         }
         return response()->json(['success'=> false, 'error'=> "Verification code is invalid."]);
     }
@@ -120,9 +129,7 @@ class AuthController extends Controller
         if($validator->fails()) {
             return response()->json(['success'=> false, 'error'=> $validator->messages()]);
         }
-
-
-
+        
         $name = $request->name;
         $password = $request->password;
         $role = $request->role;