bug rename seance

Yavsc/omnisharp.json

@@ -0,0 +1,6 @@
+{
+    "dotnet": {
+        "projects": "*/project.json",
+        "enablePackageRestore": false
+    }
+}

global.json

@@ -1,13 +1,13 @@
 {
     "projects": [
-        "Yavsc",
-        "Yavsc.Abstract",
-        "Yavsc.Server",
-        "cli",
-        "test",
-        "testOauthClient",
-        "OAuth.AspNet.Token",
-        "OAuth.AspNet.Server"
+        "src/Yavsc",
+        "src/Yavsc.Abstract",
+        "src/Yavsc.Server",
+        "src/cli",
+        "src/test",
+        "src/testOauthClient",
+        "src/OAuth.AspNet.Token",
+        "src/OAuth.AspNet.Server"
     ],
     "sdk": {
       "version": "1.0.0-rc1-update2",  

omnisharp.json

@@ -1,13 +1,11 @@
 {
-    "dotnet": {
-    "projects": "src/*/project.json;test/*/project.json;scripts/*/project.json",
-      "enable": true,
-        "projects": ".",
-        "enablePackageRestore": false,
-        "script": {
-          "enableScriptNuGetReferences": true,
-          "defaultTargetFramework": "dnx451"
-        }
-
+  "DotNet": {
+    "projectskjad": "src/*/project.json;test/*/project.json;scripts/*/project.json",
+    "enabled": true,
+    "enablePackageRestore": false,
+    "script": {
+      "enableScriptNuGetReferences": true,
+      "defaultTargetFramework": "dnx451"
     }
+  }
 }

src/Yavsc/ViewComponents/BlogIndexViewComponent.cs

@@ -33,7 +33,7 @@ namespace Yavsc.ViewComponents
         {
             long[] usercircles = await _context.Circle.Include(c=>c.Members).
             Where(c=>c.Members.Any(m=>m.MemberId == viewerId))
-            .Select(c=>c.Id).ToArray();
+            .Select(c=>c.Id).ToArrayAsync();
             IQueryable<BlogPost> posts ;
             var allposts = _context.Blogspot
                 .Include(b => b.Author)

src/sampleWebAsWebApiClient/.bowerrc

@@ -1,3 +1,3 @@
-{
-  "directory": "wwwroot/lib"
-}
+{
+  "directory": "wwwroot/lib"
+}

src/sampleWebAsWebApiClient/Controllers/HomeController.cs

@@ -1,168 +1,168 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Json;
-using System.Linq;
-using System.Net;
-using System.Net.Http;
-using System.Net.Http.Headers;
-using System.Threading;
-using System.Threading.Tasks;
-using Microsoft.AspNet.Mvc;
-using Microsoft.Extensions.Logging;
-using Yavsc.Server.Helpers;
-using Yavsc.Server.Model;
-
-namespace testOauthClient.Controllers
-{
-    public class HomeController : Controller
-    {
-        ILogger _logger;
-                   
-        public class GCMRegistrationRecord {
-                     public string   GCMRegistrationId { get; set; } = "testGoogleRegistrationIdValue";
-                     public string   DeviceId { get; set; }= "TestDeviceId";
-                     public string   Model { get; set; }= "TestModel";
-                      public string  Platform { get; set; }= "External Web";
-                     public string   Version { get; set; }= "0.0.1-rc1";
-                    }
-        
-        public HomeController(ILoggerFactory loggerFactory)
-        {
-            _logger=loggerFactory.CreateLogger<HomeController>();
-        }
-        [HttpGet]
-        public IActionResult Index()
-        {
-            return View();
-        }
-        [HttpPost]
-        public async Task<IActionResult> GetUserInfo(CancellationToken cancellationToken)
-        {
-            using (var client = new HttpClient())
-            {
-                var request = new HttpRequestMessage(HttpMethod.Get, "http://dev.pschneider.fr/api/me");
-                request.Headers.Authorization = new AuthenticationHeaderValue("Bearer", AccessToken);
-
-
-                var response = await client.SendAsync(request, cancellationToken);
-                response.EnsureSuccessStatusCode();
-
-                return View("Index", model: await response.Content.ReadAsStringAsync());
-            }
-
-        }
-
-        [HttpPost]
-        public async Task<IActionResult> PostFiles(string subdir)
-        {
-            string results = null;
-            _logger.LogInformation($"{Request.Form.Files.Count} file(s) to send");
-            
-                // TODO better uri construction in production environment
-                    List<FormFile> args = new List<FormFile>();
-                    foreach (var formFile in Request.Form.Files)
-                    {
-                        _logger.LogWarning($"Treating {formFile.ContentDisposition}");
-                        var memStream = new MemoryStream();
-                        const int sz = 1024*64;
-                        byte [] buffer = new byte[sz];
-                        using (var innerStream = formFile.OpenReadStream()) {
-                            int szRead = 0;
-                            do {
-                                szRead = innerStream.Read(buffer,0,sz);
-                                memStream.Write(buffer,0,szRead);
-                            } while (szRead>0);
-                        }
-                        memStream.Seek(0,SeekOrigin.Begin);
-                        args.Add(
-                        new FormFile {
-                            ContentDisposition = formFile.ContentDisposition,
-                            ContentType = formFile.ContentType,
-                            Stream = memStream
-                        });
-                    }
-                    string uri = "http://dev.pschneider.fr/api/fs/"+System.Uri.EscapeDataString(subdir);
-                    _logger.LogInformation($"Posting data to '{uri}'...");
-                    
-                    results = await RequestHelper.PostMultipart(uri, args.ToArray(), AccessToken);
-                    _logger.LogInformation("Data posted.");
-            
-            return View("Index", model: results);
-
-        }
-
-        [HttpPost]
-        public async Task<IActionResult> PostDeviceInfo(CancellationToken cancellationToken)
-        {
-            /* 
-                   using (var client = new HttpClient()) {
-                   var request = new HttpRequestMessage(HttpMethod.Post, "http://dev.pschneider.fr/api/gcm/register");
-
-                   request.Headers.Authorization = new AuthenticationHeaderValue("Bearer", AccessToken);
-                   var json = JsonConvert.
-                   SerializeObject(new Yavsc.Models.Identity.GoogleCloudMobileDeclaration  { DeviceId= "devid01", GCMRegistrationId = "1234" } );
-                   var content = new StringContent(json, Encoding.UTF8, "application/json");
-                   var response = await client.SendAsync(request, cancellationToken);
-                   response.EnsureSuccessStatusCode();
-
-                   return View("Index", model: await response.Content.ReadAsStringAsync());
-               }*/
-            GCMRegistrationRecord result = null;
-            var authHeader = $"Bearer {AccessToken}";
-            _logger.LogWarning($"using authorization Header {authHeader}");
-            try {
-
-            
-                using (var request = new SimpleJsonPostMethod(
-                    "http://dev.pschneider.fr/api/gcm/register", authHeader))
-                {
-                    result = await request.Invoke<GCMRegistrationRecord>(new
-                   GCMRegistrationRecord {
-                        GCMRegistrationId = "testGoogleRegistrationIdValue",
-                        DeviceId = "TestDeviceId",
-                        Model = "TestModel",
-                        Platform = "External Web",
-                        Version = "0.0.1-rc1"
-                    });
-                }
-            }
-            catch (Exception ex) {
-                 return View("Index", model: new { error = ex.Message });
-            }
-            return View("Index", model: result?.ToString());
-        }
-
-        protected string AccessToken
-        {
-            get
-            {
-                var claim = HttpContext.User?.FindFirst("access_token");
-                if (claim == null)
-                {
-                    throw new InvalidOperationException("no access_token");
-                }
-
-                return claim.Value;
-            }
-        }
-        public IActionResult About()
-        {
-            ViewData["Message"] = "Your application description page.";
-
-            return View();
-        }
-
-        public IActionResult Contact()
-        {
-            ViewData["Message"] = "Your contact page.";
-
-            return View();
-        }
-
-        public IActionResult Error()
-        {
-            return View();
-        }
-    }
-}
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Json;
+using System.Linq;
+using System.Net;
+using System.Net.Http;
+using System.Net.Http.Headers;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.AspNet.Mvc;
+using Microsoft.Extensions.Logging;
+using Yavsc.Server.Helpers;
+using Yavsc.Server.Model;
+
+namespace testOauthClient.Controllers
+{
+    public class HomeController : Controller
+    {
+        ILogger _logger;
+                   
+        public class GCMRegistrationRecord {
+                     public string   GCMRegistrationId { get; set; } = "testGoogleRegistrationIdValue";
+                     public string   DeviceId { get; set; }= "TestDeviceId";
+                     public string   Model { get; set; }= "TestModel";
+                      public string  Platform { get; set; }= "External Web";
+                     public string   Version { get; set; }= "0.0.1-rc1";
+                    }
+        
+        public HomeController(ILoggerFactory loggerFactory)
+        {
+            _logger=loggerFactory.CreateLogger<HomeController>();
+        }
+        [HttpGet]
+        public IActionResult Index()
+        {
+            return View();
+        }
+        [HttpPost]
+        public async Task<IActionResult> GetUserInfo(CancellationToken cancellationToken)
+        {
+            using (var client = new HttpClient())
+            {
+                var request = new HttpRequestMessage(HttpMethod.Get, "http://dev.pschneider.fr/api/me");
+                request.Headers.Authorization = new AuthenticationHeaderValue("Bearer", AccessToken);
+
+
+                var response = await client.SendAsync(request, cancellationToken);
+                response.EnsureSuccessStatusCode();
+
+                return View("Index", model: await response.Content.ReadAsStringAsync());
+            }
+
+        }
+
+        [HttpPost]
+        public async Task<IActionResult> PostFiles(string subdir)
+        {
+            string results = null;
+            _logger.LogInformation($"{Request.Form.Files.Count} file(s) to send");
+            
+                // TODO better uri construction in production environment
+                    List<FormFile> args = new List<FormFile>();
+                    foreach (var formFile in Request.Form.Files)
+                    {
+                        _logger.LogWarning($"Treating {formFile.ContentDisposition}");
+                        var memStream = new MemoryStream();
+                        const int sz = 1024*64;
+                        byte [] buffer = new byte[sz];
+                        using (var innerStream = formFile.OpenReadStream()) {
+                            int szRead = 0;
+                            do {
+                                szRead = innerStream.Read(buffer,0,sz);
+                                memStream.Write(buffer,0,szRead);
+                            } while (szRead>0);
+                        }
+                        memStream.Seek(0,SeekOrigin.Begin);
+                        args.Add(
+                        new FormFile {
+                            ContentDisposition = formFile.ContentDisposition,
+                            ContentType = formFile.ContentType,
+                            Stream = memStream
+                        });
+                    }
+                    string uri = "http://dev.pschneider.fr/api/fs/"+System.Uri.EscapeDataString(subdir);
+                    _logger.LogInformation($"Posting data to '{uri}'...");
+                    
+                    results = await RequestHelper.PostMultipart(uri, args.ToArray(), AccessToken);
+                    _logger.LogInformation("Data posted.");
+            
+            return View("Index", model: results);
+
+        }
+
+        [HttpPost]
+        public async Task<IActionResult> PostDeviceInfo(CancellationToken cancellationToken)
+        {
+            /* 
+                   using (var client = new HttpClient()) {
+                   var request = new HttpRequestMessage(HttpMethod.Post, "http://dev.pschneider.fr/api/gcm/register");
+
+                   request.Headers.Authorization = new AuthenticationHeaderValue("Bearer", AccessToken);
+                   var json = JsonConvert.
+                   SerializeObject(new Yavsc.Models.Identity.GoogleCloudMobileDeclaration  { DeviceId= "devid01", GCMRegistrationId = "1234" } );
+                   var content = new StringContent(json, Encoding.UTF8, "application/json");
+                   var response = await client.SendAsync(request, cancellationToken);
+                   response.EnsureSuccessStatusCode();
+
+                   return View("Index", model: await response.Content.ReadAsStringAsync());
+               }*/
+            GCMRegistrationRecord result = null;
+            var authHeader = $"Bearer {AccessToken}";
+            _logger.LogWarning($"using authorization Header {authHeader}");
+            try {
+
+            
+                using (var request = new SimpleJsonPostMethod(
+                    "http://dev.pschneider.fr/api/gcm/register", authHeader))
+                {
+                    result = await request.Invoke<GCMRegistrationRecord>(new
+                   GCMRegistrationRecord {
+                        GCMRegistrationId = "testGoogleRegistrationIdValue",
+                        DeviceId = "TestDeviceId",
+                        Model = "TestModel",
+                        Platform = "External Web",
+                        Version = "0.0.1-rc1"
+                    });
+                }
+            }
+            catch (Exception ex) {
+                 return View("Index", model: new { error = ex.Message });
+            }
+            return View("Index", model: result?.ToString());
+        }
+
+        protected string AccessToken
+        {
+            get
+            {
+                var claim = HttpContext.User?.FindFirst("access_token");
+                if (claim == null)
+                {
+                    throw new InvalidOperationException("no access_token");
+                }
+
+                return claim.Value;
+            }
+        }
+        public IActionResult About()
+        {
+            ViewData["Message"] = "Your application description page.";
+
+            return View();
+        }
+
+        public IActionResult Contact()
+        {
+            ViewData["Message"] = "Your contact page.";
+
+            return View();
+        }
+
+        public IActionResult Error()
+        {
+            return View();
+        }
+    }
+}

src/sampleWebAsWebApiClient/Startup.cs

@@ -1,142 +1,142 @@
-using System;
-using Microsoft.AspNet.Builder;
-using Microsoft.AspNet.Hosting;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
-using Microsoft.AspNet.Authentication;
-using Microsoft.AspNet.Http;
-using Microsoft.AspNet.Authentication.Cookies;
-using Microsoft.Extensions.WebEncoders;
-using Microsoft.AspNet.Authentication.OAuth;
-using System.Net.Http;
-using System.Net.Http.Headers;
-using Newtonsoft.Json.Linq;
-using System.Security.Claims;
-
-namespace testOauthClient
-{
-    public class Startup
-    {
-        public Startup(IHostingEnvironment env)
-        {
-            // Set up configuration sources.
-            var builder = new ConfigurationBuilder()
-                .AddJsonFile("appsettings.json")
-                .AddEnvironmentVariables();
-            Configuration = builder.Build();
-        }
-
-        public IConfigurationRoot Configuration { get; set; }
-
-        // This method gets called by the runtime. Use this method to add services to the container.
-        public void ConfigureServices(IServiceCollection services)
-        {
-
-            services.Configure<SharedAuthenticationOptions>(options =>
-            {
-                options.SignInScheme = "Bearer";
-            });
-
-            services.AddTransient<Microsoft.Extensions.WebEncoders.UrlEncoder, UrlEncoder>();
-
-            services.AddAuthentication();
-
-            services.AddMvc();
-
-        }
-
-        // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
-        public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory loggerFactory)
-        {
-            loggerFactory.AddConsole(Configuration.GetSection("Logging"));
-            loggerFactory.AddDebug();
-
-            if (env.IsDevelopment())
-            {
-                app.UseDeveloperExceptionPage();
-            }
-            else
-            {
-                app.UseExceptionHandler("/Home/Error");
-            }
-            app.UseIISPlatformHandler(options =>
-            {
-                options.AuthenticationDescriptions.Clear();
-            });
-            app.UseStaticFiles();
-            var authConf = Configuration.GetSection("Authentication").GetSection("Yavsc");
-            var clientId = authConf.GetSection("ClientId").Value;
-            var clientSecret = authConf.GetSection("ClientSecret").Value;
-            var logger = loggerFactory.CreateLogger<Startup>();
-            logger.LogInformation($"## ClientId: {clientId} ClientSecret: {clientSecret}");
-            app.UseCookieAuthentication(new CookieAuthenticationOptions
-            {
-                AutomaticAuthenticate = true,
-                AutomaticChallenge = true,
-                AuthenticationScheme = "Bearer",
-                CookieName = CookieAuthenticationDefaults.CookiePrefix + "Bearer",
-                ExpireTimeSpan = TimeSpan.FromMinutes(5),
-                LoginPath = new PathString("/signin"),
-                LogoutPath = new PathString("/signout")
-            });
-            var host =  "http://dev.pschneider.fr";
-            app.UseOAuthAuthentication(
-                options =>
-                {
-                    options.AuthenticationScheme = "Yavsc";
-                    options.AuthorizationEndpoint = $"{host}/authorize";
-                    options.TokenEndpoint = $"{host}/token";
-                    options.CallbackPath = new PathString("/signin-yavsc");
-                    options.DisplayName = "Yavsc dev";
-                    options.ClientId = clientId;
-                    options.ClientSecret = clientSecret;
-                    options.Scope.Add("profile");
-                    options.SaveTokensAsClaims = true;
-                    options.UserInformationEndpoint = $"{host}/api/me";
-                    
-                    options.Events = new OAuthEvents
-                    {
-                        OnCreatingTicket = async context =>
-                            {
-                                var request = new HttpRequestMessage(HttpMethod.Get, options.UserInformationEndpoint);
-                                request.Headers.Authorization = new AuthenticationHeaderValue("Bearer", context.AccessToken);
-                                var response = await context.Backchannel.SendAsync(request);
-                                response.EnsureSuccessStatusCode();
-
-                                var payload = JObject.Parse(await response.Content.ReadAsStringAsync());
-                                var identifier = payload.Value<string>("Id");
-                                var givenName = payload.Value<string>("UserName");
-                                var emails = payload.Value<JArray>("EMails");
-                                var roles = payload.Value<JArray>("Roles");
-                                string email = null;
-                                if (emails !=null)
-                                  email = emails.First?.Value<string>();
-                                if (identifier!=null)
-                                    context.Identity.AddClaim(
-                                        new Claim( ClaimTypes.NameIdentifier,identifier));
-                                if (givenName!=null)
-                                    context.Identity.AddClaim(
-                                        new Claim( ClaimTypes.Name,givenName));
-                                if (email!=null)
-                                    context.Identity.AddClaim(
-                                        new Claim( ClaimTypes.Email,email));
-                                    // TODO add all emails and roles
-
-                            }
-                    };
-                }
-            );
-
-            app.UseMvc(routes =>
-            {
-                routes.MapRoute(
-                    name: "default",
-                    template: "{controller=Home}/{action=Index}/{id?}");
-            });
-        }
-
-        // Entry point for the application.
-        public static void Main(string[] args) => Microsoft.AspNet.Hosting.WebApplication.Run<Startup>(args);
-    }
-}
+using System;
+using Microsoft.AspNet.Builder;
+using Microsoft.AspNet.Hosting;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+using Microsoft.AspNet.Authentication;
+using Microsoft.AspNet.Http;
+using Microsoft.AspNet.Authentication.Cookies;
+using Microsoft.Extensions.WebEncoders;
+using Microsoft.AspNet.Authentication.OAuth;
+using System.Net.Http;
+using System.Net.Http.Headers;
+using Newtonsoft.Json.Linq;
+using System.Security.Claims;
+
+namespace testOauthClient
+{
+    public class Startup
+    {
+        public Startup(IHostingEnvironment env)
+        {
+            // Set up configuration sources.
+            var builder = new ConfigurationBuilder()
+                .AddJsonFile("appsettings.json")
+                .AddEnvironmentVariables();
+            Configuration = builder.Build();
+        }
+
+        public IConfigurationRoot Configuration { get; set; }
+
+        // This method gets called by the runtime. Use this method to add services to the container.
+        public void ConfigureServices(IServiceCollection services)
+        {
+
+            services.Configure<SharedAuthenticationOptions>(options =>
+            {
+                options.SignInScheme = "Bearer";
+            });
+
+            services.AddTransient<Microsoft.Extensions.WebEncoders.UrlEncoder, UrlEncoder>();
+
+            services.AddAuthentication();
+
+            services.AddMvc();
+
+        }
+
+        // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
+        public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory loggerFactory)
+        {
+            loggerFactory.AddConsole(Configuration.GetSection("Logging"));
+            loggerFactory.AddDebug();
+
+            if (env.IsDevelopment())
+            {
+                app.UseDeveloperExceptionPage();
+            }
+            else
+            {
+                app.UseExceptionHandler("/Home/Error");
+            }
+            app.UseIISPlatformHandler(options =>
+            {
+                options.AuthenticationDescriptions.Clear();
+            });
+            app.UseStaticFiles();
+            var authConf = Configuration.GetSection("Authentication").GetSection("Yavsc");
+            var clientId = authConf.GetSection("ClientId").Value;
+            var clientSecret = authConf.GetSection("ClientSecret").Value;
+            var logger = loggerFactory.CreateLogger<Startup>();
+            logger.LogInformation($"## ClientId: {clientId} ClientSecret: {clientSecret}");
+            app.UseCookieAuthentication(new CookieAuthenticationOptions
+            {
+                AutomaticAuthenticate = true,
+                AutomaticChallenge = true,
+                AuthenticationScheme = "Bearer",
+                CookieName = CookieAuthenticationDefaults.CookiePrefix + "Bearer",
+                ExpireTimeSpan = TimeSpan.FromMinutes(5),
+                LoginPath = new PathString("/signin"),
+                LogoutPath = new PathString("/signout")
+            });
+            var host =  "http://dev.pschneider.fr";
+            app.UseOAuthAuthentication(
+                options =>
+                {
+                    options.AuthenticationScheme = "Yavsc";
+                    options.AuthorizationEndpoint = $"{host}/authorize";
+                    options.TokenEndpoint = $"{host}/token";
+                    options.CallbackPath = new PathString("/signin-yavsc");
+                    options.DisplayName = "Yavsc dev";
+                    options.ClientId = clientId;
+                    options.ClientSecret = clientSecret;
+                    options.Scope.Add("profile");
+                    options.SaveTokensAsClaims = true;
+                    options.UserInformationEndpoint = $"{host}/api/me";
+                    
+                    options.Events = new OAuthEvents
+                    {
+                        OnCreatingTicket = async context =>
+                            {
+                                var request = new HttpRequestMessage(HttpMethod.Get, options.UserInformationEndpoint);
+                                request.Headers.Authorization = new AuthenticationHeaderValue("Bearer", context.AccessToken);
+                                var response = await context.Backchannel.SendAsync(request);
+                                response.EnsureSuccessStatusCode();
+
+                                var payload = JObject.Parse(await response.Content.ReadAsStringAsync());
+                                var identifier = payload.Value<string>("Id");
+                                var givenName = payload.Value<string>("UserName");
+                                var emails = payload.Value<JArray>("EMails");
+                                var roles = payload.Value<JArray>("Roles");
+                                string email = null;
+                                if (emails !=null)
+                                  email = emails.First?.Value<string>();
+                                if (identifier!=null)
+                                    context.Identity.AddClaim(
+                                        new Claim( ClaimTypes.NameIdentifier,identifier));
+                                if (givenName!=null)
+                                    context.Identity.AddClaim(
+                                        new Claim( ClaimTypes.Name,givenName));
+                                if (email!=null)
+                                    context.Identity.AddClaim(
+                                        new Claim( ClaimTypes.Email,email));
+                                    // TODO add all emails and roles
+
+                            }
+                    };
+                }
+            );
+
+            app.UseMvc(routes =>
+            {
+                routes.MapRoute(
+                    name: "default",
+                    template: "{controller=Home}/{action=Index}/{id?}");
+            });
+        }
+
+        // Entry point for the application.
+        public static void Main(string[] args) => Microsoft.AspNet.Hosting.WebApplication.Run<Startup>(args);
+    }
+}

src/sampleWebAsWebApiClient/Views/Home/About.cshtml

@@ -1,7 +1,7 @@
-@{
-    ViewData["Title"] = "About";
-}
-<h2>@ViewData["Title"].</h2>
-<h3>@ViewData["Message"]</h3>
-
-<p>Use this area to provide additional information.</p>
+@{
+    ViewData["Title"] = "About";
+}
+<h2>@ViewData["Title"].</h2>
+<h3>@ViewData["Message"]</h3>
+
+<p>Use this area to provide additional information.</p>

src/sampleWebAsWebApiClient/Views/Home/Contact.cshtml

@@ -1,16 +1,16 @@
-@{
-    ViewData["Title"] = "Contact";
-}
-<h2>@ViewData["Title"].</h2>
-<h3>@ViewData["Message"]</h3>
-
-<address>
-    Paul Schneider<br />
-    <abbr title="Adresse postale">A:</abbr> Boulevard Aristide Briand - 92150 Suresnes
-    <abbr title="Mobile">M:</abbr> 336 51 14 15 64
-</address>
-
-<address>
-    <strong>Support:</strong> <a href="mailto:contact@pschneider.fr">contact@pschneider.fr</a><br />
-    <strong>Marketing:</strong> <a href="mailto:paul@pschneider.fr">paul@pschneider.fr</a>
-</address>
+@{
+    ViewData["Title"] = "Contact";
+}
+<h2>@ViewData["Title"].</h2>
+<h3>@ViewData["Message"]</h3>
+
+<address>
+    Paul Schneider<br />
+    <abbr title="Adresse postale">A:</abbr> Boulevard Aristide Briand - 92150 Suresnes
+    <abbr title="Mobile">M:</abbr> 336 51 14 15 64
+</address>
+
+<address>
+    <strong>Support:</strong> <a href="mailto:contact@pschneider.fr">contact@pschneider.fr</a><br />
+    <strong>Marketing:</strong> <a href="mailto:paul@pschneider.fr">paul@pschneider.fr</a>
+</address>

src/sampleWebAsWebApiClient/Views/Home/Index.cshtml

@@ -1,37 +1,37 @@
-@{
-    ViewData["Title"] = "Home Page";
-}
-
-<div class="jumbotron">
-    @if (User?.Identity?.IsAuthenticated ?? false) {
-        <h1>Welcome, @User.Identity.Name</h1>
-
-        <p>
-            @foreach (var claim in Context.User.Claims) {
-                <div>@claim.Type: <b>@claim.Value</b></div>
-            }
-        </p>
-
-        if (Model!=null) {
-            <h3>Message received from the resource controller: @Model</h3>
-        }
-
-        <form action="~/Home/GetUserInfo" method="post">
-            <button class="btn btn-lg btn-warning" type="submit">Get user info</button>
-        </form>
-        <form action="~/Home/PostDeviceInfo" method="post">
-            <button class="btn btn-lg btn-warning" type="submit">Post device info</button>
-        </form>
-        <form action="~/Home/PostFiles/?subdir=test" method="post" enctype="multipart/form-data">
-           Envoyer vers le dossier &quot;test&quot; <input type="file" name="file" multiple/>
-            <button class="btn btn-lg btn-warning" type="submit">Post files</button>
-        </form>
-
-        <a class="btn btn-lg btn-danger" href="/signout">Sign out</a>
-    }
-
-    else {
-        <h1>Welcome, anonymous</h1>
-        <a class="btn btn-lg btn-success" href="/signin">Sign in</a>
-    }
-</div>
+@{
+    ViewData["Title"] = "Home Page";
+}
+
+<div class="jumbotron">
+    @if (User?.Identity?.IsAuthenticated ?? false) {
+        <h1>Welcome, @User.Identity.Name</h1>
+
+        <p>
+            @foreach (var claim in Context.User.Claims) {
+                <div>@claim.Type: <b>@claim.Value</b></div>
+            }
+        </p>
+
+        if (Model!=null) {
+            <h3>Message received from the resource controller: @Model</h3>
+        }
+
+        <form action="~/Home/GetUserInfo" method="post">
+            <button class="btn btn-lg btn-warning" type="submit">Get user info</button>
+        </form>
+        <form action="~/Home/PostDeviceInfo" method="post">
+            <button class="btn btn-lg btn-warning" type="submit">Post device info</button>
+        </form>
+        <form action="~/Home/PostFiles/?subdir=test" method="post" enctype="multipart/form-data">
+           Envoyer vers le dossier &quot;test&quot; <input type="file" name="file" multiple/>
+            <button class="btn btn-lg btn-warning" type="submit">Post files</button>
+        </form>
+
+        <a class="btn btn-lg btn-danger" href="/signout">Sign out</a>
+    }
+
+    else {
+        <h1>Welcome, anonymous</h1>
+        <a class="btn btn-lg btn-success" href="/signin">Sign in</a>
+    }
+</div>

src/sampleWebAsWebApiClient/Views/Shared/Error.cshtml

@@ -1,6 +1,6 @@
-@{
-    ViewData["Title"] = "Error";
-}
-
-<h1 class="text-danger">Error.</h1>
-<h2 class="text-danger">An error occurred while processing your request.</h2>
+@{
+    ViewData["Title"] = "Error";
+}
+
+<h1 class="text-danger">Error.</h1>
+<h2 class="text-danger">An error occurred while processing your request.</h2>

src/sampleWebAsWebApiClient/Views/Shared/_Layout.cshtml

@@ -1,46 +1,46 @@
-<!DOCTYPE html>
-<html>
-    <head>
-        <meta charset="utf-8" />
-        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-        <title>@ViewData["Title"] - testOauthClient</title>
-
-            <link rel="stylesheet" href="~/lib/bootstrap/dist/css/bootstrap.css" />
-            <link rel="stylesheet" href="~/css/site.css" />
-    </head>
-    <body>
-        <div class="navbar navbar-inverse navbar-fixed-top">
-            <div class="container">
-                <div class="navbar-header">
-                    <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
-                        <span class="sr-only">Toggle navigation</span>
-                        <span class="icon-bar"></span>
-                        <span class="icon-bar"></span>
-                        <span class="icon-bar"></span>
-                    </button>
-                    <a asp-controller="Home" asp-action="Index" class="navbar-brand">testOauthClient</a>
-                </div>
-                <div class="navbar-collapse collapse">
-                    <ul class="nav navbar-nav">
-                        <li><a asp-controller="Home" asp-action="Index">Home</a></li>
-                        <li><a asp-controller="Home" asp-action="About">About</a></li>
-                        <li><a asp-controller="Home" asp-action="Contact">Contact</a></li>
-                    </ul>
-                </div>
-            </div>
-        </div>
-        <div class="container body-content">
-            @RenderBody()
-            <hr />
-            <footer>
-                <p>&copy; 2016 - testOauthClient</p>
-            </footer>
-        </div>
-
-            <script src="~/lib/jquery/dist/jquery.js"></script>
-            <script src="~/lib/bootstrap/dist/js/bootstrap.js"></script>
-            <script src="~/js/site.js" asp-append-version="true"></script>
-
-        @RenderSection("scripts", required: false)
-    </body>
-</html>
+<!DOCTYPE html>
+<html>
+    <head>
+        <meta charset="utf-8" />
+        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+        <title>@ViewData["Title"] - testOauthClient</title>
+
+            <link rel="stylesheet" href="~/lib/bootstrap/dist/css/bootstrap.css" />
+            <link rel="stylesheet" href="~/css/site.css" />
+    </head>
+    <body>
+        <div class="navbar navbar-inverse navbar-fixed-top">
+            <div class="container">
+                <div class="navbar-header">
+                    <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
+                        <span class="sr-only">Toggle navigation</span>
+                        <span class="icon-bar"></span>
+                        <span class="icon-bar"></span>
+                        <span class="icon-bar"></span>
+                    </button>
+                    <a asp-controller="Home" asp-action="Index" class="navbar-brand">testOauthClient</a>
+                </div>
+                <div class="navbar-collapse collapse">
+                    <ul class="nav navbar-nav">
+                        <li><a asp-controller="Home" asp-action="Index">Home</a></li>
+                        <li><a asp-controller="Home" asp-action="About">About</a></li>
+                        <li><a asp-controller="Home" asp-action="Contact">Contact</a></li>
+                    </ul>
+                </div>
+            </div>
+        </div>
+        <div class="container body-content">
+            @RenderBody()
+            <hr />
+            <footer>
+                <p>&copy; 2016 - testOauthClient</p>
+            </footer>
+        </div>
+
+            <script src="~/lib/jquery/dist/jquery.js"></script>
+            <script src="~/lib/bootstrap/dist/js/bootstrap.js"></script>
+            <script src="~/js/site.js" asp-append-version="true"></script>
+
+        @RenderSection("scripts", required: false)
+    </body>
+</html>

src/sampleWebAsWebApiClient/Views/_ViewImports.cshtml

@@ -1,2 +1,2 @@
-@using testOauthClient
-@addTagHelper "*, Microsoft.AspNet.Mvc.TagHelpers"
+@using testOauthClient
+@addTagHelper "*, Microsoft.AspNet.Mvc.TagHelpers"

src/sampleWebAsWebApiClient/Views/_ViewStart.cshtml

@@ -1,3 +1,3 @@
-@{
-    Layout = "_Layout";
-}
+@{
+    Layout = "_Layout";
+}

src/sampleWebAsWebApiClient/bower.json

@@ -1,10 +1,10 @@
-{
-  "name": "testOauthClient",
-  "private": true,
-  "dependencies": {
-    "bootstrap": "3.3.5",
-    "jquery": "2.1.4",
-    "jquery-validation": "1.14.0",
-    "jquery-validation-unobtrusive": "3.2.4"
-  }
-}
+{
+  "name": "testOauthClient",
+  "private": true,
+  "dependencies": {
+    "bootstrap": "3.3.5",
+    "jquery": "2.1.4",
+    "jquery-validation": "1.14.0",
+    "jquery-validation-unobtrusive": "3.2.4"
+  }
+}

src/sampleWebAsWebApiClient/gulpfile.js

@@ -1,64 +1,64 @@
-/// <binding Clean='clean' />
-"use strict";
-
-var gulp = require("gulp"),
-  rimraf = require("rimraf"),
-  concat = require("gulp-concat"),
-  cssmin = require("gulp-cssmin"),
-  shell = require("gulp-shell"),
-  uglify = require("gulp-uglify");
-
-var webroot = "./wwwroot/";
-
-var paths = {
-  js: webroot + "js/**/*.js",
-  minJs: webroot + "js/**/*.min.js",
-  css: webroot + "css/**/*.css",
-  minCss: webroot + "css/**/*.min.css",
-  concatJsDest: webroot + "js/site.min.js",
-  concatCssDest: webroot + "css/site.min.css"
-};
-
-gulp.task("clean:js", function (cb) {
-  rimraf(paths.concatJsDest, cb);
-});
-
-gulp.task("clean:css", function (cb) {
-  rimraf(paths.concatCssDest, cb);
-});
-
-gulp.task("clean", ["clean:js", "clean:css"]);
-
-gulp.task("min:js", function () {
-  return gulp.src([paths.js, "!" + paths.minJs], {
-    base: "."
-  })
-    .pipe(concat(paths.concatJsDest))
-    .pipe(uglify())
-    .pipe(gulp.dest("."));
-});
-
-gulp.task("min:css", function () {
-  return gulp.src([paths.css, "!" + paths.minCss])
-    .pipe(concat(paths.concatCssDest))
-    .pipe(cssmin())
-    .pipe(gulp.dest("."));
-});
-
-gulp.task("min", ["min:js", "min:css"]);
-gulp.task('watch', shell.task(['MONO_OPTIONS=--debug ASPNET_ENV=Development dnx-watch web --configuration=Debug --server.urls=http://*:5002']))
-
-var program = "testOauthClient";
-var port = 55555;
-
-gulp.task('default', ['debug']);
-
-gulp.task('build', function() {
-    return gulp
-        .src('./**/*.cs')
-        .pipe(msc(['-fullpaths', '-debug', '-target:exe', '-out:' + program]));
-});
-
-gulp.task('debug', ['build'], function(done) {
-    return mono.debug({ port: port, program: program}, done);
+/// <binding Clean='clean' />
+"use strict";
+
+var gulp = require("gulp"),
+  rimraf = require("rimraf"),
+  concat = require("gulp-concat"),
+  cssmin = require("gulp-cssmin"),
+  shell = require("gulp-shell"),
+  uglify = require("gulp-uglify");
+
+var webroot = "./wwwroot/";
+
+var paths = {
+  js: webroot + "js/**/*.js",
+  minJs: webroot + "js/**/*.min.js",
+  css: webroot + "css/**/*.css",
+  minCss: webroot + "css/**/*.min.css",
+  concatJsDest: webroot + "js/site.min.js",
+  concatCssDest: webroot + "css/site.min.css"
+};
+
+gulp.task("clean:js", function (cb) {
+  rimraf(paths.concatJsDest, cb);
+});
+
+gulp.task("clean:css", function (cb) {
+  rimraf(paths.concatCssDest, cb);
+});
+
+gulp.task("clean", ["clean:js", "clean:css"]);
+
+gulp.task("min:js", function () {
+  return gulp.src([paths.js, "!" + paths.minJs], {
+    base: "."
+  })
+    .pipe(concat(paths.concatJsDest))
+    .pipe(uglify())
+    .pipe(gulp.dest("."));
+});
+
+gulp.task("min:css", function () {
+  return gulp.src([paths.css, "!" + paths.minCss])
+    .pipe(concat(paths.concatCssDest))
+    .pipe(cssmin())
+    .pipe(gulp.dest("."));
+});
+
+gulp.task("min", ["min:js", "min:css"]);
+gulp.task('watch', shell.task(['MONO_OPTIONS=--debug ASPNET_ENV=Development dnx-watch web --configuration=Debug --server.urls=http://*:5002']))
+
+var program = "testOauthClient";
+var port = 55555;
+
+gulp.task('default', ['debug']);
+
+gulp.task('build', function() {
+    return gulp
+        .src('./**/*.cs')
+        .pipe(msc(['-fullpaths', '-debug', '-target:exe', '-out:' + program]));
+});
+
+gulp.task('debug', ['build'], function(done) {
+    return mono.debug({ port: port, program: program}, done);
 });

src/sampleWebAsWebApiClient/package.json

@@ -1,12 +1,12 @@
-{
-    "licence": "GNU GPL v3",
-    "name": "test-oauth-client",
-    "version": "0.0.0",
-    "devDependencies": {
-        "gulp": "^3.9.1",
-        "gulp-concat": "^2.6.1",
-        "gulp-cssmin": "^0.2.0",
-        "gulp-uglify": "^3.0.0",
-        "rimraf": "^2.6.2"
-    }
+{
+    "licence": "GNU GPL v3",
+    "name": "test-oauth-client",
+    "version": "0.0.0",
+    "devDependencies": {
+        "gulp": "^3.9.1",
+        "gulp-concat": "^2.6.1",
+        "gulp-cssmin": "^0.2.0",
+        "gulp-uglify": "^3.0.0",
+        "rimraf": "^2.6.2"
+    }
 }

src/sampleWebAsWebApiClient/wwwroot/css/site.css

@@ -1,24 +1,24 @@
-body {
-    padding-top: 50px;
-    padding-bottom: 20px;
-}
-
-/* Wrapping element */
-/* Set some basic padding to keep content from hitting the edges */
-.body-content {
-    padding-left: 15px;
-    padding-right: 15px;
-}
-
-/* Set widths on the form inputs since otherwise they're 100% wide */
-input,
-select,
-textarea {
-    max-width: 280px;
-}
-
-/* Carousel */
-.carousel-caption p {
-    font-size: 20px;
-    line-height: 1.4;
-}
+body {
+    padding-top: 50px;
+    padding-bottom: 20px;
+}
+
+/* Wrapping element */
+/* Set some basic padding to keep content from hitting the edges */
+.body-content {
+    padding-left: 15px;
+    padding-right: 15px;
+}
+
+/* Set widths on the form inputs since otherwise they're 100% wide */
+input,
+select,
+textarea {
+    max-width: 280px;
+}
+
+/* Carousel */
+.carousel-caption p {
+    font-size: 20px;
+    line-height: 1.4;
+}

src/sampleWebAsWebApiClient/wwwroot/js/site.js

@@ -1 +1 @@
-// Write your Javascript code.
+// Write your Javascript code.