You've already forked snikket-web-portal
Compare commits
6 Commits
fix/invite
...
fix/user-l
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
2762304ae8 | ||
|
|
49bbc3ab09 | ||
|
|
8f1f80b7d7 | ||
|
|
13bc283a3e | ||
|
|
abc0af3918 | ||
|
|
0aff4fc99d |
@@ -1,6 +1,9 @@
|
|||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
|
|
||||||
export SNIKKET_WEB_DOMAIN="$SNIKKET_DOMAIN"
|
export SNIKKET_WEB_DOMAIN="$SNIKKET_DOMAIN"
|
||||||
|
if [ -n "${SNIKKET_SITE_NAME:-}" ]; then
|
||||||
|
export SNIKKET_WEB_SITE_NAME="$SNIKKET_SITE_NAME"
|
||||||
|
fi
|
||||||
|
|
||||||
export SNIKKET_TWEAK_PORTAL_INTERNAL_HTTP_INTERFACE="${SNIKKET_TWEAK_PORTAL_INTERNAL_HTTP_INTERFACE-127.0.0.1}"
|
export SNIKKET_TWEAK_PORTAL_INTERNAL_HTTP_INTERFACE="${SNIKKET_TWEAK_PORTAL_INTERNAL_HTTP_INTERFACE-127.0.0.1}"
|
||||||
export SNIKKET_TWEAK_PORTAL_INTERNAL_HTTP_PORT="${SNIKKET_TWEAK_PORTAL_INTERNAL_HTTP_PORT-5765}"
|
export SNIKKET_TWEAK_PORTAL_INTERNAL_HTTP_PORT="${SNIKKET_TWEAK_PORTAL_INTERNAL_HTTP_PORT-5765}"
|
||||||
|
|||||||
@@ -27,8 +27,8 @@ from . import xmpputil
|
|||||||
from .xmpputil import split_jid
|
from .xmpputil import split_jid
|
||||||
|
|
||||||
|
|
||||||
SCOPE_DEFAULT = "prosody:scope:default"
|
SCOPE_DEFAULT = "prosody:user"
|
||||||
SCOPE_ADMIN = "prosody:scope:admin"
|
SCOPE_ADMIN = "prosody:admin"
|
||||||
|
|
||||||
|
|
||||||
T = typing.TypeVar("T")
|
T = typing.TypeVar("T")
|
||||||
@@ -61,12 +61,18 @@ class AdminUserInfo:
|
|||||||
cls,
|
cls,
|
||||||
data: typing.Mapping[str, typing.Any],
|
data: typing.Mapping[str, typing.Any],
|
||||||
) -> "AdminUserInfo":
|
) -> "AdminUserInfo":
|
||||||
|
try:
|
||||||
|
roles: typing.Optional[typing.List[str]] = [data["role"]]
|
||||||
|
assert roles is not None # make mypy happy
|
||||||
|
roles.extend(data.get("secondary_roles", []))
|
||||||
|
except KeyError:
|
||||||
|
roles = data.get("roles")
|
||||||
return cls(
|
return cls(
|
||||||
localpart=data["username"],
|
localpart=data["username"],
|
||||||
display_name=data.get("display_name") or None,
|
display_name=data.get("display_name") or None,
|
||||||
email=data.get("email") or None,
|
email=data.get("email") or None,
|
||||||
phone=data.get("phone") or None,
|
phone=data.get("phone") or None,
|
||||||
roles=data.get("roles"),
|
roles=roles,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user