From 43240a4e0d555a5d67bc76ff0fef0ddbb490f6d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adam=20W=C3=B3jcik?= <adam.wojcik.it@gmail.com>
Date: Mon, 1 Dec 2025 21:07:52 +0000
Subject: [PATCH] Fixes entra m365group remove command. Closes #7054

---
 src/m365/entra/commands/m365group/m365group-remove.spec.ts | 4 ++--
 src/m365/entra/commands/m365group/m365group-remove.ts      | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/m365/entra/commands/m365group/m365group-remove.spec.ts b/src/m365/entra/commands/m365group/m365group-remove.spec.ts
index eca0d3fee81..3f60260f52b 100644
--- a/src/m365/entra/commands/m365group/m365group-remove.spec.ts
+++ b/src/m365/entra/commands/m365group/m365group-remove.spec.ts
@@ -41,7 +41,7 @@ describe(commands.M365GROUP_REMOVE, () => {
 
   const defaultPostStub = (): sinon.SinonStub => {
     return sinon.stub(request, 'post').callsFake(async (opts) => {
-      if (opts.url === `https://contoso-admin.sharepoint.com/_api/GroupSiteManager/Delete?siteUrl='https://contoso.sharepoint.com/teams/sales'`) {
+      if (opts.url === `https://contoso-admin.sharepoint.com/_api/GroupSiteManager/Delete?siteUrl='https%3A%2F%2Fcontoso.sharepoint.com%2Fteams%2Fsales'`) {
         return Promise.resolve({
           "data": {
             "odata.null": true
@@ -247,7 +247,7 @@ describe(commands.M365GROUP_REMOVE, () => {
       .onSecondCall().resolves({ id: groupId });
 
     sinon.stub(request, 'post').callsFake(async (opts) => {
-      if (opts.url === `https://contoso-admin.sharepoint.com/_api/GroupSiteManager/Delete?siteUrl='https://contoso.sharepoint.com/teams/sales'`) {
+      if (opts.url === `https://contoso-admin.sharepoint.com/_api/GroupSiteManager/Delete?siteUrl='https%3A%2F%2Fcontoso.sharepoint.com%2Fteams%2Fsales'`) {
         return Promise.resolve({
           "data": {
             "odata.null": true
diff --git a/src/m365/entra/commands/m365group/m365group-remove.ts b/src/m365/entra/commands/m365group/m365group-remove.ts
index 6d0987617d8..bb985537910 100644
--- a/src/m365/entra/commands/m365group/m365group-remove.ts
+++ b/src/m365/entra/commands/m365group/m365group-remove.ts
@@ -163,7 +163,7 @@ class EntraM365GroupRemoveCommand extends GraphCommand {
     }
 
     const requestOptions: CliRequestOptions = {
-      url: `${spoAdminUrl}/_api/GroupSiteManager/Delete?siteUrl='${url}'`,
+      url: `${spoAdminUrl}/_api/GroupSiteManager/Delete?siteUrl='${formatting.encodeQueryParameter(url)}'`,
       headers: {
         accept: 'application/json;odata=nometadata'
       },
@@ -254,4 +254,4 @@ class EntraM365GroupRemoveCommand extends GraphCommand {
   }
 }
 
-export default new EntraM365GroupRemoveCommand();
\ No newline at end of file
+export default new EntraM365GroupRemoveCommand();