1 files changed, 107 insertions, 43 deletions
diff --git a/tests/cassettes/test_push_set.yaml b/tests/cassettes/test_push_set.yaml
index 7ef5653..ed50cdd 100644
--- a/tests/cassettes/test_push_set.yaml
+++ b/tests/cassettes/test_push_set.yaml
@@ -1,58 +1,122 @@
 interactions:
 - request:
-    body: subscription%5Bendpoint%5D=https%3A%2F%2Fexample.com&subscription%5Bkeys%5D%5Bp256dh%5D=BDqo0y%2BobJuoQj%2BtQQP3Sf9gSkR49Nli8WZdxsIOHhgA9kC3v5v9kAgpi8cn5g%2BnN6hsKXfurFwKzVX1aEA%2B5MQ%3D&subscription%5Bkeys%5D%5Bauth%5D=o5mjIYrUKouhbtiymLLwkA%3D%3D
+    body: subscription%5Bendpoint%5D=https%3A%2F%2Fexample.com&subscription%5Bkeys%5D%5Bp256dh%5D=BOqK%2BBFKWVL3y5bzJ0flceU3RlwlMLkCn14TufF0BP%2BL0LKc0wpJzXEJX%2BB8upYfUPg0vbe8c3EhfCUb8CPiZ6M%3D&subscription%5Bkeys%5D%5Bauth%5D=D%2BFsvuT7XJF9NmtoccCFbQ%3D%3D
    headers:
-      Accept: ['*/*']
+      Accept:
-      Accept-Encoding: ['gzip, deflate']
+      - '*/*'
-      Authorization: [Bearer __MASTODON_PY_TEST_ACCESS_TOKEN]
+      Accept-Encoding:
-      Connection: [keep-alive]
+      - gzip, deflate
-      Content-Length: ['248']
+      Authorization:
-      Content-Type: [application/x-www-form-urlencoded]
+      - Bearer __MASTODON_PY_TEST_ACCESS_TOKEN
-      User-Agent: [python-requests/2.18.4]
+      Connection:
+      - keep-alive
+      Content-Length:
+      - '248'
+      Content-Type:
+      - application/x-www-form-urlencoded
+      User-Agent:
+      - tests/v311
    method: POST
    uri: http://localhost:3000/api/v1/push/subscription
  response:
-    body: {string: '{"id":1,"endpoint":"https://example.com","alerts":{},"server_key":"BPSW9N0oBHCeTlN6VgEPwlf36QQzuU6XtxguTJSM9xyW9kxnN2I_lzcHsk3ShJMRa0Na7t2kiE9UyJWrtQOsTJo="}'}
+    body:
+      string: '{"id":1,"endpoint":"https://example.com","alerts":{},"server_key":"BFsPJBvWr6iQB4n0QAxBbqg5_MLh-Rm1we2OefcfRUaqTrZrB6k0E9FdzlBWD_xp8KAJrsWetwf2-l11cvSQnDU="}'
    headers:
-      Cache-Control: ['no-cache, no-store']
+      Cache-Control:
-      Content-Type: [application/json; charset=utf-8]
+      - no-store
-      Referrer-Policy: [strict-origin-when-cross-origin]
+      Content-Security-Policy:
-      Transfer-Encoding: [chunked]
+      - 'base-uri ''none''; default-src ''none''; frame-ancestors ''none''; font-src
-      Vary: ['Accept-Encoding, Origin']
+        ''self'' http://localhost:3000; img-src ''self'' https: data: blob: http://localhost:3000;
-      X-Content-Type-Options: [nosniff]
+        style-src ''self'' http://localhost:3000 ''nonce-0L6vzkLsm8vr0Amb2GskYw=='';
-      X-Download-Options: [noopen]
+        media-src ''self'' https: data: http://localhost:3000; frame-src ''self''
-      X-Frame-Options: [SAMEORIGIN]
+        https:; manifest-src ''self'' http://localhost:3000; connect-src ''self''
-      X-Permitted-Cross-Domain-Policies: [none]
+        data: blob: http://localhost:3000 http://localhost:3000 ws://localhost:4000
-      X-Request-Id: [6ab3edf5-2aba-4cba-96cc-b49f4eee636a]
+        ws://localhost:3035 http://localhost:3035; script-src ''self'' ''unsafe-inline''
-      X-Runtime: ['0.064364']
+        ''unsafe-eval'' http://localhost:3000; child-src ''self'' blob: http://localhost:3000;
-      X-XSS-Protection: [1; mode=block]
+        worker-src ''self'' blob: http://localhost:3000'
-      content-length: ['157']
+      Content-Type:
-    status: {code: 200, message: OK}
+      - application/json; charset=utf-8
+      ETag:
+      - W/"84d1ccad0cee8aa71855bc8ba7c81e0d"
+      Referrer-Policy:
+      - strict-origin-when-cross-origin
+      Transfer-Encoding:
+      - chunked
+      Vary:
+      - Accept, Origin
+      X-Content-Type-Options:
+      - nosniff
+      X-Download-Options:
+      - noopen
+      X-Frame-Options:
+      - SAMEORIGIN
+      X-Permitted-Cross-Domain-Policies:
+      - none
+      X-Request-Id:
+      - 788002f3-4047-48cc-a58b-7993a9a3234b
+      X-Runtime:
+      - '0.020483'
+      X-XSS-Protection:
+      - 1; mode=block
+    status:
+      code: 200
+      message: OK
 - request:
    body: null
    headers:
