ckoch/LudosData
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ccc

Browse Source
This commit is contained in:
Christopher Koch
2018-04-27 21:06:19 -04:00
parent 0e4ceac959
commit 732065c7b5
7 changed files with 208 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
registration.php
View File

@@ -1,20 +1,28 @@
<?php
$key = $_GET("key");
$type = $_GET("type");
$value = $_GET("value");
$userName = $_GET("username");
$password = $_GET("password");
$id = $username . $date->getTimestamp();
$
$returnData = array();
$date = new DateTime();
switch( $key ){
case "validation":
$passwordSalt = "sexfamemoney$U046qKlL$moneyfamesex";
break;
case "create":
break;
default:
echo "false";
$hashedPassword = crypt( $password, $passwordSalt );
$hashedId = crypt( $id, $passwordSalt );
/*
For login:
if (hash_equals($hashed_password, crypt($user_input, $hashed_password))) {
echo "Password verified!";
}
*/
$returnData["password"] = $hashed_password;
$returnData["id"] = $hashedId;
echo( json_encode( $returnData ) );
?>

67
registrationCreation.php Normal file
View File

@@ -0,0 +1,67 @@
<?php
//error_reporting(E_ALL);
//ini_set('display_errors', 1);
$firstName = $_POST["firstName"];
$lastName = $_POST["lastName"];
$email = $_POST["email"];
$userName = $_POST["userName"];
$password = $_POST["password"];
$returnData = array();
$date = new DateTime();
$id = $date->getTimestamp() . $userName . $date->getTimestamp();
$passwordSalt = "2cf24dba5fb0a30e26e83b2ac5b9e29e1b161e5c1fa7425e73043362938b9824";
$hashedPassword = crypt( $password, $passwordSalt );
$hashedId = crypt( $id, $passwordSalt );
/*
For login:
if (hash_equals($hashed_password, crypt($user_input, $hashed_password))) {
echo "Password verified!";
}
*/
$returnData["password"] = $hashedPassword;
$returnData["id"] = $hashedId;
//echo( json_encode( $returnData ) );
$url = 'http://192.241.155.78/api.php/users/';
$fields = array(
'firstName' => urlencode( $firstName ),
'lastName' => urlencode( $lastName ),
'email' => urlencode( $email ),
'userName' => urlencode( $userName ),
'password' => urlencode( $hashedPassword ),
'id' => urlencode( $hashedId )
);
//url-ify the data for the POST
//foreach($fields as $key=>$value) { $fields_string .= $key.'='.$value.'&'; }
//rtrim($fields_string, '&');
//open connection
$ch = curl_init( $url );
//set the url, number of POST vars, POST data
//curl_setopt($ch,CURLOPT_URL, $url);
curl_setopt($ch, CURLOPT_POST, 1);
curl_setopt($ch,CURLOPT_POSTFIELDS, json_encode($fields));
curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
//execute post
$result = curl_exec( $ch );
//close connection
curl_close( $ch );
echo( $result );
exit();
?>

3
src/app/app.module.ts
View File

@@ -27,6 +27,7 @@ import { RegisterComponent } from './register/register.component';
import { RegistrationService } from './registration.service';
import { UsernameValidator } from './validators/username.validator'
import { EmailValidator } from './validators/email.validator'
@@ -53,7 +54,7 @@ import { UsernameValidator } from './validators/username.validator'
MatPaginatorModule,
MatFormFieldModule
],
providers: [GamesService, RegistrationService, UsernameValidator],
providers: [GamesService, RegistrationService, UsernameValidator, EmailValidator],
bootstrap: [AppComponent]
})
export class AppModule { }

112
src/app/register/register.component.ts
View File

