- Change chrome OAuth API endpoint to https://www.googleapis.com/oauth2/v4/token

- Minor fixes

Author: melkamar

README.md

@@ -58,6 +58,16 @@ Tests are written with `py.test`. To run them, use `python setup.py test`.
 Alternatively, you may directly run pytest: `python -m pytest` in the root of the repository. In this case make sure you
 have all testing dependencies installed.
 
+##### Recording new Betamax cassettes
+- To record new cassettes, delete existing `webstore_manager/tests/fixtures/cassettes/*`. Make sure that folder
+`webstore_manager/tests/fixtures/cassettes` exists and is empty.
+
+- Run tests with environment variables `refresh_token`, `client_secret`, `code`, `client_id`, `app_id`. You will need to 
+get them by creating a Google account, API credentials, and running `init` command.
+
+- `app_id` must point to an extension that is already uploaded and has language and region set.
+
+
 ### Documentation
 Documentation lives in the `docs` folder. To build it, run `make html` or `make.bat html` on Linux or Windows, 
 respectively.

VERSION

@@ -1 +1 @@
-0.7.9
+0.7.10

tests/chrome_store/test_chrome.py

@@ -85,7 +85,7 @@ def test_check_status(betamax_session, auth):
                         session=betamax_session)
 
     version = store.get_uploaded_version()
-    assert version == '1.0.12345'
+    assert version == '1.0.12346'
 
 
 def test_repack_crx():

tests/files/sample_zip.zip

