Merge pull request #13 from plgd-dev/support-bundle

support bundle image

Author: ondrejtomcik

.gitignore

@@ -92,6 +92,7 @@ unlinked_spec.ds
 **/ios/Flutter/flutter_export_environment.sh
 **/ios/ServiceDefinitions.json
 **/ios/Runner/GeneratedPluginRegistrant.*
+**/ios/Flutter/.last_build_id
 
 # macOS
 **/macos/Flutter/GeneratedPluginRegistrant.swift

android/app/build.gradle

@@ -44,7 +44,7 @@ android {
 
     defaultConfig {
         applicationId "dev.plgd.client"
-        minSdkVersion 16
+        minSdkVersion 17
         targetSdkVersion 29
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName

android/app/src/main/AndroidManifest.xml

@@ -21,4 +21,5 @@
             android:value="2" />
     </application>
     <uses-permission android:name="android.permission.INTERNET"/>
+    <uses-permission android:name="android.permission.WAKE_LOCK"/>
 </manifest>

android/app/src/main/kotlin/dev/plgd/mobile/MainActivity.kt

@@ -32,11 +32,6 @@ class MainActivity: FlutterActivity() {
     }
 
     private fun initializeOCFClient(call: MethodCall, result: MethodChannel.Result) {
-        if (sdkClient != null) {
-            result.success(true)
-            return
-        }
-
         var accessToken = call.argument<String>("accessToken");
         var cloudConfiguration = call.argument<String>("cloudConfiguration")
         _mainScope.launch {

ios/Flutter/.last_build_id

@@ -219,14 +219,16 @@
 			inputPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh",
 				"${PODS_ROOT}/../Flutter/Flutter.framework",
+				"${BUILT_PRODUCTS_DIR}/flutter_inappwebview/flutter_inappwebview.framework",
+				"${BUILT_PRODUCTS_DIR}/package_info/package_info.framework",
 				"${BUILT_PRODUCTS_DIR}/shared_preferences/shared_preferences.framework",
-				"${BUILT_PRODUCTS_DIR}/webview_flutter/webview_flutter.framework",
 			);
 			name = "[CP] Embed Pods Frameworks";
 			outputPaths = (
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Flutter.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/flutter_inappwebview.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/package_info.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/shared_preferences.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/webview_flutter.framework",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;

ios/Runner.xcodeproj/project.pbxproj

@@ -28,19 +28,13 @@ import Ocfclient
     return super.application(application, didFinishLaunchingWithOptions: launchOptions)
     }
 
-    let ocfClient = OcfclientOcfclient();
-    var isInitialized = false;
+    var ocfClient: OcfclientOcfclient!;
 
     private func initializeOCFClient(args: Any?, result: FlutterResult) {
-        if (isInitialized) {
-            result(true)
-            return
-        }
-
+        ocfClient = OcfclientOcfclient();
         let args = args as! [String: String]
         do {
             try ocfClient.initialize(args["accessToken"], cloudConfiguration: args["cloudConfiguration"])
-            isInitialized = true
         } catch {
             result(FlutterError(code: "-1", message: error.localizedDescription, details: nil))
         }

ios/Runner/AppDelegate.swift

@@ -49,6 +49,10 @@ class AppLocalizations {
     return Intl.message('An error occurred during plgd client initialization.', name: 'unableToInitializeClientNotification');
   }
 
+  String get unableToAuthenticateNotification {
+    return Intl.message('An error occurred during authentication.', name: 'unableToAuthenticateNotification');
+  }
+
   String get requestApplicationSetupNotification {
     return Intl.message('Please setup your application again.', name: 'requestApplicationSetupNotification');
   }

lib/appLocalizations.dart

@@ -44,7 +44,7 @@ class _DeviceDetailsWidgetState extends State<DeviceDetails> {
               padding: EdgeInsets.only(bottom: 10, left: 15, right: 15),
               child: _getActionButton(this.widget.device)
             ),
-            OCFClient.getCodeRequestWidget(context, false, _tryGetCodeInBackground, (response) => _onboard(response, context), _cancelOnboarding)
+            OCFClient.getCodeRequestWidget(context, false, _tryGetCodeInBackground, (response) => _onboard(response, context), _cancelOnboarding, _onHttpError)
           ]
         )
       )
@@ -140,6 +140,11 @@ class _DeviceDetailsWidgetState extends State<DeviceDetails> {
       Navigator.of(context).pop(true);
     }
   }
