Merge pull request #232 from uhuraapp/refactor-api

refactor: api changes

Author: Duke

.jshintrc

@@ -2,8 +2,7 @@
   "predef": [
     "server",
     "document",
-    "window",
-    "-Promise"
+    "window"
   ],
   "browser": true,
   "boss": true,

app/authenticators/uhura.js

@@ -2,42 +2,10 @@ import Ember from 'ember';
 import Base from 'ember-simple-auth/authenticators/base';
 import ENV from '../config/environment';
 
-let { RSVP: { Promise } } = Ember;
-
 export default Base.extend({
   __authURLForProvider(provider) {
     return `${ENV.API_URL}/v2/auth/${provider}`;
   },
-  __getUserData() {
-    return Ember.$.ajax({
-      url: `${ENV.API_URL}/v2/user`,
-      type: 'GET',
-      xhrFields: {
-        withCredentials: true
-      }
-    });
-  },
-  __checkLogin(loginWindow, resolve, reject) {
-    return () => {
-      try {
-        if (loginWindow.closed) {
-          this.checkCredentials(resolve, reject);
-        } else {
-          window.setTimeout(this.__checkLogin(loginWindow, resolve, reject), 500);
-        }
-      } catch(e) {
-        Ember.run(() => reject(e));
-      }
-    };
-  },
-  checkCredentials(resolve, reject) {
-    this.__getUserData().then((data) => {
-      Ember.run(() => resolve(data));
-      this._setUser(data);
-    }, function() {
-      Ember.run(() => reject('Error: Could not authenticate using external service'));
-    });
-  },
 
   restore(properties) {
     let propertiesObject = Ember.Object.create(properties);
@@ -53,16 +21,10 @@ export default Base.extend({
 
   authenticate(data) {
     if (data.provider) {
-      return new Promise((resolve, reject) => {
-        let loginWindow = window.open(this.__authURLForProvider(data.provider), '_blank', 'location=no,toolbar=no');
-        window.setTimeout(this.__checkLogin(loginWindow, resolve, reject), 500);
-
-        loginWindow.addEventListener('loadstop', (event) => {
-          if (event.url.indexOf(`${this.__authURLForProvider(data.provider)}/callback`) === 0) {
-            loginWindow.close();
-            this.checkCredentials(resolve, reject);
-          }
-        });
+      return new Promise(() => {
+        let url = this.__authURLForProvider(data.provider);
+        url = `${url}?redirect_to=${window.location.href}`;
+        window.location = url;
       });
     } else if (data.email && data.password) {
       return this.request('POST', '/v2/users/sign_in', data).catch(()=> {
@@ -72,6 +34,8 @@ export default Base.extend({
       return Promise.reject('Error: password is required');
     } else if (data.password && !data.email) {
       return Promise.reject('Error: email is required');
+    } else if (data.token) {
+      return this.request('GET', '/v2/user', data);
     }
 
     return Promise.reject('Error: email and password is required');
@@ -91,14 +55,11 @@ export default Base.extend({
     };
   },
 
-  request(type, path, data) {
-    data = JSON.stringify(data);
+  request(type, path, data = {}) {
+    data = type === 'POST' ? JSON.stringify(data) : data;
     return new Promise((resolve, reject) => {
       Ember.$.ajax({
         url: ENV.API_URL + path,
-        xhrFields: {
-          withCredentials: true
-        },
         contentType: 'application/json; charset=utf-8',
         dataType: 'json',
         type,

app/components/channel-search.js

@@ -25,13 +25,13 @@ export default Ember.Component.extend({
     },
 
     played() {
-      let episode = this.get('episode');
-      let isPlayed = !!episode.get('played');
-      let method = isPlayed ? 'DELETE' : 'POST';
+      const episode = this.get('episode');
+      const isPlayed = !!episode.get('played');
+      const method = isPlayed ? 'DELETE' : 'POST';
 
       episode.set('played', !isPlayed); // early visual response
 
-      this.get('client').request('episode', episode.id, 'played', method).catch(() => {
+      this.get('client').request(this._episodeEndpoint(), episode.id, 'played', method).catch(() => {
         episode.set('played', isPlayed); // rollback
       });
 
@@ -40,20 +40,26 @@ export default Ember.Component.extend({
 
     download() {
       const episodeID = this.get('episode.id');
-      const downloadURL = this.get('client').buildURL('episode', episodeID, 'download');
+
+      const downloadURL = this.get('client').buildURL(this._episodeEndpoint(), episodeID, 'download');
       window.open(downloadURL);
     },
 
     more() {
       Ember.$('.itens.open').removeClass('open');
       this.$('.itens').addClass('open');
-      Ember.run.later(function() {
-        Ember.$(document).on('click.out-itens', 'body', function(e) {
+      Ember.run.later(function _later() {
+        Ember.$(document).on('click.out-itens', 'body', function _clickOutItens(e) {
           Ember.$('.itens.open').removeClass('open');
           Ember.$(document).off('click.out-itens');
           e.stopPropagation();
         });
       }, 500);
-    }
+    },
+  },
+
+  _episodeEndpoint() {
+    const episode = this.get('episode');
+    return `channels/${episode.get('channel_id')}/episode`;
   }
 });

app/components/episode-list-item.js

@@ -1,41 +1,7 @@
-/* global moment */
 import Ember from 'ember';
 
 export default Ember.Component.extend({
   classNames: ['episodes'],
   tagName: 'ul',
-  hasMore: true,
-  page: 1,
-  infiniteScroll: true,
-  hasRightActions: true,
-  actions: {
-    fetchMore(callback) {
-      let promise = Ember.RSVP.Promise.reject();
-
-      if (this.get('infiniteScroll')) {
-        let episodes = this.get('episodes');
-        let lastEpisode = episodes.get('lastObject');
-        let date = lastEpisode ? lastEpisode.get('published_at') : 1999;
-        let since = moment.utc(date).format();
-
-        // TODO: use meta
-        promise = this.get('store').query('episode', {
-          since,
-          channel_id: this.get('channel.raw_id'),
-          per_page:   20
-        }).then(function(response) {
-          // Fix error with _internalModel
-          let items = [];
-          response.get('content').forEach(function(internalModel) {
-            items.push({ _internalModel: internalModel });
-          });
-          response.set('content', items);
-          return response;
-        });
-
-      }
-
-      callback(promise);
-    }
-  }
+  hasRightActions: true
 });

app/components/episodes-list.js

@@ -7,7 +7,6 @@ export default Ember.Mixin.create({
   description: DS.attr('string'),
   copyrigth: DS.attr('string'),
   episodes: DS.hasMany('episode', { async: false }),
-  profile: DS.belongsTo('profile', { async: false }),
   profile_id: DS.attr('string'),
   raw_id: DS.attr('string'),
   subscribed: DS.attr('boolean'),

app/mixins/models/channel.js

@@ -4,9 +4,17 @@ import MaterialDesignMixin from './material-design';
 export default Ember.Mixin.create(MaterialDesignMixin, {
   session: Ember.inject.service('session'),
   beforeModel(transition) {
+    if (transition.queryParams.token) {
+      this.authenticationViaToken(transition.queryParams.token);
+    }
+
     if (this.get('session').get('isAuthenticated')) {
       this.transitionTo('subscriptions');
     }
     return this._super(transition);
+  },
+
+  authenticationViaToken(token) {
+    this.get('session').authenticate('authenticator:uhura', { token });
   }
 });

app/mixins/routes/authentication.js

@@ -19,10 +19,6 @@ export default DS.Model.extend({
   source: computed('source_url', function() {
     return this.get('source_url');
   }),
-  persisted: computed('id', function() {
-    // true when the channel id is not a URL
-    return !this.get('channel_id').match(/http:\/\//);
-  }),
   publishedAt: computed('published_at', function() {
     return moment(this.get('published_at')).format('MMM Do YY');
   }),

app/models/episode.js

@@ -13,7 +13,7 @@ export default Ember.Service.extend({
 
   PLAYED_PERCENT: 95,
 
-  observerAutoplay: observer('autoplay', function() {
+  observerAutoplay: observer('autoplay', function _observerAutoplay() {
     window.ahoy.track('player', { action: 'autoplay', enabled: this.get('autoplay') });
   }),
 
@@ -105,10 +105,12 @@ export default Ember.Service.extend({
     if (at === this.get('currentTime')) {
       return;
     }
+    const episodeEndpoint = `channels/${episode.get('channel_id')}/episode`;
+    let data = { at };
+
     this.set('currentTime', at);
 
-    let data = { at };
-    this.get('client').request('episode', episode.id, 'listen', 'PUT', { data }).then(() => {
+    this.get('client').request(episodeEndpoint, episode.id, 'listen', 'PUT', { data }).then(() => {
       episode.set('stopped_at', at);
     });
   },