LBRYCommunity/spee.ch
1
0
Fork 0
Code Issues 95 Pull requests 2 Projects Releases 4 Packages Wiki Activity

Authentication #170

Merged
bones7242 merged 43 commits from authentication into master 2017-09-29 02:29:22 +02:00
Conversation 1 Commits 43 Files changed 59 +83 -57
6 changed files with 83 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 8fab84de73 - Show all commits

2
controllers/publishController.js
View file

@ -14,7 +14,7 @@ module.exports = {
if (result === true) {
return lbryApi.publishClaim(publishParams);
} else {
return new Error('That name has already been claimed by spee.ch. Please choose a new claim name.');
return new Error('That name has already been claimed by spee.ch.');
}
})
// 3. upsert File record (update is in case the claim has been published before by this daemon)

30
public/assets/js/publishChannelFunctions.js
View file

@ -23,34 +23,4 @@ function sendSignupRequest (channelName, password) {
};
xhttp.send(params);
});
}
function publishNewChannel (event) {
const channelName = `@${document.getElementById('new-channel-name').value}`;
const password = document.getElementById('new-channel-password').value;
const channelNameErrorDisplayElement = document.getElementById('input-error-channel-name');
const passwordErrorDisplayElement = document.getElementById('input-error-password');
// prevent default so this script can handle submission
event.preventDefault();
// validate submission
validateNewChannelSubmission(channelName, password)
.then(() => {
return sendSignupRequest(channelName, password) // post the request
})
.then(() => {
console.log('success');
document.getElementById('signup-form').innerHTML = '<p>Your channel has been successfully created! Redirecting you now...</p>';
window.location.href = `/${channelName}`;
})
.catch(error => {
if (error.name === 'ChannelNameError'){
showError(channelNameErrorDisplayElement, error.message);
} else if (error.name === 'ChannelPasswordError'){
showError(passwordErrorDisplayElement, error.message);
} else {
console.log('failure:', error);
}
})
}

6
public/assets/js/validationFunctions.js
View file

