forgot & reset password

app/Http/Controllers/AuthMobile/AuthController.php

@@ -2,13 +2,13 @@
 
 namespace App\Http\Controllers\AuthMobile;
 
-use App\Http\Controllers\Controller;
+use Auth;
+use Carbon\Carbon;
 use App\Models\User;
 use App\Models\File;
+use App\Http\Controllers\Controller;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Hash;
-use Carbon\Carbon;
-use Auth;
 use Illuminate\Support\Facades\Validator;
 
 class AuthController extends Controller
@@ -79,7 +79,7 @@ class AuthController extends Controller
         return response($response, 201);
     }
 
-    public function login(Request $request) {
+    public function loginUser(Request $request) {
         $fields = $request->validate([
             'username' => 'required|string',
             'password' => 'required|string'
@@ -108,9 +108,11 @@ class AuthController extends Controller
        }
        //Check Password
        if(!$user || !Hash::check($fields['password'], $user->password)){
-            return response([
-                'message' => 'Bad Creds'
-            ], 401);
+
+            return $this->jsonResponse(null, trans('auth.failed'), 401);
+            // return response([
+            //     'message' => 'Bad Creds'
+            // ], 401);
 
        }
 
@@ -123,7 +125,7 @@ class AuthController extends Controller
         return response($response, 201);
     }
 
-    public function logout(Request $request){
+    public function logoutUser(Request $request){
         auth()->user()->tokens()->delete();
 
         return [

app/Http/Controllers/AuthMobile/ForgotPasswordController.php

@@ -0,0 +1,32 @@
+<?php
+
+namespace App\Http\Controllers\Auth;
+
+use App\Http\Controllers\Controller;
+use Illuminate\Foundation\Auth\ResetsPasswords;
+
+class ResetPasswordController extends Controller
+{
+    /*
+    |--------------------------------------------------------------------------
+    | Password Reset Controller
+    |--------------------------------------------------------------------------
+    |
+    | This controller is responsible for handling password reset emails and
+    | includes a trait which assists in sending these notifications from
+    | your application to your users. Feel free to explore this trait.
+    |
+    */
+
+    use SendsPasswordResetEmails;
+
+    /**
+     * Create a new controller instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        $this->middleware('guest');
+    }
+}

app/Http/Controllers/AuthMobile/LelongMobileController.php

@@ -1,152 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\AuthMobile;
-
-use App\Http\Controllers\Controller;
-use Illuminate\Http\Request;
-use App\Models\Lelong;
-use App\Models\LelongBid;
-use App\Models\LelongBidder;
-use App\Models\LelongBidMarhun;
-use App\Models\lelkarat;
-use App\Models\User;
-use App\Models\Payment;
-use App\Models\Cart;
-use Carbon\Carbon;
-use App\Models\Cawangan;
-
-class LelongMobileController extends Controller
-{
-
-    public function getlelongdetails(Request $request){
-
-        $currentdate = Carbon::now();
-        $currentdate = $currentdate->toDateString();
-
-        // $arrayLelong = [];
-        $lelong = Lelong::where('tarikh_lelong','=',$currentdate)->where('sts_lelong','=',1)->get()->toArray();
-
-        foreach($lelong as $index1=>$lel)
-        {
-            $lelongbid = LelongBid::whereIn('lelong_id',$lelong)
-            ->get()->toArray();
-
-            $lelong[$index1]['lelongbid'] = $lelongbid;
-            
-            foreach($lelongbid as $index2=>$lelbidmarhun){
-                $cawangan = Cawangan::where('id','=',$lelbidmarhun['caw_id'])->first()->toArray();
-                // $id = lelongbid::first();
-
-                $lelongbidmarhun = LelongBidMarhun::where('lelongbid_id', $lelbidmarhun['id'])
-                ->get()->toArray();
-
-                $lelong[$index1]['lelongbid'][$index2]['lelongbidmarhun'] = $lelongbidmarhun;
-                $lelong[$index1]['lelongbid'][$index2]['cawangan'] = $cawangan;
-            }
-            
-        }
-        
-        return response()->json($lelong);
-
-    }
-
-    public function getListKarat(Request $request){
-
-        $getKarat = lelkarat::all();
-
-        // $lelongBidder = lelongBidder::all();
-
-        return response()->json($getKarat);
-
-    }
-
-    public function bidderSelectBidItem(Request $request){
-
-        $feepayment = Payment::where('status', '=', 1)->first();
-
-        if($feepayment != null){
-
-            $user = User::where('id', '=', $request->user_id)
-            ->first();
-
-            $selectBid = Cart::join('lelongbid', 'carts.lelongbid_id', '=', 'lelongbid.id')
-            ->where('lelongbid.norujukan', $request->norujukan)
-            ->select('lelongbid.id as lelongbid_id',
-                      'lelongbid.t_lelong',
-                      'lelongbid.nilaimarhun',
-                      'lelongbid.cajlelong',
-                      'carts.hargabida')
-            ->get();
-
-            // dd($selectBid[0]->hargabida);
-
-            $currentdate = Carbon::now()->toDateTimeString();
-            
-            $lelongBidder = new LelongBidder();
-            $lelongBidder->nama_bidder = $request->name;
-            $lelongBidder->user_id = $user->id;
-            $lelongBidder->notelbimbit = $user->notelbimbit;
-            $lelongBidder->hargabida = $selectBid[0]->hargabida;
-            $lelongBidder->lelongbid_id = $selectBid[0]->lelongbid_id;
-            $lelongBidder->nilaimarhun = $selectBid[0]->nilaimarhun;
-            $lelongBidder->cajlelong = $selectBid[0]->cajlelong;
-            $lelongBidder->masa_bidaan = $currentdate;
-            $lelongBidder->save();
-
-            return response()->json("success", 201);
-        }
-        else if($feepayment == null){
-            return response()->json("unsuccess", 201);
-        }
-    }
-
-    public function listBidItem(Request $request){
-
-        $lelongbidder = LelongBidder::where('user_id','=', $request->user_id)
-        ->get()->toArray();
-
-        foreach($lelongbidder as $index1=>$lelbid)
-        {
-            $lelongbid = LelongBid::whereIn('id',$lelongbidder)
-            ->get()->toArray();
-
-            $lelongbidder[$index1]['lelongbid'] = $lelongbid;
-        }
-
-        return response()->json($lelongbidder);
-    }
-
-    public function searchLelByCaw(Request $request){
-
-        $currentdate = Carbon::now();
-        $currentdate = $currentdate->toDateString();
-
-        // $arrayLelong = [];
-        $lelong = Lelong::join('cawangan_lelong', 'lelong.id', '=', 'cawangan_lelong.lelong_id')
-        ->where('tarikh_lelong','=',$currentdate)
-        ->where('caw_id', '=', $request->caw_id)
-        ->get()->toArray();
-        
-        foreach($lelong as $index1=>$lel)
-        {
-            $lelongbid = LelongBid::where('lelong_id',$lel['lelong_id'])
-            ->get()->toArray();
-
-            $lelong[$index1]['lelongbid'] = $lelongbid;
-            
-            foreach($lelongbid as $index2=>$lelbidmarhun){
-                $cawangan = Cawangan::where('id','=',$lelbidmarhun['caw_id'])->first()->toArray();
-                // $id = lelongbid::first();
-
-                $lelongbidmarhun = LelongBidMarhun::where('lelongbid_id', $lelbidmarhun['id'])
-                ->get()->toArray();
-
-                $lelong[$index1]['lelongbid'][$index2]['lelongbidmarhun'] = $lelongbidmarhun;
-                $lelong[$index1]['lelongbid'][$index2]['cawangan'] = $cawangan;
-            }
-            
-        }
-        
-        return response()->json($lelong);
-    }
-}

app/Http/Controllers/AuthMobile/NewPasswordController.php

@@ -1,47 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\AuthMobile;
-
-use App\Http\Controllers\Controller;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Hash;
-use Illuminate\Support\Facades\Password;
-use Illuminate\Auth\Events\PasswordReset;
-use Illuminate\Validation\Rules\Password as RulesPassword;
-
-class NewPasswordController extends Controller
-{
-    public function forgotPassword(Request $request){
-
-        $request->validation([
-            'email' => 'required|email'
-        ]);
-
-        $status = User::sendResetLink(
-            $request->onlu('email')
-        );
-
-        if ($status == User::RESET_LINK_SENT){
-            return [
-                'status' => __($status)
-            ];
-        }
-
-        throw ValidationException::withMessage([
-            'email' => [trans($status)],
-        ]);
-    }
-
-    public function reset(Request $request){
-
-        $request->validation([
-            'token' => 'required',
-            'email' => 'required|email',
-            'password' => ['required', 'confirmed', RulesPassword::defaults()],
-        ]);
-
-        // $status = Password::reset(
-        //     $request->only('email', 'password_confirmation', 'token')
-        // )
-    }
-}

app/Http/Controllers/AuthMobile/ResetPasswordController.php

@@ -4,10 +4,8 @@ namespace App\Http\Controllers\AuthMobile;
 
 use App\Http\Controllers\Controller;
 use Illuminate\Http\Request;
-use App\Models\Lelong;
-use App\Models\Users;
 
-class PaymentController extends Controller
+class ResetPasswordController extends Controller
 {
     //
 }

app/Http/Controllers/AuthMobile/UserController.php

@@ -1,53 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\AuthMobile;
-
-use App\Http\Controllers\Controller;
-use Illuminate\Support\Facades\Validator;
-use Illuminate\Http\Request;
-use App\Models\User;
-use DB;
-use Carbon\Carbon;
-
-class UserController extends Controller
-{
-    public function getProfileUser(Request $request){
-
-        $getUserNokp = User::where('nokp', $request->nokp)
-        ->join('file', function ($join) {
-            $join->on('users.id', '=', 'file.user_id');
-        })
-        ->get();
-
-        // $user = User::all();
-
-        return response()->json($getUserNokp);
-    }
-
-    public function updateProfileUser(Request $request){
-
-        $validator = Validator::make($request->all(), [
-            'nokp' => 'required'
-        ]);
-
-        if ($validator->fails()) {
-            return response($validator->errors(), 201);
-        }
-
-        $currentdate = Carbon::now()->toDateTimeString();
-
-        $user_update = User::where('nokp','=',$request->nokp)
-        ->update([
-            'bank_acc_pembeli' => $request->bank_acc_pembeli,
-            'bank_acc_no_pembeli' => $request->bank_acc_no_pembeli,
-            'alamat' => $request->alamat,
-            'notelbimbit' => $request->notelbimbit,
-            'notelpejabat' => $request->notelpejabat,
-            'email' => $request->email,
-            'updated_at' => $currentdate
-        ]);
-
-        return response()->json($user_update);
-    }
-    
-}

app/Http/Controllers/AuthMobile/VerificationController.php

@@ -0,0 +1,41 @@
+<?php
+
+namespace App\Http\Controllers\Auth;
+
+use App\Http\Controllers\Controller;
+use Illuminate\Foundation\Auth\VerifiesEmails;
+
+class VerificationController extends Controller
+{
+    /*
+    |--------------------------------------------------------------------------
+    | Email Verification Controller
+    |--------------------------------------------------------------------------
+    |
+    | This controller is responsible for handling email verification for any
+    | user that recently registered with the application. Emails may also
+    | be re-sent if the user didn't receive the original email message.
+    |
+    */
+
+    use VerifiesEmails;
+
+    /**
+     * Where to redirect users after verification.
+     *
+     * @var string
+     */
+    protected $redirectTo = '/';
+
+    /**
+     * Create a new controller instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        $this->middleware('auth');
+        $this->middleware('signed')->only('verify');
+        $this->middleware('throttle:6,1')->only('verify', 'resend');
+    }
+}