Compare commits

..

6 Commits

17 changed files with 361 additions and 80 deletions

View File

@@ -46,7 +46,6 @@ class LawController extends Controller
$validated['is_locked'] = $request->has('is_locked', false); $validated['is_locked'] = $request->has('is_locked', false);
if ($request->hasFile('image') && $request->file('image')->isValid()) { if ($request->hasFile('image') && $request->file('image')->isValid()) {
dd($request->has('image'));
$imageName = uniqid('image_', true) . '.' . $request->file('image')->getClientOriginalExtension(); $imageName = uniqid('image_', true) . '.' . $request->file('image')->getClientOriginalExtension();
$request->file('image')->move(public_path('images'), $imageName); $request->file('image')->move(public_path('images'), $imageName);

View File

@@ -26,6 +26,13 @@ class ArtController extends Controller
public function index(GetApiRequest $request) public function index(GetApiRequest $request)
{ {
$book = Book::find($request->book_id);
$law = Law::find($book?->law_id);
if ($this->isLockedForCurrentUser($law)) {
return $this->failed([], ['title' => 'Subscription Required', 'message' => 'This content requires an active subscription.'], 403);
}
$arts = Art::with(['chapter', 'part', 'volum', 'law', 'book', 'section', 'gate'])->where('book_id', $request->book_id)->orderBy('number')->get(); $arts = Art::with(['chapter', 'part', 'volum', 'law', 'book', 'section', 'gate'])->where('book_id', $request->book_id)->orderBy('number')->get();
$arts = $arts->map(function ($art) { $arts = $arts->map(function ($art) {
@@ -84,6 +91,10 @@ class ArtController extends Controller
$law = Law::find($art?->law_id); $law = Law::find($art?->law_id);
if ($this->isLockedForCurrentUser($law)) {
return $this->failed([], ['title' => 'Subscription Required', 'message' => 'This content requires an active subscription.'], 403);
}
$art->is_like = $this->isLiked($art->id); $art->is_like = $this->isLiked($art->id);
$art->note = Note::select('id', 'note', 'color_code','created_at')->where('user_id', auth()->user()->id)->where('art_id', $id)->get(); $art->note = Note::select('id', 'note', 'color_code','created_at')->where('user_id', auth()->user()->id)->where('art_id', $id)->get();
$art->category = $law?->category?->name; $art->category = $law?->category?->name;
@@ -152,16 +163,23 @@ class ArtController extends Controller
->exists(); ->exists();
} }
private function isLockedForCurrentUser(?Law $law): bool
{
return !auth()->user()->isSubscriber() && (bool) $law?->is_locked;
}
public function likes() public function likes()
{ {
$likes = LikeArt::query()->where('user_id', auth()->user()->id) $likes = LikeArt::query()->where('user_id', auth()->user()->id)
->with('art') ->with('art.law')
->get() ->get()
->map(function ($q) { ->map(function ($q) {
$isLocked = $this->isLockedForCurrentUser($q->art?->law);
return [ return [
'id' => $q->art->id, 'id' => $q->art->id,
'title' => $q->art->title, 'title' => $q->art->title,
'text' => $q->art->text 'text' => $isLocked ? null : $q->art->text
]; ];
}); });
@@ -257,12 +275,13 @@ class ArtController extends Controller
} }
$law = Law::find($item->law_id); $law = Law::find($item->law_id);
$isLocked = $this->isLockedForCurrentUser($law);
return [ return [
'id' => $item->id, 'id' => $item->id,
'title' => $item->title, 'title' => $item->title,
'text' => $context, 'text' => $isLocked ? null : $context,
'is_locked' => auth()->user()->isSubscriber() !== false ? false : optional($law)->is_locked, 'is_locked' => $isLocked,
'type' => 'art', 'type' => 'art',
'route' => array_values($this->route($modelClass, $item)), 'route' => array_values($this->route($modelClass, $item)),
'category' => optional($law->category)->name, 'category' => optional($law->category)->name,
@@ -466,11 +485,13 @@ class ArtController extends Controller
$context = $text; $context = $text;
} }
$isLocked = $this->isLockedForCurrentUser($law);
return [ return [
'id' => $q->id, 'id' => $q->id,
'title' => $q->title, 'title' => $q->title,
'text' => $context, 'text' => $isLocked ? null : $context,
'is_locked' => auth()->user()->isSubscriber() !== false ? false : $law->is_locked, 'is_locked' => $isLocked,
'type' => 'art', 'type' => 'art',
'route' => $route, 'route' => $route,
'category' => $law?->category?->name, 'category' => $law?->category?->name,

View File

@@ -59,7 +59,10 @@ class AuthController extends Controller
if ($response->successful()) { if ($response->successful()) {
return $this->success([], 'موفق', 'کد ورود به شماره موبایل شما ارسال شد'); return $this->success([], 'موفق', 'کد ورود به شماره موبایل شما ارسال شد');
} else { } else {
return $this->failed([], 'نا موفق', 'در ارسال کد به شماره شما مشکلی وجود دارد'); return $this->failed([], [
'title' => 'نا موفق',
'message' => 'در ارسال کد به شماره شما مشکلی وجود دارد',
]);
} }
} }

View File

@@ -23,7 +23,7 @@ class BookController extends Controller
$books = Book::where('volum_id', $validated['volum_id'])->paginate($perPage, ['*'], 'page', $page); $books = Book::where('volum_id', $validated['volum_id'])->paginate($perPage, ['*'], 'page', $page);
$books->getCollection()->transform(function ($section) { $books->getCollection()->transform(function ($section) {
$section['is_locked'] = auth()->user()->isSubscriber() !== true ? true : Law::where('is_locked',$section['law_id'])->first()?->is_locked ?? false; $section['is_locked'] = auth()->user()->isSubscriber() !== false ? false : Law::where('id', $section['law_id'])->first()?->is_locked ?? false;
unset($section['law_id']); unset($section['law_id']);
unset($section['volum_id']); unset($section['volum_id']);

View File

@@ -24,7 +24,7 @@ class ChapterController extends Controller
$chapters->getCollection()->transform(function ($section) { $chapters->getCollection()->transform(function ($section) {
$section['is_locked'] = auth()->user()->isSubscriber() !== false ? false : Law::where('is_locked', $section['law_id'])->first()?->is_locked; $section['is_locked'] = auth()->user()->isSubscriber() !== false ? false : Law::where('id', $section['law_id'])->first()?->is_locked;
unset($section['law_id']); unset($section['law_id']);
unset($section['section_id']); unset($section['section_id']);

View File

@@ -83,13 +83,14 @@ class FolderController extends Controller
} else { } else {
$shortText = $text; $shortText = $text;
} }
$isLocked = !auth()->user()->isSubscriber() && (bool) $art->law?->is_locked;
return [ return [
'id' => $art->id, 'id' => $art->id,
'title' => $art->title, 'title' => $art->title,
'text' => $shortText, 'text' => $isLocked ? null : $shortText,
'number' => $art->number, 'number' => $art->number,
'is_locked' => auth()->user()->isSubscriber() !== false ? false : Law::where('is_locked', $art->law->id)->first()?->is_locked, 'is_locked' => $isLocked,
'chapter' => $art->chapter != null ? [ 'chapter' => $art->chapter != null ? [
'id' => $art->chapter->id, 'id' => $art->chapter->id,
'title' => $art->chapter->title, 'title' => $art->chapter->title,

View File

@@ -23,7 +23,7 @@ class GateController extends Controller
$gates->getCollection()->transform(function ($gate) { $gates->getCollection()->transform(function ($gate) {
unset($gate['book_id']); unset($gate['book_id']);
$gate['is_locked'] = auth()->user()->isSubscriber() !== false ? false : Law::where('is_locked', $gate['law_id'])->first()?->is_locked; $gate['is_locked'] = auth()->user()->isSubscriber() !== false ? false : Law::where('id', $gate['law_id'])->first()?->is_locked;
unset($gate['law_id']); unset($gate['law_id']);

View File

@@ -3,40 +3,27 @@
namespace App\Http\Controllers\api; namespace App\Http\Controllers\api;
use App\Http\Controllers\Controller; use App\Http\Controllers\Controller;
// 1. IMPORT THE JOB WE CREATED
use App\Jobs\CheckBazaarSubscription;
// These are your existing imports
use App\Models\Law; use App\Models\Law;
use App\Models\Notification; use App\Models\Notification;
use App\Models\RecentArt; use App\Models\RecentArt;
use App\Models\UserSubscriber; use App\Models\UserSubscriber;
use App\Services\AppMarketPurchaseVerifier;
use App\Traits\BaseApiResponse; use App\Traits\BaseApiResponse;
use Carbon\Carbon; use Illuminate\Support\Facades\Cache;
use Illuminate\Support\Facades\Log;
class HomeController extends Controller class HomeController extends Controller
{ {
use BaseApiResponse; use BaseApiResponse;
public function __construct(private AppMarketPurchaseVerifier $marketVerifier)
{
}
public function index() public function index()
{ {
$user = auth()->user(); $user = auth()->user();
// 2. DISPATCH THE JOB AT THE VERY BEGINNING $this->refreshMarketSubscriptionAfterResponse($user);
// ===================================================================
// Find the user's latest subscription that has a purchase token
$latestSubscription = $user->userSubscribers()->whereNotNull('purchase_token')->latest()->first();
// If such a subscription exists, create a new job and hand it to the queue
// if ($latestSubscription) {
// CheckBazaarSubscription::dispatch($latestSubscription);
// }
// ===================================================================
// Your API now continues immediately without waiting for the check to finish.
// --- ALL THE REST OF YOUR CODE REMAINS EXACTLY THE SAME ---
$recent = RecentArt::query()->where('user_id', $user->id)->get()->map(function ($q) { $recent = RecentArt::query()->where('user_id', $user->id)->get()->map(function ($q) {
return [ return [
@@ -81,8 +68,6 @@ class HomeController extends Controller
]; ];
}); });
$current_plan = null;
$freeSubscription = $user->userSubscribers() $freeSubscription = $user->userSubscribers()
->whereHas('subscribe', function ($query) { ->whereHas('subscribe', function ($query) {
$query->where('is_free', true); $query->where('is_free', true);
@@ -90,11 +75,9 @@ class HomeController extends Controller
->where('expired_at', '>=', now()) ->where('expired_at', '>=', now())
->first(); ->first();
$expiredAt = null;
$current_plan = null; $current_plan = null;
if ($freeSubscription) { if ($freeSubscription) {
$expiredAt = $freeSubscription->expired_at;
$current_plan = [ $current_plan = [
'id' => $freeSubscription->id, 'id' => $freeSubscription->id,
'name' => $freeSubscription->subscribe->name, 'name' => $freeSubscription->subscribe->name,
@@ -104,18 +87,22 @@ class HomeController extends Controller
]; ];
} }
$latestSubscription = $user->userSubscribers()->latest()->first(); $latestSubscription = $user->userSubscribers()
->where('expired_at', '>=', now())
->latest('expired_at')
->first();
$expiredDays = UserSubscriber::query()->where('user_id', $user->id)->where('expired_at', '>=', now())->get()->sum(function ($subscriber) {return $subscriber->expired_at->diffInDays(now());}); $expiredDays = UserSubscriber::query()->where('user_id', $user->id)->where('expired_at', '>=', now())->get()->sum(function ($subscriber) {return $subscriber->expired_at->diffInDays(now());});
$purchase_token = $latestSubscription?->purchase_token; if ($latestSubscription) {
$current_plan = [ $current_plan = [
'id' => $latestSubscription->id, 'id' => $latestSubscription->id,
'name' => $latestSubscription->subscribe->name ?? 'Subscription', 'name' => $latestSubscription->subscribe->name ?? 'Subscription',
'price' => $latestSubscription->subscribe->price ?? 100, 'price' => $latestSubscription->subscribe->price ?? 100,
'expired_day' => $expiredDays, 'expired_day' => $expiredDays,
'is_free' => false 'is_free' => (bool) $latestSubscription->is_free
]; ];
}
$unread_notifications_count = Notification::unreadForUser($user->id)->count(); $unread_notifications_count = Notification::unreadForUser($user->id)->count();
@@ -128,4 +115,55 @@ class HomeController extends Controller
'unread_notifications_count' => $unread_notifications_count, 'unread_notifications_count' => $unread_notifications_count,
]); ]);
} }
private function refreshMarketSubscriptionAfterResponse($user): void
{
$cacheKey = "home-market-refresh-user-{$user->id}";
$this->refreshMarketSubscription($user);
if (!Cache::add($cacheKey, true, now()->addHours(24))) {
return;
}
app()->terminating(function () use ($user) {
$this->refreshMarketSubscription($user);
});
}
private function refreshMarketSubscription($user): void
{
$bazaarSubscription = $user->userSubscribers()
->whereNotNull('purchase_token')
->whereNotNull('subscription_id')
->where(function ($query) {
$query->where('market_provider', 'bazaar')
->orWhereNull('market_provider');
})
->latest()
->first();
if ($bazaarSubscription && $this->shouldRefreshMarketSubscription($bazaarSubscription) && $this->marketVerifier->refreshBazaarSubscriber($bazaarSubscription)) {
return;
}
$myketSubscription = $user->userSubscribers()
->where('market_provider', 'myket')
->whereNotNull('purchase_token')
->whereNotNull('product_id')
->latest()
->first();
if ($myketSubscription && $this->shouldRefreshMarketSubscription($myketSubscription)) {
$this->marketVerifier->refreshMyketSubscriber($myketSubscription);
}
}
private function shouldRefreshMarketSubscription(UserSubscriber $subscriber): bool
{
if ($subscriber->expired_at && $subscriber->expired_at->lessThanOrEqualTo(now())) {
return true;
}
return !$subscriber->last_verified_at || $subscriber->last_verified_at->lessThan(now()->subHours(12));
}
} }

View File

@@ -25,11 +25,11 @@ class PartController extends Controller
$parts->getCollection()->transform(function ($part) { $parts->getCollection()->transform(function ($part) {
unset($part['book_id']); unset($part['book_id']);
$gate['is_locked'] = auth()->user()->isSubscriber() !== false ? false : Law::where('is_locked', $part['law_id'])->first()?->is_locked; $part['is_locked'] = auth()->user()->isSubscriber() !== false ? false : Law::where('id', $part['law_id'])->first()?->is_locked;
unset($gate['law_id']); unset($part['law_id']);
return $gate; return $part;
}); });

View File

@@ -25,7 +25,7 @@ class SectionController extends Controller
$section->getCollection()->transform(function ($section) { $section->getCollection()->transform(function ($section) {
unset($section['book_id']); unset($section['book_id']);
$section['is_locked'] = auth()->user()->isSubscriber() !== false ? false : Law::where('is_locked',$section['law_id'])->first()?->is_locked; $section['is_locked'] = auth()->user()->isSubscriber() !== false ? false : Law::where('id', $section['law_id'])->first()?->is_locked;
unset($section['law_id']); unset($section['law_id']);

View File

@@ -6,6 +6,7 @@ use App\Http\Controllers\Controller;
use App\Models\PaymentTransaction; use App\Models\PaymentTransaction;
use App\Models\SubscribePlan; use App\Models\SubscribePlan;
use App\Models\UserSubscriber; use App\Models\UserSubscriber;
use App\Services\AppMarketPurchaseVerifier;
use App\Traits\BaseApiResponse; use App\Traits\BaseApiResponse;
use Carbon\Carbon; use Carbon\Carbon;
use Illuminate\Http\Request; use Illuminate\Http\Request;
@@ -17,6 +18,10 @@ class SubscribePlanController extends Controller
{ {
use BaseApiResponse; use BaseApiResponse;
public function __construct(private AppMarketPurchaseVerifier $marketVerifier)
{
}
public function index() public function index()
{ {
$subscribePlans = SubscribePlan::query()->where('is_active', true)->get()->map(function ($q) { $subscribePlans = SubscribePlan::query()->where('is_active', true)->get()->map(function ($q) {
@@ -104,8 +109,6 @@ class SubscribePlanController extends Controller
public function subscribe_new(Request $request) public function subscribe_new(Request $request)
{ {
$package_name_bazzar = 'com.razzaghi.lawbook.android';
$request->validate([ $request->validate([
'subscribe_plan_id' => 'required|exists:subscribe_plans,id', 'subscribe_plan_id' => 'required|exists:subscribe_plans,id',
'subscription_id' => 'nullable', 'subscription_id' => 'nullable',
@@ -149,23 +152,13 @@ class SubscribePlanController extends Controller
return $this->failed(null, ['title' => 'Subscribe Plan', 'message' => 'Invalid subscription details.']); return $this->failed(null, ['title' => 'Subscribe Plan', 'message' => 'Invalid subscription details.']);
} }
$url = "https://pardakht.cafebazaar.ir/devapi/v2/api/applications/$package_name_bazzar/subscriptions/$subscription_id/purchases/$purchase_token";
$client = new \GuzzleHttp\Client();
try { try {
$response = $client->get($url, [ $bazaarExpiredAt = $this->marketVerifier->verifyBazaarSubscription($subscription_id, $purchase_token);
'headers' => [
'CAFEBAZAAR-PISHKHAN-API-SECRET' => 'eyJhbGciOiJIUzI1NiIsImtpZCI6ImFuY2llbnQiLCJ0eXAiOiJKV1QifQ.eyJpc3MiOiJuYXNoZXItcGlzaGtoYW4tYXBpIiwiaWF0IjoxNzQwMjQ3NTMzLCJleHAiOjQ4OTM4NDc1MzMsImFwaV9hZ2VudF9pZCI6MzQ2NX0.UCrr3IHxCqn77ckxfnaubrsyCfrhPm18gJgyg1qNqwA',
]
]);
$data = json_decode($response->getBody(), true); if (!$bazaarExpiredAt) {
if (!isset($data['validUntilTimestampMsec']) || $data['validUntilTimestampMsec'] < now()->timestamp * 1000) {
return $this->failed(null, ['title' => 'Subscribe Plan', 'message' => 'Invalid or expired subscription.']); return $this->failed(null, ['title' => 'Subscribe Plan', 'message' => 'Invalid or expired subscription.']);
} }
$bazaarExpiredAt = Carbon::createFromTimestampMs($data['validUntilTimestampMsec']);
$expiredAt = $activeSubscription ? $activeSubscription->expired_at->addDays($subscribePlan->expired_day) : $bazaarExpiredAt; $expiredAt = $activeSubscription ? $activeSubscription->expired_at->addDays($subscribePlan->expired_day) : $bazaarExpiredAt;
$user->userSubscribers()->whereHas('subscribe', function ($query) { $user->userSubscribers()->whereHas('subscribe', function ($query) {
$query->where('is_free', true); $query->where('is_free', true);
@@ -177,6 +170,8 @@ class SubscribePlanController extends Controller
'expired_at' => $expiredAt, 'expired_at' => $expiredAt,
'subscription_id' => $subscription_id, 'subscription_id' => $subscription_id,
'purchase_token' => $purchase_token, 'purchase_token' => $purchase_token,
'market_provider' => 'bazaar',
'last_verified_at' => now(),
'is_free' => false 'is_free' => false
]); ]);
@@ -187,6 +182,69 @@ class SubscribePlanController extends Controller
} }
} }
public function subscribeMyket(Request $request)
{
$request->validate([
'subscribe_plan_id' => 'required|exists:subscribe_plans,id',
'sku_id' => 'required|string',
'token' => 'required_without_all:tokenId,token_id,purchase_token|string',
'tokenId' => 'required_without_all:token,token_id,purchase_token|string',
'token_id' => 'required_without_all:token,tokenId,purchase_token|string',
'purchase_token' => 'required_without_all:token,tokenId,token_id|string',
]);
$subscribePlan = SubscribePlan::findOrFail($request->subscribe_plan_id);
$user = auth()->user();
$token = $request->input('token')
?? $request->input('tokenId')
?? $request->input('token_id')
?? $request->input('purchase_token');
if ($subscribePlan->is_free) {
return $this->failed(null, ['title' => 'Subscribe Plan', 'message' => 'Invalid subscription details.']);
}
try {
$purchase = $this->marketVerifier->verifyMyketProduct($request->sku_id, $token);
if (!$purchase) {
return $this->failed(null, ['title' => 'Subscribe Plan', 'message' => 'Invalid or failed Myket purchase.']);
}
$expiredAt = $purchase['purchased_at']->copy()->addDays($subscribePlan->expired_day);
if ($expiredAt->lessThan(now())) {
return $this->failed(null, ['title' => 'Subscribe Plan', 'message' => 'Invalid or expired subscription.']);
}
$user->userSubscribers()->whereHas('subscribe', function ($query) {
$query->where('is_free', true);
})->update(['expired_at' => now()]);
$user->userSubscribers()->updateOrCreate(
[
'market_provider' => 'myket',
'purchase_token' => $token,
],
[
'subscribe_plan_id' => $subscribePlan->id,
'expired_at' => $expiredAt,
'subscription_id' => $request->sku_id,
'product_id' => $request->sku_id,
'purchased_at' => $purchase['purchased_at'],
'last_verified_at' => now(),
'is_free' => false,
]
);
return $this->success(null, 'Subscribe Plan', 'Myket subscription successfully activated.');
} catch (\Exception $e) {
Log::error('Error in Myket subscription', ['Error' => $e->getMessage()]);
return $this->failed(null, ['title' => 'Subscribe Plan', 'message' => 'Failed to verify Myket subscription.']);
}
}
public function paymentCallback(Request $request) public function paymentCallback(Request $request)
{ {
try { try {

View File

@@ -35,7 +35,7 @@ class VolumController extends Controller
$volumes->getCollection()->transform(function ($volume) { $volumes->getCollection()->transform(function ($volume) {
$volume['has_book'] = Book::where('volum_id', $volume->id)->exists(); $volume['has_book'] = Book::where('volum_id', $volume->id)->exists();
$volume['is_locked'] = auth()->user()->isSubscriber() !== false ? false : Law::where('is_locked', $volume['law_id'])->first()?->is_locked; $volume['is_locked'] = auth()->user()->isSubscriber() !== false ? false : Law::where('id', $volume['law_id'])->first()?->is_locked;
unset($volume['law_id']); unset($volume['law_id']);
@@ -79,7 +79,7 @@ class VolumController extends Controller
'title' => $item->title, 'title' => $item->title,
'number' => $item->number, 'number' => $item->number,
'type' => $relation, 'type' => $relation,
'is_locked' => auth()->user()->isSubscriber() !== false ? false : Law::where('is_locked', $item->law_id)->first()?->is_locked 'is_locked' => auth()->user()->isSubscriber() !== false ? false : Law::where('id', $item->law_id)->first()?->is_locked
]; ];
} }
$paginationData = [ $paginationData = [
@@ -117,7 +117,7 @@ class VolumController extends Controller
'title' => $item->title, 'title' => $item->title,
'number' => $item->number, 'number' => $item->number,
'type' => $relation, 'type' => $relation,
'is_locked' => auth()->user()->isSubscriber() !== false ? false : Law::where('is_locked', $item->law_id)->first()?->is_locked 'is_locked' => auth()->user()->isSubscriber() !== false ? false : Law::where('id', $item->law_id)->first()?->is_locked
]; ];
} }
break; break;
@@ -151,7 +151,7 @@ class VolumController extends Controller
'title' => $item->title, 'title' => $item->title,
'number' => $item->number, 'number' => $item->number,
'type' => $relation, 'type' => $relation,
'is_locked' => auth()->user()->isSubscriber() !== false ? false : Law::where('is_locked', $item->law_id)->first()?->is_locked 'is_locked' => auth()->user()->isSubscriber() !== false ? false : Law::where('id', $item->law_id)->first()?->is_locked
]; ];
} }
break; break;
@@ -184,7 +184,7 @@ class VolumController extends Controller
'title' => $item->title, 'title' => $item->title,
'number' => $item->number, 'number' => $item->number,
'type' => $relation, 'type' => $relation,
'is_locked' => auth()->user()->isSubscriber() !== false ? false : Law::where('is_locked', $item->law_id)->first()?->is_locked 'is_locked' => auth()->user()->isSubscriber() !== false ? false : Law::where('id', $item->law_id)->first()?->is_locked
]; ];
} }
break; break;
@@ -218,7 +218,7 @@ class VolumController extends Controller
'title' => $item->title, 'title' => $item->title,
'number' => $item->number, 'number' => $item->number,
'type' => $relation, 'type' => $relation,
'is_locked' => auth()->user()->isSubscriber() !== false ? false : Law::where('is_locked', $item->law_id)->first()?->is_locked 'is_locked' => auth()->user()->isSubscriber() !== false ? false : Law::where('id', $item->law_id)->first()?->is_locked
]; ];
} }
break; break;
@@ -252,7 +252,7 @@ class VolumController extends Controller
'title' => $item->title, 'title' => $item->title,
'number' => $item->number, 'number' => $item->number,
'type' => $relation, 'type' => $relation,
'is_locked' => auth()->user()->isSubscriber() !== false ? false : Law::where('is_locked', $item->law_id)->first()?->is_locked 'is_locked' => auth()->user()->isSubscriber() !== false ? false : Law::where('id', $item->law_id)->first()?->is_locked
]; ];
} }
break; break;
@@ -286,7 +286,7 @@ class VolumController extends Controller
'title' => $item->title, 'title' => $item->title,
'number' => $item->number, 'number' => $item->number,
'type' => $relation, 'type' => $relation,
'is_locked' => auth()->user()->isSubscriber() !== false ? false : Law::where('is_locked', $item->law_id)->first()?->is_locked 'is_locked' => auth()->user()->isSubscriber() !== false ? false : Law::where('id', $item->law_id)->first()?->is_locked
]; ];
} }
break; break;
@@ -321,7 +321,7 @@ class VolumController extends Controller
'title' => $item->title, 'title' => $item->title,
'number' => $item->number, 'number' => $item->number,
'type' => $relation, 'type' => $relation,
'is_locked' => auth()->user()->isSubscriber() !== false ? false : Law::where('is_locked', $item->law_id)->first()?->is_locked 'is_locked' => auth()->user()->isSubscriber() !== false ? false : Law::where('id', $item->law_id)->first()?->is_locked
]; ];
} }
break; break;
@@ -355,7 +355,7 @@ class VolumController extends Controller
'title' => $item->title, 'title' => $item->title,
'number' => $item->number, 'number' => $item->number,
'type' => $relation, 'type' => $relation,
'is_locked' => auth()->user()->isSubscriber() !== false ? false : Law::where('is_locked', $item->law_id)->first()?->is_locked 'is_locked' => auth()->user()->isSubscriber() !== false ? false : Law::where('id', $item->law_id)->first()?->is_locked
]; ];
} }
break; break;
@@ -399,7 +399,7 @@ class VolumController extends Controller
'title' => $item->title, 'title' => $item->title,
'number' => $item->number, 'number' => $item->number,
'type' => 'volume', 'type' => 'volume',
'is_locked' => auth()->user()->isSubscriber() !== false ? false : Law::where('is_locked', $item->law_id)->first()?->is_locked 'is_locked' => auth()->user()->isSubscriber() !== false ? false : Law::where('id', $law->id)->first()?->is_locked
]; ];
} }
return $this->success($data, 'Success'); return $this->success($data, 'Success');
@@ -423,7 +423,7 @@ class VolumController extends Controller
'title' => $item->title, 'title' => $item->title,
'number' => $item->number, 'number' => $item->number,
'type' => 'art', 'type' => 'art',
'is_locked' => auth()->user()->isSubscriber() !== false ? false : Law::where('is_locked', $item->law_id)->first()?->is_locked 'is_locked' => auth()->user()->isSubscriber() !== false ? false : Law::where('id', $law->id)->first()?->is_locked
]; ];
} }
return $this->success($data, 'Success'); return $this->success($data, 'Success');
@@ -570,7 +570,7 @@ class VolumController extends Controller
'title' => $item->title, 'title' => $item->title,
'number' => $item->number, 'number' => $item->number,
'type' => 'laws', 'type' => 'laws',
'is_locked' => auth()->user()->isSubscriber() !== false ? false : Law::where('is_locked', $item->law_id)->first()?->is_locked, 'is_locked' => auth()->user()->isSubscriber() !== false ? false : Law::where('id', $item->id)->first()?->is_locked,
'image' => $item?->image, 'image' => $item?->image,
'law' => $item?->title, 'law' => $item?->title,
'count_art' => $item->arts->count(), 'count_art' => $item->arts->count(),
@@ -724,7 +724,7 @@ class VolumController extends Controller
'number' => $item->number, 'number' => $item->number,
'type' => $type, 'type' => $type,
'route' => $this->route($item, $item), 'route' => $this->route($item, $item),
'is_locked' => auth()->user()->isSubscriber() !== false ? false : Law::where('is_locked', $item->law_id)->first()?->is_locked, 'is_locked' => auth()->user()->isSubscriber() !== false ? false : Law::where('id', $item->law_id)->first()?->is_locked,
'law' => $law?->title, 'law' => $law?->title,
'image' => $law?->image, 'image' => $law?->image,
'count_art' => $law?->arts?->count() ?? 0, 'count_art' => $law?->arts?->count() ?? 0,

