feat(aih): cohort access ability for workshops

.changeset/wide-years-cut.md

@@ -0,0 +1,5 @@
+---
+'@coursebuilder/utils-auth': patch
+---
+
+add canCreate to abilityForResource type

apps/ai-hero/src/ability/index.ts

@@ -177,26 +177,12 @@ export function getAbilityRules(options: GetAbilityOptions = {}) {
 				}
 			})
 		}
-
-		// Entitlement-based permissions
-		options.user.entitlements?.forEach((entitlement) => {
-			if (entitlement.type === 'cohort_content_access') {
-				can('read', 'Content', {
-					id: { $in: entitlement.metadata.contentIds },
-					status: 'published',
-				})
-			}
-
-			if (entitlement.type === 'cohort_discord_role') {
-				can('invite', 'Discord')
-			}
-		})
 	}
 
-	can('read', 'Content', {
-		createdAt: { $lte: new Date() },
-		status: { $in: ['review', 'published'] },
-	})
+	// can('read', 'Content', {
+	// 	createdAt: { $lte: new Date() },
+	// 	status: { $in: ['review', 'published'] },
+	// })
 
 	return rules
 }
@@ -210,13 +196,24 @@ type ViewerAbilityInput = {
 	isSolution?: boolean
 	country?: string
 	purchases?: Purchase[]
+	entitlementTypes?: {
+		id: string
+		name: string
+	}[]
 }
 
 export function defineRulesForPurchases(
 	viewerAbilityInput: ViewerAbilityInput,
 ) {
 	const { can, rules } = new AbilityBuilder<AppAbility>(createMongoAbility)
-	const { user, country, purchases = [], module } = viewerAbilityInput
+	const {
+		user,
+		country,
+		purchases = [],
+		module,
+		lesson,
+		entitlementTypes,
+	} = viewerAbilityInput
 
 	if (user) {
 		can('update', 'User', {
@@ -266,9 +263,10 @@ export function defineRulesForPurchases(
 			return { valid: false, reason: 'unknown' }
 		})
 
-		if (userHasPurchaseWithAccess.some((purchase) => purchase.valid)) {
-			can('read', 'Content')
-		}
+		// LEGACY: non-entitlement based access
+		// if (userHasPurchaseWithAccess.some((purchase) => purchase.valid)) {
+		// 	can('read', 'Content')
+		// }
 
 		if (
 			userHasPurchaseWithAccess.some(
@@ -313,6 +311,34 @@ export function defineRulesForPurchases(
 		can('read', 'Content')
 	}
 
+	const cohortEntitlementType = entitlementTypes?.find(
+		(entitlement) => entitlement.name === 'cohort_content_access',
+	)
+
+	// check workshop in cohort
+	if (user?.entitlements && module?.id) {
+		user.entitlements.forEach((entitlement) => {
+			if (entitlement.type === cohortEntitlementType?.id) {
+				can('read', 'Content', {
+					id: { $in: entitlement.metadata.contentIds },
+				})
+			}
+		})
+	}
+
+	// lesson check
+	// TODO: validate
+	const lessonModule = module?.resources?.find(
+		(resource) => resource.resourceId === lesson?.id,
+	)
+	if (user?.entitlements && lessonModule) {
+		user.entitlements.forEach((entitlement) => {
+			if (entitlement.type === cohortEntitlementType?.id) {
+				can('read', 'Content', { id: { $in: entitlement.metadata.contentIds } })
+			}
+		})
+	}
+
 	return rules
 }
 

apps/ai-hero/src/app/(commerce)/products/page.tsx

@@ -1,6 +1,6 @@
 import * as React from 'react'
 import Link from 'next/link'
-import { getActiveSelfPacedProducts } from '@/lib/products-query'
+import { getProducts } from '@/lib/products-query'
 import { getServerAuthSession } from '@/server/auth'
 
 import {
@@ -13,7 +13,7 @@ import {
 
 export default async function EventIndexPage() {
 	const { ability } = await getServerAuthSession()
-	const products = await getActiveSelfPacedProducts()
+	const products = await getProducts()
 
 	return (
 		<div>

apps/ai-hero/src/app/(content)/workshops/[module]/[lesson]/(view)/layout.tsx

@@ -2,6 +2,7 @@ import React from 'react'
 import { WorkshopResourceList } from '@/app/(content)/workshops/_components/workshop-resource-list'
 import LayoutClient from '@/components/layout-client'
 import { ActiveHeadingProvider } from '@/hooks/use-active-heading'
+import { getAbilityForResource } from '@/utils/get-current-ability-rules'
 import { MenuIcon } from 'lucide-react'
 
 import {
@@ -25,35 +26,24 @@ const LessonLayout = async (props: {
 		<ActiveHeadingProvider>
 			<LayoutClient>
 				<div className="flex min-w-0">
-					<React.Suspense
-						fallback={
-							<div className="flex w-full max-w-sm flex-shrink-0 flex-col gap-2 border-l p-5">
-								<Skeleton className="mb-8 h-8 w-full bg-gray-800" />
-								{new Array(10).fill(null).map((_, i) => (
-									<Skeleton key={i} className="h-8 w-full bg-gray-800" />
-								))}
-							</div>
-						}
-					>
-						<WorkshopResourceList
-							currentLessonSlug={params.lesson}
-							className="hidden lg:block"
-						/>
-						<Sheet>
-							<SheetTrigger className="bg-card/80 fixed bottom-5 right-5 z-50 flex items-center gap-2 rounded border p-3 backdrop-blur-md lg:hidden">
-								<MenuIcon className="size-4" /> Lessons
-							</SheetTrigger>
-							<SheetContent className="px-0">
-								<SheetHeader>
-									<SheetTitle className="sr-only">Workshop Contents</SheetTitle>
-								</SheetHeader>
-								<WorkshopResourceList
-									currentLessonSlug={params.lesson}
-									className="border-r-0 border-t-0"
-								/>
-							</SheetContent>
-						</Sheet>
-					</React.Suspense>
+					<WorkshopResourceList
+						currentLessonSlug={params.lesson}
+						className="hidden lg:block"
+					/>
+					<Sheet>
+						<SheetTrigger className="bg-card/80 fixed bottom-5 right-5 z-50 flex items-center gap-2 rounded border p-3 backdrop-blur-md lg:hidden">
+							<MenuIcon className="size-4" /> Lessons
+						</SheetTrigger>
+						<SheetContent className="px-0">
+							<SheetHeader>
+								<SheetTitle className="sr-only">Workshop Contents</SheetTitle>
+							</SheetHeader>
+							<WorkshopResourceList
+								currentLessonSlug={params.lesson}
+								className="border-r-0 border-t-0"
+							/>
+						</SheetContent>
+					</Sheet>
 					<div className="min-w-0 flex-1">{children}</div>
 				</div>
 			</LayoutClient>

apps/ai-hero/src/app/(content)/workshops/_components/video-overlay-pricing-widget.tsx

@@ -52,13 +52,13 @@ export function VideoOverlayWorkshopPricing({
 			>
 				<Pricing.Product className="w-full">
 					<Pricing.ProductImage />
-					<Pricing.Details className="px-0">
+					<Pricing.Details className="px-0 pt-0">
 						<Pricing.Name className="mb-5" />
 						<Pricing.LiveQuantity />
 						<Pricing.Price />
 						<Pricing.TeamToggle />
 						<Pricing.TeamQuantityInput />
-						<Pricing.BuyButton />
+						<Pricing.BuyButton>Enroll Now</Pricing.BuyButton>
 						<Pricing.GuaranteeBadge />
 						<Pricing.LiveRefundPolicy />
 						<Pricing.SaleCountdown className="py-4" />

apps/ai-hero/src/app/(content)/workshops/_components/workshop-resource-list.tsx

@@ -10,6 +10,7 @@ import { CldImage } from '@/components/cld-image'
 import { findSectionIdForLessonSlug, NavigationResource } from '@/lib/workshops'
 import { api } from '@/trpc/react'
 import { cn } from '@/utils/cn'
+import { subject } from '@casl/ability'
 import { Check, Lock, PanelLeftClose, PanelLeftOpen, Pen } from 'lucide-react'
 import { useMeasure } from 'react-use'
 
@@ -30,7 +31,7 @@ import {
 import { AutoPlayToggle } from '../../_components/autoplay-toggle'
 
 type Props = {
-	currentLessonSlug?: string | null
+	currentLessonSlug?: string
 	currentSectionSlug?: string | null
 	className?: string
 	wrapperClassName?: string
@@ -40,7 +41,6 @@ type Props = {
 }
 
 export function WorkshopResourceList(props: Props) {
-	const params = useParams()
 	const wrapperClassName =
 		'wrapperClassName' in props ? props.wrapperClassName : ''
 	const className = 'className' in props ? props.className : ''
@@ -53,17 +53,23 @@ export function WorkshopResourceList(props: Props) {
 	const { moduleProgress } = useModuleProgress()
 
 	const { data: abilityRules, status: abilityStatus } =
-		api.ability.getCurrentAbilityRules.useQuery({
-			moduleId: workshopNavigation?.id,
-		})
+		api.ability.getCurrentAbilityRules.useQuery(
+			{
+				moduleId: workshopNavigation?.id,
+				lessonId: props.currentLessonSlug,
+			},
+			{
+				enabled: !!workshopNavigation?.id,
+			},
+		)
+
+	const ability = createAppAbility(abilityRules || [])
 
 	const sectionId = findSectionIdForLessonSlug(
 		workshopNavigation,
 		props.currentLessonSlug,
 	)
 
-	const ability = createAppAbility(abilityRules || [])
-
 	const scrollAreaRef = React.useRef<HTMLDivElement>(null)
 
 	React.useEffect(() => {
@@ -155,7 +161,9 @@ export function WorkshopResourceList(props: Props) {
 							{resources.map((resource: NavigationResource, i: number) => {
 								const isActiveGroup =
 									(resource.type === 'section' || resource.type === 'lesson') &&
-									resource.resources.some((item) => params.lesson === item.slug)
+									resource.resources.some(
+										(item) => props.currentLessonSlug === item.slug,
+									)
 
 								return resource.type === 'section' ? (
 									// sections
@@ -179,6 +187,7 @@ export function WorkshopResourceList(props: Props) {
 															return (
 																<LessonResource
 																	lesson={item}
+																	moduleId={workshopNavigation.id}
 																	index={index}
 																	moduleProgress={moduleProgress}
 																	ability={ability}
@@ -199,6 +208,7 @@ export function WorkshopResourceList(props: Props) {
 										lesson={resource}
 										index={i}
 										moduleProgress={moduleProgress}
+										moduleId={workshopNavigation.id}
 										ability={ability}
 										abilityStatus={abilityStatus}
 										key={resource.id}
@@ -245,13 +255,15 @@ const LessonResource = ({
 	ability,
 	abilityStatus,
 	className,
+	moduleId,
 }: {
 	lesson: NavigationResource
 	moduleProgress?: ModuleProgress | null
 	index: number
 	ability: AppAbility
 	abilityStatus: 'error' | 'success' | 'pending'
 	className?: string
+	moduleId: string
 }) => {
 	const params = useParams()
 	const pathname = usePathname()
@@ -273,6 +285,8 @@ const LessonResource = ({
 		(progress) => progress.resourceId === lesson.id && progress.completedAt,
 	)
 	// if solution of a resource is active, or resource of a section is active
+	const canView = ability.can('read', subject('Content', { id: moduleId }))
+	const canCreate = ability.can('create', 'Content')
 
 	return (
 		<li
@@ -322,7 +336,7 @@ const LessonResource = ({
 						<span className="w-full text-base">{lesson.title}</span>
 						{abilityStatus === 'success' && (
 							<>
-								{ability.can('read', 'Content') || index === 0 ? null : (
+								{canView || index === 0 ? null : (
 									<Lock
 										className="absolute right-5 w-3 text-gray-500"
 										aria-label="locked"
@@ -332,7 +346,7 @@ const LessonResource = ({
 						)}
 					</Link>
 
-					{ability.can('create', 'Content') ? (
+					{canCreate ? (
 						<Button
 							asChild
 							variant="outline"

apps/ai-hero/src/components/navigation/index.tsx

@@ -40,9 +40,6 @@ const Navigation = () => {
 		setIsMobileMenuOpen(false)
 	}, [pathname])
 
-	const { data: abilityRules, status: abilityStatus } =
-		api.ability.getCurrentAbilityRules.useQuery()
-
 	const { data: sessionData, status: sessionStatus } = useSession()
 	const { data: subscriber, status } =
 		api.ability.getCurrentSubscriberFromCookie.useQuery()

apps/ai-hero/src/inngest/functions/post-cohort-purchase-workflow.ts

@@ -7,7 +7,9 @@ import {
 import { inngest } from '@/inngest/inngest.server'
 import { getCohort } from '@/lib/cohorts-query'
 import { and, eq } from 'drizzle-orm'
+import { v4 as uuidv4 } from 'uuid'
 
+import { guid } from '@coursebuilder/adapter-drizzle/mysql'
 import { NEW_PURCHASE_CREATED_EVENT } from '@coursebuilder/core/inngest/commerce/event-new-purchase-created'
 
 export const postCohortPurchaseWorkflow = inngest.createFunction(
@@ -103,7 +105,7 @@ export const postCohortPurchaseWorkflow = inngest.createFunction(
 				if (cohortContentAccessEntitlementType && cohortResource?.resources) {
 					await step.run(`add user to cohort via entitlement`, async () => {
 						for (const resource of cohortResource.resources || []) {
-							const entitlementId = `${cohortContentAccessEntitlementType.id}-${resource.resource.id}`
+							const entitlementId = `${resource.resource.id}-${guid()}`
 							await db.insert(entitlements).values({
 								id: entitlementId,
 								entitlementType: cohortContentAccessEntitlementType.id,

apps/ai-hero/src/lib/cohorts-query.ts

@@ -4,6 +4,7 @@ import {
 	contentResource,
 	contentResourceResource,
 	entitlements as entitlementsTable,
+	entitlementTypes,
 	organizationMemberships,
 } from '@/db/schema'
 import { env } from '@/env.mjs'
@@ -88,10 +89,19 @@ export async function checkCohortAccess(
 	if (!membership) {
 		return null // User is not a member of the organization
 	}
+
+	const cohortEntitlementType = await db.query.entitlementTypes.findFirst({
+		where: eq(entitlementTypes.name, 'cohort_content_access'),
+	})
+
+	if (!cohortEntitlementType) {
+		return null // Cohort entitlement type not found
+	}
+
 	const validEntitlements = await db.query.entitlements.findMany({
 		where: and(
 			eq(entitlementsTable.organizationMembershipId, membership.id), // Use membershipId
-			eq(entitlementsTable.entitlementType, 'cohort_content_access'),
+			eq(entitlementsTable.entitlementType, cohortEntitlementType.id),
 			or(
 				isNull(entitlementsTable.expiresAt),
 				gt(entitlementsTable.expiresAt, sql`CURRENT_TIMESTAMP`),
@@ -101,7 +111,7 @@ export async function checkCohortAccess(
 	})
 
 	const cohortEntitlement = validEntitlements.find(
-		(e) => e.metadata?.cohortSlug === cohortSlug,
+		(e) => e.sourceType === 'cohort',
 	)
 
 	if (!cohortEntitlement || !cohortEntitlement.metadata) return null