8000 Revert "Add header for opting into correct URL decoding (#206)" (#274) · sww314/firebase-admin-python@18c2395 · GitHub
[go: up one dir, main page]
Skip to content

Commit 18c2395

Browse files
rockwotjrockwotj
authored
Revert "Add header for opting into correct URL decoding (firebase#206)" (firebase#274)
This reverts commit 77737c0.
1 parent 4aa3422 commit 18c2395

File tree

2 files changed

+2
-22
lines changed

2 files changed

+2
-22
lines changed

‎firebase_admin/db.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636

3737

3838
_DB_ATTRIBUTE = '_database'
39-
_INVALID_PATH_CHARACTERS = '[].#$'
39+
_INVALID_PATH_CHARACTERS = '[].?#$'
4040
_RESERVED_FILTERS = ('$key', '$value', '$priority')
4141
_USER_AGENT = 'Firebase/HTTP/{0}/{1}.{2}/AdminPython'.format(
4242
firebase_admin.__version__, sys.version_info.major, sys.version_info.minor)
@@ -849,8 +849,7 @@ def __init__(self, credential, base_url, auth_override, timeout):
849849
timeout, which is the default behavior of the underlying requests library.
850850
"""
851851
_http_client.JsonHttpClient.__init__(
852-
self, credential=credential, base_url=base_url,
853-
headers={'User-Agent': _USER_AGENT, 'X-Firebase-Decoding': '1'})
852+
self, credential=credential, base_url=base_url, headers={'User-Agent': _USER_AGENT})
854853
self.credential = credential
855854
self.auth_override = auth_override
856855
self.timeout = timeout

‎tests/test_db.py

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,6 @@ def test_get_value(self, data):
157157
assert recorder[0].url == 'https://test.firebaseio.com/test.json'
158158
assert recorder[0].headers['Authorization'] == 'Bearer mock-token'
159159
assert recorder[0].headers['User-Agent'] == db._USER_AGENT
160-
assert recorder[0].headers['X-Firebase-Decoding'] == '1'
161160
assert 'X-Firebase-ETag' not in recorder[0].headers
162161

163162
@pytest.mark.parametrize('data', valid_values)
@@ -170,7 +169,6 @@ def test_get_with_etag(self, data):
170169
assert recorder[0].url == 'https://test.firebaseio.com/test.json'
171170
assert recorder[0].headers['Authorization'] == 'Bearer mock-token'
172171
assert recorder[0].headers['User-Agent'] == db._USER_AGENT
173-
assert recorder[0].headers['X-Firebase-Decoding'] == '1'
174172
assert recorder[0].headers['X-Firebase-ETag'] == 'true'
175173

176174
@pytest.mark.parametrize('data', valid_values)
@@ -182,7 +180,6 @@ def test_get_shallow(self, data):
182180
assert recorder[0].method == 'GET'
183181
assert recorder[0].url == 'https://test.firebaseio.com/test.json?shallow=true'
184182
assert recorder[0].headers['Authorization'] == 'Bearer mock-token'
185-
assert recorder[0].headers['X-Firebase-Decoding'] == '1'
186183
assert recorder[0].headers['User-Agent'] == db._USER_AGENT
187184

188185
def test_get_with_etag_and_shallow(self):
@@ -200,14 +197,12 @@ def test_get_if_changed(self, data):
200197
assert recorder[0].method == 'GET'
201198
assert recorder[0].url == 'https://test.firebaseio.com/test.json'
202199
assert recorder[0].headers['if-none-match'] == 'invalid-etag'
203-
assert recorder[0].headers['X-Firebase-Decoding'] == '1'
204200

205201
assert ref.get_if_changed(MockAdapter.ETAG) == (False, None, None)
206202
assert len(recorder) == 2
207203
assert recorder[1].method == 'GET'
208204
assert recorder[1].url == 'https://test.firebaseio.com/test.json'
209205
assert recorder[1].headers['if-none-match'] == MockAdapter.ETAG
210-
assert recorder[1].headers['X-Firebase-Decoding'] == '1'
211206

212207
@pytest.mark.parametrize('etag', [0, 1, True, False, dict(), list(), tuple()])
213208
def test_get_if_changed_invalid_etag(self, etag):
@@ -226,7 +221,6 @@ def test_order_by_query(self, data):
226221
assert recorder[0].method == 'GET'
227222
assert recorder[0].url == 'https://test.firebaseio.com/test.json?' + query_str
228223
assert recorder[0].headers['Authorization'] == 'Bearer mock-token'
229-
assert recorder[0].headers['X-Firebase-Decoding'] == '1'
230224

231225
@pytest.mark.parametrize('data', valid_values)
232226
def test_limit_query(self, data):
@@ -240,7 +234,6 @@ def test_limit_query(self, data):
240234
assert recorder[0].method == 'GET'
241235
assert recorder[0].url == 'https://test.firebaseio.com/test.json?' + query_str
242236
assert recorder[0].headers['Authorization'] == 'Bearer mock-token'
243-
assert recorder[0].headers['X-Firebase-Decoding'] == '1'
244237

245238
@pytest.mark.parametrize('data', valid_values)
246239
def test_range_query(self, data):
@@ -255,7 +248,6 @@ def test_range_query(self, data):
255248
assert recorder[0].method == 'GET'
256249
assert recorder[0].url == 'https://test.firebaseio.com/test.json?' + query_str
257250
assert recorder[0].headers['Authorization'] == 'Bearer mock-token'
258-
assert recorder[0].headers['X-Firebase-Decoding'] == '1'
259251

260252
@pytest.mark.parametrize('data', valid_values)
261253
def test_set_value(self, data):
@@ -267,7 +259,6 @@ def test_set_value(self, data):
267259
assert recorder[0].url == 'https://test.firebaseio.com/test.json?print=silent'
268260
assert json.loads(recorder[0].body.decode()) == data
269261
assert recorder[0].headers['Authorization'] == 'Bearer mock-token'
270-
assert recorder[0].headers['X-Firebase-Decoding'] == '1'
271262

272263
def test_set_none_value(self):
273264
ref = db.reference('/test')
@@ -294,7 +285,6 @@ def test_update_children(self, data):
294285
assert recorder[0].url == 'https://test.firebaseio.com/test.json?print=silent'
295286
assert json.loads(recorder[0].body.decode()) == data
296287
assert recorder[0].headers['Authorization'] == 'Bearer mock-token'
297-
assert recorder[0].headers['X-Firebase-Decoding'] == '1'
298288

299289
@pytest.mark.parametrize('data', valid_values)
300290
def test_set_if_unchanged_success(self, data):
@@ -308,7 +298,6 @@ def test_set_if_unchanged_success(self, data):
308298
assert json.loads(recorder[0].body.decode()) == data
309299
assert recorder[0].headers['Authorization'] == 'Bearer mock-token'
310300
assert recorder[0].headers['if-match'] == MockAdapter.ETAG
311-
assert recorder[0].headers['X-Firebase-Decoding'] == '1'
312301

313302
@pytest.mark.parametrize('data', valid_values)
314303
def test_set_if_unchanged_failure(self, data):
@@ -322,7 +311,6 @@ def test_set_if_unchanged_failure(self, data):
322311
assert json.loads(recorder[0].body.decode()) == data
323312
assert recorder[0].headers['Authorization'] == 'Bearer mock-token'
324313
assert recorder[0].headers['if-match'] == 'invalid-etag'
325-
assert recorder[0].headers['X-Firebase-Decoding'] == '1'
326314

327315
@pytest.mark.parametrize('etag', [0, 1, True, False, dict(), list(), tuple()])
328316
def test_set_if_unchanged_invalid_etag(self, etag):
@@ -368,7 +356,6 @@ def test_push(self, data):
368356
assert json.loads(recorder[0].body.decode()) == data
369357
assert recorder[0].headers['Authorization'] == 'Bearer mock-token'
370358
assert recorder[0].headers['User-Agent'] == db._USER_AGENT
371-
assert recorder[0].headers['X-Firebase-Decoding'] == '1'
372359

373360
def test_push_default(self):
374361
ref = db.reference('/test')
@@ -380,7 +367,6 @@ def test_push_default(self):
380367
assert json.loads(recorder[0].body.decode()) == ''
381368
assert recorder[0].headers['Authorization'] == 'Bearer mock-token'
382369
assert recorder[0].headers['User-Agent'] == db._USER_AGENT
383-
assert recorder[0].headers['X-Firebase-Decoding'] == '1'
384370

385371
def test_push_none_value(self):
386372
ref = db.reference('/test')
@@ -397,7 +383,6 @@ def test_delete(self):
397383
assert recorder[0].url == 'https://test.firebaseio.com/test.json'
398384
assert recorder[0].headers['Authorization'] == 'Bearer mock-token'
399385
assert recorder[0].headers['User-Agent'] == db._USER_AGENT
400-
assert recorder[0].headers['X-Firebase-Decoding'] == '1'
401386

402387
def test_transaction(self):
403388
ref = db.reference('/test')
@@ -583,7 +568,6 @@ def test_get_value(self):
583568
assert recorder[0].url == 'https://test.firebaseio.com/test.json?' + query_str
584569
assert recorder[0].headers['Authorization'] == 'Bearer mock-token'
585570
assert recorder[0].headers['User-Agent'] == db._USER_AGENT
586-
assert recorder[0].headers['X-Firebase-Decoding'] == '1'
587571

588572
def test_set_value(self):
589573
ref = db.reference('/test')
@@ -597,7 +581,6 @@ def test_set_value(self):
597581
assert json.loads(recorder[0].body.decode()) == data
598582
assert recorder[0].headers['Authorization'] == 'Bearer mock-token'
599583
assert recorder[0].headers['User-Agent'] == db._USER_AGENT
600-
assert recorder[0].headers['X-Firebase-Decoding'] == '1'
601584

602585
def test_order_by_query(self):
603586
ref = db.reference('/test')
@@ -610,7 +593,6 @@ def test_order_by_query(self):
610593
assert recorder[0].url == 'https://test.firebaseio.com/test.json?' + query_str
611594
assert recorder[0].headers['Authorization'] == 'Bearer mock-token'
612595
assert recorder[0].headers['User-Agent'] == db._USER_AGENT
613-
assert recorder[0].headers['X-Firebase-Decoding'] == '1'
614596

615597
def test_range_query(self):
616598
ref = db.reference('/test')
@@ -624,7 +606,6 @@ def test_range_query(self):
624606
assert recorder[0].url == 'https://test.firebaseio.com/test.json?' + query_str
625607
assert recorder[0].headers['Authorization'] == 'Bearer mock-token'
626608
assert recorder[0].headers['User-Agent'] == db._USER_AGENT
627-
assert recorder[0].headers['X-Firebase-Decoding'] == '1'
628609

629610

630611
class TestDatabaseInitialization(object):

0 commit comments

Comments
 (0)
0