| skipped 692 lines |
| 693 | 693 | | if os.path.isfile(os.path.join(options.config_folder, 'extra-args.txt')): |
| 694 | 694 | | config = configparser.ConfigParser() |
| 695 | 695 | | config.optionxform = str |
| 696 | | - | config.read(getGamPath()+'extra-args.txt') |
| | 696 | + | ex_args_file = os.path.join(options.config_folder, 'extra-args.txt') |
| | 697 | + | config.read(ex_args_file) |
| 697 | 698 | | extra_args.update(dict(config.items('extra-args'))) |
| 698 | 699 | | httpc = _createHttpObj() |
| 699 | 700 | | request = google_auth_httplib2.Request(httpc) |
| skipped 225 lines |
| 925 | 926 | | ''' |
| 926 | 927 | | MESSAGE_CONSOLE_AUTHORIZATION_CODE = 'Enter verification code or browser URL: ' |
| 927 | 928 | | MESSAGE_LOCAL_SERVER_SUCCESS = ('The authentication flow has completed. You may' |
| 928 | | - | ' close this browser window and return to GAM.') |
| | 929 | + | ' close this browser window and return to GYB.') |
| 929 | 930 | | |
| 930 | 931 | | MESSAGE_AUTHENTICATION_COMPLETE = ('\nThe authentication flow has completed.\n') |
| 931 | 932 | | |
| skipped 268 lines |
| 1200 | 1201 | | callGAPI(crm.projects(), 'delete', projectId=projectId, soft_errors=True) |
| 1201 | 1202 | | print(' Project: {0} Deleted ({1}/{2})'.format(projectId, i, count)) |
| 1202 | 1203 | | |
| 1203 | | - | def setGAMProjectConsentScreen(httpObj, projectId, login_hint): |
| | 1204 | + | def setProjectConsentScreen(httpObj, projectId, login_hint): |
| 1204 | 1205 | | print('Setting project consent screen...') |
| 1205 | 1206 | | iap = buildGAPIObject('iap', httpObj) |
| 1206 | 1207 | | body = {'applicationTitle': 'GYB', 'supportEmail': login_hint} |
| skipped 119 lines |
| 1326 | 1327 | | name=service_account['name'], body=key_body, retry_reasons=[404]) |
| 1327 | 1328 | | oauth2service_data = base64.b64decode(key['privateKeyData']) |
| 1328 | 1329 | | writeFile(service_account_file, oauth2service_data, continueOnError=False) |
| 1329 | | - | setGAMProjectConsentScreen(httpc, project_id, login_hint) |
| | 1330 | + | setProjectConsentScreen(httpc, project_id, login_hint) |
| 1330 | 1331 | | _createClientSecretsOauth2service(project_id) |
| 1331 | 1332 | | print('That\'s it! Your GYB Project is created and ready to use.') |
| 1332 | 1333 | | |
| skipped 1339 lines |
