fix: auth flow bug on joining course
This commit is contained in:
@@ -47,9 +47,11 @@
|
||||
height="h-10"
|
||||
className="mr-2"
|
||||
/>
|
||||
<h4 class="dark:text-white text-xl mt-0">
|
||||
{$currentOrg.name ? $currentOrg.name : 'ClassroomIO'}
|
||||
</h4>
|
||||
<a href="/">
|
||||
<h4 class="dark:text-white text-xl mt-0">
|
||||
{$currentOrg.name ? $currentOrg.name : 'ClassroomIO'}
|
||||
</h4>
|
||||
</a>
|
||||
</div>
|
||||
{/if}
|
||||
<form
|
||||
|
||||
@@ -5,25 +5,17 @@
|
||||
import { VARIANTS } from '$lib/components/PrimaryButton/constants';
|
||||
import { supabase } from '$lib/utils/functions/supabase';
|
||||
import { capturePosthogEvent } from '$lib/utils/services/posthog';
|
||||
import { currentOrg, orgs } from '$lib/utils/store/org';
|
||||
import { currentOrg, orgs, defaultCurrentOrgState } from '$lib/utils/store/org';
|
||||
import { user, profile, defaultProfileState, defaultUserState } from '$lib/utils/store/user';
|
||||
|
||||
async function logout() {
|
||||
const { error } = await supabase.auth.signOut();
|
||||
console.error('Error logging out: ', error);
|
||||
|
||||
// Reset organization values, TODO: consider abstracting if needed in other places
|
||||
currentOrg.set({
|
||||
id: '',
|
||||
name: '',
|
||||
shortName: '',
|
||||
siteName: '',
|
||||
avatar_url: '',
|
||||
memberId: '',
|
||||
role_id: '',
|
||||
landingpage: {},
|
||||
theme: ''
|
||||
})
|
||||
orgs.set([]);
|
||||
currentOrg.set(defaultCurrentOrgState);
|
||||
orgs.set([]);
|
||||
user.set(defaultUserState);
|
||||
profile.set(defaultProfileState);
|
||||
|
||||
capturePosthogEvent('user_logged_out');
|
||||
posthog.reset();
|
||||
|
||||
@@ -5,6 +5,7 @@
|
||||
import ChevronRightIcon from 'carbon-icons-svelte/lib/ChevronRight.svelte';
|
||||
import ArrowLeftIcon from 'carbon-icons-svelte/lib/ArrowLeft.svelte';
|
||||
import ArrowUpRightIcon from 'carbon-icons-svelte/lib/ArrowUpRight.svelte';
|
||||
import { currentOrgDomain } from '$lib/utils/store/org';
|
||||
|
||||
import IconButton from '$lib/components/IconButton/index.svelte';
|
||||
import CloseButton from '$lib/components/Buttons/Close/index.svelte';
|
||||
@@ -128,12 +129,9 @@
|
||||
loading = false;
|
||||
syncCourseStore(course);
|
||||
}
|
||||
/**
|
||||
* 1. Use all you have for editing now
|
||||
* 2. Make course one interface we might need to computation
|
||||
*/
|
||||
|
||||
async function handlePreview() {
|
||||
const link = `${window.location.origin}/course/${course.slug}`;
|
||||
const link = `${$currentOrgDomain}/course/${course.slug}`;
|
||||
window.open(link, '_blank');
|
||||
}
|
||||
</script>
|
||||
|
||||
+8
-4
@@ -4,7 +4,7 @@
|
||||
import getCurrencyFormatter from '$lib/utils/functions/getCurrencyFormatter';
|
||||
import { isCourseFree } from '$lib/utils/functions/course';
|
||||
import { getStudentInviteLink } from '$lib/utils/functions/course';
|
||||
import { currentOrg } from '$lib/utils/store/org';
|
||||
import { currentOrg, currentOrgDomain } from '$lib/utils/store/org';
|
||||
import { goto } from '$app/navigation';
|
||||
import PaymentModal from './PaymentModal.svelte';
|
||||
import type { Course } from '$lib/utils/types';
|
||||
@@ -17,6 +17,7 @@
|
||||
export let startCoursePayment = false;
|
||||
export let mobile = false;
|
||||
|
||||
let openModal = false;
|
||||
let calculatedCost = 0;
|
||||
let discount = 0;
|
||||
let formatter: Intl.NumberFormat | undefined;
|
||||
@@ -39,11 +40,13 @@
|
||||
course_free: isFree
|
||||
});
|
||||
if (isFree) {
|
||||
const link = getStudentInviteLink(courseData, $currentOrg.siteName);
|
||||
const link = getStudentInviteLink(courseData, $currentOrg.siteName, $currentOrgDomain);
|
||||
goto(link);
|
||||
} else {
|
||||
startCoursePayment = true;
|
||||
openModal = true;
|
||||
}
|
||||
|
||||
startCoursePayment = false;
|
||||
}
|
||||
|
||||
function setFormatter(currency: string | undefined) {
|
||||
@@ -62,10 +65,11 @@
|
||||
$: discount = get(courseData, 'metadata.discount', 0);
|
||||
$: calculatedCost = calcDisc(discount, courseData.cost || 0, !!courseData.metadata.showDiscount);
|
||||
$: isFree = isCourseFree(calculatedCost);
|
||||
$: startCoursePayment && handleJoinCourse();
|
||||
</script>
|
||||
|
||||
<PaymentModal
|
||||
bind:open={startCoursePayment}
|
||||
bind:open={openModal}
|
||||
paymentLink={get(courseData, 'metadata.paymentLink', '')}
|
||||
courseName={courseData.title}
|
||||
teacherEmail={getTeacherEmail(courseData.group)}
|
||||
|
||||
@@ -66,8 +66,10 @@
|
||||
height="h-20"
|
||||
/>
|
||||
|
||||
<div class="mt-5">
|
||||
<p class="dark:text-white text-lg font-bold whitespace-nowrap truncate">
|
||||
<div class="mt-5 flex justify-center w-full">
|
||||
<p
|
||||
class="dark:text-white text-lg font-bold whitespace-nowrap truncate max-w-[80%] text-center"
|
||||
>
|
||||
{$profile.fullname}
|
||||
</p>
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user