Merge branch 'master' into update-golang

CHANGELOG.md

@@ -5,6 +5,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## Unreleased
+### Fixed
+- `RemoveScheme` function in `irmaclient` already stripping storage before checking whether the scheme is in assets
+
 ### Security
 - Update go toolchain to 1.21.5
 

irmaclient/client.go

@@ -1547,7 +1547,15 @@ func (client *Client) RemoveScheme(schemeID irma.SchemeManagerIdentifier) error
 		return errors.New("unknown scheme manager")
 	}
 
-	err := client.stripStorage([]irma.SchemeManagerIdentifier{schemeID}, true)
+	isInAssets, err := client.Configuration.IsInAssets(scheme)
+	if err != nil {
+		return err
+	}
+	if isInAssets {
+		return errors.New("cannot remove scheme manager that is in assets")
+	}
+
+	err = client.stripStorage([]irma.SchemeManagerIdentifier{schemeID}, true)
 	if err != nil {
 		return err
 	}

schemes.go

@@ -258,10 +258,18 @@ func (conf *Configuration) UpdateScheme(scheme Scheme, downloaded *IrmaIdentifie
 	return nil
 }
 
+func (conf *Configuration) IsInAssets(scheme Scheme) (bool, error) {
+	if conf.assets == "" {
+		return false, nil
+	}
+	_, exists, err := common.Stat(path.Join(conf.assets, scheme.id()))
+	return exists, err
+}
+
 // DangerousDeleteScheme deletes the given scheme from the configuration.
 // Be aware: this action is dangerous when the scheme is still in use.
 func (conf *Configuration) DangerousDeleteScheme(scheme Scheme) error {
-	_, exists, err := common.Stat(path.Join(conf.assets, scheme.id()))
+	exists, err := conf.IsInAssets(scheme)
 	if err != nil {
 		return err
 	}