Remove unnecessary class-wrapping

2 files changed, 69 insertions, 68 deletions

diff --git a/synapse/util/third_party_invites.py b/synapse/util/third_party_invites.py
new file mode 100644
index 0000000000..b7e38c7ec3
--- /dev/null
+++ b/synapse/util/third_party_invites.py
@@ -0,0 +1,69 @@
+# -*- coding: utf-8 -*-
+# Copyright 2015 OpenMarket Ltd
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+from twisted.internet import defer
+from synapse.api.errors import AuthError
+
+
+INVITE_KEYS = {"id_server", "medium", "address", "display_name"}
+
+JOIN_KEYS = {
+    "token",
+    "public_key",
+    "key_validity_url",
+    "signature",
+    "sender",
+}
+
+
+def has_invite_keys(content):
+    for key in INVITE_KEYS:
+        if key not in content:
+            return False
+    return True
+
+
+def has_join_keys(content):
+    for key in JOIN_KEYS:
+        if key not in content:
+            return False
+    return True
+
+
+def join_has_third_party_invite(content):
+    if "third_party_invite" not in content:
+        return False
+    return has_join_keys(content["third_party_invite"])
+
+
+def extract_join_keys(src):
+    return {
+        key: value
+        for key, value in src["third_party_invite"].items()
+        if key in JOIN_KEYS
+    }
+
+
+@defer.inlineCallbacks
+def check_key_valid(http_client, event):
+    try:
+        response = yield http_client.get_json(
+            event.content["third_party_invite"]["key_validity_url"],
+            {"public_key": event.content["third_party_invite"]["public_key"]}
+        )
+        if not response["valid"]:
+            raise AuthError(403, "Third party certificate was invalid")
+    except IOError:
+        raise AuthError(403, "Third party certificate could not be checked")
diff --git a/synapse/util/thirdpartyinvites.py b/synapse/util/thirdpartyinvites.py
deleted file mode 100644
index ad0f4e88e9..0000000000
--- a/synapse/util/thirdpartyinvites.py
+++ /dev/null
@@ -1,68 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright 2015 OpenMarket Ltd
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-from twisted.internet import defer
-from synapse.api.errors import AuthError
-
-
-class ThirdPartyInvites(object):
-    INVITE_KEYS = {"id_server", "medium", "address", "display_name"}
-
-    JOIN_KEYS = {
-        "token",
-        "public_key",
-        "key_validity_url",
-        "signature",
-        "sender",
-    }
-
-    @classmethod
-    def has_invite_keys(cls, content):
-        for key in cls.INVITE_KEYS:
-            if key not in content:
-                return False
-        return True
-
-    @classmethod
-    def has_join_keys(cls, content):
-        for key in cls.JOIN_KEYS:
-            if key not in content:
-                return False
-        return True
-
-    @classmethod
-    def join_has_third_party_invite(cls, content):
-        if "third_party_invite" not in content:
-            return False
-        return cls.has_join_keys(content["third_party_invite"])
-
-    @classmethod
-    def copy_join_keys(cls, src, dst):
-        for key in cls.JOIN_KEYS:
-            if key in src:
-                dst[key] = src[key]
-
-    @classmethod
-    @defer.inlineCallbacks
-    def check_key_valid(cls, http_client, event):
-        try:
-            response = yield http_client.get_json(
-                event.content["third_party_invite"]["key_validity_url"],
-                {"public_key": event.content["third_party_invite"]["public_key"]}
-            )
-            if not response["valid"]:
-                raise AuthError(403, "Third party certificate was invalid")
-        except IOError:
-            raise AuthError(403, "Third party certificate could not be checked")