+  
+  void _onHttpError() {
+    _cancelOnboarding();
+    ToastNotification.show(context, AppLocalizations.of(context).unableToAuthenticateNotification);
+  }
 
   void _cancelOnboarding() {
     setState(() {

lib/components/deviceDetails.dart

@@ -1,30 +1,34 @@
 import 'package:client/appConstants.dart';
+import 'package:client/appLocalizations.dart';
+import 'package:client/components/toastNotification.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_spinkit/flutter_spinkit.dart';
-import 'package:webview_flutter/webview_flutter.dart';
+import 'package:flutter_inappwebview/flutter_inappwebview.dart';
 
 class OAuthHandler extends StatefulWidget {
   final String authUrl;
   final Function promptForCredentials;
   final Function(String) authCompleted;
+  final Function errorOccured;
 
-  OAuthHandler({Key key, this.authUrl, this.promptForCredentials, this.authCompleted}) : super(key: key);
+  OAuthHandler({Key key, this.authUrl, this.promptForCredentials, this.authCompleted, this.errorOccured}) : super(key: key);
 
   @override
-  _OAuthHandlerState createState() => new _OAuthHandlerState(authUrl, promptForCredentials, authCompleted);
+  _OAuthHandlerState createState() => new _OAuthHandlerState(authUrl, promptForCredentials, authCompleted, errorOccured);
 }
 
 class _OAuthHandlerState extends State<OAuthHandler> {
   final String authUrl;
   final Function promptForCredentials;
   final Function(String) authCompleted;
+  final Function errorOccured;
   String authOrigin;
-  WebViewController _controller;
+  InAppWebViewController _controller;
   bool _loadingInProgress = false;
 
-  _OAuthHandlerState(this.authUrl, this.promptForCredentials, this.authCompleted);
+  _OAuthHandlerState(this.authUrl, this.promptForCredentials, this.authCompleted, this.errorOccured);
 
   @override
   initState() {
@@ -46,25 +50,37 @@ class _OAuthHandlerState extends State<OAuthHandler> {
             Visibility(
               visible: !_loadingInProgress,
               maintainState: true,
-              child: WebView(
+              child: InAppWebView(
                 initialUrl: authUrl,
-                userAgent: "Mozilla/5.0 Google",
+                initialOptions: InAppWebViewGroupOptions(
+                    crossPlatform: InAppWebViewOptions(
+                      userAgent: 'Mozilla/5.0 Google'
+                    )
+                ),
                 gestureRecognizers: Set()
                   ..add(Factory<VerticalDragGestureRecognizer>(
                     () => VerticalDragGestureRecognizer()
                   )
                 ),
-                javascriptMode: JavascriptMode.unrestricted,
-                onWebViewCreated: (WebViewController webViewController) {
-                  _controller = webViewController;
+                onWebViewCreated: (InAppWebViewController controller) {
+                  _controller = controller;
+                  _controller.addJavaScriptHandler(handlerName:'handleOAuthResponse', callback: (args) {
+                    authCompleted(args[0]);
+                  });
+
+                },
+                onLoadError: (InAppWebViewController controller, String url, int code, String message) async {
+                  errorOccured();
+                  return;
                 },
-                javascriptChannels: <JavascriptChannel>[
-                  _extractData(context),
-                ].toSet(),
-                onPageFinished: (String url) {
+                onLoadHttpError: (InAppWebViewController controller, String url, int statusCode, String description) async {
+                  errorOccured();
+                  return;
+                },
+                onLoadStop: (InAppWebViewController controller, String url) async {
                   // in case redirect url is requested, expected content will be already present
                   if (url.startsWith(authOrigin)) { 
-                    _controller.evaluateJavascript("(function(){OAuth.postMessage(document.documentElement.innerText)})();");
+                    _controller.evaluateJavascript(source: "(function(){window.flutter_inappwebview.callHandler('handleOAuthResponse', document.documentElement.innerText)})();");
                     return;
                   }
 
@@ -75,22 +91,18 @@ class _OAuthHandlerState extends State<OAuthHandler> {
                     return;
                   }
                 },
-                onPageStarted: (_) => { setState(() { _loadingInProgress = true; }) },
-                gestureNavigationEnabled: true,
+                onLoadStart: (InAppWebViewController controller, String url) {
+                  if (url.startsWith(authOrigin))
+                    setState(() { _loadingInProgress = true; });
+                },
+                onReceivedServerTrustAuthRequest: (InAppWebViewController controller, ServerTrustChallenge challenge) async {
+                  return ServerTrustAuthResponse(action: ServerTrustAuthResponseAction.PROCEED);
+                }
               )
             )
           ]
         );
       }
     );
   }
-
-  JavascriptChannel _extractData(BuildContext context) {
-    return JavascriptChannel(
-          name: 'OAuth',
-          onMessageReceived: (JavascriptMessage message) {
-            authCompleted(message.message);
-          },
-       );
-    }
 }