added messages list, new client form, logic for client Apps plus others
This commit is contained in:
@@ -6,31 +6,95 @@ use Illuminate\Http\Request;
|
||||
use App\Models;
|
||||
use App\Utilities\ApiCalls;
|
||||
use Session;
|
||||
use Illuminate\Validation\Rules\Password;
|
||||
use Illuminate\Support\Carbon;
|
||||
use Illuminate\Support\Facades\Hash;
|
||||
|
||||
class ClientsLoginController extends Controller
|
||||
{
|
||||
public function index(){
|
||||
$data = [
|
||||
'page_title' => 'User Login'
|
||||
];
|
||||
return view('client-auth.login-test', $data);
|
||||
return view('client-auth.login', $data);
|
||||
|
||||
}
|
||||
public function activation_show($hash){
|
||||
#check if activation hash exist and it has not expired
|
||||
$check_activation = Models\ClientSession::where('activation_hash', $hash)->firstOrFail();
|
||||
// dump($check_activation);
|
||||
$elapsedMinutes = now()->diffInMinutes($check_activation->activation_start_time);
|
||||
if ($elapsedMinutes > 30) {
|
||||
// code...
|
||||
// $elapsedDays = Carbon::parse($stringDate)->diffInDays();
|
||||
// OR using the now() helper
|
||||
|
||||
// $isExpired = $check_activation->activation_start_time->diffInMinutes() > 30;
|
||||
$data = [
|
||||
'page_title' => 'Client Activation Expired'
|
||||
];
|
||||
return view('client-auth.activation-notfound', $data);
|
||||
}
|
||||
$data = [
|
||||
'page_title' => 'Client Activation',
|
||||
'hash' => $hash
|
||||
];
|
||||
return view('client-auth.activation-form', $data);
|
||||
|
||||
}
|
||||
public function activation(Request $request){
|
||||
$this->validate($request, [
|
||||
// 'activation_hash' => 'required',
|
||||
'password' => 'required',
|
||||
// 'password' => ['required', 'min:8', 'confirmed']
|
||||
'password' => ['required','confirmed', Password::min(8)->letters()->numbers(),]
|
||||
]);
|
||||
if ($request->filled('activation_hash')) {
|
||||
return redirect()->back()->withErrors(['Your Activation request can not be handled. Try again']);
|
||||
}
|
||||
|
||||
$client = Models\ClientSession::where('activation_hash', $request->hash)->firstOrFail();
|
||||
if ($client->activation_status == 'ACTIVATED') {
|
||||
return redirect()->back()->withErrors(['Your Activation request can not be handled. Try again']);
|
||||
}
|
||||
|
||||
$create_client_url = "clients/$client->client_id/status";
|
||||
$client_arr = ['status' => 'ACTIVE'];
|
||||
$result = ApiCalls::CurlPatch(json_encode($client_arr), $create_client_url);
|
||||
|
||||
|
||||
$name = $client->name;
|
||||
// $client->client_id = $result->id;
|
||||
$client->activation_status = 'ACTIVATED';
|
||||
$client->password = Hash::make($request->password);
|
||||
$client->save();
|
||||
|
||||
|
||||
\Log::info($name . ' Successfully activated their account at : ' . date('Y-m-d H:i:s'));
|
||||
Session::flash('success_message', 'You have successfully activated your account, login to get started');
|
||||
return redirect(url('/'));
|
||||
|
||||
}
|
||||
|
||||
|
||||
public function handleLogin(Request $request){
|
||||
|
||||
$this->validate($request, ['email' => 'required', 'password' => 'required']);
|
||||
$logged_in = '';
|
||||
|
||||
$client_url = "clients/1";
|
||||
$client = Models\ClientSession::where('email', $request->email)->first();
|
||||
|
||||
if ($client == false) {
|
||||
return redirect()->back()->withErrors(['Invalid credentials']);
|
||||
}
|
||||
$client_url = "clients/" . $client->client_id;
|
||||
$result = ApiCalls::CurlGet($client_url);
|
||||
$result_arr = json_decode($result, true);
|
||||
|
||||
// dd($result_arr);
|
||||
|
||||
$result_arr = json_decode($result, true);
|
||||
$logged_in = $result_arr;
|
||||
|
||||
$request->session()->regenerate(true);
|
||||
$request->session()->put('current_user.user_id', $logged_in['id']);
|
||||
$request->session()->put('current_user.org_id', $logged_in['id']);
|
||||
$request->session()->put('current_user.name', $logged_in['name']);
|
||||
$request->session()->put('current_user.email', $logged_in['email']);
|
||||
$request->session()->put('current_user.phoneNumber', $logged_in['phoneNumber']);
|
||||
@@ -42,7 +106,7 @@ class ClientsLoginController extends Controller
|
||||
\Log::info($logged_in['name']. ' Successfully logged in at : ' . date('Y-m-d H:i:s'));
|
||||
return redirect(url('/'));
|
||||
}
|
||||
public function handle_logout(Request $request) {
|
||||
public function handle_logout(Request $request) {
|
||||
$user_id = session('current_user.id');
|
||||
$name = session('current_user.name');
|
||||
|
||||
|
||||
Reference in New Issue
Block a user