/*
 * mxisd - Matrix Identity Server Daemon
 * Copyright (C) 2018 Kamax Sarl
 *
 * https://www.kamax.io/
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU Affero General Public License as
 * published by the Free Software Foundation, either version 3 of the
 * License, or (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU Affero General Public License for more details.
 *
 * You should have received a copy of the GNU Affero General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */

package io.kamax.mxisd.spring;

import io.kamax.matrix.crypto.KeyFileStore;
import io.kamax.matrix.crypto.KeyManager;
import io.kamax.matrix.crypto.SignatureManager;
import io.kamax.mxisd.config.KeyConfig;
import io.kamax.mxisd.config.MatrixConfig;
import org.apache.commons.io.FileUtils;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;

import java.io.File;
import java.io.IOException;

@Configuration
public class CryptoFactory {

    @Bean
    public KeyManager getKeyManager(KeyConfig keyCfg) {
        File keyStore = new File(keyCfg.getPath());
        if (!keyStore.exists()) {
            try {
                FileUtils.touch(keyStore);
            } catch (IOException e) {
                throw new RuntimeException(e);
            }
        }

        return new KeyManager(new KeyFileStore(keyCfg.getPath()));
    }

    @Bean
    public SignatureManager getSignatureManager(KeyManager keyMgr, MatrixConfig mxCfg) {
        return new SignatureManager(keyMgr, mxCfg.getDomain());
    }

}

@@ -1008,22 +1008,22 @@
 .config.
-Matrix
+Server
 Config;%0A
@@ -1749,24 +1749,22 @@
 gr, 
-Matrix
+Server
 Config 
-mxC
+c
 fg) 
@@ -1813,23 +1813,19 @@
 gr, 
-mxC
+c
 fg.get
-Domain
+Name
 ());

Use the correct domain (server name) for signatures