api update
This commit is contained in:
@@ -65,4 +65,52 @@ class UserRequestController extends Controller
|
||||
|
||||
return redirect()->back()->with('info', 'Request rejected successfully.');
|
||||
}
|
||||
|
||||
public function profileUpdateRequests()
|
||||
{
|
||||
$requests = \App\Models\UpdateRequest::where('status', 'pending')
|
||||
->orderBy('id', 'desc')
|
||||
->get();
|
||||
|
||||
return view('admin.profile_update_requests', compact('requests'));
|
||||
}
|
||||
|
||||
public function approveProfileUpdate($id)
|
||||
{
|
||||
$req = \App\Models\UpdateRequest::findOrFail($id);
|
||||
$user = \App\Models\User::findOrFail($req->user_id);
|
||||
|
||||
// FIX: Ensure data is array
|
||||
$newData = is_array($req->data) ? $req->data : json_decode($req->data, true);
|
||||
|
||||
foreach ($newData as $key => $value) {
|
||||
if ($value !== null && $value !== "") {
|
||||
if (in_array($key, ['customer_name','company_name','designation','email','mobile_no','address','pincode'])) {
|
||||
$user->$key = $value;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
$user->save();
|
||||
|
||||
$req->status = 'approved';
|
||||
$req->admin_note = 'Approved by admin on ' . now();
|
||||
$req->save();
|
||||
|
||||
return back()->with('success', 'Profile updated successfully.');
|
||||
}
|
||||
|
||||
|
||||
|
||||
public function rejectProfileUpdate($id)
|
||||
{
|
||||
$req = \App\Models\UpdateRequest::findOrFail($id);
|
||||
$req->status = 'rejected';
|
||||
$req->admin_note = 'Rejected by admin on ' . now();
|
||||
$req->save();
|
||||
|
||||
return back()->with('info', 'Profile update request rejected.');
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
@@ -12,19 +12,68 @@ class UserAuthController extends Controller
|
||||
|
||||
public function refreshToken()
|
||||
{
|
||||
\Log::info('🔄 refreshToken() called');
|
||||
|
||||
try {
|
||||
$newToken = JWTAuth::refresh(JWTAuth::getToken());
|
||||
// Get current token
|
||||
$currentToken = JWTAuth::getToken();
|
||||
|
||||
if (!$currentToken) {
|
||||
\Log::warning('⚠ No token provided in refreshToken()');
|
||||
return response()->json([
|
||||
'success' => false,
|
||||
'message' => 'Token not provided',
|
||||
], 401);
|
||||
}
|
||||
|
||||
\Log::info('📥 Current Token:', ['token' => (string) $currentToken]);
|
||||
|
||||
// Try refreshing token
|
||||
$newToken = JWTAuth::refresh($currentToken);
|
||||
|
||||
\Log::info('✅ Token refreshed successfully', ['new_token' => $newToken]);
|
||||
|
||||
return response()->json([
|
||||
'success' => true,
|
||||
'token' => $newToken,
|
||||
]);
|
||||
|
||||
} catch (\Exception $e) {
|
||||
} catch (\Tymon\JWTAuth\Exceptions\TokenExpiredException $e) {
|
||||
\Log::error('❌ TokenExpiredException in refreshToken()', [
|
||||
'message' => $e->getMessage(),
|
||||
]);
|
||||
return response()->json([
|
||||
'success' => false,
|
||||
'message' => 'Token expired, cannot refresh.',
|
||||
], 401);
|
||||
|
||||
} catch (\Tymon\JWTAuth\Exceptions\TokenInvalidException $e) {
|
||||
\Log::error('❌ TokenInvalidException in refreshToken()', [
|
||||
'message' => $e->getMessage(),
|
||||
]);
|
||||
return response()->json([
|
||||
'success' => false,
|
||||
'message' => 'Invalid token.',
|
||||
], 401);
|
||||
|
||||
} catch (\Tymon\JWTAuth\Exceptions\JWTException $e) {
|
||||
\Log::error('❌ JWTException in refreshToken()', [
|
||||
'message' => $e->getMessage(),
|
||||
]);
|
||||
return response()->json([
|
||||
'success' => false,
|
||||
'message' => 'Could not refresh token.',
|
||||
], 401);
|
||||
|
||||
} catch (\Exception $e) {
|
||||
\Log::error('❌ General Exception in refreshToken()', [
|
||||
'message' => $e->getMessage(),
|
||||
'trace' => $e->getTraceAsString(),
|
||||
]);
|
||||
return response()->json([
|
||||
'success' => false,
|
||||
'message' => 'Unexpected error while refreshing token.',
|
||||
], 500);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -4,14 +4,17 @@ namespace App\Http\Controllers\User;
|
||||
|
||||
use App\Http\Controllers\Controller;
|
||||
use Illuminate\Http\Request;
|
||||
use App\Models\UpdateRequest;
|
||||
use PHPOpenSourceSaver\JWTAuth\Facades\JWTAuth;
|
||||
|
||||
class UserProfileController extends Controller
|
||||
{
|
||||
/**
|
||||
* Get user profile
|
||||
*/
|
||||
public function profile()
|
||||
{
|
||||
// Get logged-in user using JWT
|
||||
try {
|
||||
try {
|
||||
$user = JWTAuth::parseToken()->authenticate();
|
||||
} catch (\Exception $e) {
|
||||
return response()->json([
|
||||
@@ -20,7 +23,6 @@ class UserProfileController extends Controller
|
||||
], 401);
|
||||
}
|
||||
|
||||
|
||||
if (! $user) {
|
||||
return response()->json([
|
||||
'success' => false,
|
||||
@@ -28,7 +30,6 @@ class UserProfileController extends Controller
|
||||
], 401);
|
||||
}
|
||||
|
||||
// Format response
|
||||
return response()->json([
|
||||
'success' => true,
|
||||
'data' => [
|
||||
@@ -49,7 +50,53 @@ class UserProfileController extends Controller
|
||||
]);
|
||||
}
|
||||
|
||||
public function updateProfile(Request $request)
|
||||
|
||||
|
||||
/**
|
||||
* Update profile IMAGE only (no admin approval)
|
||||
*/
|
||||
public function updateProfileImage(Request $request)
|
||||
{
|
||||
$user = JWTAuth::parseToken()->authenticate();
|
||||
|
||||
if (! $user) {
|
||||
return response()->json([
|
||||
'success' => false,
|
||||
'message' => 'Unauthorized'
|
||||
], 401);
|
||||
}
|
||||
|
||||
$request->validate([
|
||||
'profile_image' => 'required|image|mimes:jpg,jpeg,png|max:2048'
|
||||
]);
|
||||
|
||||
// DELETE OLD IMAGE
|
||||
if ($user->profile_image && file_exists(public_path($user->profile_image))) {
|
||||
@unlink(public_path($user->profile_image));
|
||||
}
|
||||
|
||||
// SAVE NEW IMAGE
|
||||
$file = $request->file('profile_image');
|
||||
$filename = 'profile_' . time() . '.' . $file->getClientOriginalExtension();
|
||||
$folder = 'profile_upload/';
|
||||
$file->move(public_path($folder), $filename);
|
||||
|
||||
$user->profile_image = $folder . $filename;
|
||||
$user->save();
|
||||
|
||||
return response()->json([
|
||||
'success' => true,
|
||||
'message' => 'Profile image updated successfully',
|
||||
'profile_image' => url($user->profile_image),
|
||||
]);
|
||||
}
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* Submit profile update request (requires admin approval)
|
||||
*/
|
||||
public function updateProfileRequest(Request $request)
|
||||
{
|
||||
$user = JWTAuth::parseToken()->authenticate();
|
||||
|
||||
@@ -60,53 +107,28 @@ class UserProfileController extends Controller
|
||||
], 401);
|
||||
}
|
||||
|
||||
// Validate ONLY profile image
|
||||
// Validate input
|
||||
$request->validate([
|
||||
'profile_image' => 'required|image|mimes:jpg,jpeg,png|max:2048'
|
||||
'customer_name' => 'nullable|string|max:255',
|
||||
'company_name' => 'nullable|string|max:255',
|
||||
'designation' => 'nullable|string|max:255',
|
||||
'email' => 'nullable|email',
|
||||
'mobile_no' => 'nullable|string|max:15',
|
||||
'address' => 'nullable|string',
|
||||
'pincode' => 'nullable|string|max:10'
|
||||
]);
|
||||
|
||||
// If new image uploaded
|
||||
if ($request->hasFile('profile_image')) {
|
||||
|
||||
// DELETE OLD IMAGE
|
||||
if ($user->profile_image && file_exists(public_path($user->profile_image))) {
|
||||
@unlink(public_path($user->profile_image));
|
||||
}
|
||||
|
||||
// NEW FILE
|
||||
$file = $request->file('profile_image');
|
||||
$filename = 'profile_' . time() . '.' . $file->getClientOriginalExtension();
|
||||
|
||||
// Correct folder name (from your message)
|
||||
$folder = 'profile_upload/';
|
||||
$fullPath = $folder . $filename;
|
||||
|
||||
// Move file
|
||||
$file->move(public_path($folder), $filename);
|
||||
|
||||
// Save in DB (same pattern you said)
|
||||
$user->profile_image = $fullPath;
|
||||
}
|
||||
|
||||
$user->save();
|
||||
// SAVE AS ARRAY (NOT JSON STRING!)
|
||||
$updateReq = \App\Models\UpdateRequest::create([
|
||||
'user_id' => $user->id,
|
||||
'data' => $request->all(), // <---- FIXED
|
||||
'status' => 'pending',
|
||||
]);
|
||||
|
||||
return response()->json([
|
||||
'success' => true,
|
||||
'message' => 'Profile image updated successfully',
|
||||
'data' => [
|
||||
'customer_id' => $user->customer_id,
|
||||
'customer_name' => $user->customer_name,
|
||||
'company_name' => $user->company_name,
|
||||
'designation' => $user->designation,
|
||||
'email' => $user->email,
|
||||
'mobile' => $user->mobile_no,
|
||||
'address' => $user->address,
|
||||
'pincode' => $user->pincode,
|
||||
'status' => $user->status,
|
||||
'customer_type' => $user->customer_type,
|
||||
'profile_image' => $user->profile_image ? url($user->profile_image) : null,
|
||||
'date' => $user->date,
|
||||
]
|
||||
'message' => 'Profile update request submitted. Waiting for admin approval.',
|
||||
'request_id' => $updateReq->id
|
||||
]);
|
||||
}
|
||||
|
||||
|
||||
30
app/Models/UpdateRequest.php
Normal file
30
app/Models/UpdateRequest.php
Normal file
@@ -0,0 +1,30 @@
|
||||
<?php
|
||||
|
||||
namespace App\Models;
|
||||
|
||||
use Illuminate\Database\Eloquent\Factories\HasFactory;
|
||||
use Illuminate\Database\Eloquent\Model;
|
||||
|
||||
class UpdateRequest extends Model
|
||||
{
|
||||
use HasFactory;
|
||||
|
||||
protected $table = 'update_requests';
|
||||
|
||||
protected $fillable = [
|
||||
'user_id',
|
||||
'data',
|
||||
'status',
|
||||
'admin_note',
|
||||
];
|
||||
|
||||
protected $casts = [
|
||||
'data' => 'array', // converts JSON to array automatically
|
||||
];
|
||||
|
||||
// Relationship: request belongs to a user
|
||||
public function user()
|
||||
{
|
||||
return $this->belongsTo(User::class);
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user