View File

@@ -15,6 +15,10 @@ class UserSubscriber extends Model
'expired_at', 'expired_at',
'subscription_id', 'subscription_id',
'purchase_token', 'purchase_token',
'market_provider',
'product_id',
'purchased_at',
'last_verified_at',
'is_free' 'is_free'
]; ];
@@ -35,5 +39,7 @@ class UserSubscriber extends Model
protected $casts = [ protected $casts = [
'expired_at' => 'datetime', 'expired_at' => 'datetime',
'purchased_at' => 'datetime',
'last_verified_at' => 'datetime',
]; ];
} }

View File

@@ -0,0 +1,118 @@
<?php
namespace App\Services;
use App\Models\UserSubscriber;
use Carbon\Carbon;
use Illuminate\Support\Facades\Http;
use Illuminate\Support\Facades\Log;
class AppMarketPurchaseVerifier
{
public function verifyBazaarSubscription(string $subscriptionId, string $purchaseToken): ?Carbon
{
$packageName = config('services.app_markets.package_name');
$url = "https://pardakht.cafebazaar.ir/devapi/v2/api/applications/{$packageName}/subscriptions/{$subscriptionId}/purchases/{$purchaseToken}";
$response = Http::timeout(3)->connectTimeout(2)->withHeaders([
'CAFEBAZAAR-PISHKHAN-API-SECRET' => config('services.app_markets.bazaar_secret'),
])->get($url);
if (!$response->successful()) {
Log::error('Failed to verify Bazaar subscription', [
'status' => $response->status(),
'body' => $response->body(),
]);
return null;
}
$validUntil = $response->json('validUntilTimestampMsec');
if (!$validUntil || $validUntil < now()->timestamp * 1000) {
return null;
}
return Carbon::createFromTimestampMs($validUntil);
}
public function refreshBazaarSubscriber(UserSubscriber $subscriber): bool
{
if (!$subscriber->subscription_id || !$subscriber->purchase_token) {
return false;
}
$expiredAt = $this->verifyBazaarSubscription($subscriber->subscription_id, $subscriber->purchase_token);
if (!$expiredAt) {
$subscriber->update(['expired_at' => now()]);
return false;
}
$subscriber->update([
'expired_at' => $expiredAt,
'last_verified_at' => now(),
]);
return true;
}
public function verifyMyketProduct(string $skuId, string $token): ?array
{
$packageName = config('services.app_markets.package_name');
$url = "https://developer.myket.ir/api/partners/applications/{$packageName}/purchases/products/{$skuId}/verify";
$response = Http::timeout(3)->connectTimeout(2)->withHeaders([
'X-Access-Token' => config('services.app_markets.myket_access_token'),
])->post($url, [
'tokenId' => $token,
]);
if (!$response->successful()) {
Log::error('Failed to verify Myket purchase', [
'status' => $response->status(),
'body' => $response->body(),
]);
return null;
}
$data = $response->json();
if (($data['purchaseState'] ?? null) !== 0 || empty($data['purchaseTime'])) {
return null;
}
return [
'data' => $data,
'purchased_at' => Carbon::createFromTimestampMs($data['purchaseTime']),
];
}
public function refreshMyketSubscriber(UserSubscriber $subscriber): bool
{
if (!$subscriber->product_id || !$subscriber->purchase_token || !$subscriber->subscribe) {
return false;
}
$purchase = $this->verifyMyketProduct($subscriber->product_id, $subscriber->purchase_token);
if (!$purchase) {
$subscriber->update(['expired_at' => now()]);
return false;
}
$expiredAt = $purchase['purchased_at']->copy()->addDays($subscriber->subscribe->expired_day);
$subscriber->update([
'purchased_at' => $purchase['purchased_at'],
'expired_at' => $expiredAt,
'last_verified_at' => now(),
]);
return $expiredAt->greaterThanOrEqualTo(now());
}
}

