From 9fb67c66a0990637aa55b6899e18e58a5915bfc7 Mon Sep 17 00:00:00 2001
From: Mayur Sharma <mayur.sharma_1@signify.com>
Date: Tue, 16 Jun 2020 11:24:54 +0530
Subject: [PATCH] Provided custom redirect Uri setting

---
 ios/Classes/SwiftMsalFlutterPlugin.swift | 13 ++++++++-----
 lib/src/public_client_application.dart   | 12 ++++++++----
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/ios/Classes/SwiftMsalFlutterPlugin.swift b/ios/Classes/SwiftMsalFlutterPlugin.swift
index bfbf4fc..aef798d 100644
--- a/ios/Classes/SwiftMsalFlutterPlugin.swift
+++ b/ios/Classes/SwiftMsalFlutterPlugin.swift
@@ -5,8 +5,9 @@ import MSAL
 public class SwiftMsalFlutterPlugin: NSObject, FlutterPlugin {
   
   //static fields as initialization isn't really required
-  static var clientId : String = ""
-  static var authority : String = ""
+    static var clientId : String = ""
+    static var authority : String = ""
+    static var redirectURI : String?
   
   public static func register(with registrar: FlutterPluginRegistrar) {
     let channel = FlutterMethodChannel(name: "msal_flutter", binaryMessenger: registrar.messenger())
@@ -21,9 +22,10 @@ public class SwiftMsalFlutterPlugin: NSObject, FlutterPlugin {
     let scopes = dict["scopes"] as? [String] ?? [String]()
     let clientId = dict["clientId"] as? String ?? ""
     let authority = dict["authority"] as? String ?? ""
+    let redirectURI = dict["redirectURI"] as? String ?? ""
 
     switch( call.method ){
-      case "initialize": initialize(clientId: clientId, authority: authority, result: result)
+    case "initialize": initialize(clientId: clientId, authority: authority, redirectURI: redirectURI, result: result)
       case "acquireToken": acquireToken(scopes: scopes, result: result)
       case "acquireTokenSilent": acquireTokenSilent(scopes: scopes, result: result)
       case "logout": logout(result: result)
@@ -125,7 +127,7 @@ public class SwiftMsalFlutterPlugin: NSObject, FlutterPlugin {
 
         //create the msal authority and configuration
         let msalAuthority = try MSALAuthority(url: authorityUrl)
-        config = MSALPublicClientApplicationConfig(clientId: SwiftMsalFlutterPlugin.clientId, redirectUri: nil, authority: msalAuthority)
+        config = MSALPublicClientApplicationConfig(clientId: SwiftMsalFlutterPlugin.clientId, redirectUri: SwiftMsalFlutterPlugin.redirectURI, authority: msalAuthority)
       } catch {
         //return error if exception occurs
         result(FlutterError(code: "INVALID_AUTHORITY", message: "invalid authority", details: nil))
@@ -148,7 +150,7 @@ public class SwiftMsalFlutterPlugin: NSObject, FlutterPlugin {
     }
   }
 
-  private func initialize(clientId: String, authority: String, result: @escaping FlutterResult)
+    private func initialize(clientId: String, authority: String, redirectURI: String?, result: @escaping FlutterResult)
   {
     //validate clientid exists
     if(clientId.isEmpty){
@@ -158,6 +160,7 @@ public class SwiftMsalFlutterPlugin: NSObject, FlutterPlugin {
 
     SwiftMsalFlutterPlugin.clientId = clientId;
     SwiftMsalFlutterPlugin.authority = authority;
+    SwiftMsalFlutterPlugin.redirectURI = redirectURI
     result(true)
   }
 
diff --git a/lib/src/public_client_application.dart b/lib/src/public_client_application.dart
index 6e235af..4c061e9 100644
--- a/lib/src/public_client_application.dart
+++ b/lib/src/public_client_application.dart
@@ -6,7 +6,7 @@ import 'msal_exception.dart';
 class PublicClientApplication {
   static const MethodChannel _channel = const MethodChannel('msal_flutter');
 
-  String _clientId, _authority;
+  String _clientId, _authority, _redirectURI;
 
   /// Create a new PublicClientApplication authenticating as the given [clientId],
   /// optionally against the selected [authority], defaulting to the common
@@ -15,15 +15,16 @@ class PublicClientApplication {
         "Direct call is no longer supported in v1.0, please use static method createPublicClientApplication");
   }
 
-  PublicClientApplication._create(String clientId, {String authority}) {
+  PublicClientApplication._create(String clientId, {String authority, String redirectURI}) {
     _clientId = clientId;
     _authority = authority;
+    _redirectURI = redirectURI;
   }
 
   static Future<PublicClientApplication> createPublicClientApplication(
       String clientId,
-      {String authority}) async {
-    var res = PublicClientApplication._create(clientId, authority: authority);
+      {String authority, String redirectURI}) async {
+    var res = PublicClientApplication._create(clientId, authority: authority, redirectURI: redirectURI);
     await res._initialize();
     return res;
   }
@@ -99,6 +100,9 @@ class PublicClientApplication {
     if (this._authority != null) {
       res["authority"] = this._authority;
     }
+    if (this._redirectURI != null) {
+      res["redirectURI"] = this._redirectURI;
+    }
 
     try {
       await _channel.invokeMethod('initialize', res);