Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Respond with a 204 HTTP status code after cancelling a Session #142

Draft
wants to merge 3 commits into
base: master
Choose a base branch
from
Draft

Respond with a 204 HTTP status code after cancelling a Session #142

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f205586
Respond with a 204 HTTP status code after cancelling a Session
Mar 17, 2021
35ac125
Use the http.StatusNoContent instead of hardcoding the 204 HTTP respo…
Mar 18, 2021
eaad910
Test setup for verifying the HTTP response headers for cancelling an …
Mar 18, 2021
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
34 changes: 34 additions & 0 deletions internal/sessiontest/handle_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
package sessiontest

import (
"net/http"
"testing"

irma "github.com/privacybydesign/irmago"
"github.com/privacybydesign/irmago/internal/common"
"github.com/stretchr/testify/require"
)

func init() {
common.ForceHTTPS = false
irma.SetLogger(logger)
}

func TestHandleSessionDelete(t *testing.T) {
StartIrmaServer(t, false, "")
defer StopIrmaServer()

// Setup a new disclosure session
id := irma.NewAttributeTypeIdentifier("irma-demo.RU.studentCard.studentID")
session := startSession(t, getDisclosureRequest(id), "verification")

// Attempt to delete the disclosed session
req, reqErr := http.NewRequest(http.MethodDelete, "http://localhost:48682/session/"+session.Token, nil)
require.NoError(t, reqErr)

// Verify the API response
// TODO: Also test the actual deletion of the session
res, resErr := (&http.Client{}).Do(req)
require.NoError(t, resErr)
require.Equal(t, res.StatusCode, http.StatusNoContent)
}
4 changes: 2 additions & 2 deletions server/irmaserver/handle.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
"github.com/go-chi/chi"
"github.com/privacybydesign/gabi"
"github.com/privacybydesign/gabi/signed"
"github.com/privacybydesign/irmago"
irma "github.com/privacybydesign/irmago"
stefanvermaas marked this conversation as resolved.
Show resolved Hide resolved
"github.com/privacybydesign/irmago/internal/common"
"github.com/privacybydesign/irmago/server"
"github.com/sirupsen/logrus"
Expand Down Expand Up @@ -284,7 +284,7 @@ func (s *Server) handleSessionStatusEvents(w http.ResponseWriter, r *http.Reques

func (s *Server) handleSessionDelete(w http.ResponseWriter, r *http.Request) {
r.Context().Value("session").(*session).handleDelete()
w.WriteHeader(200)
w.WriteHeader(http.StatusNoContent)
}

func (s *Server) handleSessionGet(w http.ResponseWriter, r *http.Request) {
Expand Down