From a0494328742f1f3246d01b8236f943956536e32f Mon Sep 17 00:00:00 2001 From: Phill Morton Date: Thu, 15 Feb 2024 18:17:15 +0000 Subject: [PATCH 1/9] Added Azure Devops Scopes to scm api Signed-off-by: Phill Morton --- .changeset/forty-oranges-joke.md | 5 +++++ packages/integration-react/src/api/ScmAuth.ts | 12 ++++++------ 2 files changed, 11 insertions(+), 6 deletions(-) create mode 100644 .changeset/forty-oranges-joke.md diff --git a/.changeset/forty-oranges-joke.md b/.changeset/forty-oranges-joke.md new file mode 100644 index 0000000000..b2fdaccdc1 --- /dev/null +++ b/.changeset/forty-oranges-joke.md @@ -0,0 +1,5 @@ +--- +'@backstage/integration-react': patch +--- + +Updated azure devops scopes to include the clientid for Azure Dev Ops OAuth. diff --git a/packages/integration-react/src/api/ScmAuth.ts b/packages/integration-react/src/api/ScmAuth.ts index b3dab4029e..a22b15e400 100644 --- a/packages/integration-react/src/api/ScmAuth.ts +++ b/packages/integration-react/src/api/ScmAuth.ts @@ -199,13 +199,13 @@ export class ScmAuth implements ScmAuthApi { const host = options?.host ?? 'dev.azure.com'; return new ScmAuth('azure', microsoftAuthApi, host, { default: [ - 'vso.build', - 'vso.code', - 'vso.graph', - 'vso.project', - 'vso.profile', + '499b84ac-1321-427f-aa17-267ca6975798/vso.build', + '499b84ac-1321-427f-aa17-267ca6975798/vso.code', + '499b84ac-1321-427f-aa17-267ca6975798/vso.graph', + '499b84ac-1321-427f-aa17-267ca6975798/vso.project', + '499b84ac-1321-427f-aa17-267ca6975798/vso.profile', ], - repoWrite: ['vso.code_manage'], + repoWrite: ['499b84ac-1321-427f-aa17-267ca6975798/vso.code_manage'], }); } From b38dc5591a924a4614c714c5ee7d16d7fd27ff1a Mon Sep 17 00:00:00 2001 From: Phill Morton Date: Thu, 15 Feb 2024 18:17:15 +0000 Subject: [PATCH 2/9] Added Azure Devops Scopes to scm api Signed-off-by: Phill Morton --- .changeset/forty-oranges-joke.md | 5 +++++ packages/integration-react/src/api/ScmAuth.ts | 12 ++++++------ 2 files changed, 11 insertions(+), 6 deletions(-) create mode 100644 .changeset/forty-oranges-joke.md diff --git a/.changeset/forty-oranges-joke.md b/.changeset/forty-oranges-joke.md new file mode 100644 index 0000000000..b2fdaccdc1 --- /dev/null +++ b/.changeset/forty-oranges-joke.md @@ -0,0 +1,5 @@ +--- +'@backstage/integration-react': patch +--- + +Updated azure devops scopes to include the clientid for Azure Dev Ops OAuth. diff --git a/packages/integration-react/src/api/ScmAuth.ts b/packages/integration-react/src/api/ScmAuth.ts index b3dab4029e..a22b15e400 100644 --- a/packages/integration-react/src/api/ScmAuth.ts +++ b/packages/integration-react/src/api/ScmAuth.ts @@ -199,13 +199,13 @@ export class ScmAuth implements ScmAuthApi { const host = options?.host ?? 'dev.azure.com'; return new ScmAuth('azure', microsoftAuthApi, host, { default: [ - 'vso.build', - 'vso.code', - 'vso.graph', - 'vso.project', - 'vso.profile', + '499b84ac-1321-427f-aa17-267ca6975798/vso.build', + '499b84ac-1321-427f-aa17-267ca6975798/vso.code', + '499b84ac-1321-427f-aa17-267ca6975798/vso.graph', + '499b84ac-1321-427f-aa17-267ca6975798/vso.project', + '499b84ac-1321-427f-aa17-267ca6975798/vso.profile', ], - repoWrite: ['vso.code_manage'], + repoWrite: ['499b84ac-1321-427f-aa17-267ca6975798/vso.code_manage'], }); } From e951416945582d0e7bffacabdd83b842bc475718 Mon Sep 17 00:00:00 2001 From: Phill Morton Date: Thu, 22 Feb 2024 12:48:49 +0000 Subject: [PATCH 3/9] Add Profile information to Azure SCM OAuth Request. Signed-off-by: Phill Morton --- packages/integration-react/src/api/ScmAuth.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packages/integration-react/src/api/ScmAuth.ts b/packages/integration-react/src/api/ScmAuth.ts index a22b15e400..8b26c232f4 100644 --- a/packages/integration-react/src/api/ScmAuth.ts +++ b/packages/integration-react/src/api/ScmAuth.ts @@ -204,6 +204,9 @@ export class ScmAuth implements ScmAuthApi { '499b84ac-1321-427f-aa17-267ca6975798/vso.graph', '499b84ac-1321-427f-aa17-267ca6975798/vso.project', '499b84ac-1321-427f-aa17-267ca6975798/vso.profile', + 'profile', + 'openid', + 'email', ], repoWrite: ['499b84ac-1321-427f-aa17-267ca6975798/vso.code_manage'], }); From 964926f10e08160dad0cc96964435d52e5fa85a2 Mon Sep 17 00:00:00 2001 From: Phill Morton Date: Thu, 22 Feb 2024 12:52:32 +0000 Subject: [PATCH 4/9] add change set Signed-off-by: Phill Morton --- .changeset/great-rice-hunt.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/great-rice-hunt.md diff --git a/.changeset/great-rice-hunt.md b/.changeset/great-rice-hunt.md new file mode 100644 index 0000000000..ecd815b387 --- /dev/null +++ b/.changeset/great-rice-hunt.md @@ -0,0 +1,5 @@ +--- +'@backstage/integration-react': patch +--- + +Add profile and email scopes to ADO SCM Auth. From 4149571239c53669e2ce84df48bb609bcd073e24 Mon Sep 17 00:00:00 2001 From: Phill Morton Date: Thu, 22 Feb 2024 13:33:17 +0000 Subject: [PATCH 5/9] chore: small nits Signed-off-by: Phill Morton --- .changeset/forty-oranges-joke.md | 4 ++-- .changeset/great-rice-hunt.md | 5 ----- 2 files changed, 2 insertions(+), 7 deletions(-) delete mode 100644 .changeset/great-rice-hunt.md diff --git a/.changeset/forty-oranges-joke.md b/.changeset/forty-oranges-joke.md index b2fdaccdc1..9f41431245 100644 --- a/.changeset/forty-oranges-joke.md +++ b/.changeset/forty-oranges-joke.md @@ -1,5 +1,5 @@ --- -'@backstage/integration-react': patch +'@backstage/integration-react': minor --- -Updated azure devops scopes to include the clientid for Azure Dev Ops OAuth. +Updated `microsoftAuthApi` scopes to for Azure DevOps to be fully qualified. Also added `openid`, `profile` and `email` scopes diff --git a/.changeset/great-rice-hunt.md b/.changeset/great-rice-hunt.md deleted file mode 100644 index ecd815b387..0000000000 --- a/.changeset/great-rice-hunt.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@backstage/integration-react': patch ---- - -Add profile and email scopes to ADO SCM Auth. From 1fecc471dd6406ffe9790516c577abd34c5a9472 Mon Sep 17 00:00:00 2001 From: Phill Morton Date: Thu, 22 Feb 2024 13:58:10 +0000 Subject: [PATCH 6/9] remove the additional scopes - not required. Signed-off-by: Phill Morton --- .changeset/forty-oranges-joke.md | 2 +- packages/integration-react/src/api/ScmAuth.ts | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/.changeset/forty-oranges-joke.md b/.changeset/forty-oranges-joke.md index 9f41431245..bc43cc8e4c 100644 --- a/.changeset/forty-oranges-joke.md +++ b/.changeset/forty-oranges-joke.md @@ -2,4 +2,4 @@ '@backstage/integration-react': minor --- -Updated `microsoftAuthApi` scopes to for Azure DevOps to be fully qualified. Also added `openid`, `profile` and `email` scopes +Updated `microsoftAuthApi` scopes to for Azure DevOps to be fully qualified. diff --git a/packages/integration-react/src/api/ScmAuth.ts b/packages/integration-react/src/api/ScmAuth.ts index 8b26c232f4..a22b15e400 100644 --- a/packages/integration-react/src/api/ScmAuth.ts +++ b/packages/integration-react/src/api/ScmAuth.ts @@ -204,9 +204,6 @@ export class ScmAuth implements ScmAuthApi { '499b84ac-1321-427f-aa17-267ca6975798/vso.graph', '499b84ac-1321-427f-aa17-267ca6975798/vso.project', '499b84ac-1321-427f-aa17-267ca6975798/vso.profile', - 'profile', - 'openid', - 'email', ], repoWrite: ['499b84ac-1321-427f-aa17-267ca6975798/vso.code_manage'], }); From 5e8665378491ef5dfd173b182fe4a962bcd70e41 Mon Sep 17 00:00:00 2001 From: Phill Morton Date: Thu, 22 Feb 2024 14:27:55 +0000 Subject: [PATCH 7/9] chore - fix typo in changeset Signed-off-by: Phill Morton --- .changeset/forty-oranges-joke.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.changeset/forty-oranges-joke.md b/.changeset/forty-oranges-joke.md index bc43cc8e4c..fb08927fa0 100644 --- a/.changeset/forty-oranges-joke.md +++ b/.changeset/forty-oranges-joke.md @@ -2,4 +2,4 @@ '@backstage/integration-react': minor --- -Updated `microsoftAuthApi` scopes to for Azure DevOps to be fully qualified. +Updated `microsoftAuthApi` scopes for Azure DevOps to be fully qualified. From 7f3ed08594e74e680a34835d5719feb42e8351ee Mon Sep 17 00:00:00 2001 From: Phill Morton Date: Thu, 22 Feb 2024 14:49:13 +0000 Subject: [PATCH 8/9] Update test cases to include clientId for ADO Signed-off-by: Phill Morton --- packages/integration-react/src/api/ScmAuth.test.ts | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/packages/integration-react/src/api/ScmAuth.test.ts b/packages/integration-react/src/api/ScmAuth.test.ts index 7e174c4cbf..d252b95b85 100644 --- a/packages/integration-react/src/api/ScmAuth.test.ts +++ b/packages/integration-react/src/api/ScmAuth.test.ts @@ -112,7 +112,8 @@ describe('ScmAuth', () => { await expect( azureAuth.getCredentials({ url: 'http://example.com' }), ).resolves.toMatchObject({ - token: 'vso.build vso.code vso.graph vso.project vso.profile', + token: + '499b84ac-1321-427f-aa17-267ca6975798/vso.build 499b84ac-1321-427f-aa17-267ca6975798/vso.code 499b84ac-1321-427f-aa17-267ca6975798/vso.graph 499b84ac-1321-427f-aa17-267ca6975798/vso.project 499b84ac-1321-427f-aa17-267ca6975798/vso.profile', }); await expect( azureAuth.getCredentials({ @@ -121,7 +122,7 @@ describe('ScmAuth', () => { }), ).resolves.toMatchObject({ token: - 'vso.build vso.code vso.graph vso.project vso.profile vso.code_manage', + '499b84ac-1321-427f-aa17-267ca6975798/vso.build 499b84ac-1321-427f-aa17-267ca6975798/vso.code 499b84ac-1321-427f-aa17-267ca6975798/vso.graph 499b84ac-1321-427f-aa17-267ca6975798/vso.project 499b84ac-1321-427f-aa17-267ca6975798/vso.profile 499b84ac-1321-427f-aa17-267ca6975798/vso.code_manage', }); const bitbucketAuth = ScmAuth.forBitbucket(mockAuthApi); @@ -174,10 +175,15 @@ describe('ScmAuth', () => { await expect( azureAuth.getCredentials({ url: 'http://example.com', - additionalScope: { customScopes: { azure: ['vso.org'] } }, + additionalScope: { + customScopes: { + azure: ['499b84ac-1321-427f-aa17-267ca6975798/vso.org'], + }, + }, }), ).resolves.toMatchObject({ - token: 'vso.build vso.code vso.graph vso.project vso.profile vso.org', + token: + '499b84ac-1321-427f-aa17-267ca6975798/vso.build 499b84ac-1321-427f-aa17-267ca6975798/vso.code 499b84ac-1321-427f-aa17-267ca6975798/vso.graph 499b84ac-1321-427f-aa17-267ca6975798/vso.project 499b84ac-1321-427f-aa17-267ca6975798/vso.profile 499b84ac-1321-427f-aa17-267ca6975798/vso.org', }); const bitbucketAuth = ScmAuth.forBitbucket(mockAuthApi); From a8fbffd678594370d23fad619656b67d4ade1e39 Mon Sep 17 00:00:00 2001 From: Phillip Morton Date: Mon, 26 Feb 2024 14:04:02 +0000 Subject: [PATCH 9/9] Update changeset from minor to patch. Signed-off-by: Phill Morton Signed-off-by: Phillip Morton --- .changeset/forty-oranges-joke.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.changeset/forty-oranges-joke.md b/.changeset/forty-oranges-joke.md index fb08927fa0..28d162442c 100644 --- a/.changeset/forty-oranges-joke.md +++ b/.changeset/forty-oranges-joke.md @@ -1,5 +1,5 @@ --- -'@backstage/integration-react': minor +'@backstage/integration-react': patch --- Updated `microsoftAuthApi` scopes for Azure DevOps to be fully qualified.