add buttons to show calling apis to MVC samples

danielcibely · Apr 20, 2016 · 5cbed36 · 5cbed36
1 parent 9691187
commit 5cbed36
Show file tree

Hide file tree

Showing 9 changed files with 82 additions and 10 deletions.
diff --git a/source/Clients/MVC OWIN Client (Hybrid)/Controllers/HomeController.cs b/source/Clients/MVC OWIN Client (Hybrid)/Controllers/HomeController.cs
@@ -21,6 +21,9 @@ public ActionResult Claims()
         {
             ViewBag.Message = "Claims";
 
+            var cp = (ClaimsPrincipal)User;
+            ViewData["access_token"] = cp.FindFirst("access_token").Value;
+
             return View();
         }
 

diff --git a/source/Clients/MVC OWIN Client (Hybrid)/Views/Home/CallApi.cshtml b/source/Clients/MVC OWIN Client (Hybrid)/Views/Home/CallApi.cshtml
@@ -3,5 +3,6 @@
     ViewBag.Title = "CallApi";
 }
 
+<h2>API result from MVC</h2>
 <pre>@ViewBag.Json</pre>
 
diff --git a/source/Clients/MVC OWIN Client (Hybrid)/Views/Home/Claims.cshtml b/source/Clients/MVC OWIN Client (Hybrid)/Views/Home/Claims.cshtml
@@ -1,5 +1,32 @@
 <h3>@ViewBag.Message</h3>
 
+
+<div>
+    <a class="btn btn-default" href="~/Home/CallApi">Call API from MVC</a>
+    <button id="api" class="btn btn-default">Call API from JS</button>
+</div>
+
+<div id="result" style="display:none">
+    <h2>API result from JS</h2>
+    <pre id="api_result"></pre>
+</div>
+
+
+<script>
+    var access_token = '@ViewData["access_token"]';
+    document.getElementById('api').addEventListener("click", function () {
+        var xhr = new XMLHttpRequest();
+        xhr.open("GET", "https://localhost:44379/identity");
+        xhr.onload = function () {
+            document.getElementById('result').style.display = "";
+            document.getElementById('api_result').innerText = JSON.stringify(JSON.parse(xhr.response), null, 2);
+        };
+        xhr.setRequestHeader("Authorization", "Bearer " + access_token);
+        xhr.send();
+    }, false);
+</script>
+
+
 <dl>
     @foreach (var claim in System.Security.Claims.ClaimsPrincipal.Current.Claims)
     {
@@ -10,4 +37,6 @@
             @claim.Value
         </dd>
     }
-</dl>
+</dl>
+
+
diff --git a/source/Clients/MVC OWIN Client/Controllers/HomeController.cs b/source/Clients/MVC OWIN Client/Controllers/HomeController.cs
@@ -1,4 +1,8 @@
-using System.Security.Claims;
+using Newtonsoft.Json.Linq;
+using Sample;
+using System.Net.Http;
+using System.Security.Claims;
+using System.Threading.Tasks;
 using System.Web;
 using System.Web.Mvc;
 
@@ -21,12 +25,26 @@ public ActionResult Claims()
 
             if (token != null)
             {
-                ViewBag.Token = token.Value;
+                ViewData["access_token"] = token.Value;
             }
 
             return View();
         }
 
