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.

Sign up for GitHub

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

fix: Refactor login-form according to flask jwt extended changes #3301

Merged
merged 1 commit into from
Jul 23, 2019
Merged

fix: Refactor login-form according to flask jwt extended changes #3301

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
120 changes: 62 additions & 58 deletions app/components/forms/login-form.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
import Component from '@ember/component';
import FormMixin from 'open-event-frontend/mixins/form';
import { action } from '@ember/object';

export default Component.extend(FormMixin, {
export default class extends Component.extend(FormMixin) {

identification : '',
password : '',
isLoading : false,
identification = '';
password = '';
isLoading = false;


getValidationRules() {
Expand Down Expand Up @@ -38,70 +39,73 @@ export default Component.extend(FormMixin, {
}
}
};
},
}

actions: {
submit() {
this.onValid(() => {
let credentials = this.getProperties('identification', 'password'),
authenticator = 'authenticator:jwt';
@action
async submit() {
this.onValid(async() => {
let credentials = this.getProperties('identification', 'password'),
authenticator = 'authenticator:jwt';
this.setProperties({
errorMessage : null,
isLoading : true
});
try {
await this.session.authenticate(authenticator, credentials);
const tokenPayload = this.authManager.getTokenPayload();
if (tokenPayload) {
this.authManager.persistCurrentUser(
await this.store.findRecord('user', tokenPayload.identity)
);

this.set('errorMessage', null);
this.set('isLoading', true);
}
} catch (e) {
if (e.error) {
this.set('errorMessage', this.l10n.tVar(e.error));
} else {
this.set('errorMessage', this.l10n.t('An unexpected error occurred.'));
}
}

this.session
.authenticate(authenticator, credentials)
.then(async() => {
const tokenPayload = this.authManager.getTokenPayload();
if (tokenPayload) {
this.authManager.persistCurrentUser(
await this.store.findRecord('user', tokenPayload.identity)
);
}
})
.catch(reason => {
if (!(this.isDestroyed || this.isDestroying)) {
if (reason && reason.hasOwnProperty('status_code') && reason.status_code === 401) {
this.set('errorMessage', this.l10n.t('Your credentials were incorrect.'));
} else {
this.set('errorMessage', this.l10n.t('An unexpected error occurred.'));
}
this.set('isLoading', false);
} else {
console.warn(reason);
}
})
.finally(() => {
if (!(this.isDestroyed || this.isDestroying)) {
this.set('password', '');
}
if (!(this.isDestroyed || this.isDestroying)) {
this.setProperties(
{
password : '',
isLoading : false
});
});
},
}
});
}

async auth(provider) {
@action
async auth(provider) {
if (provider === 'facebook') {
try {
if (provider === 'facebook') {
this.loader.load('/auth/oauth/facebook')
.then(async response => {
window.location.replace(response.url);
});
let response = await this.loader.load('/auth/oauth/facebook');
window.location.replace(response.url);
Copy link
Member

Choose a reason for hiding this comment

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

@CosmicCoder96 Do we need it for now, as O-auth is not implemented properly on server

} catch (e) {
if (e.message) {
this.notify.error(this.l10n.tVar(e.message));
} else {
this.notify.error(this.l10n.t('An unexpected error has occurred'));
}
} catch (error) {
this.notify.error(this.l10n.t(error.message));
}
},

showPassword() {
this.toggleProperty('showPass');
}
},
}

@action
showPassword() {
this.toggleProperty('showPass');
}


didInsertElement() {
if (this.get('session.newUser')) {
this.set('newUser', this.get('session.newUser'));
this.set('identification', this.get('session.newUser'));
this.set('session.newUser', null);
if (this.session.newUser) {
this.setProperties({
newUser : this.session.newUser,
identification : this.session.newUser
});
this.session.set('newUser', null);
}
}
});
}
2 changes: 1 addition & 1 deletion tests/acceptance/login-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ module('Acceptance | login', function(hooks) {
await login(assert, 'wrong_user@gmail.com', 'wrong_password');
assert.equal(currentURL(), '/login');
assert.dom('.ui.negative.message').exists();
assert.dom('.ui.negative.message').hasText('Your credentials were incorrect.', 'Error message displayed');
assert.dom('.ui.negative.message').hasText('Invalid Credentials', 'Error message displayed');
});

test('logout at /logout', async function(assert) {
Expand Down