Skip to content
GitLab
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
44d91d6c
Commit
44d91d6c
authored
Feb 06, 2019
by
Sietse Ringers
Browse files
Rename irmarequestor package to irmaserver
parent
1b2d8bb2
Changes
3
Hide whitespace changes
Inline
Side-by-side
internal/sessiontest/server_test.go
View file @
44d91d6c
...
...
@@ -8,7 +8,6 @@ import (
"github.com/privacybydesign/irmago/internal/test"
"github.com/privacybydesign/irmago/server"
"github.com/privacybydesign/irmago/server/irmarequestor"
"github.com/privacybydesign/irmago/server/irmaserver"
"github.com/sirupsen/logrus"
"github.com/stretchr/testify/require"
...
...
@@ -16,7 +15,7 @@ import (
var
(
httpServer
*
http
.
Server
irmaServer
*
irma
requesto
r
.
Server
irmaServer
*
irma
serve
r
.
Server
combinedServer
*
irmaserver
.
Server
logger
=
logrus
.
New
()
...
...
@@ -53,7 +52,7 @@ func StartIrmaClientServer(t *testing.T) {
logger
.
Formatter
=
&
logrus
.
TextFormatter
{}
var
err
error
irmaServer
,
err
=
irma
requesto
r
.
New
(
&
server
.
Configuration
{
irmaServer
,
err
=
irma
serve
r
.
New
(
&
server
.
Configuration
{
URL
:
"http://localhost:48680"
,
Logger
:
logger
,
SchemesPath
:
filepath
.
Join
(
testdata
,
"irma_configuration"
),
...
...
server/irmad/server.go
View file @
44d91d6c
...
...
@@ -17,14 +17,14 @@ import (
"github.com/go-errors/errors"
"github.com/privacybydesign/irmago"
"github.com/privacybydesign/irmago/server"
"github.com/privacybydesign/irmago/server/irma
requesto
r"
"github.com/privacybydesign/irmago/server/irma
serve
r"
"github.com/sirupsen/logrus"
)
type
Server
struct
{
serv
,
clientserv
*
http
.
Server
conf
*
Configuration
irmaserv
*
irma
requesto
r
.
Server
irmaserv
*
irma
serve
r
.
Server
}
// Start the server. If successful then it will not return until Stop() is called.
...
...
@@ -97,7 +97,7 @@ func (s *Server) Stop() error {
}
func
New
(
config
*
Configuration
)
(
*
Server
,
error
)
{
irmaserv
,
err
:=
irma
requesto
r
.
New
(
config
.
Configuration
)
irmaserv
,
err
:=
irma
serve
r
.
New
(
config
.
Configuration
)
if
err
!=
nil
{
return
nil
,
err
}
...
...
server/irma
requesto
r/main.go
→
server/irma
serve
r/main.go
View file @
44d91d6c
...
...
@@ -3,7 +3,7 @@
// IRMA sessions with irmaclient instances (i.e. the IRMA app). It
// exposes functions for handling IRMA sessions and a HTTP handler
// that handles the sessions with the irmaclient.
package
irma
requesto
r
package
irma
serve
r
import
(
"io/ioutil"
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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