From 6ddc4ce4b1ad912a56a2d2f907462fa6685fc889 Mon Sep 17 00:00:00 2001
From: Scott Wilson <scottraywilson@gmail.com>
Date: Wed, 9 Oct 2024 13:58:22 -0700
Subject: [PATCH 1/2] fix: prevent example project from being created when
 joining existing org SSO

---
 backend/src/ee/services/license/license-fns.ts       |  4 ++--
 .../components/UserInfoSSOStep/UserInfoSSOStep.tsx   | 12 ++++++++----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/backend/src/ee/services/license/license-fns.ts b/backend/src/ee/services/license/license-fns.ts
index fa67b72d1..b4424797a 100644
--- a/backend/src/ee/services/license/license-fns.ts
+++ b/backend/src/ee/services/license/license-fns.ts
@@ -30,9 +30,9 @@ export const getDefaultOnPremFeatures = (): TFeatureSet => ({
   auditLogStreamLimit: 3,
   samlSSO: false,
   oidcSSO: false,
-  scim: false,
+  scim: true,
   ldap: false,
-  groups: false,
+  groups: true,
   status: null,
   trial_end: null,
   has_used_trial: true,
diff --git a/frontend/src/views/Signup/components/UserInfoSSOStep/UserInfoSSOStep.tsx b/frontend/src/views/Signup/components/UserInfoSSOStep/UserInfoSSOStep.tsx
index c65317662..f502d3c6b 100644
--- a/frontend/src/views/Signup/components/UserInfoSSOStep/UserInfoSSOStep.tsx
+++ b/frontend/src/views/Signup/components/UserInfoSSOStep/UserInfoSSOStep.tsx
@@ -176,12 +176,16 @@ export const UserInfoSSOStep = ({
                 organizationId: orgId
               });
 
-              const project = await ProjectService.initProject({
-                projectName: "Example Project"
-              });
+              // only create example project if not joining existing org
+              if (!providerOrganizationName) {
+                const project = await ProjectService.initProject({
+                  projectName: "Example Project"
+                });
+
+                localStorage.setItem("projectData.id", project.id);
+              }
 
               localStorage.setItem("orgData.id", orgId);
-              localStorage.setItem("projectData.id", project.id);
 
               setStep(2);
             } catch (error) {

From c90e8ca715d77a1436b15dd41c2a7bc11779f393 Mon Sep 17 00:00:00 2001
From: Scott Wilson <scottraywilson@gmail.com>
Date: Wed, 9 Oct 2024 14:01:16 -0700
Subject: [PATCH 2/2] chore: revert prem features

---
 backend/src/ee/services/license/license-fns.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/backend/src/ee/services/license/license-fns.ts b/backend/src/ee/services/license/license-fns.ts
index b4424797a..fa67b72d1 100644
--- a/backend/src/ee/services/license/license-fns.ts
+++ b/backend/src/ee/services/license/license-fns.ts
@@ -30,9 +30,9 @@ export const getDefaultOnPremFeatures = (): TFeatureSet => ({
   auditLogStreamLimit: 3,
   samlSSO: false,
   oidcSSO: false,
-  scim: true,
+  scim: false,
   ldap: false,
-  groups: true,
+  groups: false,
   status: null,
   trial_end: null,
   has_used_trial: true,