Skip to content
This repository has been archived by the owner on Aug 28, 2021. It is now read-only.

Commit

Permalink
Remove email verification stuff until its finished
Browse files Browse the repository at this point in the history
  • Loading branch information
mswaidan committed Jul 25, 2019
1 parent 019cf1e commit 7c60ccc
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 150 deletions.
25 changes: 4 additions & 21 deletions app/api/accounts/UserCreate.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,9 @@
const winston = require( '../../../config/logger' )
const jwt = require( 'jsonwebtoken' )
const cryptoRandomString = require( 'crypto-random-string' )

const User = require( '../../../models/User' )
const ActionToken = require( '../../../models/ActionToken' )

const SendEmailVerification = require( '../../../app/email/index' ).SendEmailVerification

module.exports = function ( req, res ) {
module.exports = function( req, res ) {
winston.debug( 'register new user route' )
if ( !req.body.email ) { res.status( 400 ); return res.send( { success: false, message: 'Do not fuck with us. Give us your email.' } ) }
if ( !req.body.password ) { res.status( 400 ); return res.send( { success: false, message: 'Passwords are a necessary evil, fam.' } ) }
Expand All @@ -24,14 +20,6 @@ module.exports = function ( req, res ) {
let sessionSecret = process.env.SESSION_SECRET
let userCount = 1 // do not default to 0

let validationToken = new ActionToken( {
owner: myUser._id,
token: cryptoRandomString( { length: 20, type: 'base64' } ),
action: "email-confirmation"
} )

let savedUser = {}

User.count( {} )
.then( count => {
userCount = count
Expand All @@ -40,18 +28,13 @@ module.exports = function ( req, res ) {
.then( user => {
if ( user ) throw new Error( 'Email taken. Please login. Thanks!' )
myUser.apitoken = 'JWT ' + jwt.sign( { _id: myUser._id }, sessionSecret, { expiresIn: '2y' } )
if ( userCount === 0 && process.env.FIRST_USER_ADMIN === 'true' )
if ( userCount === 0 )
myUser.role = 'admin'
return myUser.save( )
} )
.then( user => {
savedUser = user
return validationToken.save( )
} )
.then( result => {
let verfication = SendEmailVerification( { name: savedUser.name, email: savedUser.email, token: validationToken.token } )
.then( savedUser => {
let token = 'JWT ' + jwt.sign( { _id: myUser._id, name: myUser.name }, sessionSecret, { expiresIn: '24h' } )
return res.send( { success: true, message: 'User saved. Redirect to login.', resource: { apitoken: savedUser.apitoken, token: token, email: savedUser.email }, validationToken: res.token } )
return res.send( { success: true, message: 'User saved. Redirect to login.', resource: { apitoken: savedUser.apitoken, token: token, email: savedUser.email } } )
} )
.catch( err => {
winston.error( JSON.stringify( err ) )
Expand Down
36 changes: 0 additions & 36 deletions app/api/accounts/UserVerify.js

This file was deleted.

93 changes: 0 additions & 93 deletions app/email/index.js

This file was deleted.

0 comments on commit 7c60ccc

Please sign in to comment.