Commit 568919de authored by Sietse Ringers's avatar Sietse Ringers

fix: several small fixes

parent ce997ec7
......@@ -79,7 +79,7 @@ func TestIssuanceCombinedMultiSchemeSession(t *testing.T) {
sessionHelper(t, irma.NewIssuanceRequest([]*irma.CredentialRequest{
{
CredentialTypeID: irma.NewCredentialTypeIdentifier("test.test.email"),
CredentialTypeID: irma.NewCredentialTypeIdentifier("test.test.mijnirma"),
Attributes: map[string]string{
"email": "example@example.com",
},
......
......@@ -536,9 +536,9 @@ func TestRevocationAll(t *testing.T) {
require.NoError(t, err)
res, err := (&http.Client{}).Do(req)
require.NoError(t, err)
require.Equal(t,
fmt.Sprintf("max-age=%d", irma.RevocationParameters.EventsCacheMaxAge),
res.Header.Get("Cache-Control"),
cacheheader := res.Header.Get("Cache-Control")
require.True(t, cacheheader == fmt.Sprintf("max-age=%d", irma.RevocationParameters.EventsCacheMaxAge) ||
cacheheader == fmt.Sprintf("max-age=%d", irma.RevocationParameters.EventsCacheMaxAge-1),
)
// check /update endpoint
......
......@@ -278,7 +278,7 @@ func (conf *Configuration) verifyRevocation() error {
_, err := rev.Keys.PrivateKeyLatest(credid.IssuerIdentifier())
haveSK := err == nil
settings := conf.RevocationSettings[credid]
if haveSK && settings == nil || (settings.RevocationServerURL == "" && !settings.ServerMode) {
if haveSK && (settings == nil || (settings.RevocationServerURL == "" && !settings.ServerMode)) {
message := "Revocation-supporting private key installed for %s, but no revocation server is configured: issuance sessions will always fail"
if conf.IrmaConfiguration.SchemeManagers[credid.IssuerIdentifier().SchemeManagerIdentifier()].Demo {
conf.Logger.Warnf(message, credid)
......
../irma_configuration/test
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment