Skip to content

CORE-669: use same welcome email for Google and Azure registrants #1661

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 25, 2025
Merged

CORE-669: use same welcome email for Google and Azure registrants #1661

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a161d9e
use same welcome email for Google and Azure registrants
davidangb Aug 22, 2025
e8ecc5b
update unit test
davidangb Aug 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions src/main/scala/org/broadinstitute/dsde/firecloud/service/RegisterService.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,11 +91,7 @@ class RegisterService(val rawlsDao: RawlsDAO,
}

def generateWelcomeEmail(userInfo: UserInfo): Notification =
// If the user is a B2C user and does not have a Google access token, we can safely assume that they're an Azure user
userInfo.googleAccessTokenThroughB2C match {
case None if userInfo.isB2C => AzurePreviewActivationNotification(WorkbenchUserId(userInfo.id))
case _ => ActivationNotification(WorkbenchUserId(userInfo.id))
}
ActivationNotification(WorkbenchUserId(userInfo.id))

private def registerUser(userInfo: UserInfo, termsOfService: Option[String]): Future[RegistrationInfo] =
samDao.registerUser(termsOfService)(userInfo)
Expand Down
2 changes: 1 addition & 1 deletion src/test/scala/org/broadinstitute/dsde/firecloud/service/RegisterServiceSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ class RegisterServiceSpec extends AnyFlatSpec with Matchers with BeforeAndAfterE

"generateWelcomeEmail" should "generate an Azure welcome email for Azure B2C users" in {
val notification = registerService.generateWelcomeEmail(azureB2CUserInfo)
notification.getClass.getName shouldBe AzurePreviewActivationNotification.getClass.getName.stripSuffix("$")
notification.getClass.getName shouldBe ActivationNotification.getClass.getName.stripSuffix("$")
}

it should "generate a standard welcome email for Google B2C users" in {
Expand Down
Loading