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
27fcab30
Commit
27fcab30
authored
Jan 20, 2018
by
Sietse Ringers
Browse files
Don't forget to return scheme manager errors if any
parent
3ee8b7e4
Changes
1
Hide whitespace changes
Inline
Side-by-side
irmaclient/client.go
View file @
27fcab30
...
...
@@ -129,10 +129,13 @@ func New(
if
err
!=
nil
{
return
nil
,
err
}
err
=
cm
.
Configuration
.
ParseFolder
()
_
,
isSchemeMgrErr
:=
err
.
(
*
irma
.
SchemeManagerError
)
if
err
!=
nil
&&
!
isSchemeMgrErr
{
return
nil
,
err
schemeMgrErr
:=
cm
.
Configuration
.
ParseFolder
()
// If schemMgrErr is of type SchemeManagerError, we continue and
// return it at the end; otherwise bail out now
_
,
isSchemeMgrErr
:=
schemeMgrErr
.
(
*
irma
.
SchemeManagerError
)
if
schemeMgrErr
!=
nil
&&
!
isSchemeMgrErr
{
return
nil
,
schemeMgrErr
}
// Ensure storage path exists, and populate it with necessary files
...
...
@@ -173,7 +176,7 @@ func New(
return
nil
,
errors
.
New
(
"Too many keyshare servers"
)
}
return
cm
,
nil
return
cm
,
schemeMgrErr
}
// CredentialInfoList returns a list of information of all contained credentials.
...
...
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