diff --git a/.github/workflows/auth-release.yml b/.github/workflows/auth-release.yml index 4bb31e85e1..65361fb064 100644 --- a/.github/workflows/auth-release.yml +++ b/.github/workflows/auth-release.yml @@ -90,13 +90,14 @@ jobs: - name: Install dependencies for desktop build run: | sudo apt-get update -y - sudo apt-get install -y libsecret-1-dev libsodium-dev libwebkit2gtk-4.0-dev libfuse2 ninja-build libgtk-3-dev dpkg-dev pkg-config libsqlite3-dev locate appindicator3-0.1 libappindicator3-dev libffi-dev libtiff5 + sudo apt-get install -y libsecret-1-dev libsodium-dev libfuse2 ninja-build libgtk-3-dev dpkg-dev pkg-config libsqlite3-dev locate appindicator3-0.1 libappindicator3-dev libffi-dev libtiff5 sudo updatedb --localpaths='/usr/lib/x86_64-linux-gnu' - name: Build desktop app run: | flutter config --enable-linux-desktop - dart pub global activate flutter_distributor + # dart pub global activate flutter_distributor + dart pub global activate --source git https://github.com/prateekmedia/flutter_distributor --git-ref develop --git-path packages/flutter_distributor flutter_distributor package --platform=linux --targets=deb --skip-clean mv dist/**/*-*-linux.deb artifacts/ente-${{ github.ref_name }}-x86_64.deb env: @@ -104,7 +105,7 @@ jobs: - name: Generate checksums and push to artifacts run: | - sha256sum artifacts/ente-* > artifacts/sha256sum-apk-deb + sha256sum artifacts/ente-* > artifacts/sha256sum-apk-deb - name: Create a draft GitHub release uses: ncipollo/release-action@v1 @@ -125,65 +126,65 @@ jobs: track: internal build-fedora-etc: - runs-on: ubuntu-latest + runs-on: ubuntu-latest - defaults: - run: - working-directory: auth + defaults: + run: + working-directory: auth - steps: - - name: Checkout code and submodules - uses: actions/checkout@v4 - with: - submodules: recursive + steps: + - name: Checkout code and submodules + uses: actions/checkout@v4 + with: + submodules: recursive - - name: Install Flutter ${{ env.FLUTTER_VERSION }} - uses: subosito/flutter-action@v2 - with: - channel: "stable" - flutter-version: ${{ env.FLUTTER_VERSION }} - cache: true + - name: Install Flutter ${{ env.FLUTTER_VERSION }} + uses: subosito/flutter-action@v2 + with: + channel: "stable" + flutter-version: ${{ env.FLUTTER_VERSION }} + cache: true - - name: Create artifacts directory - run: mkdir artifacts + - name: Create artifacts directory + run: mkdir artifacts - - name: Install dependencies for desktop build - run: | - sudo apt-get update -y - sudo apt-get install -y libsecret-1-dev libsodium-dev libwebkit2gtk-4.0-dev libfuse2 ninja-build libgtk-3-dev dpkg-dev pkg-config rpm patchelf libsqlite3-dev locate libayatana-appindicator3-dev libffi-dev libtiff5 xz-utils libarchive-tools - sudo updatedb --localpaths='/usr/lib/x86_64-linux-gnu' + - name: Install dependencies for desktop build + run: | + sudo apt-get update -y + sudo apt-get install -y libsecret-1-dev libsodium-dev libfuse2 ninja-build libgtk-3-dev dpkg-dev pkg-config rpm patchelf libsqlite3-dev locate libayatana-appindicator3-dev libffi-dev libtiff5 xz-utils libarchive-tools + sudo updatedb --localpaths='/usr/lib/x86_64-linux-gnu' - - name: Install appimagetool - run: | - wget -O appimagetool "https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-x86_64.AppImage" - chmod +x appimagetool - mv appimagetool /usr/local/bin/ + - name: Install appimagetool + run: | + wget -O appimagetool "https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-x86_64.AppImage" + chmod +x appimagetool + mv appimagetool /usr/local/bin/ - - name: Build desktop app - run: | - flutter config --enable-linux-desktop - # dart pub global activate flutter_distributor - dart pub global activate --source git https://github.com/prateekmedia/flutter_distributor --git-ref pacman --git-path packages/flutter_distributor - # Run below command if it is a beta or nightly - if [[ ${{ github.ref }} =~ beta|nightly ]]; then - flutter_distributor package --platform=linux --targets=pacman --skip-clean - mv dist/**/*-*-linux.pacman artifacts/ente-${{ github.ref_name }}-x86_64.pacman - fi - flutter_distributor package --platform=linux --targets=rpm --skip-clean - mv dist/**/*-*-linux.rpm artifacts/ente-${{ github.ref_name }}-x86_64.rpm - flutter_distributor package --platform=linux --targets=appimage --skip-clean - mv dist/**/*-*-linux.AppImage artifacts/ente-${{ github.ref_name }}-x86_64.AppImage + - name: Build desktop app + run: | + flutter config --enable-linux-desktop + # dart pub global activate flutter_distributor + dart pub global activate --source git https://github.com/prateekmedia/flutter_distributor --git-ref develop --git-path packages/flutter_distributor + # Run below command if it is a beta or nightly + if [[ ${{ github.ref }} =~ beta|nightly ]]; then + flutter_distributor package --platform=linux --targets=pacman --skip-clean + mv dist/**/*-*-linux.pacman artifacts/ente-${{ github.ref_name }}-x86_64.pacman + fi + flutter_distributor package --platform=linux --targets=rpm --skip-clean + mv dist/**/*-*-linux.rpm artifacts/ente-${{ github.ref_name }}-x86_64.rpm + flutter_distributor package --platform=linux --targets=appimage --skip-clean + mv dist/**/*-*-linux.AppImage artifacts/ente-${{ github.ref_name }}-x86_64.AppImage - - name: Generate checksums - run: sha256sum artifacts/ente-* >> artifacts/sha256sum-rpm-appimage + - name: Generate checksums + run: sha256sum artifacts/ente-* >> artifacts/sha256sum-rpm-appimage - - name: Create a draft GitHub release - uses: ncipollo/release-action@v1 - with: - artifacts: "auth/artifacts/*" - draft: true - allowUpdates: true - updateOnlyUnreleased: true + - name: Create a draft GitHub release + uses: ncipollo/release-action@v1 + with: + artifacts: "auth/artifacts/*" + draft: true + allowUpdates: true + updateOnlyUnreleased: true build-windows: runs-on: windows-latest @@ -211,10 +212,11 @@ jobs: - name: Build Windows installer run: | flutter config --enable-windows-desktop - dart pub global activate flutter_distributor + # dart pub global activate flutter_distributor + dart pub global activate --source git https://github.com/prateekmedia/flutter_distributor --git-ref develop --git-path packages/flutter_distributor make innoinstall flutter_distributor package --platform=windows --targets=exe --skip-clean - mv dist/**/ente_auth-*-windows-setup.exe artifacts/ente-${{ github.ref_name }}-installer.exe + mv dist/**/*-windows-setup.exe artifacts/ente-${{ github.ref_name }}-installer.exe - name: Retain Windows EXE and DLLs run: cp -r build/windows/x64/runner/Release ente-${{ github.ref_name }}-windows @@ -307,7 +309,7 @@ jobs: flutter config --enable-macos-desktop dart pub global activate flutter_distributor flutter_distributor package --platform=macos --targets=dmg --skip-clean - mv dist/**/ente_auth-*-macos.dmg artifacts/ente-${{ github.ref_name }}.dmg + mv dist/**/*-macos.dmg artifacts/ente-${{ github.ref_name }}.dmg - name: Code sign DMG run: | diff --git a/auth/lib/core/configuration.dart b/auth/lib/core/configuration.dart index 950ebd60b6..c032d79689 100644 --- a/auth/lib/core/configuration.dart +++ b/auth/lib/core/configuration.dart @@ -13,11 +13,11 @@ import 'package:ente_auth/models/key_attributes.dart'; import 'package:ente_auth/models/key_gen_result.dart'; import 'package:ente_auth/models/private_key_attributes.dart'; import 'package:ente_auth/store/authenticator_db.dart'; +import 'package:ente_auth/utils/directory_utils.dart'; import 'package:ente_auth/utils/lock_screen_settings.dart'; import 'package:ente_crypto_dart/ente_crypto_dart.dart'; import 'package:flutter_secure_storage/flutter_secure_storage.dart'; import 'package:logging/logging.dart'; -import 'package:path_provider/path_provider.dart'; import 'package:shared_preferences/shared_preferences.dart'; import 'package:sqflite_common_ffi/sqflite_ffi.dart'; import 'package:tuple/tuple.dart'; @@ -56,7 +56,6 @@ class Configuration { static final _logger = Logger("Configuration"); String? _cachedToken; - late String _documentsDirectory; late SharedPreferences _preferences; String? _key; String? _secretKey; @@ -75,8 +74,7 @@ class Configuration { _preferences = await SharedPreferences.getInstance(); sqfliteFfiInit(); _secureStorage = const FlutterSecureStorage(); - _documentsDirectory = (await getApplicationDocumentsDirectory()).path; - _tempDirectory = "$_documentsDirectory/temp/"; + _tempDirectory = (await DirectoryUtils.getDirectoryForInit()).path; final tempDirectory = io.Directory(_tempDirectory); try { final currentTime = DateTime.now().microsecondsSinceEpoch; diff --git a/auth/lib/main.dart b/auth/lib/main.dart index f812960a9a..b88104c188 100644 --- a/auth/lib/main.dart +++ b/auth/lib/main.dart @@ -22,6 +22,7 @@ import 'package:ente_auth/store/code_store.dart'; import 'package:ente_auth/ui/tools/app_lock.dart'; import 'package:ente_auth/ui/tools/lock_screen.dart'; import 'package:ente_auth/ui/utils/icon_utils.dart'; +import 'package:ente_auth/utils/directory_utils.dart'; import 'package:ente_auth/utils/lock_screen_settings.dart'; import 'package:ente_auth/utils/platform_util.dart'; import 'package:ente_auth/utils/window_protocol_handler.dart'; @@ -72,6 +73,7 @@ void main() async { size: WindowListenerService.instance.getWindowSize(), ); await windowManager.waitUntilReadyToShow(windowOptions, () async { + await DirectoryUtils.migrateNamingChanges(); await windowManager.show(); await windowManager.focus(); initSystemTray().ignore(); diff --git a/auth/lib/store/authenticator_db.dart b/auth/lib/store/authenticator_db.dart index deb57bc814..cc47745d59 100644 --- a/auth/lib/store/authenticator_db.dart +++ b/auth/lib/store/authenticator_db.dart @@ -37,8 +37,9 @@ class AuthenticatorDB { ), ); } - final Directory documentsDirectory = - await getApplicationDocumentsDirectory(); + final Directory documentsDirectory = Platform.isMacOS + ? await getApplicationSupportDirectory() + : await getApplicationDocumentsDirectory(); final String path = join(documentsDirectory.path, _databaseName); debugPrint(path); return await openDatabase( diff --git a/auth/lib/store/offline_authenticator_db.dart b/auth/lib/store/offline_authenticator_db.dart index d1af51fff3..3d280825bc 100644 --- a/auth/lib/store/offline_authenticator_db.dart +++ b/auth/lib/store/offline_authenticator_db.dart @@ -37,8 +37,9 @@ class OfflineAuthenticatorDB { ), ); } - final Directory documentsDirectory = - await getApplicationDocumentsDirectory(); + final Directory documentsDirectory = Platform.isMacOS + ? await getApplicationSupportDirectory() + : await getApplicationDocumentsDirectory(); final String path = join(documentsDirectory.path, _databaseName); debugPrint(path); return await openDatabase( diff --git a/auth/lib/utils/directory_utils.dart b/auth/lib/utils/directory_utils.dart index b9da6e6130..0cef244c67 100644 --- a/auth/lib/utils/directory_utils.dart +++ b/auth/lib/utils/directory_utils.dart @@ -1,12 +1,137 @@ +import 'dart:io'; + +import 'package:io/io.dart'; +import 'package:logging/logging.dart'; import 'package:path/path.dart' as p; import 'package:path_provider/path_provider.dart'; +import 'package:shared_preferences/shared_preferences.dart'; +import 'package:xdg_directories/xdg_directories.dart'; class DirectoryUtils { - static Future getDatabasePath(String databaseName) async => p.joinAll( - [ + static final logger = Logger('DirectoryUtils'); + + static Future getDatabasePath(String databaseName) async { + String? directoryPath; + + directoryPath ??= (await getApplicationSupportDirectory()).path; + + return p.joinAll( + [ + directoryPath, + ".$databaseName", + ], + ); + } + + static Future getDirectoryForInit() async { + Directory? directory; + if (Platform.isLinux) { + try { + return cacheHome; + } catch (e) { + logger.warning("Failed to get cacheHome: $e"); + } + } + + directory ??= await getApplicationDocumentsDirectory(); + + return Directory(p.join(directory.path, "enteauthinit")); + } + + static Future getTempsDir() async { + return await getTemporaryDirectory(); + } + + static String migratedNamingChanges = "migrated_naming_changes.b5"; + static migrateNamingChanges() async { + try { + final sharedPrefs = await SharedPreferences.getInstance(); + if (sharedPrefs.containsKey(migratedNamingChanges)) { + return; + } + var databaseFile = File( + p.join( (await getApplicationDocumentsDirectory()).path, "ente", - ".$databaseName", - ], + ".ente.authenticator.db", + ), ); + var offlineDatabaseFile = File( + p.join( + (await getApplicationDocumentsDirectory()).path, + "ente", + ".ente.offline_authenticator.db", + ), + ); + Directory oldDataDir; + Directory newDataDir; + + Directory? tempDir; + if (Platform.isLinux) { + oldDataDir = Directory( + p.join(dataHome.path, "ente_auth"), + ); + tempDir = Directory( + p.join(dataHome.path, "enteauth"), + ); + } else if (Platform.isWindows) { + oldDataDir = Directory( + p.join( + (await getApplicationDocumentsDirectory()).path, + "ente", + ), + ); + tempDir = Directory( + p.join( + (await getApplicationDocumentsDirectory()).path, + "enteauth", + ), + ); + } else { + oldDataDir = await getApplicationDocumentsDirectory(); + databaseFile = File( + p.join( + (await getApplicationDocumentsDirectory()).path, + "ente.authenticator.db", + ), + ); + offlineDatabaseFile = File( + p.join( + (await getApplicationDocumentsDirectory()).path, + "ente.offline_authenticator.db", + ), + ); + } + + if (tempDir?.existsSync() ?? false) { + oldDataDir = tempDir!; + } + newDataDir = await getApplicationSupportDirectory(); + await newDataDir.create(recursive: true); + + final prefix = Platform.isMacOS ? "" : "."; + File newDatabaseFile = + File(p.join(newDataDir.path, "${prefix}ente.authenticator.db")); + if (await databaseFile.exists() && !await newDatabaseFile.exists()) { + await databaseFile.copy(newDatabaseFile.path); + } + + File newOfflineDatabaseFile = File( + p.join(newDataDir.path, "${prefix}ente.offline_authenticator.db"), + ); + if (await offlineDatabaseFile.exists() && + !await newOfflineDatabaseFile.exists()) { + await offlineDatabaseFile.copy(newOfflineDatabaseFile.path); + } + + if (Platform.isLinux && await oldDataDir.exists()) { + await copyPath(oldDataDir.path, newDataDir.path); + } + + sharedPrefs.setBool(migratedNamingChanges, true).ignore(); + } catch (e, st) { + logger.warning("Migrating Database failed!", e, st); + rethrow; + } + } } diff --git a/auth/lib/utils/email_util.dart b/auth/lib/utils/email_util.dart index 73291a1ed5..3c35769574 100644 --- a/auth/lib/utils/email_util.dart +++ b/auth/lib/utils/email_util.dart @@ -10,6 +10,7 @@ import 'package:ente_auth/ui/components/dialog_widget.dart'; import 'package:ente_auth/ui/components/models/button_type.dart'; import 'package:ente_auth/ui/tools/debug/log_file_viewer.dart'; import 'package:ente_auth/utils/dialog_util.dart'; +import 'package:ente_auth/utils/directory_utils.dart'; import 'package:ente_auth/utils/platform_util.dart'; import 'package:ente_auth/utils/share_utils.dart'; import 'package:ente_auth/utils/toast_util.dart'; @@ -146,7 +147,7 @@ Future getZippedLogsFile(BuildContext context) async { await dialog.show(); final logsPath = (await getApplicationSupportDirectory()).path; final logsDirectory = Directory("$logsPath/logs"); - final tempPath = (await getTemporaryDirectory()).path; + final tempPath = (await DirectoryUtils.getTempsDir()).path; final zipFilePath = "$tempPath/logs-${Configuration.instance.getUserID() ?? 0}.zip"; final encoder = ZipFileEncoder(); diff --git a/auth/lib/utils/platform_util.dart b/auth/lib/utils/platform_util.dart index 5e02702579..87fed6f97e 100644 --- a/auth/lib/utils/platform_util.dart +++ b/auth/lib/utils/platform_util.dart @@ -1,6 +1,5 @@ import 'dart:io'; -import 'package:desktop_webview_window/desktop_webview_window.dart'; import 'package:ente_auth/ui/common/web_page.dart'; import 'package:file_saver/file_saver.dart'; import 'package:flutter/cupertino.dart'; @@ -31,17 +30,7 @@ class PlatformUtil { static openWebView(BuildContext context, String title, String url) async { if (PlatformUtil.isDesktop()) { - if (!await WebviewWindow.isWebviewAvailable()) { - await launchUrlString(url); - return; - } - - final webview = await WebviewWindow.create( - configuration: CreateConfiguration( - title: title, - ), - ); - webview.launch(url); + await launchUrlString(url); return; } await Navigator.of(context).push( diff --git a/auth/linux/CMakeLists.txt b/auth/linux/CMakeLists.txt index 2c0f9c6882..b36a97b845 100644 --- a/auth/linux/CMakeLists.txt +++ b/auth/linux/CMakeLists.txt @@ -4,7 +4,7 @@ project(runner LANGUAGES CXX) # The name of the executable created for the application. Change this to change # the on-disk name of your application. -set(BINARY_NAME "ente_auth") +set(BINARY_NAME "enteauth") # The unique GTK application identifier for this application. See: # https://wiki.gnome.org/HowDoI/ChooseApplicationID set(APPLICATION_ID "io.ente.auth") diff --git a/auth/linux/flutter/generated_plugin_registrant.cc b/auth/linux/flutter/generated_plugin_registrant.cc index 7b1c79935e..2fdf0b385a 100644 --- a/auth/linux/flutter/generated_plugin_registrant.cc +++ b/auth/linux/flutter/generated_plugin_registrant.cc @@ -6,7 +6,6 @@ #include "generated_plugin_registrant.h" -#include #include #include #include @@ -20,9 +19,6 @@ #include void fl_register_plugins(FlPluginRegistry* registry) { - g_autoptr(FlPluginRegistrar) desktop_webview_window_registrar = - fl_plugin_registry_get_registrar_for_plugin(registry, "DesktopWebviewWindowPlugin"); - desktop_webview_window_plugin_register_with_registrar(desktop_webview_window_registrar); g_autoptr(FlPluginRegistrar) file_saver_registrar = fl_plugin_registry_get_registrar_for_plugin(registry, "FileSaverPlugin"); file_saver_plugin_register_with_registrar(file_saver_registrar); diff --git a/auth/linux/flutter/generated_plugins.cmake b/auth/linux/flutter/generated_plugins.cmake index 45674067d7..7ad28f0761 100644 --- a/auth/linux/flutter/generated_plugins.cmake +++ b/auth/linux/flutter/generated_plugins.cmake @@ -3,7 +3,6 @@ # list(APPEND FLUTTER_PLUGIN_LIST - desktop_webview_window file_saver flutter_local_authentication flutter_secure_storage_linux diff --git a/auth/linux/packaging/appimage/make_config.yaml b/auth/linux/packaging/appimage/make_config.yaml index a41658fd17..8e88af9120 100644 --- a/auth/linux/packaging/appimage/make_config.yaml +++ b/auth/linux/packaging/appimage/make_config.yaml @@ -1,7 +1,8 @@ -display_name: Auth +display_name: Ente Auth +package_name: enteauth license: GPLv3 -metainfo: linux/packaging/ente_auth.appdata.xml +metainfo: linux/packaging/enteauth.appdata.xml icon: assets/icons/auth-icon.png @@ -25,10 +26,6 @@ startup_notify: false # # include: # - libcurl.so.4 -include: - - libffi.so.8 - - libtiff.so.5 - - libjpeg.so.8 supported_mime_type: - - x-scheme-handler/enteauth \ No newline at end of file + - x-scheme-handler/enteauth diff --git a/auth/linux/packaging/deb/make_config.yaml b/auth/linux/packaging/deb/make_config.yaml index 3ec44bae56..78022df17e 100644 --- a/auth/linux/packaging/deb/make_config.yaml +++ b/auth/linux/packaging/deb/make_config.yaml @@ -1,5 +1,7 @@ -display_name: Auth -package_name: auth +display_name: Ente Auth +package_name: enteauth +include_build_number: false + maintainer: name: Ente.io Developers email: auth@ente.io @@ -10,10 +12,9 @@ license: GPLv3 icon: assets/icons/auth-icon.png installed_size: 36000 -metainfo: linux/packaging/ente_auth.appdata.xml +metainfo: linux/packaging/enteauth.appdata.xml dependencies: - - libwebkit2gtk-4.0-37 - libsqlite3-0 - libsodium23 - libsecret-1-0 @@ -25,7 +26,7 @@ keywords: - Authentication - 2FA -generic_name: Ente Authentication +generic_name: Ente Authenticator categories: - Utility diff --git a/auth/linux/packaging/ente_auth.appdata.xml b/auth/linux/packaging/enteauth.appdata.xml similarity index 74% rename from auth/linux/packaging/ente_auth.appdata.xml rename to auth/linux/packaging/enteauth.appdata.xml index 5ef4c647f4..0772f405b8 100644 --- a/auth/linux/packaging/ente_auth.appdata.xml +++ b/auth/linux/packaging/enteauth.appdata.xml @@ -1,16 +1,16 @@ - ente_auth + enteauth CC0-1.0 AGPL-3.0 Ente Auth - Open source 2FA authenticator, with end-to-end encrypted backups + FOSS, cross-platform 2FA app