+        public async Task<ActionResult> CallApi()
+        {
+            var token = (User as ClaimsPrincipal).FindFirst("access_token").Value;
+
+            var client = new HttpClient();
+            client.SetBearerToken(token);
+
+            var result = await client.GetStringAsync(Constants.AspNetWebApiSampleApi + "identity");
+            ViewBag.Json = JArray.Parse(result.ToString());
+
+            return View();
+        }
+
+
         public ActionResult Signout()
         {
             Request.GetOwinContext().Authentication.SignOut();

diff --git a/source/Clients/MVC OWIN Client/Views/Home/Claims.cshtml b/source/Clients/MVC OWIN Client/Views/Home/Claims.cshtml
@@ -1,7 +1,28 @@
 <h3>@ViewBag.Message</h3>
 
+<div>
+    <a class="btn btn-default" href="~/Home/CallApi">Call API from MVC</a>
+    <button id="api" class="btn btn-default">Call API from JS</button>
+</div>
+
+<div id="result" style="display:none">
+    <h2>API result from JS</h2>
+    <pre id="api_result"></pre>
+</div>
+
+
 <script>
-    var token = '@ViewBag.Token';
+    var access_token = '@ViewData["access_token"]';
+    document.getElementById('api').addEventListener("click", function () {
+        var xhr = new XMLHttpRequest();
+        xhr.open("GET", "https://localhost:44379/identity");
+        xhr.onload = function () {
+            document.getElementById('result').style.display = "";
+            document.getElementById('api_result').innerText = JSON.stringify(JSON.parse(xhr.response), null, 2);
+        };
+        xhr.setRequestHeader("Authorization", "Bearer " + access_token);
+        xhr.send();
+    }, false);
 </script>
 
 <dl>
@@ -14,4 +35,4 @@
             @claim.Value
         </dd>
     }
-</dl>
+</dl>
diff --git a/source/Clients/SampleAspNetWebApi/App_Start/WebApiConfig.cs b/source/Clients/SampleAspNetWebApi/App_Start/WebApiConfig.cs
@@ -14,7 +14,7 @@ public static HttpConfiguration Register()
             // Web API routes
             config.MapHttpAttributeRoutes();
 
-            config.EnableCors(new EnableCorsAttribute("http://localhost:21575, http://localhost:37045, http://localhost:37046", "accept, authorization", "GET", "WWW-Authenticate"));
+            config.EnableCors(new EnableCorsAttribute("https://localhost:44300, http://localhost:21575, http://localhost:37045, http://localhost:37046, https://localhost:44301", "accept, authorization", "GET", "WWW-Authenticate"));
 
             config.Routes.MapHttpRoute(
                 name: "DefaultApi",

diff --git a/source/Clients/SampleAspNetWebApi/Sample Web API.csproj b/source/Clients/SampleAspNetWebApi/Sample Web API.csproj
@@ -15,7 +15,7 @@
     <AssemblyName>SampleAspNetWebApi</AssemblyName>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <UseIISExpress>true</UseIISExpress>
-    <IISExpressSSLPort />
+    <IISExpressSSLPort>44379</IISExpressSSLPort>
     <IISExpressAnonymousAuthentication>enabled</IISExpressAnonymousAuthentication>
     <IISExpressWindowsAuthentication>disabled</IISExpressWindowsAuthentication>
     <IISExpressUseClassicPipelineMode>false</IISExpressUseClassicPipelineMode>

diff --git a/source/DefaultViewService/EmbeddedAssetsViewService/EmbeddedAssetsViewService.csproj b/source/DefaultViewService/EmbeddedAssetsViewService/EmbeddedAssetsViewService.csproj
@@ -39,8 +39,8 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="IdentityServer3, Version=2.4.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\IdentityServer3.2.4.0\lib\net45\IdentityServer3.dll</HintPath>
+    <Reference Include="IdentityServer3, Version=2.5.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\IdentityServer3.2.5.0\lib\net45\IdentityServer3.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.CSharp" />

diff --git a/source/DefaultViewService/EmbeddedAssetsViewService/packages.config b/source/DefaultViewService/EmbeddedAssetsViewService/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="IdentityServer3" version="2.4.0" targetFramework="net45" />
+  <package id="IdentityServer3" version="2.5.0" targetFramework="net45" />
   <package id="Microsoft.Owin" version="3.0.1" targetFramework="net45" />
   <package id="Microsoft.Owin.Host.SystemWeb" version="3.0.1" targetFramework="net45" />
   <package id="Microsoft.Owin.Security" version="3.0.1" targetFramework="net45" />