Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
IRMA
Github mirrors
irmago
Commits
32aaf497
Commit
32aaf497
authored
Dec 08, 2018
by
Sietse Ringers
Browse files
Add session delete api for requestor in library and server
parent
2b156c7e
Changes
3
Hide whitespace changes
Inline
Side-by-side
server/backend/api.go
View file @
32aaf497
...
@@ -110,6 +110,15 @@ func GetSessionResult(token string) *server.SessionResult {
...
@@ -110,6 +110,15 @@ func GetSessionResult(token string) *server.SessionResult {
return
session
.
result
return
session
.
result
}
}
func
CancelSession
(
token
string
)
error
{
session
:=
sessions
.
get
(
token
)
if
session
==
nil
{
return
errors
.
New
(
"Unknown session, can't cancel"
)
}
session
.
handleDelete
()
return
nil
}
func
HandleProtocolMessage
(
func
HandleProtocolMessage
(
path
string
,
path
string
,
method
string
,
method
string
,
...
...
server/irmarequestor/main.go
View file @
32aaf497
...
@@ -32,6 +32,10 @@ func GetSessionResult(token string) *server.SessionResult {
...
@@ -32,6 +32,10 @@ func GetSessionResult(token string) *server.SessionResult {
return
backend
.
GetSessionResult
(
token
)
return
backend
.
GetSessionResult
(
token
)
}
}
func
CancelSession
(
token
string
)
error
{
return
backend
.
CancelSession
(
token
)
}
func
HttpHandlerFunc
(
prefix
string
)
http
.
HandlerFunc
{
func
HttpHandlerFunc
(
prefix
string
)
http
.
HandlerFunc
{
if
len
(
prefix
)
!=
0
&&
prefix
[
0
]
!=
'/'
{
if
len
(
prefix
)
!=
0
&&
prefix
[
0
]
!=
'/'
{
prefix
=
"/"
+
prefix
prefix
=
"/"
+
prefix
...
...
server/irmaserver/server.go
View file @
32aaf497
...
@@ -63,6 +63,7 @@ func Handler(config *Configuration) (http.Handler, error) {
...
@@ -63,6 +63,7 @@ func Handler(config *Configuration) (http.Handler, error) {
// Server routes
// Server routes
router
.
Post
(
"/session"
,
handleCreate
)
router
.
Post
(
"/session"
,
handleCreate
)
router
.
Delete
(
"/session/{token}"
,
handleDelete
)
router
.
Get
(
"/session/{token}/status"
,
handleStatus
)
router
.
Get
(
"/session/{token}/status"
,
handleStatus
)
router
.
Get
(
"/session/{token}/result"
,
handleResult
)
router
.
Get
(
"/session/{token}/result"
,
handleResult
)
...
@@ -141,6 +142,13 @@ func handleStatus(w http.ResponseWriter, r *http.Request) {
...
@@ -141,6 +142,13 @@ func handleStatus(w http.ResponseWriter, r *http.Request) {
server
.
WriteJson
(
w
,
res
.
Status
)
server
.
WriteJson
(
w
,
res
.
Status
)
}
}
func
handleDelete
(
w
http
.
ResponseWriter
,
r
*
http
.
Request
)
{
err
:=
irmarequestor
.
CancelSession
(
chi
.
URLParam
(
r
,
"token"
))
if
err
!=
nil
{
server
.
WriteError
(
w
,
server
.
ErrorSessionUnknown
,
""
)
}
}
func
handleResult
(
w
http
.
ResponseWriter
,
r
*
http
.
Request
)
{
func
handleResult
(
w
http
.
ResponseWriter
,
r
*
http
.
Request
)
{
res
:=
irmarequestor
.
GetSessionResult
(
chi
.
URLParam
(
r
,
"token"
))
res
:=
irmarequestor
.
GetSessionResult
(
chi
.
URLParam
(
r
,
"token"
))
if
res
==
nil
{
if
res
==
nil
{
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment