From cf290502fb2533822f60c92892812113b715c5f8 Mon Sep 17 00:00:00 2001
From: David Christofas <dchristofas@owncloud.com>
Date: Wed, 21 Dec 2022 14:26:00 +0100
Subject: [PATCH] fix gosimple bugs

---
 services/ocs/pkg/service/v0/groups.go | 12 ------------
 services/ocs/pkg/service/v0/users.go  |  1 -
 2 files changed, 13 deletions(-)

diff --git a/services/ocs/pkg/service/v0/groups.go b/services/ocs/pkg/service/v0/groups.go
index b01153fdd..0f1364226 100644
--- a/services/ocs/pkg/service/v0/groups.go
+++ b/services/ocs/pkg/service/v0/groups.go
@@ -2,9 +2,7 @@ package svc
 
 import (
 	"net/http"
-	"net/url"
 
-	"github.com/go-chi/chi/v5"
 	"github.com/owncloud/ocis/v2/services/ocs/pkg/service/v0/data"
 	"github.com/owncloud/ocis/v2/services/ocs/pkg/service/v0/response"
 )
@@ -15,17 +13,13 @@ const (
 
 // ListUserGroups lists a users groups
 func (o Ocs) ListUserGroups(w http.ResponseWriter, r *http.Request) {
-	userid := chi.URLParam(r, "userid")
-	userid, _ = url.PathUnescape(userid)
 	switch o.config.AccountBackend {
 	case _backendCS3:
 		// TODO
 		o.mustRender(w, r, response.DataRender(&data.Groups{}))
-		return
 	default:
 		o.logger.Fatal().Msgf("Invalid accounts backend type '%s'", o.config.AccountBackend)
 	}
-	return
 }
 
 // AddToGroup adds a user to a group
@@ -34,7 +28,6 @@ func (o Ocs) AddToGroup(w http.ResponseWriter, r *http.Request) {
 	case _backendCS3:
 		// TODO
 		o.cs3WriteNotSupported(w, r)
-		return
 	default:
 		o.logger.Fatal().Msgf("Invalid accounts backend type '%s'", o.config.AccountBackend)
 	}
@@ -46,7 +39,6 @@ func (o Ocs) RemoveFromGroup(w http.ResponseWriter, r *http.Request) {
 	case _backendCS3:
 		// TODO
 		o.cs3WriteNotSupported(w, r)
-		return
 	default:
 		o.logger.Fatal().Msgf("Invalid accounts backend type '%s'", o.config.AccountBackend)
 	}
@@ -58,7 +50,6 @@ func (o Ocs) ListGroups(w http.ResponseWriter, r *http.Request) {
 	case _backendCS3:
 		// TODO
 		o.mustRender(w, r, response.DataRender(&data.Groups{}))
-		return
 	default:
 		o.logger.Fatal().Msgf("Invalid accounts backend type '%s'", o.config.AccountBackend)
 	}
@@ -70,7 +61,6 @@ func (o Ocs) AddGroup(w http.ResponseWriter, r *http.Request) {
 	switch o.config.AccountBackend {
 	case _backendCS3:
 		o.cs3WriteNotSupported(w, r)
-		return
 	default:
 		o.logger.Fatal().Msgf("Invalid accounts backend type '%s'", o.config.AccountBackend)
 	}
@@ -81,7 +71,6 @@ func (o Ocs) DeleteGroup(w http.ResponseWriter, r *http.Request) {
 	switch o.config.AccountBackend {
 	case _backendCS3:
 		o.cs3WriteNotSupported(w, r)
-		return
 	default:
 		o.logger.Fatal().Msgf("Invalid accounts backend type '%s'", o.config.AccountBackend)
 	}
@@ -93,7 +82,6 @@ func (o Ocs) GetGroupMembers(w http.ResponseWriter, r *http.Request) {
 	case _backendCS3:
 		// TODO
 		o.mustRender(w, r, response.DataRender(&data.Users{}))
-		return
 	default:
 		o.logger.Fatal().Msgf("Invalid accounts backend type '%s'", o.config.AccountBackend)
 	}
diff --git a/services/ocs/pkg/service/v0/users.go b/services/ocs/pkg/service/v0/users.go
index 84f7ab52f..f62953414 100644
--- a/services/ocs/pkg/service/v0/users.go
+++ b/services/ocs/pkg/service/v0/users.go
@@ -37,7 +37,6 @@ func (o Ocs) GetSelf(w http.ResponseWriter, r *http.Request) {
 		GIDNumber:         u.GidNumber,
 	}
 	o.mustRender(w, r, response.DataRender(d))
-	return
 }
 
 // GetUser returns the user with the given userid