vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

refactor: remove redundant API Key from Google Picker

Browse source
This commit is contained in:
barredterra 2024-01-16 13:26:03 +01:00
parent f57315c2ec
commit c17f014ef4
4 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
frappe/integrations/doctype/google_settings/google_settings.json
View file

@ -39,8 +39,7 @@
"description": "The browser API key obtained from the Google Cloud Console under <a href=\"https://console.cloud.google.com/apis/credentials\">\n\"APIs &amp; Services\" &gt; \"Credentials\"\n</a>",
"fieldname": "api_key",
"fieldtype": "Data",
"label": "API Key",
"mandatory_depends_on": "google_drive_picker_enabled"
"label": "API Key"
},
{
"depends_on": "enable",
@ -76,7 +75,7 @@
],
"issingle": 1,
"links": [],
"modified": "2021-06-29 18:26:07.094851",
"modified": "2024-01-16 13:19:22.365362",
"modified_by": "Administrator",
"module": "Integrations",
"name": "Google Settings",
@ -96,5 +95,6 @@
"quick_entry": 1,
"sort_field": "modified",
"sort_order": "ASC",
"states": [],
"track_changes": 1
}

2
frappe/integrations/doctype/google_settings/google_settings.py
View file

@ -21,6 +21,7 @@ class GoogleSettings(Document):
enable: DF.Check
google_drive_picker_enabled: DF.Check
# end: auto-generated types
pass
@ -34,6 +35,5 @@ def get_file_picker_settings():
return {
"enabled": True,
"appId": google_settings.app_id,
"developerKey": google_settings.api_key,
"clientId": google_settings.client_id,
}

1
frappe/integrations/doctype/google_settings/test_google_settings.py
View file

@ -40,4 +40,3 @@ class TestGoogleSettings(FrappeTestCase):
self.assertEqual(True, settings.get("enabled", False))
self.assertEqual("test_client_id", settings.get("clientId", ""))
self.assertEqual("test_app_id", settings.get("appId", ""))
self.assertEqual("test_api_key", settings.get("developerKey", ""))

4
frappe/public/js/integrations/google_drive_picker.js
View file

@ -1,12 +1,11 @@
/* global gapi:false, google:false */
export default class GoogleDrivePicker {
constructor({ pickerCallback, enabled, appId, developerKey, clientId } = {}) {
constructor({ pickerCallback, enabled, appId, clientId } = {}) {
this.scope = "https://www.googleapis.com/auth/drive.file";
this.pickerApiLoaded = false;
this.enabled = enabled;
this.appId = appId;
this.pickerCallback = pickerCallback;
this.developerKey = developerKey;
this.clientId = clientId;
}
@ -45,7 +44,6 @@ export default class GoogleDrivePicker {
createPicker(access_token) {
this.view = new google.picker.View(google.picker.ViewId.DOCS);
this.picker = new google.picker.PickerBuilder()
.setDeveloperKey(this.developerKey)
.setAppId(this.appId)
.setOAuthToken(access_token)
.addView(this.view)