@ -31,12 +31,12 @@ function validateFile(file) {
function validateClaimName (name) {
// ensure a name was entered
if (name.length < 1) {
throw new NameError("You must enter a name for your claim");
throw new NameError("You must enter a name for your url");
}
// validate the characters in the 'name' field
const invalidCharacters = /[^A-Za-z0-9,-]/g.exec(name);
if (invalidCharacters) {
throw new NameError('"' + invalidCharacters + '" characters are not allowed in the title.');
throw new NameError('"' + invalidCharacters + '" characters are not allowed in the url.');
}
}
@ -81,7 +81,7 @@ function isNameAvailable (name, apiUrl) {
if (this.response == true) {
resolve();
} else {
reject( new NameError("That name has already been claimed by another user. Please choose a different name."));
reject( new NameError("That name has already been claimed by someone else."));
}
} else {
reject("request to check claim name failed with status:" + this.status);

40
views/login.handlebars
View file

@ -20,23 +20,20 @@
<h2>Create New</h2>
<p>Create a brand new channel:</p>
<form id="signup-form" action="/signup" method="post">
<form id="publish-channel-form">
<div>
<span id="input-error-channel-name" class="info-message info-message--failure"></span><br/>
<div id="input-error-channel-name" class="info-message info-message--failure"></div>
<label>Channel name:</label>
@ <input type="text" name="username" value="" id="new-channel-name" class="input-text input-text--primary" oninput="checkChannelName(event.target.value)"/>
<span id="input-success-channel-name" class="info-message info-message--success"></span>
</div>
<div>
<span id="input-error-password" class="info-message info-message--failure"></span><br/>
<div id="input-error-password" class="info-message info-message--failure"></div>
<label>Password:</label>
<input type="password" name="password" value="" id="new-channel-password" class="input-text input-text--primary"/>
</div>
<div>
<input type="submit" value="Create" onclick="publishNewChannel(event)"/>
</div>
</form>
<button value="Create" onclick="publishNewChannel(event)">Create Channel</button>
</div>
{{> footer}}
</div>
@ -44,3 +41,32 @@
<script src="/assets/js/generalFunctions.js"></script>
<script src="/assets/js/validationFunctions.js"></script>
<script src="/assets/js/publishChannelFunctions.js"></script>
<script type="text/javascript">
function publishNewChannel (event) {
const channelName = `@${document.getElementById('new-channel-name').value}`;
const password = document.getElementById('new-channel-password').value;
const channelNameErrorDisplayElement = document.getElementById('input-error-channel-name');
const passwordErrorDisplayElement = document.getElementById('input-error-password');
// prevent default so this script can handle submission
event.preventDefault();
// validate submission
validateNewChannelSubmission(channelName, password)
.then(() => {
return sendSignupRequest(channelName, password) // post the request
})
.then(() => {
console.log('success');
document.getElementById('publish-channel-form').innerHTML = '<p>Your channel has been successfully created! Redirecting you now...</p>';
window.location.href = `/${channelName}`;
})
.catch(error => {
if (error.name === 'ChannelNameError'){
showError(channelNameErrorDisplayElement, error.message);
} else if (error.name === 'ChannelPasswordError'){
showError(passwordErrorDisplayElement, error.message);
} else {
console.log('failure:', error);
}
})
}
</script>

60
views/partials/publishChannel.handlebars
View file

@ -1,8 +1,8 @@
<div id="claim-channel-input-area">
<span id="input-error-channel-select" class="info-message info-message--failure"></span>
<p>
<div id="input-error-channel-select" class="info-message info-message--failure"></div>
<label for="channel-name-select">Channel:</label>
<select type="text" id="channel-name-select" name="channel" value="channel" onclick="check(event)">
<select type="text" id="channel-name-select" name="channel" value="channel" onclick="toggleChannel(event)">
{{#if user}}
<option value="{{user.channelName}}" >{{user.channelName}}</option>
{{/if}}
@ -12,25 +12,30 @@
</p>
<div id="channel-create-details" hidden="true">
<span id="input-error-channel-name" class="info-message info-message--failure"></span>
<p>
<label for="channelName">Channel Name: </label>
@<input type="text" id="channel-name-input" class="input-text input-text--primary" placeholder="exampleChannel" value="" oninput="checkChannelName(event.target.value)">
<span id="input-success-channel-name" class="info-message info-message--success"></span>
<br/>
<form id="publish-channel-form">
<div>
<div id="input-error-channel-name" class="info-message info-message--failure"></div>
<label for="channelName">Channel Name: </label>
@<input type="text" name="channelName" id="new-channel-name" class="input-text input-text--primary" placeholder="exampleChannel" value="" oninput="checkChannelName(event.target.value)">
<span id="input-success-channel-name" class="info-message info-message--success"></span>
</div>
<div>
<div id="input-error-channel-password" class="info-message info-message--failure"></div>
<label for="channelPassword" >Password: </label>
<input type="password" name="channelPassword" id="new-channel-password" placeholder="" value="" class="input-text input-text--primary">
</div>
<label for="password" >Password: </label>
<input type="password" id="password" placeholder="" value="" class="input-text input-text--primary">
<br/>
</form>
</p>
<button >create</button>
<button onclick="publishNewChannel(event)">Create Channel</button>
</div>
</div>
<script type="text/javascript">
// toggle channel creation tool
const createChannelTool = document.getElementById('channel-create-details');
function check(event) {
function toggleChannel (event) {
const createChannelTool = document.getElementById('channel-create-details');
const selectedOption = event.target.selectedOptions[0].value;
if (selectedOption != 'new') {
createChannelTool.hidden = true;
@ -39,8 +44,33 @@
createChannelTool.hidden = false;
}
}
function createChannel() {
function publishNewChannel (event) {
const channelName = `@${document.getElementById('new-channel-name').value}`;
const password = document.getElementById('new-channel-password').value;
const channelNameErrorDisplayElement = document.getElementById('input-error-channel-name');
const passwordErrorDisplayElement = document.getElementById('input-error-channel-password');
// prevent default so this script can handle submission
event.preventDefault();
// validate submission
validateNewChannelSubmission(channelName, password)
.then(() => {
return sendSignupRequest(channelName, password) // post the request
})
.then(() => {
console.log('success');
document.getElementById('signup-form').innerHTML = '<p>Your channel has been successfully created! Redirecting you now...</p>';
window.location.href = `/${channelName}`;
})
.catch(error => {
if (error.name === 'ChannelNameError'){
showError(channelNameErrorDisplayElement, error.message);
} else if (error.name === 'ChannelPasswordError'){
showError(passwordErrorDisplayElement, error.message);
} else {
console.log('failure:', error);
}
})
}
</script>

2
views/partials/publishForm.handlebars
View file

@ -12,8 +12,8 @@
<div class="col-right">
<div id="publish-active-area">
<div class="stop-float">
<span id="input-error-claim-name" class="info-message info-message--failure" hidden="true"></span>
<p>
<div id="input-error-claim-name" class="info-message info-message--failure" hidden="true"></div>
Spee.ch/
<input type="text" id="claim-name-input" class="input-text input-text--primary" placeholder="your-url-here" oninput="checkClaimName(event.target.value)">
<span id="input-success-claim-name" class="info-message info-message--success"></span>