Issue 4549 - Implement the Windows Store API to upload development builds

sitescripts/extensions/bin/createNightlies.py

 # This file is part of the Adblock Plus web scripts,
 # Copyright (C) 2006-2016 Eyeo GmbH
 #
 # Adblock Plus is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 3 as
 # published by the Free Software Foundation.
 #
 # Adblock Plus is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ skipping 521 matching lines @@
         request.add_header('Authorization', auth_token)
         request.add_header('x-goog-api-version', '2')
         request.add_header('Content-Length', '0')
 
         response = json.load(opener.open(request))
 
         if any(status not in ('OK', 'ITEM_PENDING_REVIEW') for status in response['status']):
             raise Exception({'status': response['status'], 'statusDetail': response['statusDetail']})
 
     def get_windows_store_access_token(self):
-        auth_token = ''

[Sebastian Noack, 2017/02/16 11:01:12]

Defining auth_token here seems redundant.

         # use refresh token to obtain a valid access token
         # https://docs.microsoft.com/en-us/azure/active-directory/active-directory-protocols-oauth-code#refreshing-the-access-tokens
         server = 'https://login.microsoftonline.com'
         token_path = '{}/{}/oauth2/token'.format(server, self.config.tenantID)
 
         opener = urllib2.build_opener(HTTPErrorBodyHandler)
         post_data = urlencode([
             ('refresh_token', self.config.refreshToken),
             ('client_id', self.config.clientID),
             ('client_secret', self.config.clientSecret),
             ('grant_type', 'refresh_token'),
             ('resource', 'https://graph.windows.net')
         ])
         request = urllib2.Request(token_path, post_data)
         with contextlib.closing(opener.open(request)) as response:
             data = json.load(response)
             auth_token = '{0[token_type]} {0[access_token]}'.format(data)
 
         return auth_token
 
     def upload_appx_file_to_windows_store(self, file_upload_url):
-

[Sebastian Noack, 2017/02/16 11:01:12]

Nit: We don't add a blank line at the beginning of a block. Please also remove
other occurrences of that practice below as well.

         # Add .appx file to a .zip file
         zip_path = os.path.splitext(self.path)[0] + '.zip'
         with zipfile.ZipFile(zip_path, 'w', zipfile.ZIP_DEFLATED) as zf:
             zf.write(self.path, os.path.basename(self.path))
 
         # Upload that .zip file
         file_upload_url = file_upload_url.replace('+', '%2B')
         request = urllib2.Request(file_upload_url)
         request.get_method = lambda: 'PUT'
         request.add_header('x-ms-blob-type', 'BlockBlob')
 
         opener = urllib2.build_opener(HTTPErrorBodyHandler)
 
         with open(zip_path, 'rb') as file:
             request.add_header('Content-Length',
                                os.fstat(file.fileno()).st_size - file.tell())
             request.add_data(file)
             opener.open(request).close()
 
+    # Clone the previous submission for the new one. Largely based on code
+    # from https://msdn.microsoft.com/en-us/windows/uwp/monetize/python-code-examples-for-the-windows-store-submission-api#create-an-app-submission
     def upload_to_windows_store(self):
-
-        auth_token = self.get_windows_store_access_token()

[Sebastian Noack, 2017/02/16 11:01:13]

This variable seems redundant, just inline it below?

-
         opener = urllib2.build_opener(HTTPErrorBodyHandler)
 
-        # Clone the previous submission for the new one. Largely based on code
-        # from https://msdn.microsoft.com/en-us/windows/uwp/monetize/python-code-examples-for-the-windows-store-submission-api#create-an-app-submission
-        headers = {'Authorization': auth_token,
+        headers = {'Authorization': self.get_windows_store_access_token(),
                    'Content-type': 'application/json'}
 
         # Get application
         # https://docs.microsoft.com/en-us/windows/uwp/monetize/get-an-app
         api_path = '{}/v1.0/my/applications/{}'.format(
             'https://manage.devcenter.microsoft.com',
             self.config.devbuildGalleryID
         )
 
         request = urllib2.Request(api_path, None, headers)
@@ skipping 13 matching lines @@
         # Create submission
         # https://msdn.microsoft.com/en-us/windows/uwp/monetize/create-an-app-submission
         request = urllib2.Request(submissions_path, '', headers)
         request.get_method = lambda: 'POST'
         with contextlib.closing(opener.open(request)) as response:
             submission = json.load(response)
 
         submission_id = submission['id']
         file_upload_url = submission['fileUploadUrl']
 
-        new_submission_path = '{}/{}'.format(

[Sebastian Noack, 2017/02/16 11:01:13]

Nit: We generally prefer aligning arguments over hanging indentation.

  new_submission_path = '{}/{}'.format(submissions_path,
                                       submission_id)

-            submissions_path, submission_id)
+        new_submission_path = '{}/{}'.format(submissions_path,
+                                             submission_id)
 
         request = urllib2.Request(new_submission_path, None, headers)
         opener.open(request).close()
 
         self.upload_appx_file_to_windows_store(file_upload_url)
 
         # Commit submission
         # https://msdn.microsoft.com/en-us/windows/uwp/monetize/commit-an-app-submission
         commit_path = '{}/commit'.format(new_submission_path)
         request = urllib2.Request(commit_path, '', headers)
@@ skipping 91 matching lines @@
         except Exception as ex:
             logging.error('The build for %s failed:', repo)
             logging.exception(ex)
 
     file = open(nightlyConfigFile, 'wb')
     nightlyConfig.write(file)
 
 
 if __name__ == '__main__':
     main()