Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Matrix
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Container Registry
Model registry
Operate
Environments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
TeDomum
Matrix
Commits
301cb60d
Commit
301cb60d
authored
6 years ago
by
Neil Johnson
Browse files
Options
Downloads
Patches
Plain Diff
assert rather than warn
parent
0b01281e
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
synapse/api/auth.py
+2
-3
2 additions, 3 deletions
synapse/api/auth.py
with
2 additions
and
3 deletions
synapse/api/auth.py
+
2
−
3
View file @
301cb60d
...
...
@@ -783,6 +783,7 @@ class Auth(object):
Args:
user_id(str|None): If present, checks for presence against existing
MAU cohort
threepid(dict|None): If present, checks for presence against configured
reserved threepid. Used in cases where the user is trying register
with a MAU blocked server, normally they would be rejected but their
...
...
@@ -803,9 +804,7 @@ class Auth(object):
limit_type
=
self
.
hs
.
config
.
hs_disabled_limit_type
)
if
self
.
hs
.
config
.
limit_usage_by_mau
is
True
:
if
user_id
and
threepid
:
logger
.
warn
(
"
Called with both user_id and threepid, this shoudn
'
t happen
"
)
assert
not
(
user_id
and
threepid
)
# If the user is already part of the MAU cohort or a trial user
if
user_id
:
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment