From 8a2113a69a62213d05a436a15c25e76c1894df60 Mon Sep 17 00:00:00 2001 From: Paul Schneider Date: Tue, 6 Oct 2015 10:32:54 +0200 Subject: [PATCH 1/5] Fixes Html div import * style.css: reactive margins * Edit.aspx: The 'div' tag is not interpreted in Markdown. --- web/App_Themes/style.css | 14 ++++++++++---- web/ChangeLog | 6 ++++++ web/Views/Blogs/Edit.aspx | 1 - 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/web/App_Themes/style.css b/web/App_Themes/style.css index be9389a6..71e630e6 100644 --- a/web/App_Themes/style.css +++ b/web/App_Themes/style.css @@ -4,7 +4,8 @@ body { background-color: black; color: #D0FFD0; font-family: 'Arial', cursive; - padding: 2em; + padding:2em; + margin:2em; } .iconsmall { max-height: 1.3em; max-width: 1.3em; } @@ -19,7 +20,7 @@ header { border-radius:1em; margin: 1em; padding: 3em; - min-height: 10em; + min-height: 8em; background: url("/images/star-939235_1280.jpg") 0 0 no-repeat fixed; } @@ -265,14 +266,18 @@ input, select { { display:none;} } -@media all and (min-width: 640px) { .bshpanel { display:block; } .bsh { display: none; } .c3 { display:initial; } .c3-alt { display:none; } - } @media all and (max-width: 640px) { +body { padding: 1em; margin: 1em;} + header {min-height: 5em;} + } + +@media all and (max-width: 460px) { +body { padding: .5em; margin:.5;} header { margin: .5em; padding: .5em; @@ -317,6 +322,7 @@ input, select { } @media all and (max-width: 350px) { +body { padding: 0em; margin:0; } .c2 { display:none; } .c2-alt { display:initial; } } diff --git a/web/ChangeLog b/web/ChangeLog index de12274d..d555dba4 100644 --- a/web/ChangeLog +++ b/web/ChangeLog @@ -1,3 +1,9 @@ +2015-10-06 Paul Schneider + + * style.css: reactive margins + + * Edit.aspx: The 'div' tag is not interpreted in Markdown. + 2015-10-04 Paul Schneider * App.master: Indicates that a login permits to comment diff --git a/web/Views/Blogs/Edit.aspx b/web/Views/Blogs/Edit.aspx index bd98bbe9..83c813f1 100644 --- a/web/Views/Blogs/Edit.aspx +++ b/web/Views/Blogs/Edit.aspx @@ -82,7 +82,6 @@ jQuery('#vcontent').hallo({ 'em', 'strong', 'br', - 'div', 'ol', 'ul', 'li', From 303aaa5e1bb0bc7e940ebb767c0e64d22ba53178 Mon Sep 17 00:00:00 2001 From: Paul Schneider Date: Wed, 7 Oct 2015 11:50:44 +0200 Subject: [PATCH 2/5] Starting to test some controller * BlogUnitTest.cs: Should test the user registration * NpgsqlBlogProvider.cs: Fixes usage of Npgsql upgrade to latest version * TestAPI.csproj: switch to .Net framework 4.5.1 * AccountController.cs: refactoring password validation * CalendarController.cs: * WorkFlowController.cs: SendActivationMessage became an extension method * style.css: menu items already have a background and color, since they're `` tags * Unregister.aspx: * AccountController.cs: refactoring user registration * BlogsController.cs: Fixes a confusion between Author and reader ... * YavscHelpers.cs: refactoring the password reset * App.master: no more
, they're hyperlinks * Login.aspx: * Profile.aspx: refactoring the user registration * BlogEntryCollection.cs: implements a method to filter a given post collection in order to be displayed tu a given user or anonymous --- NpgsqlBlogProvider/ChangeLog | 5 ++ NpgsqlBlogProvider/NpgsqlBlogProvider.cs | 2 +- TestAPI/BlogUnitTest.cs | 76 ++++++++++++++++++++++++ TestAPI/ChangeLog | 6 ++ TestAPI/TestAPI.csproj | 10 +++- web/ApiControllers/AccountController.cs | 7 ++- web/ApiControllers/CalendarController.cs | 3 +- web/ApiControllers/WorkFlowController.cs | 3 +- web/App_Themes/style.css | 1 - web/ChangeLog | 25 ++++++++ web/Controllers/AccountController.cs | 27 +++++++-- web/Controllers/BlogsController.cs | 11 +++- web/Helpers/YavscHelpers.cs | 71 ++++++++-------------- web/Models/App.master | 4 +- web/Views/Account/Login.aspx | 2 +- web/Views/Account/Profile.aspx | 2 +- web/Views/Account/Unregister.aspx | 1 + yavscModel/Blogs/BlogEntryCollection.cs | 21 ++++++- yavscModel/ChangeLog | 6 ++ 19 files changed, 218 insertions(+), 65 deletions(-) create mode 100644 TestAPI/BlogUnitTest.cs diff --git a/NpgsqlBlogProvider/ChangeLog b/NpgsqlBlogProvider/ChangeLog index ceb4b524..fe331901 100644 --- a/NpgsqlBlogProvider/ChangeLog +++ b/NpgsqlBlogProvider/ChangeLog @@ -1,3 +1,8 @@ +2015-10-07 Paul Schneider + + * NpgsqlBlogProvider.cs: Fixes usage of Npgsql upgrade to + latest version + 2015-10-04 Paul Schneider * packages.config: diff --git a/NpgsqlBlogProvider/NpgsqlBlogProvider.cs b/NpgsqlBlogProvider/NpgsqlBlogProvider.cs index 9f237b10..a5825052 100644 --- a/NpgsqlBlogProvider/NpgsqlBlogProvider.cs +++ b/NpgsqlBlogProvider/NpgsqlBlogProvider.cs @@ -407,7 +407,7 @@ namespace Npgsql.Web.Blog if (circles.Length>0) using (NpgsqlCommand cmd = cnx.CreateCommand ()) { cmd.CommandText = "insert into blog_access (post_id,circle_id) values (:pid,:cid)"; - cmd.Parameters.AddWithValue ("pid", pid); + cmd.Parameters.AddWithValue ("pid", NpgsqlTypes.NpgsqlDbType.Bigint, pid); cmd.Parameters.Add ("cid", NpgsqlTypes.NpgsqlDbType.Bigint); cmd.Prepare (); foreach (long ci in circles) { diff --git a/TestAPI/BlogUnitTest.cs b/TestAPI/BlogUnitTest.cs new file mode 100644 index 00000000..be591a08 --- /dev/null +++ b/TestAPI/BlogUnitTest.cs @@ -0,0 +1,76 @@ +// +// BlogUnitTest.cs +// +// Author: +// Paul Schneider +// +// Copyright (c) 2015 GNU GPL +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public License +// along with this program. If not, see . +using NUnit.Framework; +using System; +using Yavsc.Model.Blogs; +using Yavsc.Controllers; +using System.Web.Mvc; +using System.Web.Security; + +namespace TestAPI +{ + [TestFixture ()] + public class BlogUnitTest + { + + public string UserName { get; set; } + public string Email { get; set; } + public string Password { get; set; } + + + AccountController accountController; + [TestFixtureSetUp] + public void Init() + { + accountController = new AccountController (); + } + + [Test ()] + public void Register () + { + ViewResult actionResult = accountController.Register ( + new Yavsc.Model.RolesAndMembers.RegisterViewModel () { + UserName = UserName, Email = Email, + Password = "tpwd", ConfirmPassword = Password, + IsApprouved = true + }, + "/testreturnurl") as ViewResult; + Assert.AreEqual (actionResult.ViewName, "RegistrationPending"); + MembershipUser u = Membership.GetUser (UserName, false); + Assert.NotNull (u); + Assert.False (u.IsApproved); + // TODO : check mail for test, + // get the validation key from its body, + // and use the accountController.Validate(username,key) + u.IsApproved = true; + Membership.UpdateUser (u); + Assert.True (u.IsApproved); + } + [TestFixtureTearDown()] + public void Unregister() + { + ViewResult actionResult = + accountController.Unregister (UserName, true) as ViewResult; + Assert.AreEqual (actionResult.ViewName, "Index"); + } + } +} + diff --git a/TestAPI/ChangeLog b/TestAPI/ChangeLog index 5210c59a..74fc3d9e 100644 --- a/TestAPI/ChangeLog +++ b/TestAPI/ChangeLog @@ -1,3 +1,9 @@ +2015-10-07 Paul Schneider + + * BlogUnitTest.cs: Should test the user registration + + * TestAPI.csproj: switch to .Net framework 4.5.1 + 2015-10-04 Paul Schneider * TestAPI.csproj: diff --git a/TestAPI/TestAPI.csproj b/TestAPI/TestAPI.csproj index ed962888..8e601b4c 100644 --- a/TestAPI/TestAPI.csproj +++ b/TestAPI/TestAPI.csproj @@ -9,7 +9,7 @@ Library TestAPI TestAPI - v4.5 + v4.5.1 true @@ -55,10 +55,14 @@ ..\packages\Spark.1.8.1.0\lib\NET45\Spark.dll + + + + @@ -66,6 +70,10 @@ {68F5B80A-616E-4C3C-91A0-828AA40000BD} YavscModel + + {77044C92-D2F1-45BD-80DD-AA25B311B027} + Web + diff --git a/web/ApiControllers/AccountController.cs b/web/ApiControllers/AccountController.cs index 6c45c52c..1a7e2362 100644 --- a/web/ApiControllers/AccountController.cs +++ b/web/ApiControllers/AccountController.cs @@ -72,7 +72,7 @@ namespace Yavsc.ApiControllers break; case MembershipCreateStatus.Success: if (!model.IsApprouved) - YavscHelpers.SendActivationMessage (user); + Url.SendActivationMessage (user); ProfileBase prtu = ProfileBase.Create (model.UserName); prtu.SetPropertyValue("Name",model.Name); prtu.SetPropertyValue("Address",model.Address); @@ -99,9 +99,12 @@ namespace Yavsc.ApiControllers public void ResetPassword(LostPasswordModel model) { StringDictionary errors; - YavscHelpers.ResetPassword (model, out errors); + MembershipUser user; + YavscHelpers.ValidatePasswordReset (model, out errors, out user); foreach (string key in errors.Keys) ModelState.AddModelError (key, errors [key]); + if (user != null && ModelState.IsValid) + Url.SendActivationMessage (user); } } } diff --git a/web/ApiControllers/CalendarController.cs b/web/ApiControllers/CalendarController.cs index 9919ff1b..d1b8300f 100644 --- a/web/ApiControllers/CalendarController.cs +++ b/web/ApiControllers/CalendarController.cs @@ -27,6 +27,7 @@ using Yavsc.Helpers; using System.Web.Profile; using Yavsc.Model.Circles; using Yavsc.Model.Calendar; +using System.Web.Http.Routing; namespace Yavsc.ApiControllers @@ -160,7 +161,7 @@ namespace Yavsc.ApiControllers "déjà enregistré"); break; case MembershipCreateStatus.Success: - YavscHelpers.SendActivationMessage (user); + Url.SendActivationMessage (user); // TODO set registration id throw new NotImplementedException (); } diff --git a/web/ApiControllers/WorkFlowController.cs b/web/ApiControllers/WorkFlowController.cs index 8a79f680..ca0cf435 100644 --- a/web/ApiControllers/WorkFlowController.cs +++ b/web/ApiControllers/WorkFlowController.cs @@ -85,7 +85,8 @@ namespace Yavsc.ApiControllers return ; case MembershipCreateStatus.Success: if (!userModel.IsApprouved) - YavscHelpers.SendActivationMessage (user); + + Url.SendActivationMessage (user); return; default: throw new InvalidOperationException (string.Format("Unexpected user creation code :{0}",mcs)); diff --git a/web/App_Themes/style.css b/web/App_Themes/style.css index 71e630e6..5d484951 100644 --- a/web/App_Themes/style.css +++ b/web/App_Themes/style.css @@ -235,7 +235,6 @@ input, select { .menuitem { - background-color: rgba(0,0,40,.8); border-radius:5px; margin:.5em; padding:.5em; diff --git a/web/ChangeLog b/web/ChangeLog index d555dba4..d3d7badb 100644 --- a/web/ChangeLog +++ b/web/ChangeLog @@ -1,3 +1,28 @@ +2015-10-07 Paul Schneider + + * AccountController.cs: refactoring password validation + + * CalendarController.cs: + * WorkFlowController.cs: SendActivationMessage became an + extension method + + * style.css: menu items already have a background and color, + since they're `` tags + + * Unregister.aspx: + * AccountController.cs: refactoring user registration + + * BlogsController.cs: Fixes a confusion between Author and + reader ... + + * YavscHelpers.cs: refactoring the password reset + + * App.master: no more
, they're + hyperlinks + + * Login.aspx: + * Profile.aspx: refactoring the user registration + 2015-10-06 Paul Schneider * style.css: reactive margins diff --git a/web/Controllers/AccountController.cs b/web/Controllers/AccountController.cs index 02572bd0..84135b87 100644 --- a/web/Controllers/AccountController.cs +++ b/web/Controllers/AccountController.cs @@ -126,11 +126,17 @@ namespace Yavsc.Controllers return View (); } + public ActionResult RegisterForm() + { + return View ("Register"); + } + /// /// Register the specified model and returnUrl. /// /// Model. /// Return URL. + [HttpPost] public ActionResult Register (RegisterViewModel model, string returnUrl) { ViewData ["returnUrl"] = returnUrl; @@ -138,7 +144,8 @@ namespace Yavsc.Controllers foreach (string k in ModelState.Keys) ModelState [k].Errors.Clear (); return View (model); - } + } + if (ModelState.IsValid) { if (model.ConfirmPassword != model.Password) { ModelState.AddModelError ("ConfirmPassword", "Veuillez confirmer votre mot de passe"); @@ -164,7 +171,7 @@ namespace Yavsc.Controllers "déjà enregistré"); return View (model); case MembershipCreateStatus.Success: - YavscHelpers.SendActivationMessage (user); + Url.SendActivationMessage (user); ViewData ["username"] = user.UserName; ViewData ["email"] = user.Email; return View ("RegistrationPending"); @@ -203,14 +210,20 @@ namespace Yavsc.Controllers } /// - /// Unregister the specified confirmed. + /// Unregister the specified id and confirmed. /// + /// Identifier. /// If set to true confirmed. [Authorize] - public ActionResult Unregister (bool confirmed = false) + public ActionResult Unregister (string id, bool confirmed = false) { + ViewData ["UserName"] = id; if (!confirmed) return View (); + string logged = Membership.GetUser ().UserName; + if (logged != id) + if (!Roles.IsUserInRole ("Admin")) + throw new Exception ("Unregister another user"); Membership.DeleteUser ( Membership.GetUser ().UserName); @@ -381,9 +394,13 @@ namespace Yavsc.Controllers { if (Request.HttpMethod == "POST") { StringDictionary errors; - YavscHelpers.ResetPassword (model, out errors); + MembershipUser user; + YavscHelpers.ValidatePasswordReset (model, out errors, out user); foreach (string key in errors.Keys) ModelState.AddModelError (key, errors [key]); + + if (user != null && ModelState.IsValid) + Url.SendActivationMessage (user); } return View (model); } diff --git a/web/Controllers/BlogsController.cs b/web/Controllers/BlogsController.cs index 96c39f60..7f0dd553 100644 --- a/web/Controllers/BlogsController.cs +++ b/web/Controllers/BlogsController.cs @@ -185,8 +185,8 @@ namespace Yavsc.Controllers ViewData ["Avatar"] = pr.avatar; ViewData ["BlogTitle"] = pr.BlogTitle; MembershipUser u = Membership.GetUser (); - if (u != null) - ViewData ["Author"] = u.UserName; + + ViewData ["Author"] = bec.Author; if (!pr.BlogVisible) { // only deliver to admins or owner if (u == null) @@ -197,6 +197,13 @@ namespace Yavsc.Controllers return View ("NotAuthorized"); } } + if (u == null || (u.UserName != bec.Author) && !Roles.IsUserInRole (u.UserName, "Admin")) { + // Filer on allowed posts + BlogEntryCollection filtered = bec.FilterFor((u == null)?null : u.UserName); + UUTBlogEntryCollection nbec = new UUTBlogEntryCollection (bec.Author, bec.Title); + nbec.AddRange (filtered); + View ("UserPost",nbec); + } } return View ("UserPost",bec); } diff --git a/web/Helpers/YavscHelpers.cs b/web/Helpers/YavscHelpers.cs index b64e507b..236e46b3 100644 --- a/web/Helpers/YavscHelpers.cs +++ b/web/Helpers/YavscHelpers.cs @@ -5,11 +5,9 @@ using System.Web.Security; using System.IO; using System.Web.Configuration; using System.Net.Mail; -using System.Web.Http.ModelBinding; using Yavsc.Model.RolesAndMembers; using System.Collections.Generic; using System.Collections.Specialized; -using System.Web.Mvc; using Yavsc.Model.Circles; using System.Web.UI; using System.Linq.Expressions; @@ -22,31 +20,6 @@ namespace Yavsc.Helpers /// public static class YavscHelpers { - /// - /// Formats the circle. - /// - /// The circle. - /// C. - public static HtmlString FormatCircle (Circle c) - { - if (c.Members!=null) - if (c.Members.Length > 0) { - TagBuilder i = new TagBuilder ("i"); - i.SetInnerText (String.Join (", ", c.Members)); - return new HtmlString (c.Title+"
\n"+i.ToString()); - } - return new HtmlString (c.Title); - } - /// - /// Formats the circle. - /// - /// The circle as Html string. - /// Helper. - /// C. - public static HtmlString FormatCircle(this HtmlHelper helper, Circle c) - { - return FormatCircle (c); - } private static string siteName = null; /// @@ -76,19 +49,33 @@ namespace Yavsc.Helpers /// /// Sends the activation message. /// + /// Helper. /// User. - public static void SendActivationMessage(MembershipUser user) + public static void SendActivationMessage(this System.Web.Http.Routing.UrlHelper helper, MembershipUser user) { - SendEmail (WebConfigurationManager.AppSettings ["RegistrationMessage"], + SendActivationMessage (helper.Route("~/Account/Validate/",new { id=user.UserName, key=user.ProviderUserKey.ToString() } ) + , WebConfigurationManager.AppSettings ["RegistrationMessage"], + user); + } + /// + /// Sends the activation message. + /// + /// Helper. + /// User. + public static void SendActivationMessage(this System.Web.Mvc.UrlHelper helper, MembershipUser user) + { + SendActivationMessage (helper.Content("~/Account/Validate/"+user.UserName+"/?key="+user.ProviderUserKey.ToString()) + , WebConfigurationManager.AppSettings ["RegistrationMessage"], user); } /// - /// Sends the email. + /// Sends the activation message. /// + /// Validation URL. /// Registration message. /// User. - public static void SendEmail(string registrationMessage, MembershipUser user) { + public static void SendActivationMessage(string validationUrl, string registrationMessage, MembershipUser user) { FileInfo fi = new FileInfo ( HttpContext.Current.Server.MapPath (registrationMessage)); if (!fi.Exists) { @@ -103,12 +90,8 @@ namespace Yavsc.Helpers string body = sr.ReadToEnd (); body = body.Replace ("<%SiteName%>", YavscHelpers.SiteName); body = body.Replace ("<%UserName%>", user.UserName); - body = body.Replace ("<%UserActivatonUrl%>", - string.Format ("<{0}://{1}/Account/Validate/{2}?key={3}>", - HttpContext.Current.Request.Url.Scheme, - HttpContext.Current.Request.Url.Authority, - user.UserName, - user.ProviderUserKey.ToString ())); + body = body.Replace ("<%UserActivatonUrl%>", validationUrl); + using (MailMessage msg = new MailMessage ( Admail, user.Email, string.Format ("Validation de votre compte {0}", YavscHelpers.SiteName), @@ -122,15 +105,16 @@ namespace Yavsc.Helpers } /// - /// Resets the password. + /// Validates the password reset. /// /// Model. /// Errors. - public static void ResetPassword(LostPasswordModel model, out StringDictionary errors) + /// User. + public static void ValidatePasswordReset(LostPasswordModel model, out StringDictionary errors, out MembershipUser user) { MembershipUserCollection users = null; errors = new StringDictionary (); - + user = null; if (!string.IsNullOrEmpty (model.UserName)) { users = Membership.FindUsersByName (model.UserName); @@ -158,10 +142,7 @@ namespace Yavsc.Helpers if (users==null) return; // Assert users.Count == 1 - if (users.Count != 1) - throw new InvalidProgramException ("Emails and user's names are uniques, and we find more than one result here, aborting."); - foreach (MembershipUser u in users) - YavscHelpers.SendActivationMessage (u); + foreach (MembershipUser u in users) user = u; } /// /// Avatars the URL. @@ -169,7 +150,7 @@ namespace Yavsc.Helpers /// The URL. /// Helper. /// Username. - public static string AvatarUrl (this HtmlHelper helper, string username) { + public static string AvatarUrl (this System.Web.WebPages.Html.HtmlHelper helper, string username) { ProfileBase pr = ProfileBase.Create (username); var a = pr.GetPropertyValue("Avatar") ; if (a == null || a is DBNull) return "/avatars/" + helper.Encode(username)+".png"; diff --git a/web/Models/App.master b/web/Models/App.master index 3e247c4d..63ee0f0f 100644 --- a/web/Models/App.master +++ b/web/Models/App.master @@ -103,11 +103,9 @@ $(document).ready(function(){
<% } else { %> - -
+ vos billets
Vos billets
-
" accesskey="L" class="menuitem"> <%= HttpContext.Current.User.Identity.Name %> diff --git a/web/Views/Account/Login.aspx b/web/Views/Account/Login.aspx index 00306c42..ba09a7da 100644 --- a/web/Views/Account/Login.aspx +++ b/web/Views/Account/Login.aspx @@ -20,7 +20,7 @@ <% } %>
-<%= Html.ActionLink("S'enregistrer","Register",new {returnUrl=ViewData["returnUrl"]}, new { @class="actionlink" }) %> +<%= Html.ActionLink("S'enregistrer","RegisterForm",new {returnUrl=ViewData["returnUrl"]}, new { @class="actionlink" }) %>
?returnUrl=<%=ViewData["returnUrl"]==null?Request.Url.PathAndQuery:(string)ViewData["returnUrl"]%>" class="actionlink"> diff --git a/web/Views/Account/Profile.aspx b/web/Views/Account/Profile.aspx index f04f9791..9c016311 100644 --- a/web/Views/Account/Profile.aspx +++ b/web/Views/Account/Profile.aspx @@ -112,7 +112,7 @@ Avatar : - <%= Html.ActionLink("Désincription","Unregister", "Account",null, new { @class="actionlink" })%> + <%= Html.ActionLink("Désincription","Unregister", "Account", new { id=ViewData["UserName"] } , new { @class="actionlink" })%>