Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Reset password #86

Merged
merged 6 commits into from Jan 11, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions api/Gemfile
Expand Up @@ -6,6 +6,7 @@ gem 'grape-entity', '~> 0.5.1'
gem 'data_mapper', '~> 1.2.0'
gem 'dm-timestamps', '~> 1.2.0'
gem 'dotenv', '~> 2.1.1'
gem 'pony', '~> 1.11'

group :development, :test do
gem 'rspec', '~> 3.5.0'
Expand Down
6 changes: 6 additions & 0 deletions api/Gemfile.lock
Expand Up @@ -95,6 +95,9 @@ GEM
ice_nine (0.11.2)
json (1.8.3)
json_pure (1.8.3)
mail (2.6.3)
mime-types (>= 1.16, < 3)
mime-types (2.6.2)
minitest (5.10.1)
multi_json (1.12.1)
multi_xml (0.6.0)
Expand All @@ -103,6 +106,8 @@ GEM
mustermann-grape (0.4.0)
mustermann (= 0.4.0)
pg (0.19.0)
pony (1.11)
mail (>= 2.0)
public_suffix (2.0.5)
rack (2.0.1)
rack-accept (0.4.5)
Expand Down Expand Up @@ -148,6 +153,7 @@ DEPENDENCIES
grape (~> 0.18.0)
grape-entity (~> 0.5.1)
pg (~> 0.19.0)
pony (~> 1.11)
rack-cors (~> 0.4.0)
rack-test (~> 0.6.3)
rspec (~> 3.5.0)
Expand Down
15 changes: 15 additions & 0 deletions api/main.rb
Expand Up @@ -19,6 +19,7 @@
require_relative './models/person_task_relation'
require_relative './db/fixtures'
require_relative './repositories/tasks'
require_relative './repositories/mailer'

module Huertask
class API < Grape::API
Expand Down Expand Up @@ -50,6 +51,20 @@ class API < Grape::API
end
end

resource :reset_password do
post '/' do
person = Huertask::Person.first(:email => params[:email])
return error!('Unauthorized', 401) unless person
new_password = (1..6).map{(rand(26)+65).chr}.join
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

llevar esto al modelo Person

person.set_password(new_password)
if person.save
Mailer.reset_password(params[:email], new_password)
else
error_400(person)
end
end
end

resource :tasks do

get "/" do
Expand Down
24 changes: 24 additions & 0 deletions api/repositories/mailer.rb
@@ -0,0 +1,24 @@
require 'pony'

