Merge branch 'main' of https://github.com/classroomio/classroomio

2026-06-22 06:54:33 +01:00
parent 3e6d34e629 7a30c49880
commit 38775810f3
197 changed files with 6582 additions and 817 deletions
@@ -202,9 +202,14 @@ class AppInitApi extends BaseApi {

    if (!shouldRedirectOnAuth(page.url.pathname)) return;

+    // Students with existing org memberships who open /onboarding may intend to create their own academy.
+    if (path.includes('/onboarding') && isStudent && userHasOrganizations) {
+      return;
+    }
+
    const shouldGoToLMS = isCloud ? isOrgSite || !!isStudent : !!isStudent;
    console.log('redirecting to', shouldGoToLMS ? 'lms' : 'org');
-    return shouldGoToLMS ? this.goToLMS() : this.goToOrg();
+    return shouldGoToLMS ? this.goToLMS(isOrgSite) : this.goToOrg();
  }

  goToLMS(isOrgSite: boolean) {