Contact support@zulipchat.com diff --git a/templates/corporate/upgrade.html b/templates/corporate/upgrade.html index d534fe532e..82230614cf 100644 --- a/templates/corporate/upgrade.html +++ b/templates/corporate/upgrade.html @@ -207,6 +207,15 @@
We're happy to help! diff --git a/zerver/tests/test_signup.py b/zerver/tests/test_signup.py index 770d94063f..39f415c112 100644 --- a/zerver/tests/test_signup.py +++ b/zerver/tests/test_signup.py @@ -2150,6 +2150,10 @@ class RealmCreationTest(ZulipTestCase): HTTP_HOST=string_id + ".testserver") self.assertEqual(result.status_code, 302) + result = self.client_get(result.url, subdomain=string_id) + self.assertEqual(result.status_code, 302) + self.assertEqual(result.url, 'http://zuliptest.testserver') + # Make sure the realm is created realm = get_realm(string_id) self.assertEqual(realm.string_id, string_id) @@ -2158,6 +2162,46 @@ class RealmCreationTest(ZulipTestCase): self.assertEqual(realm.name, realm_name) self.assertEqual(realm.subdomain, string_id) + @override_settings(OPEN_REALM_CREATION=True, FREE_TRIAL_DAYS=30) + def test_create_realm_during_free_trial(self) -> None: + password = "test" + string_id = "zuliptest" + email = "user1@test.com" + realm_name = "Test" + + with self.assertRaises(Realm.DoesNotExist): + get_realm(string_id) + + result = self.client_post('/new/', {'email': email}) + self.assertEqual(result.status_code, 302) + self.assertTrue(result["Location"].endswith( + "/accounts/new/send_confirm/%s" % (email,))) + result = self.client_get(result["Location"]) + self.assert_in_response("Check your email so we can get started.", result) + + confirmation_url = self.get_confirmation_url_from_outbox(email) + result = self.client_get(confirmation_url) + self.assertEqual(result.status_code, 200) + + result = self.submit_reg_form_for_user(email, password, + realm_subdomain = string_id, + realm_name=realm_name, + HTTP_HOST=string_id + ".testserver") + self.assertEqual(result.status_code, 302) + + result = self.client_get(result.url, subdomain=string_id) + self.assertEqual(result.url, 'http://zuliptest.testserver/upgrade/?onboarding=true') + + result = self.client_get(result.url, subdomain=string_id) + self.assert_in_success_response(["Or start with Zulip Limited (Free) plan"], result) + + realm = get_realm(string_id) + self.assertEqual(realm.string_id, string_id) + self.assertEqual(get_user(email, realm).realm, realm) + + self.assertEqual(realm.name, realm_name) + self.assertEqual(realm.subdomain, string_id) + @override_settings(OPEN_REALM_CREATION=True) def test_mailinator_signup(self) -> None: result = self.client_post('/new/', {'email': "hi@mailinator.com"}) diff --git a/zerver/views/auth.py b/zerver/views/auth.py index 377b19ff21..708d6ee04b 100644 --- a/zerver/views/auth.py +++ b/zerver/views/auth.py @@ -218,6 +218,7 @@ def register_remote_user(request: HttpRequest, result: ExternalAuthResult) -> Ht # maybe_send_to_registration doesn't take these arguments, so delete them. kwargs.pop('subdomain', None) kwargs.pop('redirect_to', None) + kwargs.pop('is_realm_creation', None) kwargs["password_required"] = False return maybe_send_to_registration(request, **kwargs) @@ -247,6 +248,7 @@ def login_or_register_remote_user(request: HttpRequest, result: ExternalAuthResu # Otherwise, the user has successfully authenticated to an # account, and we need to do the right thing depending whether # or not they're using the mobile OTP flow or want a browser session. + is_realm_creation = result.data_dict.get('is_realm_creation') mobile_flow_otp = result.data_dict.get('mobile_flow_otp') desktop_flow_otp = result.data_dict.get('desktop_flow_otp') if mobile_flow_otp is not None: @@ -256,7 +258,11 @@ def login_or_register_remote_user(request: HttpRequest, result: ExternalAuthResu do_login(request, user_profile) - redirect_to = get_safe_redirect_to(result.data_dict.get('redirect_to', ''), user_profile.realm.uri) + redirect_to = result.data_dict.get('redirect_to', '') + if is_realm_creation is not None and settings.FREE_TRIAL_DAYS not in [None, 0]: + redirect_to = "{}?onboarding=true".format(reverse('corporate.views.initial_upgrade')) + + redirect_to = get_safe_redirect_to(redirect_to, user_profile.realm.uri) return HttpResponseRedirect(redirect_to) def finish_desktop_flow(request: HttpRequest, user_profile: UserProfile, diff --git a/zerver/views/registration.py b/zerver/views/registration.py index f785cc68b8..badf7c6aef 100644 --- a/zerver/views/registration.py +++ b/zerver/views/registration.py @@ -343,7 +343,8 @@ def accounts_register(request: HttpRequest) -> HttpResponse: # Because for realm creation, registration happens on the # root domain, we need to log them into the subdomain for # their new realm. - return redirect_and_log_into_subdomain(ExternalAuthResult(user_profile=user_profile)) + return redirect_and_log_into_subdomain(ExternalAuthResult(user_profile=user_profile, + data_dict={'is_realm_creation': True})) # This dummy_backend check below confirms the user is # authenticating to the correct subdomain. diff --git a/zproject/backends.py b/zproject/backends.py index bbfd97c4a5..044ad871ba 100644 --- a/zproject/backends.py +++ b/zproject/backends.py @@ -920,6 +920,7 @@ ExternalAuthDataDict = TypedDict('ExternalAuthDataDict', { 'full_name': str, 'email': str, 'is_signup': bool, + 'is_realm_creation': bool, 'redirect_to': str, 'mobile_flow_otp': Optional[str], 'desktop_flow_otp': Optional[str],