module Mailer
class << self
def reset_password(user_mail, new_password)
Pony.mail(
:to => user_mail,
:from => "miguelmundiaragones@gmail.com",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

cuidado con configuraciones

:subject => "Tu contraseña ha sido cambiada",
:body => "#{user_mail.split("@")[0]} tu nueva contraseña es #{new_password}",
:via => :smtp,
:via_options => {
:address => 'smtp.gmail.com',
:port => '587',
:enable_starttls_auto => true,
:user_name => 'miguelmundiaragones',
:password => ENV["MAIL_PASS"],
:authentication => :plain, # :plain, :login, :cram_md5, no auth by default
:domain => 'localhost' # the HELO domain provided by the client to the server
}
)
end
end
end
3 changes: 3 additions & 0 deletions app/src/app/app.module.ts
Expand Up @@ -15,6 +15,7 @@ import { CategoryForm } from '../pages/category-form/category-form';
import { FavCategories } from '../pages/fav-categories/fav-categories';
import { FavCategoriesMenu } from '../pages/fav-categories/fav-categories-menu';
import { Register } from '../pages/register/register';
import { ResetPassword } from '../pages/reset-password/reset-password';
import { Welcome } from '../pages/welcome/welcome';
import { TaskService } from '../providers/task.service';
import { PersonService } from '../providers/person.service';
Expand Down Expand Up @@ -44,6 +45,7 @@ export function createTranslateLoader(http: Http) {
DuplicateTask,
FormAction,
Register,
ResetPassword,
Welcome,
],
imports: [
Expand Down Expand Up @@ -71,6 +73,7 @@ export function createTranslateLoader(http: Http) {
CategoryForm,
DuplicateTask,
Register,
ResetPassword,
Welcome
],
providers: [TaskService, PersonService]
Expand Down
4 changes: 4 additions & 0 deletions app/src/assets/i18n/es.json
Expand Up @@ -110,6 +110,10 @@
"REMEMBER" : "Recuérdame"
}
},
"REMEMBER_PASSWORD" : {
"TITLE" : "Resetear contraseña",
"INFO" : "Te enviaremos un mail para verificar que eres quien dices ser"
},
"LINK" : {
"REGISTER" : "¿Aún no tienes cuenta?",
"PASSWORD_LOST": "¿Olvidaste tu contraseña?"
Expand Down
2 changes: 1 addition & 1 deletion app/src/pages/log-in/log-in.html
Expand Up @@ -35,7 +35,7 @@
</ion-item>
</ion-row>
<ion-row>
<span>{{ 'LOGIN.LINK.PASSWORD_LOST' | translate }}</span>
<span (click)="goToResetPassword()" >{{ 'LOGIN.LINK.PASSWORD_LOST' | translate }}</span>
</ion-row>
<ion-row>
<span (click)="goToRegister()">{{ 'LOGIN.LINK.REGISTER' | translate }}</span>
Expand Down
5 changes: 5 additions & 0 deletions app/src/pages/log-in/log-in.ts
Expand Up @@ -3,6 +3,7 @@ import { NavController, ToastController } from 'ionic-angular';
import { FormBuilder, FormGroup, Validators } from '@angular/forms';
import { PersonService } from '../../providers/person.service';
import { Tasks } from '../tasks/tasks';
import { ResetPassword } from '../reset-password/reset-password';
import { Register } from '../register/register';

@Component({
Expand Down Expand Up @@ -45,6 +46,10 @@ export class LogIn {
this.navCtrl.setRoot(Register)
}

goToResetPassword(){
this.navCtrl.push(ResetPassword)
}

hasValidationError(property){
return !this.form.controls[property].valid && this.personService.logged
}
Expand Down
38 changes: 38 additions & 0 deletions app/src/pages/reset-password/reset-password.html
@@ -0,0 +1,38 @@

<ion-header>

<ion-navbar>
<ion-title>{{ 'LOGIN.REMEMBER_PASSWORD.TITLE' | translate }}</ion-title>
</ion-navbar>

</ion-header>


<ion-content padding>

<form id="login">
<ion-grid>
<ion-row class="info">
{{ 'LOGIN.REMEMBER_PASSWORD.INFO' | translate }}
</ion-row>
<ion-row>
<ion-input [(ngModel)]="email" [ngModelOptions]="{standalone: true}"
type="email"
placeholder="Mail">
</ion-input>
</ion-row>
</ion-grid>
</form>

<ion-footer>
<ion-row class="buttons">
<ion-col width-50>
</ion-col>
<ion-col width-50>
<button form="login" (click)="sendResetLink()" ion-button id="log-in" clear full>
Enviar
</button>
</ion-col>
</ion-row>
</ion-footer>
</ion-content>
45 changes: 45 additions & 0 deletions app/src/pages/reset-password/reset-password.scss
@@ -0,0 +1,45 @@
page-reset-password {
background-color: blue;
ion-content{
&.content-md, &.content-ios, &.content-wp{
background-color: map-get($colors, primary);
color: white;
}
}
ion-row{
&.info{
margin-bottom: 20px;
font-size: 20px
}
}
ion-input{
background-color: white;
border-radius: 5px;
color: black;
padding-left: 10px;
}
ion-grid{
margin-bottom: 50px;
.item-md, .item-ios, .item-wp{
background-color: map-get($colors, primary);
}
.input-has-focus .label-md[floating], .input-has-value .label-md[floating],
.input-has-focus .label-ios[floating], .input-has-value .label-ios[floating],
.input-has-focus .label-wp[floating], .input-has-value .label-wp[floating],
.item-input .label-md, .item-input .label-ios, .item-input .label-wp{
color: white;
}

.item-input .label-md, .item-input .label-ios, .item-input .label-wp{
color: map-get($colors, primary);
padding-left: 10px;
}
}
ion-footer{
ion-row{
button.button-clear{
color: white;
}
}
}
}
22 changes: 22 additions & 0 deletions app/src/pages/reset-password/reset-password.ts
@@ -0,0 +1,22 @@
import { Component } from '@angular/core';
import { NavController } from 'ionic-angular';
import { PersonService } from '../../providers/person.service';

@Component({
selector: 'page-reset-password',
templateUrl: 'reset-password.html'
})
export class ResetPassword {

email: string = ""

constructor(public navCtrl: NavController, public personService: PersonService) {}

sendResetLink() {
this.personService.resetPassword(this.email).subscribe(
data => this.navCtrl.pop(),
err => console.log(err)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

toast????

)
}

}
8 changes: 8 additions & 0 deletions app/src/providers/person.service.ts
Expand Up @@ -50,6 +50,14 @@ export class PersonService {
.catch((error:any) => Observable.throw(error.json() || 'Server error'))
}

resetPassword(email){
let headers = new Headers({ 'Content-Type': 'application/json' });
let options = new RequestOptions({ headers: headers });

return this.http.post(`${this.huertaskApiUrl}/reset_password`, {email: email}, options)
.map(res => <Person>this.instanciatedPerson(res.json()));
}

getPerson(id): Observable<Person> {
return this.http.get(`${this.huertaskApiUrl}/people/${id}`)
.map(res => <Person>this.instanciatedPerson(res.json()));
Expand Down