From 344bb6046cbc665f0aa428e62b70eb77f19b1c31 Mon Sep 17 00:00:00 2001 From: Shaun Dunning Date: Fri, 5 Jul 2019 11:18:39 -0400 Subject: [PATCH] Update jira jwt subject per Atlassian's recent GDPR changes --- jira/jira.go | 2 +- jira/jira_test.go | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/jira/jira.go b/jira/jira.go index 3441560..39aa713 100644 --- a/jira/jira.go +++ b/jira/jira.go @@ -81,7 +81,7 @@ func (js jwtSource) Token() (*oauth2.Token, error) { exp := time.Duration(59) * time.Second claimSet := &ClaimSet{ Issuer: fmt.Sprintf("urn:atlassian:connect:clientid:%s", js.conf.ClientID), - Subject: fmt.Sprintf("urn:atlassian:connect:userkey:%s", js.conf.Subject), + Subject: fmt.Sprintf("urn:atlassian:connect:useraccountid:%s", js.conf.Subject), InstalledURL: js.conf.BaseURL, AuthURL: js.conf.Endpoint.AuthURL, IssuedAt: time.Now().Unix(), diff --git a/jira/jira_test.go b/jira/jira_test.go index c49940d..07f6a63 100644 --- a/jira/jira_test.go +++ b/jira/jira_test.go @@ -30,7 +30,7 @@ func TestJWTFetch_JSONResponse(t *testing.T) { conf := &Config{ BaseURL: "https://my.app.com", - Subject: "userkey", + Subject: "useraccountId", Config: oauth2.Config{ ClientID: "super_secret_client_id", ClientSecret: "super_shared_secret", @@ -69,7 +69,7 @@ func TestJWTFetch_BadResponse(t *testing.T) { conf := &Config{ BaseURL: "https://my.app.com", - Subject: "userkey", + Subject: "useraccountId", Config: oauth2.Config{ ClientID: "super_secret_client_id", ClientSecret: "super_shared_secret", @@ -108,7 +108,7 @@ func TestJWTFetch_BadResponseType(t *testing.T) { conf := &Config{ BaseURL: "https://my.app.com", - Subject: "userkey", + Subject: "useraccountId", Config: oauth2.Config{ ClientID: "super_secret_client_id", ClientSecret: "super_shared_secret", @@ -145,7 +145,7 @@ func TestJWTFetch_Assertion(t *testing.T) { conf := &Config{ BaseURL: "https://my.app.com", - Subject: "userkey", + Subject: "useraccountId", Config: oauth2.Config{ ClientID: "super_secret_client_id", ClientSecret: "super_shared_secret",