Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| ec45bfb1d5 |
@@ -41,7 +41,7 @@ namespace OurUmbraco.Our.Controllers
|
||||
}
|
||||
|
||||
var memberService = Services.MemberService;
|
||||
|
||||
|
||||
if (memberService.GetByEmail(model.Email) != null)
|
||||
{
|
||||
ModelState.AddModelError("Email", "A member with that email address already exists");
|
||||
@@ -60,28 +60,6 @@ namespace OurUmbraco.Our.Controllers
|
||||
return Redirect("/");
|
||||
}
|
||||
|
||||
// these values are enforced in MemberDto which is internal ;-(
|
||||
// we should really have ways to query for Core meta-data!
|
||||
const int maxEmailLength = 900; // 1000*.9 for safety
|
||||
const int maxLoginNameLength = 900; // 1000*.9 for safety
|
||||
const int maxPasswordLength = 900; // 1000*.9 for safety
|
||||
const int maxPropertyLength = 900; // keep it safe too
|
||||
|
||||
if (model.Email.Length > maxEmailLength
|
||||
|| model.Name.Length > maxLoginNameLength
|
||||
|| model.Password.Length > maxPasswordLength
|
||||
|| model.Location.Length > maxPropertyLength
|
||||
|| model.Longitude.Length > maxPropertyLength
|
||||
|| model.Latitude.Length > maxPropertyLength
|
||||
|| model.Company.Length > maxPropertyLength
|
||||
|| model.TwitterAlias.Length > maxPropertyLength
|
||||
)
|
||||
{
|
||||
// has to be a rogue registration
|
||||
// go away!
|
||||
return Redirect("/");
|
||||
}
|
||||
|
||||
var member = memberService.CreateMember(model.Email, model.Email, model.Name, "member");
|
||||
member.SetValue("location", model.Location);
|
||||
member.SetValue("longitude", model.Longitude);
|
||||
@@ -108,7 +86,7 @@ namespace OurUmbraco.Our.Controllers
|
||||
|
||||
memberService.AssignRole(member.Username, "standard");
|
||||
|
||||
memberService.SavePassword(member, model.Password);
|
||||
memberService.SavePassword(member, model.Password);
|
||||
|
||||
Members.Login(model.Email, model.Password);
|
||||
|
||||
|
||||
+19
-14
@@ -1,37 +1,42 @@
|
||||
@ECHO OFF
|
||||
SETLOCAL
|
||||
:: SETLOCAL is on, so changes to the path not persist to the actual user's path
|
||||
|
||||
SET release=%1
|
||||
ECHO Installing Npm NuGet Package
|
||||
|
||||
SET nuGetFolder=%CD%\..\packages\
|
||||
SET release=%1
|
||||
SET buildFolder=%CD%
|
||||
|
||||
SET nuGetFolder=%CD%\..\packages
|
||||
ECHO Configured packages folder: %nuGetFolder%
|
||||
ECHO Current folder: %CD%
|
||||
|
||||
%CD%\..\.nuget\NuGet.exe install Npm.js -OutputDirectory %nuGetFolder% -Verbosity quiet
|
||||
ECHO Installing Npm NuGet Package
|
||||
"%CD%\..\.nuget\NuGet.exe" install Npm.js -OutputDirectory "%nuGetFolder%" -Verbosity quiet
|
||||
|
||||
for /f "delims=" %%A in ('dir %nuGetFolder%node.js.* /b') do set "nodePath=%nuGetFolder%%%A\"
|
||||
for /f "delims=" %%A in ('dir %nuGetFolder%npm.js.* /b') do set "npmPath=%nuGetFolder%%%A\tools\"
|
||||
for /f "delims=" %%A in ('dir "%nuGetFolder%\node.js.*" /b') do set "nodePath=%nuGetFolder%\%%A\"
|
||||
for /f "delims=" %%A in ('dir "%nuGetFolder%\npm.js.*" /b') do set "npmPath=%nuGetFolder%\%%A\tools\"
|
||||
|
||||
REM Ensures that we look for the just downloaded NPM, not whatever the user has installed on their machine
|
||||
path=%npmPath%;%nodePath%
|
||||
SET PATH=%npmPath%;%nodePath%;%PATH%
|
||||
ECHO Path
|
||||
ECHO %PATH%
|
||||
|
||||
ECHO %path%
|
||||
ECHO Node
|
||||
node -v
|
||||
|
||||
SET buildFolder=%CD%
|
||||
|
||||
ECHO Change directory to %CD%\..\OurUmbraco.Client\
|
||||
CD %CD%\..\OurUmbraco.Client\
|
||||
ECHO Change directory to "%CD%\..\OurUmbraco.Client"
|
||||
CD "%CD%\..\OurUmbraco.Client"
|
||||
|
||||
ECHO.
|
||||
ECHO Setting node_modules folder to hidden to prevent VS13 from crashing on it while loading the websites project
|
||||
attrib +h node_modules
|
||||
|
||||
ECHO Do npm install and the gulp build
|
||||
ECHO Npm Cache Clean
|
||||
call npm cache clean
|
||||
ECHO Npm Install
|
||||
call npm install
|
||||
ECHO Npm Install Gulp
|
||||
call npm install -g install gulp -g --quiet
|
||||
ECHO Gulp build
|
||||
call gulp build
|
||||
|
||||
ECHO Move back to the build folder
|
||||
|
||||
Reference in New Issue
Block a user