Skip to content
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

CORE-266: use GroupAccessRequestNotificationV2 #1627

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

CORE-266: use GroupAccessRequestNotificationV2 #1627

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
9602500
update to latest workbench-libs
davidangb Jan 17, 2025
df1175b
use GroupAccessRequestNotificationV2
davidangb Jan 17, 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
12 changes: 6 additions & 6 deletions project/Dependencies.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@ object Dependencies {
val postgresDriverVersion = "42.7.4"
val sentryVersion = "6.15.0"

val workbenchLibV = "fa46370" // If updating this, make sure googleStorageLocal in test dependencies is up-to-date
val workbenchLibV = "4292239" // If updating this, make sure googleStorageLocal in test dependencies is up-to-date
val workbenchUtilV = s"0.10-$workbenchLibV"
val workbenchUtil2V = s"0.9-$workbenchLibV"
val workbenchModelV = s"0.20-$workbenchLibV"
val workbenchGoogleV = s"0.33-$workbenchLibV"
val workbenchGoogle2V = s"0.36-$workbenchLibV"
val workbenchNotificationsV = s"0.8-$workbenchLibV"
val workbenchOauth2V = s"0.8-$workbenchLibV"
val workbenchModelV = s"0.21-$workbenchLibV"
val workbenchGoogleV = s"0.34-$workbenchLibV"
val workbenchGoogle2V = s"0.37-$workbenchLibV"
val workbenchNotificationsV = s"0.10-$workbenchLibV"
val workbenchOauth2V = s"0.9-$workbenchLibV"
val monocleVersion = "2.0.5"
val crlVersion = "1.2.34-SNAPSHOT"
val tclVersion = "1.1.30-SNAPSHOT"
Expand Down
2 changes: 1 addition & 1 deletion src/main/scala/org/broadinstitute/dsde/workbench/sam/service/ManagedGroupService.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@ class ManagedGroupService(
}
} yield {
val notifications = adminUserIds.map { recipientUserId =>
Notifications.GroupAccessRequestNotification(recipientUserId, WorkbenchGroupName(resourceId.value).value, adminUserIds, requesterSubjectId)
Notifications.GroupAccessRequestNotificationV2(recipientUserId, WorkbenchGroupName(resourceId.value).value, requesterSubjectId, requesterSubjectId)
}
cloudExtensions.fireAndForgetNotifications(notifications)
}
Expand Down
4 changes: 2 additions & 2 deletions src/test/scala/org/broadinstitute/dsde/workbench/sam/google/GoogleExtensionSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2137,10 +2137,10 @@ class GoogleExtensionSpec(_system: ActorSystem)
)

val messages = Set(
Notifications.GroupAccessRequestNotification(
Notifications.GroupAccessRequestNotificationV2(
WorkbenchUserId("Bob"),
WorkbenchGroupName("bobs_buds").value,
Set(WorkbenchUserId("reply_to_address")),
WorkbenchUserId("requesters_id"),
WorkbenchUserId("requesters_id")
)
)
Expand Down
8 changes: 5 additions & 3 deletions src/test/scala/org/broadinstitute/dsde/workbench/sam/service/ManagedGroupServiceSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -543,12 +543,14 @@ class ManagedGroupServiceSpec
.value
)

val requesterId = requester.googleSubjectId.map(id => WorkbenchUserId(id.value)).getOrElse(fail("no requester google subject id"))

val expectedNotificationMessages = Set(
Notifications.GroupAccessRequestNotification(
Notifications.GroupAccessRequestNotificationV2(
adminGoogleSubjectId,
WorkbenchGroupName(resourceId.value).value,
Set(adminGoogleSubjectId),
requester.googleSubjectId.map(id => WorkbenchUserId(id.value)).getOrElse(fail("no requester google subject id"))
requesterId,
requesterId
)
)

Expand Down
Loading