File tree 2 files changed +11
-6
lines changed
2 files changed +11
-6
lines changed Original file line number Diff line number Diff line change @@ -308,18 +308,18 @@ def ServiceAuth(self):
308
308
if set (self .SERVICE_CONFIGS_LIST ) - set (self .client_config ):
309
309
self .LoadServiceConfigSettings ()
310
310
scopes = scopes_to_string (self .settings ["oauth_scope" ])
311
- client_service_json = self .client_config .get ("client_json_file_path" )
312
- creds_dict = self .client_config .get ("client_creds_dict " )
313
- if creds_dict :
311
+ keyfile_name = self .client_config .get ("client_json_file_path" )
312
+ keyfile_dict = self .client_config .get ("client_json_dict " )
313
+ if keyfile_dict :
314
314
self .credentials = (
315
315
ServiceAccountCredentials .from_json_keyfile_dict (
316
- keyfile_dict = creds_dict , scopes = scopes
316
+ keyfile_dict = keyfile_dict , scopes = scopes
317
317
)
318
318
)
319
- elif client_service_json :
319
+ elif keyfile_name :
320
320
self .credentials = (
321
321
ServiceAccountCredentials .from_json_keyfile_name (
322
- filename = client_service_json , scopes = scopes
322
+ filename = keyfile_name , scopes = scopes
323
323
)
324
324
)
325
325
else :
Original file line number Diff line number Diff line change 77
77
"client_service_email" : {"type" : str , "required" : False },
78
78
"client_pkcs12_file_path" : {"type" : str , "required" : False },
79
79
"client_json_file_path" : {"type" : str , "required" : False },
80
+ "client_json_dict" : {
81
+ "type" : dict ,
82
+ "required" : False ,
83
+ "struct" : {},
84
+ },
80
85
},
81
86
},
82
87
"oauth_scope" : {
You can’t perform that action at this time.
0 commit comments