KevinMidboe/seasonedShows
1
0
Fork 0
Code Issues 20 Pull Requests 2 Packages Projects Releases 8 Wiki Activity

When creating a account the email field is now optional.

Browse Source
This commit is contained in:
Kevin
2018-03-06 19:18:51 +01:00
parent 34a97c069b
commit 6619184a45
3 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
seasoned_api/src/user/user.js
View File

@@ -1,5 +1,5 @@
class User { class User {
constructor(username, email) { constructor(username, email=undefined) {
this.username = username; this.username = username;
this.email = email; this.email = email;
} }

11
seasoned_api/src/user/userRepository.js
View File

@@ -6,7 +6,7 @@ class UserRepository {
this.database = database || establishedDatabase; this.database = database || establishedDatabase;
this.queries = { this.queries = {
read: 'select * from user where lower(user_name) = lower(?)', read: 'select * from user where lower(user_name) = lower(?)',
create: 'insert into user (user_name, email) values(?, ?)', create: 'insert into user (user_name) values (?)',
change: 'update user set password = ? where user_name = ?', change: 'update user set password = ? where user_name = ?',
retrieveHash: 'select * from user where user_name = ?', retrieveHash: 'select * from user where user_name = ?',
}; };
@@ -20,13 +20,10 @@ class UserRepository {
create(user) { create(user) {
return Promise.resolve() return Promise.resolve()
.then(() => this.database.get(this.queries.read, user.username)) .then(() => this.database.get(this.queries.read, user.username))
.then(row => assert.equal(row, undefined)) .then(() => this.database.run(this.queries.create, user.username))
.then(() => this.database.run(this.queries.create, [user.username, user.email]))
.catch((error) => { .catch((error) => {
if (error.message.endsWith('email')) { if (error.name === 'AssertionError' || error.message.endsWith('user_name')) {
throw new Error('That email is already taken'); throw new Error('That username is already registered');
} else if (error.name === 'AssertionError' || error.message.endsWith('user_name')) {
throw new Error('That username is already taken');
} }
}); });
} }

2
seasoned_api/src/user/userSecurity.js
View File

@@ -15,8 +15,6 @@ class UserSecurity {
createNewUser(user, clearPassword) { createNewUser(user, clearPassword) {
if (user.username.trim() === '') { if (user.username.trim() === '') {
throw new Error('The username is empty.'); throw new Error('The username is empty.');
} else if (user.email.trim() === '') {
throw new Error('The email is empty.');
} else if (clearPassword.trim() === '') { } else if (clearPassword.trim() === '') {
throw new Error('The password is empty.'); throw new Error('The password is empty.');
} else { } else {