@@ -56,7 +56,7 @@ def test_does_not_authenticate_with_invalid_password(self):
56
56
57
57
@control_silo_test
58
58
class GetLoginRedirectTest (TestCase ):
59
- def make_request (self , next = None ):
59
+ def _make_request (self , next = None ):
60
60
request = HttpRequest ()
61
61
request .META ["SERVER_NAME" ] = "testserver"
62
62
request .META ["SERVER_PORT" ] = "80"
@@ -67,75 +67,75 @@ def make_request(self, next=None):
67
67
return request
68
68
69
69
def test_schema_uses_default (self ):
70
- result = get_login_redirect (self .make_request ("http://example.com" ))
70
+ result = get_login_redirect (self ._make_request ("http://example.com" ))
71
71
assert result == reverse ("sentry-login" )
72
72
73
- result = get_login_redirect (self .make_request ("ftp://testserver" ))
73
+ result = get_login_redirect (self ._make_request ("ftp://testserver" ))
74
74
assert result == reverse ("sentry-login" )
75
75
76
76
def test_next (self ):
77
- result = get_login_redirect (self .make_request ("http://testserver/foobar/" ))
77
+ result = get_login_redirect (self ._make_request ("http://testserver/foobar/" ))
78
78
assert result == "http://testserver/foobar/"
79
79
80
- result = get_login_redirect (self .make_request ("ftp://testserver/foobar/" ))
80
+ result = get_login_redirect (self ._make_request ("ftp://testserver/foobar/" ))
81
81
assert result == reverse ("sentry-login" )
82
82
83
- request = self .make_request ("/foobar/" )
83
+ request = self ._make_request ("/foobar/" )
84
84
request .subdomain = "orgslug"
85
85
result = get_login_redirect (request )
86
86
assert result == "http://orgslug.testserver/foobar/"
87
87
88
- request = self .make_request ("http://testserver/foobar/" )
88
+ request = self ._make_request ("http://testserver/foobar/" )
89
89
request .subdomain = "orgslug"
90
90
result = get_login_redirect (request )
91
91
assert result == "http://testserver/foobar/"
92
92
93
- request = self .make_request ("ftp://testserver/foobar/" )
93
+ request = self ._make_request ("ftp://testserver/foobar/" )
94
94
request .subdomain = "orgslug"
95
95
result = get_login_redirect (request )
96
96
assert result == f"http://orgslug.testserver{ reverse ('sentry-login' )} "
97
97
98
98
def test_after_2fa (self ):
99
- request = self .make_request ()
99
+ request = self ._make_request ()
100
100
request .session ["_after_2fa" ] = "http://testserver/foobar/"
101
101
result = get_login_redirect (request )
102
102
assert result == "http://testserver/foobar/"
103
103
104
- request = self .make_request ()
104
+ request = self ._make_request ()
105
105
request .subdomain = "orgslug"
106
106
request .session ["_after_2fa" ] = "/foobar/"
107
107
result = get_login_redirect (request )
108
108
assert result == "http://orgslug.testserver/foobar/"
109
109
110
110
def test_pending_2fa (self ):
111
- request = self .make_request ()
111
+ request = self ._make_request ()
112
112
request .session ["_pending_2fa" ] = [1234 , 1234 , 1234 ]
113
113
result = get_login_redirect (request )
114
114
assert result == reverse ("sentry-2fa-dialog" )
115
115
116
- request = self .make_request ()
116
+ request = self ._make_request ()
117
117
request .subdomain = "orgslug"
118
118
request .session ["_pending_2fa" ] = [1234 , 1234 , 1234 ]
119
119
result = get_login_redirect (request )
120
120
assert result == f"http://orgslug.testserver{ reverse ('sentry-2fa-dialog' )} "
121
121
122
122
def test_login_uses_default (self ):
123
- result = get_login_redirect (self .make_request (reverse ("sentry-login" )))
123
+ result = get_login_redirect (self ._make_request (reverse ("sentry-login" )))
124
124
assert result == reverse ("sentry-login" )
125
125
126
126
def test_no_value_uses_default (self ):
127
- result = get_login_redirect (self .make_request ())
127
+ result = get_login_redirect (self ._make_request ())
128
128
assert result == reverse ("sentry-login" )
129
129
130
- request = self .make_request ()
130
+ request = self ._make_request ()
131
131
request .subdomain = "orgslug"
132
132
result = get_login_redirect (request )
133
133
assert result == f"http://orgslug.testserver{ reverse ('sentry-login' )} "
134
134
135
135
136
136
@control_silo_test
137
137
class LoginTest (TestCase ):
138
- def make_request (self , next = None ):
138
+ def _make_request (self , next = None ):
139
139
request = HttpRequest ()
140
140
request .META ["REMOTE_ADDR" ] = "127.0.0.1"
141
141
request .session = self .session
@@ -145,14 +145,14 @@ def make_request(self, next=None):
145
145
return request
146
146
147
147
def test_simple (self ):
148
- request = self .make_request ()
148
+ request = self ._make_request ()
149
149
assert login (request , self .user )
150
150
assert request .user == self .user
151
151
assert "_nonce" not in request .session
152
152
153
153
def test_with_organization (self ):
154
154
org = self .create_organization (name = "foo" , owner = self .user )
155
- request = self .make_request ()
155
+ request = self ._make_request ()
156
156
assert login (request , self .user , organization_id = org .id )
157
157
assert request .user == self .user
158
158
assert f"{ SsoSession .SSO_SESSION_KEY } :{ org .id } " in request .session
@@ -161,7 +161,7 @@ def test_with_nonce(self):
161
161
self .user .refresh_session_nonce ()
162
162
self .user .save ()
163
163
assert self .user .session_nonce is not None
164
- request = self .make_request ()
164
+ request = self ._make_request ()
165
165
assert login (request , self .user )
166
166
assert request .user == self .user
167
167
assert request .session ["_nonce" ] == self .user .session_nonce
0 commit comments