-      Accept: ['*/*']
+      Accept:
-      Accept-Encoding: ['gzip, deflate']
+      - '*/*'
-      Authorization: [Bearer __MASTODON_PY_TEST_ACCESS_TOKEN]
+      Accept-Encoding:
-      Connection: [keep-alive]
+      - gzip, deflate
-      User-Agent: [python-requests/2.18.4]
+      Authorization:
+      - Bearer __MASTODON_PY_TEST_ACCESS_TOKEN
+      Connection:
+      - keep-alive
+      User-Agent:
+      - tests/v311
    method: GET
    uri: http://localhost:3000/api/v1/push/subscription
  response:
-    body: {string: '{"id":1,"endpoint":"https://example.com","alerts":{},"server_key":"BPSW9N0oBHCeTlN6VgEPwlf36QQzuU6XtxguTJSM9xyW9kxnN2I_lzcHsk3ShJMRa0Na7t2kiE9UyJWrtQOsTJo="}'}
+    body:
+      string: '{"id":1,"endpoint":"https://example.com","alerts":{},"server_key":"BFsPJBvWr6iQB4n0QAxBbqg5_MLh-Rm1we2OefcfRUaqTrZrB6k0E9FdzlBWD_xp8KAJrsWetwf2-l11cvSQnDU="}'
    headers:
-      Cache-Control: ['no-cache, no-store']
+      Cache-Control:
-      Content-Type: [application/json; charset=utf-8]
+      - no-store
-      Referrer-Policy: [strict-origin-when-cross-origin]
+      Content-Security-Policy:
-      Transfer-Encoding: [chunked]
+      - 'base-uri ''none''; default-src ''none''; frame-ancestors ''none''; font-src
-      Vary: ['Accept-Encoding, Origin']
+        ''self'' http://localhost:3000; img-src ''self'' https: data: blob: http://localhost:3000;
-      X-Content-Type-Options: [nosniff]
+        style-src ''self'' http://localhost:3000 ''nonce-To8ysnGAzZSQ9J16jqmZvQ=='';
-      X-Download-Options: [noopen]
+        media-src ''self'' https: data: http://localhost:3000; frame-src ''self''
-      X-Frame-Options: [SAMEORIGIN]
+        https:; manifest-src ''self'' http://localhost:3000; connect-src ''self''
-      X-Permitted-Cross-Domain-Policies: [none]
+        data: blob: http://localhost:3000 http://localhost:3000 ws://localhost:4000
-      X-Request-Id: [3fcf73c1-5966-473d-937b-9dcb07859cff]
+        ws://localhost:3035 http://localhost:3035; script-src ''self'' ''unsafe-inline''
-      X-Runtime: ['0.063734']
+        ''unsafe-eval'' http://localhost:3000; child-src ''self'' blob: http://localhost:3000;
-      X-XSS-Protection: [1; mode=block]
+        worker-src ''self'' blob: http://localhost:3000'
-      content-length: ['157']
+      Content-Type:
-    status: {code: 200, message: OK}
+      - application/json; charset=utf-8
+      ETag:
+      - W/"84d1ccad0cee8aa71855bc8ba7c81e0d"
+      Referrer-Policy:
+      - strict-origin-when-cross-origin
+      Transfer-Encoding:
+      - chunked
+      Vary:
+      - Accept, Origin
+      X-Content-Type-Options:
+      - nosniff
+      X-Download-Options:
+      - noopen
+      X-Frame-Options:
+      - SAMEORIGIN
+      X-Permitted-Cross-Domain-Policies:
+      - none
+      X-Request-Id:
+      - 43ac3987-277d-441d-87b1-3eb02e769e3d
+      X-Runtime:
+      - '0.007561'
+      X-XSS-Protection:
+      - 1; mode=block
+    status:
+      code: 200
+      message: OK
 version: 1

