Skip to content

Commit c67c8e0

Browse files
committed
auth: rename client_creds_dict -> client_json_dict
1 parent 9948238 commit c67c8e0

File tree

2 files changed

+11
-6
lines changed

2 files changed

+11
-6
lines changed

pydrive2/auth.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -308,18 +308,18 @@ def ServiceAuth(self):
308308
if set(self.SERVICE_CONFIGS_LIST) - set(self.client_config):
309309
self.LoadServiceConfigSettings()
310310
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:
314314
self.credentials = (
315315
ServiceAccountCredentials.from_json_keyfile_dict(
316-
keyfile_dict=creds_dict, scopes=scopes
316+
keyfile_dict=keyfile_dict, scopes=scopes
317317
)
318318
)
319-
elif client_service_json:
319+
elif keyfile_name:
320320
self.credentials = (
321321
ServiceAccountCredentials.from_json_keyfile_name(
322-
filename=client_service_json, scopes=scopes
322+
filename=keyfile_name, scopes=scopes
323323
)
324324
)
325325
else:

pydrive2/settings.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,11 @@
7777
"client_service_email": {"type": str, "required": False},
7878
"client_pkcs12_file_path": {"type": str, "required": False},
7979
"client_json_file_path": {"type": str, "required": False},
80+
"client_json_dict": {
81+
"type": dict,
82+
"required": False,
83+
"struct": {},
84+
},
8085
},
8186
},
8287
"oauth_scope": {

0 commit comments

Comments
 (0)