From ac7430c5432e7e9590a035c579738921e4db6a80 Mon Sep 17 00:00:00 2001 From: Tobias Binna Date: Wed, 10 Jan 2024 14:14:10 +0800 Subject: [PATCH] Add support to make OAuth 2.0 client credential request to product APIs for Connect on Forge app - Add `cloudId` field to repository implementation - Update evolution to include `cloud_id` field fixes #31 --- src/main/resources/evolutions/default/1.sql | 1 + .../connect/play/slick/SlickAtlassianHostRepository.scala | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/src/main/resources/evolutions/default/1.sql b/src/main/resources/evolutions/default/1.sql index 26a9d99..bf25e16 100644 --- a/src/main/resources/evolutions/default/1.sql +++ b/src/main/resources/evolutions/default/1.sql @@ -5,6 +5,7 @@ CREATE TABLE atlassian_host key VARCHAR NOT NULL, oauth_client_id VARCHAR, shared_secret VARCHAR NOT NULL, + cloud_id VARCHAR, base_url VARCHAR NOT NULL, display_url VARCHAR NOT NULL, display_url_servicedesk_help_center VARCHAR NOT NULL, diff --git a/src/main/scala/io/toolsplus/atlassian/connect/play/slick/SlickAtlassianHostRepository.scala b/src/main/scala/io/toolsplus/atlassian/connect/play/slick/SlickAtlassianHostRepository.scala index 1e4ddb3..2f75c47 100644 --- a/src/main/scala/io/toolsplus/atlassian/connect/play/slick/SlickAtlassianHostRepository.scala +++ b/src/main/scala/io/toolsplus/atlassian/connect/play/slick/SlickAtlassianHostRepository.scala @@ -56,6 +56,7 @@ private[slick] trait AtlassianHostTable { val key = column[String]("key", NotNull) val oauthClientId = column[Option[String]]("oauth_client_id") val sharedSecret = column[String]("shared_secret", NotNull) + val cloudId = column[String]("cloud_id", SqlType("VARCHAR(255)")) val baseUrl = column[String]("base_url", NotNull, SqlType("VARCHAR(512)")) val displayUrl = column[String]("display_url", NotNull, SqlType("VARCHAR(512)")) @@ -82,6 +83,7 @@ private[slick] trait AtlassianHostTable { key, oauthClientId, sharedSecret, + cloudId, baseUrl, displayUrl, displayUrlServicedeskHelpCenter, @@ -96,6 +98,7 @@ private[slick] trait AtlassianHostTable { String, Option[String], String, + Option[String], String, String, String, @@ -112,6 +115,7 @@ private[slick] trait AtlassianHostTable { String, Option[String], String, + Option[String], String, String, String, @@ -127,6 +131,7 @@ private[slick] trait AtlassianHostTable { host.key, host.oauthClientId, host.sharedSecret, + host.cloudId, host.baseUrl, host.displayUrl, host.displayUrlServicedeskHelpCenter,