Merge branch 'develop' into WOR-1215

broadinstitute · Aug 25, 2023 · 915047d · 915047d
2 parents 307632f + e851a89
commit 915047d
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -80,7 +80,7 @@ object Dependencies {
 
 
     excludeGuava("com.google.apis"     % "google-api-services-pubsub"       % "v1-rev20230801-2.0.0"),
-    excludeGuava("com.google.apis"     % "google-api-services-admin-directory"  % "directory_v1-rev20230802-2.0.0"),
+    excludeGuava("com.google.apis"     % "google-api-services-admin-directory"  % "directory_v1-rev20230814-2.0.0"),
 
 
     "com.github.jwt-scala"          %% "jwt-core"            % "9.4.3",

diff --git a/src/main/scala/org/broadinstitute/dsde/firecloud/webservice/UserApiService.scala b/src/main/scala/org/broadinstitute/dsde/firecloud/webservice/UserApiService.scala
@@ -94,6 +94,18 @@ trait UserApiService
         }
       }
     } ~
+    pathPrefix("profile" / "billing") {
+      pathEnd {
+        get {
+          passthrough(UserApiService.billingUrl, HttpMethods.GET)
+        }
+      } ~
+      path(Segment) { projectName =>
+        get {
+          passthrough(UserApiService.billingProjectUrl(projectName), HttpMethods.GET)
+        }
+      }
+    } ~
     pathPrefix("api") {
       pathPrefix("profile" / "billing") {
         pathEnd {