diff --git a/app/Http/Controllers/AuthController.php b/app/Http/Controllers/AuthController.php index 4f06657..0730cbf 100644 --- a/app/Http/Controllers/AuthController.php +++ b/app/Http/Controllers/AuthController.php @@ -28,26 +28,32 @@ class AuthController extends Controller $password = $request->password; $remember = $request->remember; $is_mobile = $request->is_mobile; - - if (empty($username) || empty($password)) - return response()->json(['status' => 'error', 'message' => 'You must fill all the fields'], 400); - - $usernameCheck = false; + $usernameCheck = false; $passwordCheck = false; - if (User::where('username', $username)->exists()) - $usernameCheck = true; + if (empty($username) || empty($password)) { + return response()->json(['status' => 'error', 'message' => 'You must fill all the fields'], 400); + } - if (User::where('password', md5($password))->exists()) - $passwordCheck = true; + if (User::where('username', $username)->exists()) { + $usernameCheck = true; + } + if (User::where('password', md5($password))->exists()) { + $passwordCheck = true; + } if ($usernameCheck & $passwordCheck) { - $user = User::where('username', $username)->where('password', md5($password))->first(); + $user = User::where([['username', $username],['password', md5($password)]])->first(); + $checkExpiredOspro = $this->setExpiredTimeOspro($user['company_id']); + if($checkExpiredOspro === false) { + return response()->json(['status' => 'error', 'message' => 'Expired! Please update license!'], 201); + } if ($is_mobile) { $fcm_token = $request->fcm_token; - if (!$fcm_token || $fcm_token == "") + if (!$fcm_token || $fcm_token == "") { return response()->json(['status' => 'error', 'message' => 'FCM Token is required'], 400); + } $dataUpdateFcm = array( "fcm_token" => $fcm_token @@ -55,8 +61,9 @@ class AuthController extends Controller $hr = User::find($user->id); - if ($hr) - $hr->update($dataUpdateFcm); + if ($hr) { + $hr->update($dataUpdateFcm); + } } $dataRole = Role::find($user->role_id); @@ -71,21 +78,26 @@ class AuthController extends Controller $configApp->logo_header = $logoHeader; } - if ($configApp) + if ($configApp) { $user->configApp = $configApp; + } - if ($dataRole) + if ($dataRole) { $user->role = $dataRole; + } - if ($dataHierarchy) + if ($dataHierarchy) { $user->hierarchy = $dataHierarchy; + } - if (!$token = Auth::login($user)) + if (!$token = Auth::login($user)) { return response()->json(['error' => 'Unauthorized'], 401); + } $ttl = 60; - if ($remember) + if ($remember) { $ttl = 10080; + } // todo : change existing md5 hashed function to laravel's originally bcrypt /* $token = auth()->setTTL($ttl)->attempt(['username' => $username, 'password' => Hash::make($password)]); */ @@ -101,12 +113,15 @@ class AuthController extends Controller ), ]); } else { - if (!$usernameCheck && !$passwordCheck) - return response()->json(['code' => 201, 'message' => "username and password doesn't match"], 201); - if (!$passwordCheck) - return response()->json(['code' => 201, 'message' => "password doesn't match"], 201); - if (!$usernameCheck) - return response()->json(['code' => 201, 'message' => "username doesn't match"], 201); + if (!$usernameCheck && !$passwordCheck) { + return response()->json(['code' => 201, 'message' => "Username and password doesn't match"], 201); + } + if (!$passwordCheck) { + return response()->json(['code' => 201, 'message' => "Password doesn't match"], 201); + } + if (!$usernameCheck) { + return response()->json(['code' => 201, 'message' => "Username doesn't match"], 201); + } } } diff --git a/app/Http/Controllers/Controller.php b/app/Http/Controllers/Controller.php index e320f72..f26f623 100644 --- a/app/Http/Controllers/Controller.php +++ b/app/Http/Controllers/Controller.php @@ -6,11 +6,12 @@ use App\Models\User; use App\Models\Divisi; use App\Models\Activity; use App\Models\AssignMaterial; +use App\Models\Company; use App\Models\ReportK3Detail; use App\Models\UserToActivity; use App\Models\ProductTransaction; use Illuminate\Support\Facades\DB; - +use Carbon\Carbon; use Illuminate\Support\Facades\Http; use Laravel\Lumen\Routing\Controller as BaseController; use RecursiveIteratorIterator; @@ -67,6 +68,25 @@ class Controller extends BaseController return round($size / 1048576, 2); } + public function setExpiredTimeOspro($company_id) + { + $currentDate = Carbon::now(); + $countCreate = false; + $transaction = ProductTransaction::query() + ->where('company_id', $company_id)->first(); + if(!empty($transaction)) { + $dateExpired = $transaction['exp_ospro']; + if ($currentDate->gt(Carbon::parse($dateExpired))) { + $countCreate = false; + } else { + $countCreate = true; + } + return $countCreate; + } else { + return $countCreate; + } + } + protected function setLimitsStorage($company, $dokumen, $name, $initPath, $destinatePath) { $totalSize = 0;