@@ -4,6 +4,7 @@ import { FormBuilder, FormGroup, FormControl, Validators, AbstractControl } from
import { RegistrationService } from '../registration.service';
import { UsernameValidator } from '../validators/username.validator'
import { EmailValidator } from '../validators/email.validator'
@Component({
@@ -18,7 +19,10 @@ export class RegisterComponent implements OnInit {
constructor(
private registrationService: RegistrationService,
private usernameValidator: UsernameValidator
private usernameValidator: UsernameValidator,
private emailValidator: EmailValidator,
public formBuilder: FormBuilder
){ }
ngOnInit() {
@@ -27,83 +31,47 @@ export class RegisterComponent implements OnInit {
}
buildForm(){
const formGroup = {};
formGroup["firstName"] = new FormControl( "", this.mapValidators({
required: true,
min: "3",
max: "50"
}) );
formGroup["lastName"] = new FormControl( "", this.mapValidators({
required: true,
min: "3",
max: "50"
}) );
formGroup["email"] = new FormControl( "", this.mapValidators({
required: true,
email: true,
max: "100"
}) );
formGroup["userName"] = new FormControl( "", this.mapValidators({
ValidateUserName: true,
required: true,
min: "5",
max: "25"
}) );
formGroup["password"] = new FormControl( "", this.mapValidators({
required: true,
min: "7",
max: "25"
}) );
this.form = new FormGroup(formGroup);
this.form = this.formBuilder.group({
firstName: ['', Validators.compose([
Validators.maxLength(50),
Validators.minLength(3),
Validators.required
])],
lastName: ['', Validators.compose([
Validators.maxLength(50),
Validators.minLength(3),
Validators.required
])],
email: ['', Validators.compose([
Validators.maxLength(100),
Validators.email,
Validators.required
]),
this.emailValidator.checkEmail.bind(this.emailValidator)
],
userName: ['', Validators.compose([
Validators.maxLength(25),
Validators.minLength(5),
Validators.required
]),
this.usernameValidator.checkUsername.bind(this.usernameValidator)
],
password: ['', Validators.compose([
Validators.maxLength(25),
Validators.minLength(5),
Validators.required
])]
});
}
private mapValidators(validators) {
const formValidators = [];
for( var key in validators ){
if( key == "required" ) {
if( validators.required ){
formValidators.push( Validators.required );
}
}else if( key == "email" ) {
if( validators.email ){
formValidators.push( Validators.email );
}
}else if( key == "min" ) {
formValidators.push(Validators.min(validators[key]));
}else if( key == "max" ) {
formValidators.push(Validators.max(validators[key]));
}else if( key == "ValidateUserName" ){
formValidators.push( this.usernameValidator.checkUsername.bind( this.usernameValidator ) );
}
}
return formValidators;
}
/*
validateUserName( control: AbstractControl ){
this.registrationService.validateUserName( control.value ).subscribe( data => {
console.log( data );
if( control.value != data.username ){
return{
validUserName: true
};
}
return null;
onSubmit( form ){
this.registrationService.createNewUser( form ).subscribe( data => {
console.log(data);
//this.router.navigateByUrl("/login");
});
}
*/
}

35
src/app/registration.service.ts
View File

@@ -1,31 +1,53 @@
import { Injectable } from '@angular/core';
import { HttpClient, HttpHeaders } from '@angular/common/http';
import { HttpClient, HttpHeaders, HttpParams } from '@angular/common/http';
import { Observable } from 'rxjs/Observable';
import 'rxjs/add/operator/map';
const httpOptions = {
headers: new HttpHeaders({ 'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8' })
}
@Injectable()
export class RegistrationService {
APIURL = "http://192.241.155.78/api.php";
registrationUrl = "http://192.241.155.78/registrationCreation.php";
/* Needed for post, could be moved to local method variable */
params;
constructor(
private http: HttpClient
){ }
/*
validateUserName( userName ): Observable<any> {
return this.http.get( "http://www.pugludos.com/registration.php?key=validation&type=username&value=" + userName )
return this.http.get( this.APIURL + "/users?filter=userName,eq," + userName + "&transform=1" )
.map(res => {
return(
res
);
});
}
*/
validateUserName( userName ): Observable<any> {
return this.http.get( this.APIURL + "/users?filter=userName,cs," + userName + "&transform=1" )
validateEmail( email ): Observable<any> {
return this.http.get( this.APIURL + "/users?filter=email,eq," + email + "&transform=1" )
.map(res => {
return(
res
);
});
}
createNewUser( userData ): Observable<any>{
/* needed for content-type x-www */
this.params = new HttpParams({
fromObject: userData
});
return this.http.post( this.registrationUrl, this.params, httpOptions )
.map(res => {
console.log(res)
return(
@@ -34,4 +56,5 @@ export class RegistrationService {
});
}
}

38
src/app/validators/email.validator.ts Normal file
View File

@@ -0,0 +1,38 @@
import { Injectable } from '@angular/core';
import { FormControl } from '@angular/forms';
import { RegistrationService } from '../registration.service';
@Injectable()
export class EmailValidator {
debouncer: any;
constructor(
private registrationService: RegistrationService
){ }
checkEmail( control: FormControl ): any{
clearTimeout(this.debouncer);
return new Promise(resolve => {
this.debouncer = setTimeout(() => {
this.registrationService.validateEmail(control.value).subscribe((res) => {
console.log(res.users.length)
if(res.users.length === 0){
resolve(null);
}else{
resolve({'emailInUse': true});
}
/*
if(res.ok){
resolve(null);
}
}, (err) => {
resolve({'usernameInUse': true});
*/
});
}, 1000);
});
}
}

9
src/app/validators/username.validator.ts
View File

@@ -17,11 +17,20 @@ export class UsernameValidator {
return new Promise(resolve => {
this.debouncer = setTimeout(() => {
this.registrationService.validateUserName(control.value).subscribe((res) => {
console.log(res.users.length)
if(res.users.length === 0){
resolve(null);
}else{
resolve({'usernameInUse': true});
}
/*
if(res.ok){
resolve(null);
}
}, (err) => {
resolve({'usernameInUse': true});
*/
});
}, 1000);
});