From: Marcin Haba <marcin.haba@bacula.pl>
Date: Thu, 18 Aug 2022 11:35:26 +0000 (+0200)
Subject: baculum: Add Microsoft 365 plugin endpoint for listing logged in users for given... 
X-Git-Tag: Release-13.0.2~65
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3769789f66e162b91c9fe3177c3f9131ce3ef264;p=thirdparty%2Fbacula.git

baculum: Add Microsoft 365 plugin endpoint for listing logged in users for given tenant
---

diff --git a/gui/baculum/protected/API/Pages/API/endpoints.xml b/gui/baculum/protected/API/Pages/API/endpoints.xml
index c2ca1f06d..102457dfe 100644
--- a/gui/baculum/protected/API/Pages/API/endpoints.xml
+++ b/gui/baculum/protected/API/Pages/API/endpoints.xml
@@ -125,6 +125,7 @@
 	<!-- Plugins -->
 	<!-- M365 Plugin -->
 	<url ServiceParameter="PluginM365ListLoggedUsers" pattern="api/v2/plugins/m365/{id}/users/" parameters.id="\d+" />
+	<url ServiceParameter="PluginM365ListLoggedUsers" pattern="api/v2/plugins/m365/{id}/{tenantid}/users/" parameters.id="\d+" parameters.tenantid="[a-zA-Z0-9:.\-_ ]+" />
 	<url ServiceParameter="PluginM365EmailList" pattern="api/v2/plugins/m365/{id}/{tenantid}/emails/" parameters.id="\d+" parameters.tenantid="[a-zA-Z0-9:.\-_ ]+" />
 	<url ServiceParameter="PluginM365EmailAttachmentList" pattern="api/v2/plugins/m365/{id}/{tenantid}/emails/attachments/" parameters.id="\d+" parameters.tenantid="[a-zA-Z0-9:.\-_ ]+" />
 
diff --git a/gui/baculum/protected/API/openapi_baculum.json b/gui/baculum/protected/API/openapi_baculum.json
index e5a83996d..71a36ce4a 100644
--- a/gui/baculum/protected/API/openapi_baculum.json
+++ b/gui/baculum/protected/API/openapi_baculum.json
@@ -6605,11 +6605,11 @@
 		"/api/v2/plugins/m365/{clientid}/users": {
 			"get": {
 				"tags": ["plugins"],
-				"summary": "Microsoft 365 plugin logged in user list",
-				"description": "Get Microsoft 365 logged in user list.",
+				"summary": "Microsoft 365 plugin logged in user list for all tenants",
+				"description": "Get Microsoft 365 logged in user list for all tenants.",
 				"responses": {
 					"200": {
-						"description": "List of Microsoft 365 users",
+						"description": "List of Microsoft 365 users for all tenants",
 						"content": {
 							"application/json": {
 								"schema": {
@@ -6658,6 +6658,56 @@
 				]
 			}
 		},
+		"/api/v2/plugins/m365/{clientid}/{tenantid}/users": {
+			"get": {
+				"tags": ["plugins"],
+				"summary": "Microsoft 365 plugin logged in user list",
+				"description": "Get Microsoft 365 logged in user list.",
+				"responses": {
+					"200": {
+						"description": "List of Microsoft 365 users",
+						"content": {
+							"application/json": {
+								"schema": {
+									"type": "object",
+									"properties": {
+										"output": {
+											"type": "object",
+											"properties": {
+												"tenantid": {
+													"type": "array",
+													"description": "Microsoft 365 users",
+													"items": {
+														"description": "User list",
+														"type": "string"
+													}
+												}
+											}
+										},
+										"error": {
+											"type": "integer",
+											"description": "Error code",
+											"enum": [0, 1, 4, 5, 6, 7, 11, 1000]
+										}
+									}
+								}
+							}
+						}
+					}
+				},
+				"parameters": [
+					{
+						"$ref": "#/components/parameters/ClientId"
+					},
+					{
+						"$ref": "#/components/parameters/TenantId"
+					},
+					{
+						"$ref": "#/components/parameters/Output"
+					}
+				]
+			}
+		},
 		"/api/v2/plugins/m365/{clientid}/{tenantid}/emails": {
 			"get": {
 				"tags": ["plugins"],