From baa3f99ed7aca2394f38f3e637da11d7d51ee689 Mon Sep 17 00:00:00 2001
From: Marvin W <git@larma.de>
Date: Sun, 19 Aug 2018 18:56:46 +0100
Subject: Initial implementation of SCRAM-SHA-1

---
 libdino/src/service/connection_manager.vala | 2 +-
 libdino/src/service/module_manager.vala     | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'libdino')

diff --git a/libdino/src/service/connection_manager.vala b/libdino/src/service/connection_manager.vala
index 4413dfd7..b73cd117 100644
--- a/libdino/src/service/connection_manager.vala
+++ b/libdino/src/service/connection_manager.vala
@@ -162,7 +162,7 @@ public class ConnectionManager {
         stream.attached_modules.connect((stream) => {
             change_connection_state(account, ConnectionState.CONNECTED);
         });
-        stream.get_module(PlainSasl.Module.IDENTITY).received_auth_failure.connect((stream, node) => {
+        stream.get_module(Sasl.Module.IDENTITY).received_auth_failure.connect((stream, node) => {
             set_connection_error(account, new ConnectionError(ConnectionError.Source.SASL, null));
             change_connection_state(account, ConnectionState.DISCONNECTED);
         });
diff --git a/libdino/src/service/module_manager.vala b/libdino/src/service/module_manager.vala
index dac5aef2..d16dc935 100644
--- a/libdino/src/service/module_manager.vala
+++ b/libdino/src/service/module_manager.vala
@@ -41,8 +41,8 @@ public class ModuleManager {
         foreach (XmppStreamModule module in module_map[account]) {
             if (module.get_id() == Bind.Module.IDENTITY.id) {
                 (module as Bind.Module).requested_resource = resource ?? account.resourcepart;
-            } else if (module.get_id() == PlainSasl.Module.IDENTITY.id) {
-                (module as PlainSasl.Module).password = account.password;
+            } else if (module.get_id() == Sasl.Module.IDENTITY.id) {
+                (module as Sasl.Module).password = account.password;
             }
         }
         return modules;
@@ -54,7 +54,7 @@ public class ModuleManager {
             module_map[account].add(new Iq.Module());
             module_map[account].add(new Tls.Module());
             module_map[account].add(new Xep.SrvRecordsTls.Module());
-            module_map[account].add(new PlainSasl.Module(account.bare_jid.to_string(), account.password));
+            module_map[account].add(new Sasl.Module(account.bare_jid.to_string(), account.password));
             module_map[account].add(new Xep.StreamManagement.Module());
             module_map[account].add(new Bind.Module(account.resourcepart));
             module_map[account].add(new Session.Module());
-- 
cgit v1.2.3-54-g00ecf