@@ -1,97 +1 @@
-{
-  "recorded_with": "betamax/0.8.0",
-  "http_interactions": [
-    {
-      "recorded_at": "2017-01-18T15:22:08",
-      "response": {
-        "headers": {
-          "Vary": "Accept-Encoding",
-          "Alt-Svc": "quic=\":443\"; ma=2592000; v=\"35,34\"",
-          "Expires": "Mon, 01 Jan 1990 00:00:00 GMT",
-          "Accept-Ranges": "none",
-          "X-Frame-Options": "SAMEORIGIN",
-          "Transfer-Encoding": "chunked",
-          "Content-Type": "application/json; charset=utf-8",
-          "X-Content-Type-Options": "nosniff",
-          "Cache-Control": "no-cache, no-store, max-age=0, must-revalidate",
-          "Date": "Wed, 18 Jan 2017 15:22:08 GMT",
-          "Content-Disposition": "attachment; filename=\"json.txt\"; filename*=UTF-8''json.txt",
-          "Server": "ESF",
-          "Pragma": "no-cache",
-          "X-XSS-Protection": "1; mode=block"
-        },
-        "url": "https://accounts.google.com/o/oauth2/token",
-        "status": {
-          "code": 200,
-          "message": "OK"
-        },
-        "body": {
-          "encoding": "utf-8",
-          "string": "{\n  \"access_token\" : \"<ACCESS_TOKEN>\",\n  \"expires_in\" : 3600,\n  \"token_type\" : \"Bearer\"\n}"
-        }
-      },
-      "request": {
-        "headers": {
-          "Content-Type": "application/x-www-form-urlencoded",
-          "User-Agent": "python-requests/2.12.2",
-          "Accept": "*/*",
-          "Accept-Encoding": "identity",
-          "Content-Length": "257",
-          "Connection": "keep-alive"
-        },
-        "uri": "https://accounts.google.com/o/oauth2/token",
-        "body": {
-          "encoding": "utf-8",
-          "string": "client_id=<CLIENT_ID>&refresh_token=<REFRESH_TOKEN>&client_secret=<CLIENT_SECRET>&grant_type=refresh_token&redirect_uri=urn%3Aietf%3Awg%3Aoauth%3A2.0%3Aoob"
-        },
-        "method": "POST"
-      }
-    },
-    {
-      "recorded_at": "2017-01-18T15:22:08",
-      "response": {
-        "headers": {
-          "Vary": "Origin",
-          "Content-Type": "application/json; charset=UTF-8",
-          "Expires": "Wed, 18 Jan 2017 15:22:08 GMT",
-          "ETag": "\"zcKCbcvu6shTA9Iu7WA6nfbfCrA/-blXXN4HeOtwfJ7Qs6Xj_UX6aGg\"",
-          "X-Frame-Options": "SAMEORIGIN",
-          "Alt-Svc": "quic=\":443\"; ma=2592000; v=\"35,34\"",
-          "Content-Length": "596",
-          "Date": "Wed, 18 Jan 2017 15:22:08 GMT",
-          "Server": "GSE",
-          "Cache-Control": "private, max-age=0, must-revalidate, no-transform",
-          "X-Content-Type-Options": "nosniff",
-          "X-XSS-Protection": "1; mode=block"
-        },
-        "url": "https://www.googleapis.com/chromewebstore/v1.1/items/<APP_ID>?projection=draft",
-        "status": {
-          "code": 200,
-          "message": "OK"
-        },
-        "body": {
-          "encoding": "UTF-8",
-          "string": "{\"kind\":\"chromewebstore#item\",\"id\":\"<APP_ID>\",\"publicKey\":\"-----BEGIN PUBLIC KEY-----\\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA06F1SfYp6ho9+z/ur6cD\\ndLMJgkn0kStcKRFG39ze7+DaL6rmuqEnlw0skVl1oA8sy7e+5okoOP7hgipGfC7q\\n9aZeW2zoFYanMxQwEnoVD7S2Cpcx4USABoKRD9CkLEhg9GCCY0oP735fN8G7qB+b\\nUpuSl4IRlbKQKaw12eo3WmMRYkX7tzyNyXpJH8YHmkegkx8t2mYIqHGkm5IGUink\\n1tfKLRIjiO8R+N0nlQYjniQPWVhcbsXfBrHB006ArD1VOObZEGPCf5AVMZzQt3qB\\nSyiMbRqIDkU4fvv/KktFxlzIml6Nqnj+DiZPzENftLaW2ZbXtNruGeZ8ZKOHU2XV\\nfQIDAQAB\\n-----END PUBLIC KEY-----\\n\",\"uploadState\":\"NOT_FOUND\",\"crxVersion\":\"1.0.12345\"}"
-        }
-      },
-      "request": {
-        "headers": {
-          "x-goog-api-version": "2",
-          "User-Agent": "python-requests/2.12.2",
-          "Accept": "*/*",
-          "Accept-Encoding": "identity",
-          "Expect": "",
-          "Authorization": "Bearer <ACCESS_TOKEN>",
-          "Content-Length": "0",
-          "Connection": "keep-alive"
-        },
-        "uri": "https://www.googleapis.com/chromewebstore/v1.1/items/<APP_ID>?projection=draft",
-        "body": {
-          "encoding": "utf-8",
-          "string": ""
-        },
-        "method": "GET"
-      }
-    }
-  ]
-}
+{"http_interactions": [{"recorded_at": "2018-02-26T14:50:30", "request": {"method": "POST", "body": {"encoding": "utf-8", "string": "redirect_uri=urn%3Aietf%3Awg%3Aoauth%3A2.0%3Aoob&client_id=<CLIENT_ID>&refresh_token=<REFRESH_TOKEN>&client_secret=<CLIENT_SECRET>&grant_type=refresh_token"}, "uri": "https://www.googleapis.com/oauth2/v4/token", "headers": {"User-Agent": "python-requests/2.12.2", "Accept": "*/*", "Content-Type": "application/x-www-form-urlencoded", "Content-Length": "257", "Accept-Encoding": "identity", "Connection": "keep-alive"}}, "response": {"status": {"message": "OK", "code": 200}, "body": {"encoding": "UTF-8", "string": "{\n \"access_token\": \"<ACCESS_TOKEN>\",\n \"token_type\": \"Bearer\",\n \"expires_in\": 3600\n}\n"}, "url": "https://www.googleapis.com/oauth2/v4/token", "headers": {"X-Content-Type-Options": "nosniff", "Pragma": "no-cache", "Transfer-Encoding": "chunked", "Accept-Ranges": "none", "Vary": "X-Origin", "Expires": "Mon, 01 Jan 1990 00:00:00 GMT", "Content-Type": "application/json; charset=UTF-8", "X-Frame-Options": "SAMEORIGIN", "Server": "GSE", "Cache-Control": "no-cache, no-store, max-age=0, must-revalidate", "X-XSS-Protection": "1; mode=block", "Alt-Svc": "hq=\":443\"; ma=2592000; quic=51303431; quic=51303339; quic=51303338; quic=51303337; quic=51303335,quic=\":443\"; ma=2592000; v=\"41,39,38,37,35\"", "Date": "Mon, 26 Feb 2018 14:50:30 GMT"}}}, {"recorded_at": "2018-02-26T14:50:30", "request": {"method": "GET", "body": {"encoding": "utf-8", "string": ""}, "uri": "https://www.googleapis.com/chromewebstore/v1.1/items/<APP_ID>?projection=draft", "headers": {"User-Agent": "python-requests/2.12.2", "Accept": "*/*", "Authorization": "Bearer <ACCESS_TOKEN>", "x-goog-api-version": "2", "Content-Length": "0", "Accept-Encoding": "identity", "Connection": "keep-alive", "Expect": ""}}, "response": {"status": {"message": "OK", "code": 200}, "body": {"encoding": "UTF-8", "string": "{\"kind\":\"chromewebstore#item\",\"id\":\"<APP_ID>\",\"publicKey\":\"-----BEGIN PUBLIC KEY-----\\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAo90XN0T+lW0tlZjmySCq\\npKjGjbwW+75ev4mRna7HLOpbdDbvv+boxs0YLdYneI6LofkKkWEE86l+znaJXyxu\\n0G2yF90Vc/pYre7UyDk7+RRZKa/0WZXE4sA1Jo2XGoj8mu1wWb5CAqQ2fwZaHYFO\\n9UxEM24rhkyFezTe+gCLrRW83FJC7APH36wNZyW8FQmogh6D8nOzp7o35FSXXivh\\nPE7LlkQ0dRW1W3F6RsWDLyWcB4AKQERQfsWbQgt2yezSrdjyAcSGmKg8Bo/jrMKo\\nr9hPewkkh6xkEmKhOrqgMvUrxPxB9kEcTmhZ6oGt4H2hMVNsmkBUcGkzpHBArHlP\\nTwIDAQAB\\n-----END PUBLIC KEY-----\\n\",\"uploadState\":\"NOT_FOUND\",\"crxVersion\":\"1.0.12346\"}"}, "url": "https://www.googleapis.com/chromewebstore/v1.1/items/<APP_ID>?projection=draft", "headers": {"X-Content-Type-Options": "nosniff", "Expires": "Mon, 26 Feb 2018 14:50:30 GMT", "Content-Length": "596", "Vary": "Origin", "Content-Type": "application/json; charset=UTF-8", "X-Frame-Options": "SAMEORIGIN", "Server": "GSE", "ETag": "\"ScjL6uzcKur_Zh_9YYIwNs7aBB0/jtqiWm9MQnU01TH3M_riD8csboo\"", "Cache-Control": "private, max-age=0, must-revalidate, no-transform", "X-XSS-Protection": "1; mode=block", "Alt-Svc": "hq=\":443\"; ma=2592000; quic=51303431; quic=51303339; quic=51303338; quic=51303337; quic=51303335,quic=\":443\"; ma=2592000; v=\"41,39,38,37,35\"", "Date": "Mon, 26 Feb 2018 14:50:30 GMT"}}}], "recorded_with": "betamax/0.8.0"}