diff --git a/tests/cassettes/test_push_set.yaml b/tests/cassettes/test_push_set.yaml index 7ef5653..ed50cdd 100644 --- a/tests/cassettes/test_push_set.yaml +++ b/tests/cassettes/test_push_set.yaml
@@ -1,58 +1,122 @@
1	interactions:	1	interactions:
2	- request:	2	- request:
3	body: subscription%5Bendpoint%5D=https%3A%2F%2Fexample.com&subscription%5Bkeys%5D%5Bp256dh%5D=BDqo0y%2BobJuoQj%2BtQQP3Sf9gSkR49Nli8WZdxsIOHhgA9kC3v5v9kAgpi8cn5g%2BnN6hsKXfurFwKzVX1aEA%2B5MQ%3D&subscription%5Bkeys%5D%5Bauth%5D=o5mjIYrUKouhbtiymLLwkA%3D%3D	3	body: subscription%5Bendpoint%5D=https%3A%2F%2Fexample.com&subscription%5Bkeys%5D%5Bp256dh%5D=BOqK%2BBFKWVL3y5bzJ0flceU3RlwlMLkCn14TufF0BP%2BL0LKc0wpJzXEJX%2BB8upYfUPg0vbe8c3EhfCUb8CPiZ6M%3D&subscription%5Bkeys%5D%5Bauth%5D=D%2BFsvuT7XJF9NmtoccCFbQ%3D%3D
4	headers:	4	headers:
5	Accept: ['/']	5	Accept:
6	Accept-Encoding: ['gzip, deflate']	6	- '/'
7	Authorization: [Bearer __MASTODON_PY_TEST_ACCESS_TOKEN]	7	Accept-Encoding:
8	Connection: [keep-alive]	8	- gzip, deflate
9	Content-Length: ['248']	9	Authorization:
10	Content-Type: [application/x-www-form-urlencoded]	10	- Bearer __MASTODON_PY_TEST_ACCESS_TOKEN
11	User-Agent: [python-requests/2.18.4]	11	Connection:
		12	- keep-alive
		13	Content-Length:
		14	- '248'
		15	Content-Type:
		16	- application/x-www-form-urlencoded
		17	User-Agent:
		18	- tests/v311
12	method: POST	19	method: POST
13	uri: http://localhost:3000/api/v1/push/subscription	20	uri: http://localhost:3000/api/v1/push/subscription
14	response:	21	response:
15	body: {string: '{"id":1,"endpoint":"https://example.com","alerts":{},"server_key":"BPSW9N0oBHCeTlN6VgEPwlf36QQzuU6XtxguTJSM9xyW9kxnN2I_lzcHsk3ShJMRa0Na7t2kiE9UyJWrtQOsTJo="}'}	22	body:
		23	string: '{"id":1,"endpoint":"https://example.com","alerts":{},"server_key":"BFsPJBvWr6iQB4n0QAxBbqg5_MLh-Rm1we2OefcfRUaqTrZrB6k0E9FdzlBWD_xp8KAJrsWetwf2-l11cvSQnDU="}'
16	headers:	24	headers:
17	Cache-Control: ['no-cache, no-store']	25	Cache-Control:
18	Content-Type: [application/json; charset=utf-8]	26	- no-store
19	Referrer-Policy: [strict-origin-when-cross-origin]	27	Content-Security-Policy:
20	Transfer-Encoding: [chunked]	28	- 'base-uri ''none''; default-src ''none''; frame-ancestors ''none''; font-src
21	Vary: ['Accept-Encoding, Origin']	29	''self'' http://localhost:3000; img-src ''self'' https: data: blob: http://localhost:3000;
22	X-Content-Type-Options: [nosniff]	30	style-src ''self'' http://localhost:3000 ''nonce-0L6vzkLsm8vr0Amb2GskYw=='';
23	X-Download-Options: [noopen]	31	media-src ''self'' https: data: http://localhost:3000; frame-src ''self''
24	X-Frame-Options: [SAMEORIGIN]	32	https:; manifest-src ''self'' http://localhost:3000; connect-src ''self''
25	X-Permitted-Cross-Domain-Policies: [none]	33	data: blob: http://localhost:3000 http://localhost:3000 ws://localhost:4000
26	X-Request-Id: [6ab3edf5-2aba-4cba-96cc-b49f4eee636a]	34	ws://localhost:3035 http://localhost:3035; script-src ''self'' ''unsafe-inline''
27	X-Runtime: ['0.064364']	35	''unsafe-eval'' http://localhost:3000; child-src ''self'' blob: http://localhost:3000;
28	X-XSS-Protection: [1; mode=block]	36	worker-src ''self'' blob: http://localhost:3000'
29	content-length: ['157']	37	Content-Type:
30	status: {code: 200, message: OK}	38	- application/json; charset=utf-8
		39	ETag:
		40	- W/"84d1ccad0cee8aa71855bc8ba7c81e0d"
		41	Referrer-Policy:
		42	- strict-origin-when-cross-origin
		43	Transfer-Encoding:
		44	- chunked
		45	Vary:
		46	- Accept, Origin
		47	X-Content-Type-Options:
		48	- nosniff
		49	X-Download-Options:
		50	- noopen
		51	X-Frame-Options:
		52	- SAMEORIGIN
		53	X-Permitted-Cross-Domain-Policies:
		54	- none
		55	X-Request-Id:
		56	- 788002f3-4047-48cc-a58b-7993a9a3234b
		57	X-Runtime:
		58	- '0.020483'
		59	X-XSS-Protection:
		60	- 1; mode=block
		61	status:
		62	code: 200
		63	message: OK
