Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions api/handlers/network_client_handlers.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@ func RemoveNetworkClient(w http.ResponseWriter, r *http.Request) {
router.WrapWithInputRequireAuth(model.RemoveNetworkClient, w, r)
}

func RemoveNetworkClients(w http.ResponseWriter, r *http.Request) {
router.WrapWithInputRequireAuth(model.RemoveNetworkClients, w, r)
}

func RemoveNetwork(w http.ResponseWriter, r *http.Request) {
router.WrapRequireAuth(controller.NetworkRemove, w, r)
}
Expand Down
1 change: 1 addition & 0 deletions api/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,7 @@ Options:
router.NewRoute("POST", "/auth/upgrade-guest-existing", handlers.UpgradeGuestExisting),
router.NewRoute("POST", "/network/auth-client", handlers.AuthNetworkClient),
router.NewRoute("POST", "/network/remove-client", handlers.RemoveNetworkClient),
router.NewRoute("POST", "/network/remove-clients", handlers.RemoveNetworkClients),
router.NewRoute("GET", "/network/clients", handlers.NetworkClients),
router.NewRoute("GET", "/network/provider-locations", handlers.NetworkGetProviderLocations),
router.NewRoute("POST", "/network/find-provider-locations", handlers.NetworkFindProviderLocations),
Expand Down
37 changes: 37 additions & 0 deletions model/network_client_model.go
Original file line number Diff line number Diff line change
Expand Up @@ -445,6 +445,43 @@ func RemoveNetworkClient(
return removeClientResult, removeClientErr
}

type RemoveNetworkClientsArgs struct {
ClientIds []server.Id `json:"client_ids"`
}

type RemoveNetworkClientsResult struct{}

func RemoveNetworkClients(
removeClients *RemoveNetworkClientsArgs,
session *session.ClientSession,
) (*RemoveNetworkClientsResult, error) {
var removeClientsResult *RemoveNetworkClientsResult
if len(removeClients.ClientIds) == 0 {
return &RemoveNetworkClientsResult{}, nil
}

server.Tx(session.Ctx, func(tx server.PgTx) {
_, err := tx.Exec(
session.Ctx,
`
UPDATE network_client
SET
active = false
WHERE
client_id = ANY($1) AND
network_id = $2
`,
removeClients.ClientIds,
session.ByJwt.NetworkId,
)
server.Raise(err)

removeClientsResult = &RemoveNetworkClientsResult{}
})

return removeClientsResult, nil
}

type NetworkClientsResult struct {
Clients []*NetworkClientInfo `json:"clients"`
}
Expand Down
30 changes: 30 additions & 0 deletions model/network_client_model_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ import (
"github.com/go-playground/assert/v2"

"github.com/urnetwork/server"
"github.com/urnetwork/server/jwt"
"github.com/urnetwork/server/session"
)

func TestNetworkClientHandlerLifecycle(t *testing.T) {
Expand Down Expand Up @@ -196,3 +198,31 @@ func TestSetProvide(t *testing.T) {

})
}

func TestRemoveNetworkClients(t *testing.T) {
server.DefaultTestEnv().Run(t, func(t testing.TB) {
ctx := context.Background()
networkId := server.NewId()

// Create a mock session
sess := &session.ClientSession{
Ctx: ctx,
ByJwt: &jwt.ByJwt{
NetworkId: networkId,
},
}

// Generate random IDs to test the ANY($1) binding
clientIds := []server.Id{server.NewId(), server.NewId(), server.NewId()}

args := &RemoveNetworkClientsArgs{
ClientIds: clientIds,
}

// This will panic if the driver fails to cast []server.Id to uuid[]
_, err := RemoveNetworkClients(args, sess)

// Assert that the function ran without returning an error
assert.Equal(t, err, nil)
})
}