tests/fixtures/cassettes/test_chrome.test_check_status.json

@@ -1,51 +1 @@
-{
-  "http_interactions": [
-    {
-      "response": {
-        "headers": {
-          "Accept-Ranges": "none",
-          "Vary": "Accept-Encoding",
-          "Server": "ESF",
-          "Expires": "Mon, 01 Jan 1990 00:00:00 GMT",
-          "Alt-Svc": "quic=\":443\"; ma=2592000; v=\"35,34\"",
-          "X-Frame-Options": "SAMEORIGIN",
-          "Cache-Control": "no-cache, no-store, max-age=0, must-revalidate",
-          "Content-Disposition": "attachment; filename=\"json.txt\"; filename*=UTF-8''json.txt",
-          "Content-Type": "application/json; charset=utf-8",
-          "Transfer-Encoding": "chunked",
-          "X-Content-Type-Options": "nosniff",
-          "X-XSS-Protection": "1; mode=block",
-          "Date": "Thu, 22 Dec 2016 14:22:40 GMT",
-          "Pragma": "no-cache"
-        },
-        "body": {
-          "string": "{\n  \"access_token\" : \"<ACCESS_TOKEN>\",\n  \"expires_in\" : 3600,\n  \"token_type\" : \"Bearer\"\n}",
-          "encoding": "utf-8"
-        },
-        "url": "https://accounts.google.com/o/oauth2/token",
-        "status": {
-          "code": 200,
-          "message": "OK"
-        }
-      },
-      "recorded_at": "2016-12-22T14:22:40",
-      "request": {
-        "headers": {
-          "Accept-Encoding": "identity",
-          "Content-Type": "application/x-www-form-urlencoded",
-          "Connection": "keep-alive",
-          "User-Agent": "python-requests/2.12.2",
-          "Content-Length": "257",
-          "Accept": "*/*"
-        },
-        "uri": "https://accounts.google.com/o/oauth2/token",
-        "body": {
-          "string": "refresh_token=<REFRESH_TOKEN>&client_secret=<CLIENT_SECRET>&client_id=<CLIENT_ID>&redirect_uri=urn%3Aietf%3Awg%3Aoauth%3A2.0%3Aoob&grant_type=refresh_token",
-          "encoding": "utf-8"
-        },
-        "method": "POST"
-      }
-    }
-  ],
-  "recorded_with": "betamax/0.8.0"
-}
+{"http_interactions": [{"recorded_at": "2018-02-26T14:50:06", "request": {"method": "POST", "body": {"encoding": "utf-8", "string": "redirect_uri=urn%3Aietf%3Awg%3Aoauth%3A2.0%3Aoob&client_id=<CLIENT_ID>&refresh_token=<REFRESH_TOKEN>&client_secret=<CLIENT_SECRET>&grant_type=refresh_token"}, "uri": "https://www.googleapis.com/oauth2/v4/token", "headers": {"User-Agent": "python-requests/2.12.2", "Accept": "*/*", "Content-Type": "application/x-www-form-urlencoded", "Content-Length": "257", "Accept-Encoding": "identity", "Connection": "keep-alive"}}, "response": {"status": {"message": "OK", "code": 200}, "body": {"encoding": "UTF-8", "string": "{\n \"access_token\": \"<ACCESS_TOKEN>\",\n \"token_type\": \"Bearer\",\n \"expires_in\": 3600\n}\n"}, "url": "https://www.googleapis.com/oauth2/v4/token", "headers": {"X-Content-Type-Options": "nosniff", "Pragma": "no-cache", "Transfer-Encoding": "chunked", "Accept-Ranges": "none", "Vary": "X-Origin", "Expires": "Mon, 01 Jan 1990 00:00:00 GMT", "Content-Type": "application/json; charset=UTF-8", "X-Frame-Options": "SAMEORIGIN", "Server": "GSE", "Cache-Control": "no-cache, no-store, max-age=0, must-revalidate", "X-XSS-Protection": "1; mode=block", "Alt-Svc": "hq=\":443\"; ma=2592000; quic=51303431; quic=51303339; quic=51303338; quic=51303337; quic=51303335,quic=\":443\"; ma=2592000; v=\"41,39,38,37,35\"", "Date": "Mon, 26 Feb 2018 14:50:06 GMT"}}}], "recorded_with": "betamax/0.8.0"}