View File

@@ -31,4 +31,11 @@ return [
'region' => env('AWS_DEFAULT_REGION', 'us-east-1'), 'region' => env('AWS_DEFAULT_REGION', 'us-east-1'),
], ],
'app_markets' => [
'package_name' => env('APP_MARKET_PACKAGE_NAME', 'com.razzaghi.lawbook.android'),
'myket_access_token' => env('MYKET_ACCESS_TOKEN', 'd9f9207b-72c9-438e-9ff1-0b44e24b2612'),
'myket_public_key' => env('MYKET_PUBLIC_KEY', 'MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCg3ZcL+tvifbjvSbo1ZKbG0Zw7PwVEtkiP9yCwpn6J9pxs53ZO5dqWDc2u8pewPPFxXbi/sUrbdpuia+l2raSO+8ncp5loA8r/dCRww/qjtWmcXhqGEZWfb9dsh8VduNVjBBva1EcePL63L3PbLgnj+ty/gLd03o+H+yOJbFc/dwIDAQAB'),
'bazaar_secret' => env('BAZAAR_API_SECRET', 'eyJhbGciOiJIUzI1NiIsImtpZCI6ImFuY2llbnQiLCJ0eXAiOiJKV1QifQ.eyJpc3MiOiJuYXNoZXItcGlzaGtoYW4tYXBpIiwiaWF0IjoxNzQwMjQ3NTMzLCJleHAiOjQ4OTM4NDc1MzMsImFwaV9hZ2VudF9pZCI6MzQ2NX0.UCrr3IHxCqn77ckxfnaubrsyCfrhPm18gJgyg1qNqwA'),
],
]; ];

