summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO18
-rw-r--r--PKGBUILD29
-rw-r--r--Update-set_profile_displayname-to-use-UserID-type.patch33
3 files changed, 66 insertions, 14 deletions
diff --git a/.SRCINFO b/.SRCINFO
index d63652385561..ac7d2e1ed0e1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,19 @@
+# Generated by makepkg 6.0.2
+# Thu Jun 1 06:50:01 UTC 2023
pkgbase = matrix-synapse-rest-auth
pkgdesc = REST endpoint Authentication module for synapse
- pkgver = 0.1.1
+ pkgver = v0.1.4.r25.g53fbc12
pkgrel = 2
- url = https://github.com/kamax-io/matrix-synapse-rest-auth
+ url = https://github.com/ma1uta/matrix-synapse-rest-password-provider
arch = any
license = AGPL3
- depends = python2
- depends = python2-twisted
+ makedepends = git
+ depends = python
+ depends = python-twisted
depends = matrix-synapse
- source = https://github.com/kamax-io/matrix-synapse-rest-auth/archive/v0.1.1.tar.gz
- sha256sums = 8c9368c5f1ab8e2e3a9788cf4e4ad0bcd197cc68b278efd360edb516e674658d
+ source = matrix-synapse-rest-password-provider::git+https://github.com/anishihara/matrix-synapse-rest-password-provider.git
+ source = Update-set_profile_displayname-to-use-UserID-type.patch
+ sha256sums = SKIP
+ sha256sums = 5fb2cfbf8ae32c7ca2d17d01f67a3492b70a7631f865c657ceb4b4ecac7d5285
pkgname = matrix-synapse-rest-auth
-
diff --git a/PKGBUILD b/PKGBUILD
index 985418bb77cd..0229bbb8696d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,20 +1,35 @@
# Maintainer: Carlos Mogas da Silva <r3pek@r3pek.org>
+_pkgname=matrix-synapse-rest-password-provider
pkgname=matrix-synapse-rest-auth
-pkgver=0.1.1
+pkgver=v0.1.4.r25.g53fbc12
pkgrel=2
pkgdesc='REST endpoint Authentication module for synapse'
arch=('any')
-url='https://github.com/kamax-io/matrix-synapse-rest-auth'
+url='https://github.com/anishihara/matrix-synapse-rest-password-provider'
license=('AGPL3')
-depends=('python2' 'python2-twisted' 'matrix-synapse')
-source=("https://github.com/kamax-io/${pkgname}/archive/v${pkgver}.tar.gz")
-sha256sums=('8c9368c5f1ab8e2e3a9788cf4e4ad0bcd197cc68b278efd360edb516e674658d')
+depends=('python' 'python-twisted' 'matrix-synapse')
+makedepends=('git')
+
+source=("${_pkgname}"::"git+https://github.com/anishihara/matrix-synapse-rest-password-provider.git"
+ 'Update-set_profile_displayname-to-use-UserID-type.patch')
+sha256sums=('SKIP'
+ '5fb2cfbf8ae32c7ca2d17d01f67a3492b70a7631f865c657ceb4b4ecac7d5285')
+
+pkgver() {
+ cd "${_pkgname}"
+ git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
+}
+
+prepare() {
+ cd "${_pkgname}"
+ patch -Np1 < '../Update-set_profile_displayname-to-use-UserID-type.patch'
+}
package() {
- cd "${pkgname}-${pkgver}"
+ cd "${_pkgname}"
- PYTHON_LOCATION=$(python2 -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")
+ PYTHON_LOCATION=$(python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")
# File
install -dm 755 "${pkgdir}"/${PYTHON_LOCATION}
diff --git a/Update-set_profile_displayname-to-use-UserID-type.patch b/Update-set_profile_displayname-to-use-UserID-type.patch
new file mode 100644
index 000000000000..28c39679fbba
--- /dev/null
+++ b/Update-set_profile_displayname-to-use-UserID-type.patch
@@ -0,0 +1,33 @@
+--- a/rest_auth_provider.py 2023-06-01 08:43:23.196158358 +0200
++++ b/rest_auth_provider.py 2023-06-01 08:44:11.764498766 +0200
+@@ -26,6 +26,7 @@
+
+ import synapse
+ from synapse import module_api
++from synapse.types import UserID
+
+ import logging
+ import requests
+@@ -112,10 +113,12 @@
+ if not auth["success"]:
+ logger.info("User not authenticated")
+ return None
+- return auth
++ return auth
+
+ async def initialize_matrix_user(self, user_id, auth):
++ types_user_id = UserID.from_string(user_id)
+ localpart = user_id.split(":", 1)[0][1:]
++ domain = user_id.split(":", 1)[1][1:]
+ logger.info("User %s authenticated", user_id)
+
+ registration = False
+@@ -142,7 +145,7 @@
+ if "display_name" in profile and ((registration and self.config.setNameOnRegister) or (self.config.setNameOnLogin)):
+ display_name = profile["display_name"]
+ logger.info("Setting display name to '%s' based on profile data", display_name)
+- await store.set_profile_displayname(localpart, display_name)
++ await store.set_profile_displayname(types_user_id, display_name)
+ else:
+ logger.info("Display name was not set because it was not given or policy restricted it")
+