thermokarst/hymenobacterdotinfo
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into clostridium

Browse source 
* master:
  Lint
This commit is contained in:
Matthew Dillon 2015-11-16 18:15:42 -07:00
commit d93f4a3152
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/authenticators/oauth2.js
View file

@ -1,13 +1,14 @@
import OAuth2PasswordGrant from 'ember-simple-auth/authenticators/oauth2-password-grant'; import OAuth2PasswordGrant from 'ember-simple-auth/authenticators/oauth2-password-grant';
import config from '../config/environment'; import config from '../config/environment';
import parseBase64 from '../utils/parse-base64'; import parseBase64 from '../utils/parse-base64';
import Ember from 'ember';
const { RSVP: { Promise }, isEmpty, run, Logger: { warn } } = Ember; const { RSVP: { Promise }, isEmpty, run, Logger: { warn } } = Ember;
export default OAuth2PasswordGrant.extend({ export default OAuth2PasswordGrant.extend({
serverTokenEndpoint: `${config.apiURL}/api/authenticate`, serverTokenEndpoint: `${config.apiURL}/api/authenticate`,
serverTokenRefreshEndpoint: `${config.apiURL}/api/refresh`, serverTokenRefreshEndpoint: `${config.apiURL}/api/refresh`,
authenticate: function(identification, password, scope = []) { authenticate: function(identification, password) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
const data = { username: identification, password }; const data = { username: identification, password };
const serverTokenEndpoint = this.get('serverTokenEndpoint'); const serverTokenEndpoint = this.get('serverTokenEndpoint');