View File

@@ -0,0 +1,30 @@
<?php
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
return new class extends Migration
{
public function up(): void
{
Schema::table('user_subscribers', function (Blueprint $table) {
$table->string('market_provider')->nullable()->after('purchase_token');
$table->string('product_id')->nullable()->after('market_provider');
$table->timestamp('purchased_at')->nullable()->after('product_id');
$table->timestamp('last_verified_at')->nullable()->after('purchased_at');
});
}
public function down(): void
{
Schema::table('user_subscribers', function (Blueprint $table) {
$table->dropColumn([
'market_provider',
'1',
'purchased_at',
'last_verified_at',
]);
});
}
};

View File

@@ -57,6 +57,7 @@ Route::prefix('v1')->middleware('auth:sanctum')->group(function () {
Route::get('subscribe-plans', [SubscribePlanController::class, 'index']); Route::get('subscribe-plans', [SubscribePlanController::class, 'index']);
Route::post('subscribe-plan-user', [SubscribePlanController::class, 'subscribe']); Route::post('subscribe-plan-user', [SubscribePlanController::class, 'subscribe']);
Route::post('subscribe-plan-user-new', [SubscribePlanController::class, 'subscribe_new']); Route::post('subscribe-plan-user-new', [SubscribePlanController::class, 'subscribe_new']);
Route::post('subscribe-plan-user-myket', [SubscribePlanController::class, 'subscribeMyket']);
Route::get('subscribe-plan-current', [SubscribePlanController::class, 'current']); Route::get('subscribe-plan-current', [SubscribePlanController::class, 'current']);
Route::post('pay',[PayController::class, 'pay']); Route::post('pay',[PayController::class, 'pay']);
@@ -69,4 +70,3 @@ Route::prefix('v1')->middleware('auth:sanctum')->group(function () {
Route::post('suggestions',[SuggestionController::class,'index']); Route::post('suggestions',[SuggestionController::class,'index']);
}); });