tests/fixtures/cassettes/test_chrome.test_gen_access_token.json

@@ -1 +1 @@
-{"recorded_with": "betamax/0.8.0", "http_interactions": [{"request": {"headers": {"Content-Length": "0", "Authorization": "Bearer <ACCESS_TOKEN>", "Connection": "keep-alive", "x-goog-api-version": "2", "Accept": "*/*", "Accept-Encoding": "identity", "User-Agent": "python-requests/2.12.2"}, "method": "POST", "uri": "https://www.googleapis.com/chromewebstore/v1.1/items/<APP_ID>/publish?publishTarget=default", "body": {"encoding": "utf-8", "string": ""}}, "response": {"headers": {"Transfer-Encoding": "chunked", "Expires": "Mon, 01 Jan 1990 00:00:00 GMT", "Server": "GSE", "Accept-Ranges": "none", "Alt-Svc": "quic=\":443\"; ma=2592000; v=\"35,34\"", "Cache-Control": "no-cache, no-store, max-age=0, must-revalidate", "Pragma": "no-cache", "Date": "Fri, 06 Jan 2017 09:29:57 GMT", "X-Content-Type-Options": "nosniff", "X-XSS-Protection": "1; mode=block", "Vary": "X-Origin", "X-Frame-Options": "SAMEORIGIN", "Content-Type": "application/json; charset=UTF-8"}, "status": {"message": "OK", "code": 200}, "url": "https://www.googleapis.com/chromewebstore/v1.1/items/<APP_ID>/publish?publishTarget=default", "body": {"encoding": "UTF-8", "string": "{\"kind\":\"chromewebstore#item\",\"item_id\":\"<APP_ID>\",\"status\":[\"OK\"],\"statusDetail\":[\"OK.\"]}"}}, "recorded_at": "2017-01-06T09:29:57"}, {"request": {"headers": {"Content-Length": "257", "Connection": "keep-alive", "Accept": "*/*", "Accept-Encoding": "identity", "User-Agent": "python-requests/2.12.2", "Content-Type": "application/x-www-form-urlencoded"}, "method": "POST", "uri": "https://accounts.google.com/o/oauth2/token", "body": {"encoding": "utf-8", "string": "redirect_uri=urn%3Aietf%3Awg%3Aoauth%3A2.0%3Aoob&client_secret=<CLIENT_SECRET>&client_id=<CLIENT_ID>&refresh_token=<REFRESH_TOKEN>&grant_type=refresh_token"}}, "response": {"headers": {"Transfer-Encoding": "chunked", "X-Frame-Options": "SAMEORIGIN", "Expires": "Mon, 01 Jan 1990 00:00:00 GMT", "Accept-Ranges": "none", "Server": "ESF", "Content-Disposition": "attachment; filename=\"json.txt\"; filename*=UTF-8''json.txt", "Cache-Control": "no-cache, no-store, max-age=0, must-revalidate", "Pragma": "no-cache", "Date": "Fri, 06 Jan 2017 09:31:43 GMT", "X-Content-Type-Options": "nosniff", "X-XSS-Protection": "1; mode=block", "Vary": "Accept-Encoding", "Alt-Svc": "quic=\":443\"; ma=2592000; v=\"35,34\"", "Content-Type": "application/json; charset=utf-8"}, "status": {"message": "OK", "code": 200}, "url": "https://accounts.google.com/o/oauth2/token", "body": {"encoding": "utf-8", "string": "{\n  \"access_token\" : \"<ACCESS_TOKEN>\",\n  \"expires_in\" : 3600,\n  \"token_type\" : \"Bearer\"\n}"}}, "recorded_at": "2017-01-06T09:31:43"}, {"request": {"headers": {"Content-Length": "0", "Authorization": "Bearer <ACCESS_TOKEN>", "Connection": "keep-alive", "x-goog-api-version": "2", "publishTarget": "trustedTesters", "Accept": "*/*", "Accept-Encoding": "identity", "User-Agent": "python-requests/2.12.2"}, "method": "POST", "uri": "https://www.googleapis.com/chromewebstore/v1.1/items/<APP_ID>/publish?publishTarget=trustedTesters", "body": {"encoding": "utf-8", "string": ""}}, "response": {"headers": {"Transfer-Encoding": "chunked", "X-Frame-Options": "SAMEORIGIN", "Expires": "Mon, 01 Jan 1990 00:00:00 GMT", "Accept-Ranges": "none", "Server": "GSE", "Cache-Control": "no-cache, no-store, max-age=0, must-revalidate", "X-Content-Type-Options": "nosniff", "Pragma": "no-cache", "Date": "Fri, 06 Jan 2017 09:31:50 GMT", "Vary": "X-Origin", "X-XSS-Protection": "1; mode=block", "Alt-Svc": "quic=\":443\"; ma=2592000; v=\"35,34\"", "Content-Type": "application/json; charset=UTF-8"}, "status": {"message": "OK", "code": 200}, "url": "https://www.googleapis.com/chromewebstore/v1.1/items/<APP_ID>/publish?publishTarget=trustedTesters", "body": {"encoding": "UTF-8", "string": "{\"kind\":\"chromewebstore#item\",\"item_id\":\"<APP_ID>\",\"status\":[\"OK\"],\"statusDetail\":[\"OK.\"]}"}}, "recorded_at": "2017-01-06T09:31:50"}]}
+{"http_interactions": [{"recorded_at": "2018-02-26T14:50:24", "request": {"method": "POST", "body": {"encoding": "utf-8", "string": "redirect_uri=urn%3Aietf%3Awg%3Aoauth%3A2.0%3Aoob&client_id=<CLIENT_ID>&refresh_token=<REFRESH_TOKEN>&client_secret=<CLIENT_SECRET>&grant_type=refresh_token"}, "uri": "https://www.googleapis.com/oauth2/v4/token", "headers": {"User-Agent": "python-requests/2.12.2", "Accept": "*/*", "Content-Type": "application/x-www-form-urlencoded", "Content-Length": "257", "Accept-Encoding": "identity", "Connection": "keep-alive"}}, "response": {"status": {"message": "OK", "code": 200}, "body": {"encoding": "UTF-8", "string": "{\n \"access_token\": \"<ACCESS_TOKEN>\",\n \"token_type\": \"Bearer\",\n \"expires_in\": 3600\n}\n"}, "url": "https://www.googleapis.com/oauth2/v4/token", "headers": {"X-Content-Type-Options": "nosniff", "Pragma": "no-cache", "Transfer-Encoding": "chunked", "Accept-Ranges": "none", "Vary": "X-Origin", "Expires": "Mon, 01 Jan 1990 00:00:00 GMT", "Content-Type": "application/json; charset=UTF-8", "X-Frame-Options": "SAMEORIGIN", "Server": "GSE", "Cache-Control": "no-cache, no-store, max-age=0, must-revalidate", "X-XSS-Protection": "1; mode=block", "Alt-Svc": "hq=\":443\"; ma=2592000; quic=51303431; quic=51303339; quic=51303338; quic=51303337; quic=51303335,quic=\":443\"; ma=2592000; v=\"41,39,38,37,35\"", "Date": "Mon, 26 Feb 2018 14:50:24 GMT"}}}, {"recorded_at": "2018-02-26T14:50:30", "request": {"method": "POST", "body": {"encoding": "utf-8", "string": ""}, "uri": "https://www.googleapis.com/chromewebstore/v1.1/items/<APP_ID>/publish?publishTarget=trustedTesters", "headers": {"User-Agent": "python-requests/2.12.2", "Accept": "*/*", "Authorization": "Bearer <ACCESS_TOKEN>", "publishTarget": "trustedTesters", "x-goog-api-version": "2", "Content-Length": "0", "Accept-Encoding": "identity", "Connection": "keep-alive"}}, "response": {"status": {"message": "OK", "code": 200}, "body": {"encoding": "UTF-8", "string": "{\"kind\":\"chromewebstore#item\",\"item_id\":\"<APP_ID>\",\"status\":[\"OK\"],\"statusDetail\":[\"OK.\"]}"}, "url": "https://www.googleapis.com/chromewebstore/v1.1/items/<APP_ID>/publish?publishTarget=trustedTesters", "headers": {"X-Content-Type-Options": "nosniff", "Pragma": "no-cache", "Transfer-Encoding": "chunked", "Accept-Ranges": "none", "Vary": "X-Origin", "Expires": "Mon, 01 Jan 1990 00:00:00 GMT", "Content-Type": "application/json; charset=UTF-8", "X-Frame-Options": "SAMEORIGIN", "Server": "GSE", "Cache-Control": "no-cache, no-store, max-age=0, must-revalidate", "X-XSS-Protection": "1; mode=block", "Alt-Svc": "hq=\":443\"; ma=2592000; quic=51303431; quic=51303339; quic=51303338; quic=51303337; quic=51303335,quic=\":443\"; ma=2592000; v=\"41,39,38,37,35\"", "Date": "Mon, 26 Feb 2018 14:50:30 GMT"}}}], "recorded_with": "betamax/0.8.0"}