' + _("Please close this window") + "
" - - if not callback.state or not callback.code: - frappe.respond_as_web_page( - _("Dropbox Setup"), - _("Illegal Access Token. Please try again") + close, - indicator_color="red", - http_status_code=frappe.AuthenticationError.http_status_code, - ) - return - - dropbox_oauth_flow = dropbox.DropboxOAuth2Flow( - consumer_key=app_details["app_key"], - redirect_uri=app_details["redirect_uri"], - session={"dropbox-auth-csrf-token": callback.state}, - csrf_token_session_key="dropbox-auth-csrf-token", - consumer_secret=app_details["app_secret"], - ) - - token = dropbox_oauth_flow.finish({"state": callback.state, "code": callback.code}) - set_dropbox_token(token.access_token, token.refresh_token) - - frappe.local.response["type"] = "redirect" - frappe.local.response["location"] = "/app/dropbox-settings" - - -def set_dropbox_token(access_token, refresh_token=None): - # NOTE: used doc object instead of db.set_value so that password field is set properly - dropbox_settings = frappe.get_single("Dropbox Settings") - dropbox_settings.dropbox_access_token = access_token - if refresh_token: - dropbox_settings.dropbox_refresh_token = refresh_token - - dropbox_settings.save() - - frappe.db.commit() diff --git a/frappe/integrations/doctype/dropbox_settings/test_dropbox_settings.py b/frappe/integrations/doctype/dropbox_settings/test_dropbox_settings.py deleted file mode 100644 index dedaa2d861..0000000000 --- a/frappe/integrations/doctype/dropbox_settings/test_dropbox_settings.py +++ /dev/null @@ -1,8 +0,0 @@ -# Copyright (c) 2019, Frappe Technologies and Contributors -# License: MIT. See LICENSE -# import frappe -from frappe.tests import IntegrationTestCase - - -class TestDropboxSettings(IntegrationTestCase): - pass diff --git a/frappe/integrations/doctype/google_drive/__init__.py b/frappe/integrations/doctype/google_drive/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/frappe/integrations/doctype/google_drive/google_drive.js b/frappe/integrations/doctype/google_drive/google_drive.js deleted file mode 100644 index ec5833cf59..0000000000 --- a/frappe/integrations/doctype/google_drive/google_drive.js +++ /dev/null @@ -1,71 +0,0 @@ -// Copyright (c) 2019, Frappe Technologies and contributors -// For license information, please see license.txt - -frappe.ui.form.on("Google Drive", { - refresh: function (frm) { - if (!frm.doc.enable) { - frm.dashboard.set_headline( - __("To use Google Drive, enable {0}.", [ - `${__("Google Settings")}`, - ]) - ); - } - - frappe.realtime.on("upload_to_google_drive", (data) => { - if (data.progress) { - const progress_title = __("Uploading to Google Drive"); - frm.dashboard.show_progress( - progress_title, - (data.progress / data.total) * 100, - data.message - ); - if (data.progress === data.total) { - frm.dashboard.hide_progress(progress_title); - } - } - }); - - if (frm.doc.enable && frm.doc.refresh_token) { - let sync_button = frm.add_custom_button(__("Take Backup"), function () { - frappe.show_alert({ - indicator: "green", - message: __("Backing up to Google Drive."), - }); - frappe - .call({ - method: "frappe.integrations.doctype.google_drive.google_drive.take_backup", - btn: sync_button, - }) - .then((r) => { - frappe.msgprint(r.message); - }); - }); - } - - if (frm.doc.enable && frm.doc.backup_folder_name && !frm.doc.refresh_token) { - frm.dashboard.set_headline( - __( - "Click on Authorize Google Drive Access to authorize Google Drive Access." - ) - ); - } - - if (frm.doc.enable && frm.doc.refresh_token && frm.doc.authorization_code) { - frm.page.set_indicator("Authorized", "green"); - } - }, - authorize_google_drive_access: function (frm) { - frappe.call({ - method: "frappe.integrations.doctype.google_drive.google_drive.authorize_access", - args: { - reauthorize: frm.doc.authorization_code ? 1 : 0, - }, - callback: function (r) { - if (!r.exc) { - frm.save(); - window.open(r.message.url); - } - }, - }); - }, -}); diff --git a/frappe/integrations/doctype/google_drive/google_drive.json b/frappe/integrations/doctype/google_drive/google_drive.json deleted file mode 100644 index ece2d429a0..0000000000 --- a/frappe/integrations/doctype/google_drive/google_drive.json +++ /dev/null @@ -1,126 +0,0 @@ -{ - "actions": [], - "creation": "2019-08-13 17:24:05.470876", - "doctype": "DocType", - "engine": "InnoDB", - "field_order": [ - "enable", - "google_drive_section", - "backup_folder_name", - "frequency", - "email", - "send_email_for_successful_backup", - "file_backup", - "authorize_google_drive_access", - "column_break_5", - "backup_folder_id", - "last_backup_on", - "refresh_token", - "authorization_code" - ], - "fields": [ - { - "default": "0", - "fieldname": "enable", - "fieldtype": "Check", - "label": "Enable" - }, - { - "fieldname": "backup_folder_name", - "fieldtype": "Data", - "in_list_view": 1, - "label": "Backup Folder Name", - "reqd": 1 - }, - { - "depends_on": "eval:!doc.__islocal", - "fieldname": "authorize_google_drive_access", - "fieldtype": "Button", - "label": "Authorize Google Drive Access" - }, - { - "fieldname": "column_break_5", - "fieldtype": "Column Break" - }, - { - "fieldname": "backup_folder_id", - "fieldtype": "Data", - "label": "Backup Folder ID", - "read_only": 1 - }, - { - "fieldname": "frequency", - "fieldtype": "Select", - "label": "Frequency", - "options": "\nDaily\nWeekly", - "reqd": 1 - }, - { - "fieldname": "refresh_token", - "fieldtype": "Data", - "hidden": 1, - "label": "Refresh Token" - }, - { - "fieldname": "authorization_code", - "fieldtype": "Data", - "hidden": 1, - "label": "Authorization Code" - }, - { - "fieldname": "last_backup_on", - "fieldtype": "Datetime", - "label": "Last Backup On", - "read_only": 1 - }, - { - "default": "0", - "description": "Note: By default emails for failed backups are sent.", - "fieldname": "send_email_for_successful_backup", - "fieldtype": "Check", - "label": "Send Email for Successful backup" - }, - { - "default": "0", - "fieldname": "file_backup", - "fieldtype": "Check", - "label": "File Backup" - }, - { - "depends_on": "enable", - "fieldname": "google_drive_section", - "fieldtype": "Section Break", - "label": "Google Drive" - }, - { - "fieldname": "email", - "fieldtype": "Data", - "label": "Send Notification To", - "options": "Email", - "reqd": 1 - } - ], - "issingle": 1, - "links": [], - "modified": "2024-03-23 16:03:26.999110", - "modified_by": "Administrator", - "module": "Integrations", - "name": "Google Drive", - "owner": "Administrator", - "permissions": [ - { - "create": 1, - "delete": 1, - "email": 1, - "print": 1, - "read": 1, - "role": "System Manager", - "share": 1, - "write": 1 - } - ], - "sort_field": "creation", - "sort_order": "DESC", - "states": [], - "track_changes": 1 -} \ No newline at end of file diff --git a/frappe/integrations/doctype/google_drive/google_drive.py b/frappe/integrations/doctype/google_drive/google_drive.py deleted file mode 100644 index cd1c8c2577..0000000000 --- a/frappe/integrations/doctype/google_drive/google_drive.py +++ /dev/null @@ -1,229 +0,0 @@ -# Copyright (c) 2019, Frappe Technologies and contributors -# License: MIT. See LICENSE - -import os -from urllib.parse import quote - -from apiclient.http import MediaFileUpload -from googleapiclient.errors import HttpError - -import frappe -from frappe import _ -from frappe.integrations.google_oauth import GoogleOAuth -from frappe.integrations.offsite_backup_utils import ( - get_latest_backup_file, - send_email, - validate_file_size, -) -from frappe.model.document import Document -from frappe.utils import get_backups_path, get_bench_path -from frappe.utils.background_jobs import enqueue -from frappe.utils.backups import new_backup - - -class GoogleDrive(Document): - # begin: auto-generated types - # This code is auto-generated. Do not modify anything in this block. - - from typing import TYPE_CHECKING - - if TYPE_CHECKING: - from frappe.types import DF - - authorization_code: DF.Data | None - backup_folder_id: DF.Data | None - backup_folder_name: DF.Data - email: DF.Data - enable: DF.Check - file_backup: DF.Check - frequency: DF.Literal["", "Daily", "Weekly"] - last_backup_on: DF.Datetime | None - refresh_token: DF.Data | None - send_email_for_successful_backup: DF.Check - # end: auto-generated types - - def validate(self): - doc_before_save = self.get_doc_before_save() - if doc_before_save and doc_before_save.backup_folder_name != self.backup_folder_name: - self.backup_folder_id = "" - - def get_access_token(self): - if not self.refresh_token: - button_label = frappe.bold(_("Allow Google Drive Access")) - raise frappe.ValidationError(_("Click on {0} to generate Refresh Token.").format(button_label)) - - oauth_obj = GoogleOAuth("drive") - r = oauth_obj.refresh_access_token( - self.get_password(fieldname="refresh_token", raise_exception=False) - ) - - return r.get("access_token") - - -@frappe.whitelist(methods=["POST"]) -def authorize_access(reauthorize=False, code=None): - """ - If no Authorization code get it from Google and then request for Refresh Token. - Google Contact Name is set to flags to set_value after Authorization Code is obtained. - """ - - oauth_code = frappe.db.get_single_value("Google Drive", "authorization_code") if not code else code - oauth_obj = GoogleOAuth("drive") - - if not oauth_code or reauthorize: - if reauthorize: - frappe.db.set_single_value("Google Drive", "backup_folder_id", "") - return oauth_obj.get_authentication_url( - { - "redirect": f"/app/Form/{quote('Google Drive')}", - }, - ) - - r = oauth_obj.authorize(oauth_code) - frappe.db.set_single_value( - "Google Drive", - {"authorization_code": oauth_code, "refresh_token": r.get("refresh_token")}, - ) - - -def get_google_drive_object(): - """Return an object of Google Drive.""" - account = frappe.get_doc("Google Drive") - oauth_obj = GoogleOAuth("drive") - - google_drive = oauth_obj.get_google_service_object( - account.get_access_token(), - account.get_password(fieldname="indexing_refresh_token", raise_exception=False), - ) - - return google_drive, account - - -def check_for_folder_in_google_drive(): - """Checks if folder exists in Google Drive else create it.""" - - def _create_folder_in_google_drive(google_drive, account): - file_metadata = { - "name": account.backup_folder_name, - "mimeType": "application/vnd.google-apps.folder", - } - - try: - folder = google_drive.files().create(body=file_metadata, fields="id").execute() - frappe.db.set_single_value("Google Drive", "backup_folder_id", folder.get("id")) - frappe.db.commit() - except HttpError as e: - frappe.throw( - _("Google Drive - Could not create folder in Google Drive - Error Code {0}").format(e) - ) - - google_drive, account = get_google_drive_object() - - if account.backup_folder_id: - return - - backup_folder_exists = False - - try: - google_drive_folders = ( - google_drive.files().list(q="mimeType='application/vnd.google-apps.folder'").execute() - ) - except HttpError as e: - frappe.throw(_("Google Drive - Could not find folder in Google Drive - Error Code {0}").format(e)) - - for f in google_drive_folders.get("files"): - if f.get("name") == account.backup_folder_name: - frappe.db.set_single_value("Google Drive", "backup_folder_id", f.get("id")) - frappe.db.commit() - backup_folder_exists = True - break - - if not backup_folder_exists: - _create_folder_in_google_drive(google_drive, account) - - -@frappe.whitelist() -def take_backup(): - """Enqueue longjob for taking backup to Google Drive""" - enqueue( - "frappe.integrations.doctype.google_drive.google_drive.upload_system_backup_to_google_drive", - queue="long", - timeout=1500, - ) - frappe.msgprint(_("Queued for backup. It may take a few minutes to an hour.")) - - -def upload_system_backup_to_google_drive(): - """ - Upload system backup to Google Drive - """ - # Get Google Drive Object - google_drive, account = get_google_drive_object() - - # Check if folder exists in Google Drive - check_for_folder_in_google_drive() - account.load_from_db() - - validate_file_size() - - if frappe.flags.create_new_backup: - set_progress(1, _("Backing up Data.")) - backup = new_backup() - file_urls = [] - file_urls.append(backup.backup_path_db) - file_urls.append(backup.backup_path_conf) - - if account.file_backup: - file_urls.append(backup.backup_path_files) - file_urls.append(backup.backup_path_private_files) - else: - file_urls = get_latest_backup_file(with_files=account.file_backup) - - for fileurl in file_urls: - if not fileurl: - continue - - file_metadata = {"name": os.path.basename(fileurl), "parents": [account.backup_folder_id]} - - try: - media = MediaFileUpload( - get_absolute_path(filename=fileurl), mimetype="application/gzip", resumable=True - ) - except OSError as e: - frappe.throw(_("Google Drive - Could not locate - {0}").format(e)) - - try: - set_progress(2, _("Uploading backup to Google Drive.")) - google_drive.files().create(body=file_metadata, media_body=media, fields="id").execute() - except HttpError as e: - send_email(False, "Google Drive", "Google Drive", "email", error_status=e) - - set_progress(3, _("Uploading successful.")) - frappe.db.set_single_value("Google Drive", "last_backup_on", frappe.utils.now_datetime()) - send_email(True, "Google Drive", "Google Drive", "email") - return _("Google Drive Backup Successful.") - - -def daily_backup(): - drive_settings = frappe.db.get_singles_dict("Google Drive", cast=True) - if drive_settings.enable and drive_settings.frequency == "Daily": - upload_system_backup_to_google_drive() - - -def weekly_backup(): - drive_settings = frappe.db.get_singles_dict("Google Drive", cast=True) - if drive_settings.enable and drive_settings.frequency == "Weekly": - upload_system_backup_to_google_drive() - - -def get_absolute_path(filename): - file_path = os.path.join(get_backups_path()[2:], os.path.basename(filename)) - return f"{get_bench_path()}/sites/{file_path}" - - -def set_progress(progress, message): - frappe.publish_realtime( - "upload_to_google_drive", - dict(progress=progress, total=3, message=message), - user=frappe.session.user, - ) diff --git a/frappe/integrations/doctype/google_drive/test_google_drive.py b/frappe/integrations/doctype/google_drive/test_google_drive.py deleted file mode 100644 index 90c400ba80..0000000000 --- a/frappe/integrations/doctype/google_drive/test_google_drive.py +++ /dev/null @@ -1,8 +0,0 @@ -# Copyright (c) 2019, Frappe Technologies and Contributors -# License: MIT. See LICENSE -# import frappe -from frappe.tests import IntegrationTestCase - - -class TestGoogleDrive(IntegrationTestCase): - pass diff --git a/frappe/integrations/doctype/s3_backup_settings/__init__.py b/frappe/integrations/doctype/s3_backup_settings/__init__.py deleted file mode 100755 index e69de29bb2..0000000000 diff --git a/frappe/integrations/doctype/s3_backup_settings/s3_backup_settings.js b/frappe/integrations/doctype/s3_backup_settings/s3_backup_settings.js deleted file mode 100755 index 6db4087cf3..0000000000 --- a/frappe/integrations/doctype/s3_backup_settings/s3_backup_settings.js +++ /dev/null @@ -1,26 +0,0 @@ -// Copyright (c) 2017, Frappe Technologies and contributors -// For license information, please see license.txt - -frappe.ui.form.on("S3 Backup Settings", { - refresh: function (frm) { - frm.clear_custom_buttons(); - frm.events.take_backup(frm); - }, - - take_backup: function (frm) { - if (frm.doc.access_key_id && frm.doc.secret_access_key) { - frm.add_custom_button(__("Take Backup Now"), function () { - frm.dashboard.set_headline_alert("S3 Backup Started!"); - frappe.call({ - method: "frappe.integrations.doctype.s3_backup_settings.s3_backup_settings.take_backups_s3", - callback: function (r) { - if (!r.exc) { - frappe.msgprint(__("S3 Backup complete!")); - frm.dashboard.clear_headline(); - } - }, - }); - }).addClass("btn-primary"); - } - }, -}); diff --git a/frappe/integrations/doctype/s3_backup_settings/s3_backup_settings.json b/frappe/integrations/doctype/s3_backup_settings/s3_backup_settings.json deleted file mode 100755 index 320128df66..0000000000 --- a/frappe/integrations/doctype/s3_backup_settings/s3_backup_settings.json +++ /dev/null @@ -1,163 +0,0 @@ -{ - "actions": [], - "creation": "2017-09-04 20:57:20.129205", - "doctype": "DocType", - "editable_grid": 1, - "engine": "InnoDB", - "field_order": [ - "enabled", - "api_access_section", - "access_key_id", - "column_break_4", - "secret_access_key", - "notification_section", - "notify_email", - "column_break_8", - "send_email_for_successful_backup", - "s3_bucket_details_section", - "bucket", - "endpoint_url", - "column_break_13", - "backup_path", - "backup_details_section", - "frequency", - "backup_files" - ], - "fields": [ - { - "default": "0", - "fieldname": "enabled", - "fieldtype": "Check", - "label": "Enable Automatic Backup" - }, - { - "fieldname": "notify_email", - "fieldtype": "Data", - "in_list_view": 1, - "label": "Send Notifications To", - "mandatory_depends_on": "enabled", - "reqd": 1 - }, - { - "default": "1", - "description": "By default, emails are only sent for failed backups.", - "fieldname": "send_email_for_successful_backup", - "fieldtype": "Check", - "label": "Send Email for Successful Backup" - }, - { - "fieldname": "frequency", - "fieldtype": "Select", - "in_list_view": 1, - "label": "Backup Frequency", - "mandatory_depends_on": "enabled", - "options": "Daily\nWeekly\nMonthly\nNone", - "reqd": 1 - }, - { - "fieldname": "access_key_id", - "fieldtype": "Data", - "in_list_view": 1, - "label": "Access Key ID", - "mandatory_depends_on": "enabled", - "reqd": 1 - }, - { - "fieldname": "secret_access_key", - "fieldtype": "Password", - "in_list_view": 1, - "label": "Access Key Secret", - "mandatory_depends_on": "enabled", - "reqd": 1 - }, - { - "default": "https://s3.amazonaws.com", - "description": "Only change this if you want to use other S3 compatible object storage backends.", - "fieldname": "endpoint_url", - "fieldtype": "Data", - "label": "Endpoint URL" - }, - { - "fieldname": "bucket", - "fieldtype": "Data", - "label": "Bucket Name", - "mandatory_depends_on": "enabled", - "reqd": 1 - }, - { - "depends_on": "enabled", - "fieldname": "api_access_section", - "fieldtype": "Section Break", - "label": "API Access" - }, - { - "fieldname": "column_break_4", - "fieldtype": "Column Break" - }, - { - "depends_on": "enabled", - "fieldname": "notification_section", - "fieldtype": "Section Break", - "label": "Notification" - }, - { - "fieldname": "column_break_8", - "fieldtype": "Column Break" - }, - { - "depends_on": "enabled", - "fieldname": "s3_bucket_details_section", - "fieldtype": "Section Break", - "label": "S3 Bucket Details" - }, - { - "fieldname": "column_break_13", - "fieldtype": "Column Break" - }, - { - "depends_on": "enabled", - "fieldname": "backup_details_section", - "fieldtype": "Section Break", - "label": "Backup Details" - }, - { - "default": "1", - "description": "Backup public and private files along with the database.", - "fieldname": "backup_files", - "fieldtype": "Check", - "label": "Backup Files" - }, - { - "description": "If it's empty, it will backup to the root of the bucket.", - "fieldname": "backup_path", - "fieldtype": "Data", - "label": "Backup Path" - } - ], - "hide_toolbar": 1, - "issingle": 1, - "links": [], - "modified": "2025-03-15 12:17:49.167012", - "modified_by": "Administrator", - "module": "Integrations", - "name": "S3 Backup Settings", - "owner": "Administrator", - "permissions": [ - { - "create": 1, - "delete": 1, - "email": 1, - "print": 1, - "read": 1, - "role": "System Manager", - "share": 1, - "write": 1 - } - ], - "quick_entry": 1, - "row_format": "Dynamic", - "sort_field": "creation", - "sort_order": "DESC", - "states": [], - "track_changes": 1 -} diff --git a/frappe/integrations/doctype/s3_backup_settings/s3_backup_settings.py b/frappe/integrations/doctype/s3_backup_settings/s3_backup_settings.py deleted file mode 100755 index 885e423c41..0000000000 --- a/frappe/integrations/doctype/s3_backup_settings/s3_backup_settings.py +++ /dev/null @@ -1,196 +0,0 @@ -# Copyright (c) 2017, Frappe Technologies and contributors -# License: MIT. See LICENSE -import os -import os.path - -import boto3 -from botocore.exceptions import ClientError -from rq.timeouts import JobTimeoutException - -import frappe -from frappe import _ -from frappe.integrations.offsite_backup_utils import ( - generate_files_backup, - get_latest_backup_file, - send_email, - validate_file_size, -) -from frappe.model.document import Document -from frappe.utils import cint -from frappe.utils.background_jobs import enqueue - - -class S3BackupSettings(Document): - # begin: auto-generated types - # This code is auto-generated. Do not modify anything in this block. - - from typing import TYPE_CHECKING - - if TYPE_CHECKING: - from frappe.types import DF - - access_key_id: DF.Data - backup_files: DF.Check - backup_path: DF.Data | None - bucket: DF.Data - enabled: DF.Check - endpoint_url: DF.Data | None - frequency: DF.Literal["Daily", "Weekly", "Monthly", "None"] - notify_email: DF.Data - secret_access_key: DF.Password - send_email_for_successful_backup: DF.Check - # end: auto-generated types - - def validate(self): - if not self.enabled: - return - - if not self.endpoint_url: - self.endpoint_url = "https://s3.amazonaws.com" - - if self.backup_path and self.backup_path[-1] != "/": - self.backup_path += "/" - - conn = boto3.client( - "s3", - aws_access_key_id=self.access_key_id, - aws_secret_access_key=self.get_password("secret_access_key"), - endpoint_url=self.endpoint_url, - ) - - try: - # Head_bucket returns a 200 OK if the bucket exists and have access to it. - # Requires ListBucket permission - conn.head_bucket(Bucket=self.bucket) - except ClientError as e: - error_code = e.response["Error"]["Code"] - bucket_name = frappe.bold(self.bucket) - if error_code == "403": - msg = _("Do not have permission to access bucket {0}.").format(bucket_name) - elif error_code == "404": - msg = _("Bucket {0} not found.").format(bucket_name) - else: - msg = e.args[0] - - frappe.throw(msg) - - -@frappe.whitelist() -def take_backup(): - """Enqueue longjob for taking backup to s3""" - enqueue( - "frappe.integrations.doctype.s3_backup_settings.s3_backup_settings.take_backups_s3", - queue="long", - timeout=1500, - ) - frappe.msgprint(_("Queued for backup. It may take a few minutes to an hour.")) - - -def take_backups_daily(): - take_backups_if("Daily") - - -def take_backups_weekly(): - take_backups_if("Weekly") - - -def take_backups_monthly(): - take_backups_if("Monthly") - - -def take_backups_if(freq): - if cint(frappe.db.get_single_value("S3 Backup Settings", "enabled")): - if frappe.db.get_single_value("S3 Backup Settings", "frequency") == freq: - take_backups_s3() - - -@frappe.whitelist() -def take_backups_s3(retry_count=0): - try: - validate_file_size() - backup_to_s3() - send_email(True, "Amazon S3", "S3 Backup Settings", "notify_email") - except JobTimeoutException: - if retry_count < 2: - args = {"retry_count": retry_count + 1} - enqueue( - "frappe.integrations.doctype.s3_backup_settings.s3_backup_settings.take_backups_s3", - queue="long", - timeout=1500, - **args, - ) - else: - notify() - except Exception: - notify() - - -def notify(): - error_message = frappe.get_traceback() - send_email(False, "Amazon S3", "S3 Backup Settings", "notify_email", error_message) - - -def backup_to_s3(): - from frappe.utils import get_backups_path - from frappe.utils.backups import new_backup - - doc = frappe.get_single("S3 Backup Settings") - bucket = doc.bucket - path = doc.backup_path or "" - backup_files = cint(doc.backup_files) - - conn = boto3.client( - "s3", - aws_access_key_id=doc.access_key_id, - aws_secret_access_key=doc.get_password("secret_access_key"), - endpoint_url=doc.endpoint_url or "https://s3.amazonaws.com", - ) - - if frappe.flags.create_new_backup: - backup = new_backup( - ignore_files=False, - backup_path_db=None, - backup_path_files=None, - backup_path_private_files=None, - force=True, - ) - db_filename = os.path.join(get_backups_path(), os.path.basename(backup.backup_path_db)) - site_config = os.path.join(get_backups_path(), os.path.basename(backup.backup_path_conf)) - if backup_files: - files_filename = os.path.join(get_backups_path(), os.path.basename(backup.backup_path_files)) - private_files = os.path.join( - get_backups_path(), os.path.basename(backup.backup_path_private_files) - ) - else: - if backup_files: - db_filename, site_config, files_filename, private_files = get_latest_backup_file( - with_files=backup_files - ) - - if not files_filename or not private_files: - generate_files_backup() - db_filename, site_config, files_filename, private_files = get_latest_backup_file( - with_files=backup_files - ) - - else: - db_filename, site_config = get_latest_backup_file() - - folder = path + os.path.basename(db_filename)[:15] + "/" - # for adding datetime to folder name - - upload_file_to_s3(db_filename, folder, conn, bucket) - upload_file_to_s3(site_config, folder, conn, bucket) - - if backup_files: - if private_files: - upload_file_to_s3(private_files, folder, conn, bucket) - - if files_filename: - upload_file_to_s3(files_filename, folder, conn, bucket) - - -def upload_file_to_s3(filename, folder, conn, bucket): - destpath = os.path.join(folder, os.path.basename(filename)) - print("Uploading file:", filename) - conn.upload_file(filename, bucket, destpath) # Requires PutObject permission diff --git a/frappe/integrations/doctype/s3_backup_settings/test_s3_backup_settings.py b/frappe/integrations/doctype/s3_backup_settings/test_s3_backup_settings.py deleted file mode 100755 index ff40ab8a11..0000000000 --- a/frappe/integrations/doctype/s3_backup_settings/test_s3_backup_settings.py +++ /dev/null @@ -1,7 +0,0 @@ -# Copyright (c) 2017, Frappe Technologies and Contributors -# License: MIT. See LICENSE -from frappe.tests import IntegrationTestCase - - -class TestS3BackupSettings(IntegrationTestCase): - pass diff --git a/frappe/integrations/google_oauth.py b/frappe/integrations/google_oauth.py index d9ca8e596a..448de20d03 100644 --- a/frappe/integrations/google_oauth.py +++ b/frappe/integrations/google_oauth.py @@ -16,13 +16,11 @@ _SCOPES = { } _SERVICES = { "contacts": ("people", "v1"), - "drive": ("drive", "v3"), "indexing": ("indexing", "v3"), } _DOMAIN_CALLBACK_METHODS = { "mail": "frappe.email.oauth.authorize_google_access", "contacts": "frappe.integrations.doctype.google_contacts.google_contacts.authorize_access", - "drive": "frappe.integrations.doctype.google_drive.google_drive.authorize_access", "indexing": "frappe.website.doctype.website_settings.google_indexing.authorize_access", } @@ -34,7 +32,7 @@ class GoogleAuthenticationError(Exception): class GoogleOAuth: OAUTH_URL = "https://oauth2.googleapis.com/token" - def __init__(self, domain: str, validate: bool = True): + def __init__(self, domain: str, validate: bool = True, config=None): self.google_settings = frappe.get_single("Google Settings") self.domain = domain.lower() self.scopes = ( @@ -43,6 +41,10 @@ class GoogleOAuth: else _SCOPES[self.domain] ) + if config: + _DOMAIN_CALLBACK_METHODS[self.domain] = config["domain_callback_url"] + _SERVICES[self.domain] = config["service_version"] + if validate: self.validate_google_settings() diff --git a/frappe/integrations/offsite_backup_utils.py b/frappe/integrations/offsite_backup_utils.py deleted file mode 100644 index f16eabe748..0000000000 --- a/frappe/integrations/offsite_backup_utils.py +++ /dev/null @@ -1,118 +0,0 @@ -# Copyright (c) 2019, Frappe Technologies and contributors -# License: MIT. See LICENSE - -import glob -import os - -import frappe -from frappe.utils import cint, split_emails - - -def send_email(success, service_name, doctype, email_field, error_status=None): - recipients = get_recipients(doctype, email_field) - if not recipients: - frappe.log_error( - f"No Email Recipient found for {service_name}", - f"{service_name}: Failed to send backup status email", - ) - return - - if success: - if not frappe.db.get_single_value(doctype, "send_email_for_successful_backup"): - return - - subject = "Backup Upload Successful" - message = """ -Hi there, this is just to inform you that your backup was successfully uploaded to your {} bucket. So relax!
""".format( - service_name - ) - else: - subject = "[Warning] Backup Upload Failed" - message = f""" -Oops, your automated backup to {service_name} failed.
-Error message: {error_status}
-Please contact your system manager for more information.
""" - - frappe.sendmail(recipients=recipients, subject=subject, message=message) - - -def get_recipients(doctype, email_field): - return split_emails(frappe.db.get_value(doctype, None, email_field)) - - -def get_latest_backup_file(with_files=False): - from frappe.utils.backups import BackupGenerator - - odb = BackupGenerator( - frappe.conf.db_name, - frappe.conf.db_user, - frappe.conf.db_password, - db_socket=frappe.conf.db_socket, - db_host=frappe.conf.db_host, - db_port=frappe.conf.db_port, - db_type=frappe.conf.db_type, - ) - database, public, private, config = odb.get_recent_backup(older_than=24 * 30) - - if with_files: - return database, config, public, private - - return database, config - - -def get_file_size(file_path, unit="MB"): - file_size = os.path.getsize(file_path) - - memory_size_unit_mapper = {"KB": 1, "MB": 2, "GB": 3, "TB": 4} - i = 0 - while i < memory_size_unit_mapper[unit]: - file_size = file_size / 1000.0 - i += 1 - - return file_size - - -def get_chunk_site(file_size): - """this function will return chunk size in megabytes based on file size""" - - file_size_in_gb = cint(file_size / 1024 / 1024) - - MB = 1024 * 1024 - if file_size_in_gb > 5000: - return 200 * MB - elif file_size_in_gb >= 3000: - return 150 * MB - elif file_size_in_gb >= 1000: - return 100 * MB - elif file_size_in_gb >= 500: - return 50 * MB - else: - return 15 * MB - - -def validate_file_size(): - frappe.flags.create_new_backup = True - latest_file, site_config = get_latest_backup_file() - file_size = get_file_size(latest_file, unit="GB") if latest_file else 0 - - if file_size > 1: - frappe.flags.create_new_backup = False - - -def generate_files_backup(): - from frappe.utils.backups import BackupGenerator - - backup = BackupGenerator( - frappe.conf.db_name, - frappe.conf.db_user, - frappe.conf.db_password, - db_socket=frappe.conf.db_socket, - db_host=frappe.conf.db_host, - db_port=frappe.conf.db_port, - db_type=frappe.conf.db_type, - ) - - backup.set_backup_file_name() - backup.zip_files() diff --git a/frappe/integrations/workspace/integrations/integrations.json b/frappe/integrations/workspace/integrations/integrations.json index 3fe9965bcc..2d72732361 100644 --- a/frappe/integrations/workspace/integrations/integrations.json +++ b/frappe/integrations/workspace/integrations/integrations.json @@ -12,47 +12,6 @@ "is_hidden": 0, "label": "Integrations", "links": [ - { - "hidden": 0, - "is_query_report": 0, - "label": "Backup", - "link_count": 0, - "onboard": 0, - "type": "Card Break" - }, - { - "dependencies": "", - "hidden": 0, - "is_query_report": 0, - "label": "Dropbox Settings", - "link_count": 0, - "link_to": "Dropbox Settings", - "link_type": "DocType", - "onboard": 0, - "type": "Link" - }, - { - "dependencies": "", - "hidden": 0, - "is_query_report": 0, - "label": "S3 Backup Settings", - "link_count": 0, - "link_to": "S3 Backup Settings", - "link_type": "DocType", - "onboard": 0, - "type": "Link" - }, - { - "dependencies": "", - "hidden": 0, - "is_query_report": 0, - "label": "Google Drive", - "link_count": 0, - "link_to": "Google Drive", - "link_type": "DocType", - "onboard": 0, - "type": "Link" - }, { "hidden": 0, "is_query_report": 0, diff --git a/frappe/patches.txt b/frappe/patches.txt index 3ae67c9092..0519025e88 100644 --- a/frappe/patches.txt +++ b/frappe/patches.txt @@ -246,4 +246,4 @@ frappe.patches.v16_0.move_role_desk_settings_to_user frappe.printing.doctype.print_format.patches.sets_wkhtmltopdf_as_default_for_pdf_generator_field frappe.patches.v14_0.fix_user_settings_collation execute:frappe.call("frappe.core.doctype.system_settings.system_settings.sync_system_settings") -frappe.patches.v16_0.social_eps_deprecation_warning +frappe.patches.v16_0.add_module_deprecation_warning diff --git a/frappe/patches/v16_0/add_module_deprecation_warning.py b/frappe/patches/v16_0/add_module_deprecation_warning.py new file mode 100644 index 0000000000..16e1e9a9e1 --- /dev/null +++ b/frappe/patches/v16_0/add_module_deprecation_warning.py @@ -0,0 +1,15 @@ +import click + + +def execute(): + module_app_map = { + "Social Module/ Energy Points System": ("eps", "system"), + "Offsite Backup Integrations (Google Drive, S3, Dropbox)": ("offsite_backups", "intergration"), + } + for module, (app, system_type) in module_app_map.items(): + click.secho( + f"{module} is moving to a new app and will removed from the framework in version-16.\n" + f"Please install the app to continue using the {system_type}: https://github.com/frappe/{app}", + fg="yellow", + ) + click.secho("\n") diff --git a/frappe/patches/v16_0/social_eps_deprecation_warning.py b/frappe/patches/v16_0/social_eps_deprecation_warning.py deleted file mode 100644 index e412e5969f..0000000000 --- a/frappe/patches/v16_0/social_eps_deprecation_warning.py +++ /dev/null @@ -1,9 +0,0 @@ -import click - - -def execute(): - click.secho( - "Social Module/Energy Points System is moving to a new app and will removed from the framework in version-16.\n" - "Please install the app to continue using the integration: https://github.com/frappe/eps", - fg="yellow", - ) diff --git a/frappe/translate.py b/frappe/translate.py index acd02d46d6..ead55ab67e 100644 --- a/frappe/translate.py +++ b/frappe/translate.py @@ -810,7 +810,6 @@ def migrate_translations(source_app, target_app): """Migrate target-app-specific translations from source-app to target-app""" strings_in_source_app = [m[1] for m in frappe.translate.get_messages_for_app(source_app)] strings_in_target_app = [m[1] for m in frappe.translate.get_messages_for_app(target_app)] - strings_in_target_app_but_not_in_source_app = list( set(strings_in_target_app) - set(strings_in_source_app) ) diff --git a/pyproject.toml b/pyproject.toml index 5a3d38c6d0..9912ed905d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -83,8 +83,6 @@ dependencies = [ "markdownify~=0.14.1", # integration dependencies - "boto3~=1.34.143", - "dropbox~=11.36.2", "google-api-python-client~=2.2.0", "google-auth-oauthlib~=0.4.4", "google-auth~=1.29.0", @@ -250,13 +248,9 @@ disable_error_code = [ # External libraries without types [[tool.mypy.overrides]] module = [ - "apiclient.http", "bleach_allowlist", - "boto3", - "botocore.exceptions", "cssutils", "cups", - "dropbox", "email_reply_parser", "filetype", "google",