Auth provides end-to-end encrypted cloud backups so you don't have to worry about losing your tokens. Our cryptography has been externally audited.

Auth has an app for every platform. Mobile, desktop and web. Your codes sync across all your devices, end-to-end encrypted.

Auth also comes with Offline mode, tags, icons, pins, import/export and more

 - ente_auth.desktop + enteauth.desktop https://ente.io/auth @@ -18,14 +18,18 @@ - + - ente_auth.desktop + enteauth.desktop Ente.io Developers auth@ente.io + + #ffffff + #000000 + \ No newline at end of file diff --git a/auth/linux/packaging/pacman/make_config.yaml b/auth/linux/packaging/pacman/make_config.yaml index 7545d8c06e..5ee05e2016 100644 --- a/auth/linux/packaging/pacman/make_config.yaml +++ b/auth/linux/packaging/pacman/make_config.yaml @@ -1,5 +1,5 @@ -display_name: Auth -package_name: auth +display_name: Ente Auth +package_name: enteauth maintainer: name: Ente.io Developers email: auth@ente.io @@ -8,29 +8,18 @@ licenses: icon: assets/icons/auth-icon.png installed_size: 36000 -metainfo: linux/packaging/ente_auth.appdata.xml +metainfo: linux/packaging/enteauth.appdata.xml dependencies: - - c-ares - - ffmpeg - - gtk3 - - http-parser - - libevent - - libvpx - - libxslt - - libxss - - minizip - - nss - - re2 - - snappy - - libnotify + - sqlite + - libsecret - libappindicator-gtk3 keywords: - Authentication - 2FA -generic_name: Ente Authentication +generic_name: Ente Authenticator categories: - Utility @@ -47,12 +36,12 @@ postinstall_scripts: postupgrade_scripts: - post_install - + postremove_scripts: - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor - update-desktop-database -q - if [ -e /usr/lib/libsodium.so.23 ]; then - - rm /usr/lib/libsodium.so.23 + - rm /usr/lib/libsodium.so.23 - fi -startup_notify: false \ No newline at end of file +startup_notify: false diff --git a/auth/linux/packaging/rpm/make_config.yaml b/auth/linux/packaging/rpm/make_config.yaml index 6f6c45153a..8bd55438d5 100644 --- a/auth/linux/packaging/rpm/make_config.yaml +++ b/auth/linux/packaging/rpm/make_config.yaml @@ -6,15 +6,15 @@ packager: Ente.io Developers packagerEmail: auth@ente.io license: GPLv3 url: https://github.com/ente-io/ente +package_name: enteauth +include_build_number: false display_name: Auth -metainfo: linux/packaging/ente_auth.appdata.xml +metainfo: linux/packaging/enteauth.appdata.xml requires: - libsqlite3x - - webkit2gtk4.0 - - libsodium - libsecret - libappindicator @@ -22,7 +22,7 @@ keywords: - Authentication - 2FA -generic_name: Ente Authentication +generic_name: Ente Authenticator categories: - Utility diff --git a/auth/macos/Flutter/GeneratedPluginRegistrant.swift b/auth/macos/Flutter/GeneratedPluginRegistrant.swift index 5e814a187f..5c6cfc0c6d 100644 --- a/auth/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/auth/macos/Flutter/GeneratedPluginRegistrant.swift @@ -7,7 +7,6 @@ import Foundation import app_links import connectivity_plus -import desktop_webview_window import device_info_plus import file_saver import flutter_inappwebview_macos @@ -31,7 +30,6 @@ import window_manager func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { AppLinksMacosPlugin.register(with: registry.registrar(forPlugin: "AppLinksMacosPlugin")) ConnectivityPlusPlugin.register(with: registry.registrar(forPlugin: "ConnectivityPlusPlugin")) - DesktopWebviewWindowPlugin.register(with: registry.registrar(forPlugin: "DesktopWebviewWindowPlugin")) DeviceInfoPlusMacosPlugin.register(with: registry.registrar(forPlugin: "DeviceInfoPlusMacosPlugin")) FileSaverPlugin.register(with: registry.registrar(forPlugin: "FileSaverPlugin")) InAppWebViewFlutterPlugin.register(with: registry.registrar(forPlugin: "InAppWebViewFlutterPlugin")) diff --git a/auth/pubspec.lock b/auth/pubspec.lock index 36fb338398..08ebc6efbd 100644 --- a/auth/pubspec.lock +++ b/auth/pubspec.lock @@ -326,15 +326,6 @@ packages: url: "https://pub.dev" source: hosted version: "0.7.10" - desktop_webview_window: - dependency: "direct main" - description: - path: "packages/desktop_webview_window" - ref: main - resolved-ref: "3e4247ba5b71049704395b70b5a827fb113b88ea" - url: "https://github.com/MixinNetwork/flutter-plugins" - source: git - version: "0.2.4" device_info_plus: dependency: "direct main" description: @@ -879,7 +870,7 @@ packages: source: hosted version: "0.19.0" io: - dependency: transitive + dependency: "direct main" description: name: io sha256: "2ec25704aba361659e10e3e5f5d672068d332fc8ac516421d483a11e5cbd061e" @@ -1821,7 +1812,7 @@ packages: source: hosted version: "0.4.2" xdg_directories: - dependency: transitive + dependency: "direct main" description: name: xdg_directories sha256: "7a3f37b05d989967cdddcbb571f1ea834867ae2faa29725fd085180e0883aa15" diff --git a/auth/pubspec.yaml b/auth/pubspec.yaml index 34baa0e1b9..8d417272a7 100644 --- a/auth/pubspec.yaml +++ b/auth/pubspec.yaml @@ -1,6 +1,6 @@ name: ente_auth description: ente two-factor authenticator -version: 4.0.2+402 +version: 4.0.3+403 publish_to: none environment: @@ -19,11 +19,6 @@ dependencies: confetti: ^0.8.0 connectivity_plus: ^6.0.5 convert: ^3.1.1 - desktop_webview_window: - git: - url: https://github.com/MixinNetwork/flutter-plugins - ref: main - path: packages/desktop_webview_window device_info_plus: ^9.1.1 dio: ^5.4.0 dotted_border: ^2.0.0+2 @@ -67,6 +62,7 @@ dependencies: gradient_borders: ^1.0.0 http: ^1.1.0 intl: ^0.19.0 + io: ^1.0.4 json_annotation: ^4.5.0 local_auth: ^2.3.0 local_auth_android: ^1.0.37 @@ -105,6 +101,7 @@ dependencies: uuid: ^4.2.2 win32: ^5.1.1 window_manager: ^0.4.2 + xdg_directories: ^1.0.4 dependency_overrides: flutter_secure_storage_linux: diff --git a/auth/windows/flutter/generated_plugin_registrant.cc b/auth/windows/flutter/generated_plugin_registrant.cc index d4872e8b9c..bfed849740 100644 --- a/auth/windows/flutter/generated_plugin_registrant.cc +++ b/auth/windows/flutter/generated_plugin_registrant.cc @@ -8,7 +8,6 @@ #include #include -#include #include #include #include @@ -27,8 +26,6 @@ void RegisterPlugins(flutter::PluginRegistry* registry) { registry->GetRegistrarForPlugin("AppLinksPluginCApi")); ConnectivityPlusWindowsPluginRegisterWithRegistrar( registry->GetRegistrarForPlugin("ConnectivityPlusWindowsPlugin")); - DesktopWebviewWindowPluginRegisterWithRegistrar( - registry->GetRegistrarForPlugin("DesktopWebviewWindowPlugin")); FileSaverPluginRegisterWithRegistrar( registry->GetRegistrarForPlugin("FileSaverPlugin")); FlutterInappwebviewWindowsPluginCApiRegisterWithRegistrar( diff --git a/auth/windows/flutter/generated_plugins.cmake b/auth/windows/flutter/generated_plugins.cmake index 598cf85d96..cc78f72ebb 100644 --- a/auth/windows/flutter/generated_plugins.cmake +++ b/auth/windows/flutter/generated_plugins.cmake @@ -5,7 +5,6 @@ list(APPEND FLUTTER_PLUGIN_LIST app_links connectivity_plus - desktop_webview_window file_saver flutter_inappwebview_windows flutter_local_authentication diff --git a/auth/windows/packaging/exe/make_config.yaml b/auth/windows/packaging/exe/make_config.yaml index 378d2d4d8c..efd1736446 100644 --- a/auth/windows/packaging/exe/make_config.yaml +++ b/auth/windows/packaging/exe/make_config.yaml @@ -1,4 +1,5 @@ app_id: 9E5F0C93-96A3-4DA9-AE52-1AA6339851FC +package_name: enteauth publisher: ente.io publisher_url: https://github.com/ente-io/ente display_name: Ente Auth