From 9836c6064f81d5a20152963e4b86fe3787262c40 Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Sun, 19 Jun 2022 16:30:42 +0300 Subject: [PATCH] Microsoft Login --- lib/ui/auth/login_vm.dart | 13 ----- linux/flutter/generated_plugin_registrant.cc | 4 -- linux/flutter/generated_plugins.cmake | 1 - macos/Flutter/GeneratedPluginRegistrant.swift | 2 - pubspec.lock | 49 ------------------- pubspec.yaml | 1 - .../flutter/generated_plugin_registrant.cc | 3 -- windows/flutter/generated_plugins.cmake | 1 - 8 files changed, 74 deletions(-) diff --git a/lib/ui/auth/login_vm.dart b/lib/ui/auth/login_vm.dart index b7164c4ac..06e13531c 100644 --- a/lib/ui/auth/login_vm.dart +++ b/lib/ui/auth/login_vm.dart @@ -2,16 +2,13 @@ import 'dart:async'; // Flutter imports: -import 'package:aad_oauth/model/config.dart'; import 'package:flutter/material.dart'; import 'package:msal_js/msal_js.dart'; // Package imports: import 'package:flutter_redux/flutter_redux.dart'; -import 'package:invoiceninja_flutter/main_app.dart'; import 'package:redux/redux.dart'; import 'package:shared_preferences/shared_preferences.dart'; -import 'package:aad_oauth/aad_oauth.dart'; // Project imports: import 'package:invoiceninja_flutter/constants.dart'; @@ -110,16 +107,6 @@ class LoginVM { final Function(BuildContext, Completer completer) onMicrosoftSignUpPressed; - static final Config config = Config( - tenant: '3196aaac-9636-4f91-8f04-3297e2654909', - clientId: '1023b9ce-5b09-4f04-98f8-e1ed85a72332', - scope: 'openid profile offline_access', - redirectUri: 'https://invoicing.co/auth/microsoft', - //redirectUri: kIsWeb ? 'http://localhost:8483' : 'https://login.live.com/oauth20_desktop.srf', - navigatorKey: navigatorKey, - ); - static final AadOAuth oauth = AadOAuth(config); - static LoginVM fromStore(Store store) { void _handleLogin({BuildContext context, bool isSignUp = false}) { final layout = calculateLayout(context); diff --git a/linux/flutter/generated_plugin_registrant.cc b/linux/flutter/generated_plugin_registrant.cc index 40cdae427..71d3db665 100644 --- a/linux/flutter/generated_plugin_registrant.cc +++ b/linux/flutter/generated_plugin_registrant.cc @@ -6,15 +6,11 @@ #include "generated_plugin_registrant.h" -#include #include #include #include void fl_register_plugins(FlPluginRegistry* registry) { - g_autoptr(FlPluginRegistrar) flutter_secure_storage_linux_registrar = - fl_plugin_registry_get_registrar_for_plugin(registry, "FlutterSecureStorageLinuxPlugin"); - flutter_secure_storage_linux_plugin_register_with_registrar(flutter_secure_storage_linux_registrar); g_autoptr(FlPluginRegistrar) printing_registrar = fl_plugin_registry_get_registrar_for_plugin(registry, "PrintingPlugin"); printing_plugin_register_with_registrar(printing_registrar); diff --git a/linux/flutter/generated_plugins.cmake b/linux/flutter/generated_plugins.cmake index fe59b1dc7..bfbaf253b 100644 --- a/linux/flutter/generated_plugins.cmake +++ b/linux/flutter/generated_plugins.cmake @@ -3,7 +3,6 @@ # list(APPEND FLUTTER_PLUGIN_LIST - flutter_secure_storage_linux printing sentry_flutter url_launcher_linux diff --git a/macos/Flutter/GeneratedPluginRegistrant.swift b/macos/Flutter/GeneratedPluginRegistrant.swift index 370e305ca..c9ff43176 100644 --- a/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/macos/Flutter/GeneratedPluginRegistrant.swift @@ -5,7 +5,6 @@ import FlutterMacOS import Foundation -import flutter_secure_storage_macos import package_info import package_info_plus_macos import path_provider_macos @@ -16,7 +15,6 @@ import sqflite import url_launcher_macos func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { - FlutterSecureStorageMacosPlugin.register(with: registry.registrar(forPlugin: "FlutterSecureStorageMacosPlugin")) FLTPackageInfoPlugin.register(with: registry.registrar(forPlugin: "FLTPackageInfoPlugin")) FLTPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FLTPackageInfoPlusPlugin")) PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin")) diff --git a/pubspec.lock b/pubspec.lock index 91fc88dc4..2cb91921e 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -8,13 +8,6 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "31.0.0" - aad_oauth: - dependency: "direct main" - description: - name: aad_oauth - url: "https://pub.dartlang.org" - source: hosted - version: "0.4.0" analyzer: dependency: transitive description: @@ -387,48 +380,6 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "0.8.2" - flutter_secure_storage: - dependency: transitive - description: - name: flutter_secure_storage - url: "https://pub.dartlang.org" - source: hosted - version: "5.0.2" - flutter_secure_storage_linux: - dependency: transitive - description: - name: flutter_secure_storage_linux - url: "https://pub.dartlang.org" - source: hosted - version: "1.1.0" - flutter_secure_storage_macos: - dependency: transitive - description: - name: flutter_secure_storage_macos - url: "https://pub.dartlang.org" - source: hosted - version: "1.1.0" - flutter_secure_storage_platform_interface: - dependency: transitive - description: - name: flutter_secure_storage_platform_interface - url: "https://pub.dartlang.org" - source: hosted - version: "1.0.0" - flutter_secure_storage_web: - dependency: transitive - description: - name: flutter_secure_storage_web - url: "https://pub.dartlang.org" - source: hosted - version: "1.0.2" - flutter_secure_storage_windows: - dependency: transitive - description: - name: flutter_secure_storage_windows - url: "https://pub.dartlang.org" - source: hosted - version: "1.1.2" flutter_slidable: dependency: "direct main" description: diff --git a/pubspec.yaml b/pubspec.yaml index b1ef27502..3d1fb89e8 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -69,7 +69,6 @@ dependencies: html2md: ^1.2.5 printing: ^5.8.0 image_cropper: ^2.0.2 - aad_oauth: ^0.4.0 msal_js: ^2.14.0 # bitsdojo_window: ^0.1.2 # quick_actions: ^0.2.1 diff --git a/windows/flutter/generated_plugin_registrant.cc b/windows/flutter/generated_plugin_registrant.cc index f98efee3f..d6eac6a2d 100644 --- a/windows/flutter/generated_plugin_registrant.cc +++ b/windows/flutter/generated_plugin_registrant.cc @@ -6,14 +6,11 @@ #include "generated_plugin_registrant.h" -#include #include #include #include void RegisterPlugins(flutter::PluginRegistry* registry) { - FlutterSecureStorageWindowsPluginRegisterWithRegistrar( - registry->GetRegistrarForPlugin("FlutterSecureStorageWindowsPlugin")); PrintingPluginRegisterWithRegistrar( registry->GetRegistrarForPlugin("PrintingPlugin")); SentryFlutterPluginRegisterWithRegistrar( diff --git a/windows/flutter/generated_plugins.cmake b/windows/flutter/generated_plugins.cmake index c8c46d31a..53fcac6db 100644 --- a/windows/flutter/generated_plugins.cmake +++ b/windows/flutter/generated_plugins.cmake @@ -3,7 +3,6 @@ # list(APPEND FLUTTER_PLUGIN_LIST - flutter_secure_storage_windows printing sentry_flutter url_launcher_windows