31	- request:	64	- request:
32	body: null	65	body: null
33	headers:	66	headers:
34	Accept: ['/']	67	Accept:
35	Accept-Encoding: ['gzip, deflate']	68	- '/'
36	Authorization: [Bearer __MASTODON_PY_TEST_ACCESS_TOKEN]	69	Accept-Encoding:
37	Connection: [keep-alive]	70	- gzip, deflate
38	User-Agent: [python-requests/2.18.4]	71	Authorization:
		72	- Bearer __MASTODON_PY_TEST_ACCESS_TOKEN
		73	Connection:
		74	- keep-alive
		75	User-Agent:
		76	- tests/v311
39	method: GET	77	method: GET
40	uri: http://localhost:3000/api/v1/push/subscription	78	uri: http://localhost:3000/api/v1/push/subscription
41	response:	79	response:
42	body: {string: '{"id":1,"endpoint":"https://example.com","alerts":{},"server_key":"BPSW9N0oBHCeTlN6VgEPwlf36QQzuU6XtxguTJSM9xyW9kxnN2I_lzcHsk3ShJMRa0Na7t2kiE9UyJWrtQOsTJo="}'}	80	body:
		81	string: '{"id":1,"endpoint":"https://example.com","alerts":{},"server_key":"BFsPJBvWr6iQB4n0QAxBbqg5_MLh-Rm1we2OefcfRUaqTrZrB6k0E9FdzlBWD_xp8KAJrsWetwf2-l11cvSQnDU="}'
43	headers:	82	headers:
44	Cache-Control: ['no-cache, no-store']	83	Cache-Control:
45	Content-Type: [application/json; charset=utf-8]	84	- no-store
46	Referrer-Policy: [strict-origin-when-cross-origin]	85	Content-Security-Policy:
47	Transfer-Encoding: [chunked]	86	- 'base-uri ''none''; default-src ''none''; frame-ancestors ''none''; font-src
48	Vary: ['Accept-Encoding, Origin']	87	''self'' http://localhost:3000; img-src ''self'' https: data: blob: http://localhost:3000;
49	X-Content-Type-Options: [nosniff]	88	style-src ''self'' http://localhost:3000 ''nonce-To8ysnGAzZSQ9J16jqmZvQ=='';
50	X-Download-Options: [noopen]	89	media-src ''self'' https: data: http://localhost:3000; frame-src ''self''
51	X-Frame-Options: [SAMEORIGIN]	90	https:; manifest-src ''self'' http://localhost:3000; connect-src ''self''
52	X-Permitted-Cross-Domain-Policies: [none]	91	data: blob: http://localhost:3000 http://localhost:3000 ws://localhost:4000
53	X-Request-Id: [3fcf73c1-5966-473d-937b-9dcb07859cff]	92	ws://localhost:3035 http://localhost:3035; script-src ''self'' ''unsafe-inline''
54	X-Runtime: ['0.063734']	93	''unsafe-eval'' http://localhost:3000; child-src ''self'' blob: http://localhost:3000;
55	X-XSS-Protection: [1; mode=block]	94	worker-src ''self'' blob: http://localhost:3000'
56	content-length: ['157']	95	Content-Type:
57	status: {code: 200, message: OK}	96	- application/json; charset=utf-8
		97	ETag:
		98	- W/"84d1ccad0cee8aa71855bc8ba7c81e0d"
		99	Referrer-Policy:
		100	- strict-origin-when-cross-origin
		101	Transfer-Encoding:
		102	- chunked
		103	Vary:
		104	- Accept, Origin
		105	X-Content-Type-Options:
		106	- nosniff
		107	X-Download-Options:
		108	- noopen
		109	X-Frame-Options:
		110	- SAMEORIGIN
		111	X-Permitted-Cross-Domain-Policies:
		112	- none
		113	X-Request-Id:
		114	- 43ac3987-277d-441d-87b1-3eb02e769e3d
		115	X-Runtime:
		116	- '0.007561'
		117	X-XSS-Protection:
		118	- 1; mode=block
		119	status:
		120	code: 200
		121	message: OK
58	version: 1	122	version: 1