Updated samples to show new native Safari view controller

Clancey · Sep 20, 2016 · 0c91319 · 0c91319
1 parent 1f0bcc8
commit 0c91319
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 15 deletions.
diff --git a/samples/Sample.Forms/Sample.Forms.iOS/AppDelegate.cs b/samples/Sample.Forms/Sample.Forms.iOS/AppDelegate.cs
@@ -30,10 +30,11 @@ public override bool FinishedLaunching(UIApplication app, NSDictionary options)
 		}
 		public override bool OpenUrl(UIApplication application, NSUrl url, string sourceApplication, NSObject annotation)
 		{
+			if (SimpleAuth.NativeSafariAuthenticator.ResumeAuth (url.AbsoluteString))
+				return true;
 			if (SimpleAuth.Providers.Facebook.OpenUrl(application, url, sourceApplication, annotation))
 				return true;
 			return base.OpenUrl(application, url, sourceApplication, annotation);
 		}
-
 	}
 }
diff --git a/samples/Sample.Forms/Sample.Forms.iOS/Info.plist b/samples/Sample.Forms/Sample.Forms.iOS/Info.plist
@@ -21,7 +21,7 @@
 		<string>UIInterfaceOrientationLandscapeRight</string>
 	</array>
 	<key>MinimumOSVersion</key>
-	<string>6.0</string>
+	<string>7.0</string>
 	<key>CFBundleDisplayName</key>
 	<string>Sample.Forms</string>
 	<key>CFBundleIdentifier</key>
@@ -79,9 +79,12 @@
 			<string>FB</string>
 			<key>CFBundleURLSchemes</key>
 			<array>
-				<string>fb172317429487848</string>
+				<string>fbclientid</string>
+				<string>com.googleusercontent.apps.clientid</string>
 			</array>
 		</dict>
 	</array>
+	<key>CFBundleName</key>
+	<string>Sample.Forms</string>
 </dict>
 </plist>
diff --git a/samples/Sample.iOS/AppDelegate.cs b/samples/Sample.iOS/AppDelegate.cs
@@ -20,14 +20,21 @@ public override UIWindow Window
 			get;
 			set;
 		}
-		GoogleApi googleApi = new GoogleApi("google","clientid","clientsecret");
+		GoogleApi googleApi = new GoogleApi ("google", "clientid", "clientsecret") {
+			Scopes = new []
+			{
+				"https://www.googleapis.com/auth/userinfo.email",
+				"https://www.googleapis.com/auth/userinfo.profile"
+			}
+		};
 		ApiKeyApi apiKeyApi = new ApiKeyApi ("myapikey", "api_key", AuthLocation.Query){
 			BaseAddress = new Uri("http://petstore.swagger.io/v2"),
 		};
-		BasicAuthApi basicApi = new BasicAuthApi ("github","https://api.github.com"){UserAgent = "SimpleAuthDemo"};
+		BasicAuthApi basicApi = new BasicAuthApi ("github","encryptionstring","https://api.github.com"){UserAgent = "SimpleAuthDemo"};
 		public override bool FinishedLaunching(UIApplication application, NSDictionary launchOptions)
 		{
 			SimpleAuth.OnePassword.Activate ();
+			SimpleAuth.NativeSafariAuthenticator.Activate ();
 			Api.UnhandledException += (sender, e) =>
 			{
 				Console.WriteLine(e);
@@ -37,13 +44,11 @@ public override bool FinishedLaunching(UIApplication application, NSDictionary l
 
 			Window.RootViewController = new DialogViewController (new RootElement ("Simple Auth") {
 				new Section("Google Api"){
-					new StringElement("Authenticate", () => {
-						RunWithSpinner("Authenticating",async ()=>{
-							var account = await googleApi.Authenticate();
-							ShowAlert("Success","Authenticate");
-						});
+					new StringElement("Authenticate", async() => {
+						var account = await googleApi.Authenticate();
+						ShowAlert("Success","Authenticate");
 					}),
-					new StringElement("Log out", async () => {
+					new StringElement("Log out", () => {
 						googleApi.ResetData();
 						ShowAlert ("Success", "Logged out");
 					}),
@@ -60,7 +65,7 @@ public override bool FinishedLaunching(UIApplication application, NSDictionary l
 						var account = await basicApi.Authenticate();
 						ShowAlert ("Success", "Authenticated");
 					}),
-					new StringElement("Log out", async () => {
+					new StringElement("Log out", () => {
 						basicApi.ResetData();
 						ShowAlert ("Success", "Logged out");
 					}),
@@ -72,7 +77,12 @@ public override bool FinishedLaunching(UIApplication application, NSDictionary l
 
 			return true;
 		}
-
+		public override bool OpenUrl (UIApplication app, NSUrl url, NSDictionary options)
+		{
+			if (NativeSafariAuthenticator.ResumeAuth (url.AbsoluteString))
+				return true;
+			return false;
+		}
 		async Task RunWithSpinner(string status,Func<Task> task)
 		{
 			try{

diff --git a/samples/Sample.iOS/Info.plist b/samples/Sample.iOS/Info.plist
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
@@ -42,5 +42,16 @@
 		<string>UIInterfaceOrientationLandscapeLeft</string>
 		<string>UIInterfaceOrientationLandscapeRight</string>
 	</array>
+	<key>CFBundleName</key>
+	<string>Sample.iOS</string>
+	<key>CFBundleURLTypes</key>
+	<array>
+		<dict>
+			<key>CFBundleURLSchemes</key>
+			<array>
+				<string>com.googleusercontent.apps.88139740130-v4lei65b09c6gn13f152b5dlnokk5d3q</string>
+			</array>
+		</dict>
+	</array>
 </dict>
-</plist>
+</plist>
diff --git a/samples/Sample.iOS/Sample.iOS.csproj b/samples/Sample.iOS/Sample.iOS.csproj
@@ -22,6 +22,7 @@
     <MtouchArch>i386</MtouchArch>
     <MtouchLink>None</MtouchLink>
     <MtouchDebug>true</MtouchDebug>
+    <MtouchHttpClientHandler>NSUrlSessionHandler</MtouchHttpClientHandler>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhoneSimulator' ">
     <DebugType>none</DebugType>