From 972ea65a5d6f1af964d27abd0ac70964b51a5d34 Mon Sep 17 00:00:00 2001
From: Lenin Alevski <alevsk.8772@gmail.com>
Date: Mon, 25 Oct 2021 12:17:03 -0700
Subject: [PATCH] Implement logout endpoint for operator-ui (#1144)

Signed-off-by: Lenin Alevski <alevsk.8772@gmail.com>
---
 operatorapi/configure_operator.go |  3 ++-
 operatorapi/operator_logout.go    | 42 +++++++++++++++++++++++++++++++
 swagger-console.yml               |  2 +-
 3 files changed, 45 insertions(+), 2 deletions(-)
 create mode 100644 operatorapi/operator_logout.go

diff --git a/operatorapi/configure_operator.go b/operatorapi/configure_operator.go
index f554f2202..5c165d211 100644
--- a/operatorapi/configure_operator.go
+++ b/operatorapi/configure_operator.go
@@ -70,7 +70,8 @@ func configureAPI(api *operations.OperatorAPI) http.Handler {
 			AccountAccessKey:   claims.AccountAccessKey,
 		}, nil
 	}
-
+	// Register logout handlers
+	registerLogoutHandlers(api)
 	// Register login handlers
 	registerLoginHandlers(api)
 	registerSessionHandlers(api)
diff --git a/operatorapi/operator_logout.go b/operatorapi/operator_logout.go
new file mode 100644
index 000000000..30af26c1f
--- /dev/null
+++ b/operatorapi/operator_logout.go
@@ -0,0 +1,42 @@
+// This file is part of MinIO Console Server
+// Copyright (c) 2021 MinIO, Inc.
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+package operatorapi
+
+import (
+	"net/http"
+
+	"github.com/go-openapi/runtime"
+	"github.com/go-openapi/runtime/middleware"
+	"github.com/minio/console/models"
+	"github.com/minio/console/operatorapi/operations"
+	"github.com/minio/console/operatorapi/operations/user_api"
+	"github.com/minio/console/restapi"
+)
+
+func registerLogoutHandlers(api *operations.OperatorAPI) {
+	// logout from console
+	api.UserAPILogoutHandler = user_api.LogoutHandlerFunc(func(params user_api.LogoutParams, session *models.Principal) middleware.Responder {
+		// Custom response writer to expire the session cookies
+		return middleware.ResponderFunc(func(w http.ResponseWriter, p runtime.Producer) {
+			expiredCookie := restapi.ExpireSessionCookie()
+			// this will tell the browser to clear the cookie and invalidate user session
+			// additionally we are deleting the cookie from the client side
+			http.SetCookie(w, &expiredCookie)
+			user_api.NewLogoutOK().WriteResponse(w, p)
+		})
+	})
+}
diff --git a/swagger-console.yml b/swagger-console.yml
index fb44e49ae..1a4561a9f 100644
--- a/swagger-console.yml
+++ b/swagger-console.yml
@@ -108,7 +108,7 @@ paths:
 
   /logout:
     post:
-      summary: Logout from Console.
+      summary: Logout from Operator.
       operationId: Logout
       responses:
         200: