Merge branch 'master' into vendor-default

marcy-terui · Sep 3, 2018 · 25d0d03 · 25d0d03
2 parents 5e31877 + 4454e05
commit 25d0d03
Show file tree

Hide file tree

Showing 11 changed files with 41 additions and 28 deletions.
diff --git a/index.js b/index.js
@@ -6,6 +6,7 @@ const initialize = require('./lib/initialize');
 const createHttpServer = require('./lib/createHttpServer');
 const openAuthorizationUri = require('./lib/openAuthorizationUri');
 const getVendorId = require('./lib/getVendorId');
+const getToken = require('./lib/getToken');
 const getRemoteSkills = require('./lib/getRemoteSkills');
 const outputSkills = require('./lib/outputSkills');
 const createSkill = require('./lib/createSkill');
@@ -37,6 +38,7 @@ class AlexaSkills {
       createHttpServer,
       openAuthorizationUri,
       getVendorId,
+      getToken,
       getRemoteSkills,
       outputSkills,
       createSkill,

diff --git a/lib/AlexaApi.js b/lib/AlexaApi.js
@@ -3,16 +3,30 @@
 const BbPromise = require('bluebird');
 const rp = require('request-promise');
 const qs = require('querystring');
+const so2 = require('simple-oauth2');
 
 const URL_BASE = 'https://api.amazonalexa.com';
 const URL_VERSION = 'v1';
 
 class AlexaApi {
   constructor(token) {
-    this.headers = {
-      Authorization: token,
+    this.accessToken = token;
+  }
+  _getHeaders() {
+    return {
+      Authorization: this.accessToken.token.access_token,
     };
   }
+  getHeaders() {
+    if (this.accessToken.expired()) {
+      return this.accessToken.refresh().then(newToken => {
+        this.accessToken = newToken;
+        return BbPromise.resolve(this._getHeaders())
+      })
+    }
+
+    return BbPromise.resolve(this._getHeaders());
+  }
   get(path, params) {
     let url = URL_BASE;
 
@@ -25,36 +39,37 @@ class AlexaApi {
     if (!(typeof params === 'undefined')) {
       url = `${url}?${qs.stringify(params)}`;
     }
-    return rp({
+
+    return this.getHeaders().then(headers => rp({
       url,
       method: 'GET',
-      headers: this.headers,
-    });
+      headers,
+    }));
   }
   _jsonRequest(url, method, params) {
-    return {
+    return this.getHeaders().then(headers => ({
       url,
       method,
-      headers: this.headers,
+      headers,
       json: true,
       body: params,
-    };
+    }));
   }
   post(path, params) {
     const url = `${URL_BASE}/${URL_VERSION}${path}`;
-    return rp(this._jsonRequest(url, 'POST', params));
+    return this._jsonRequest(url, 'POST', params).then(rp);
   }
   put(path, params) {
     const url = `${URL_BASE}/${URL_VERSION}${path}`;
-    return rp(this._jsonRequest(url, 'PUT', params));
+    return this._jsonRequest(url, 'PUT', params).then(rp);
   }
   delete(path) {
     const url = `${URL_BASE}/${URL_VERSION}${path}`;
-    return rp({
+    return this.getHeaders().then(headers => rp({
       url,
       method: 'DELETE',
-      headers: this.headers,
-    });
+      headers,
+    }));
   }
   getVendors() {
     return this.get('/vendors').then(function (body) {

diff --git a/lib/createSkill.js b/lib/createSkill.js
@@ -1,7 +1,6 @@
 'use strict';
 
 const AlexaApi = require('./AlexaApi');
-const getToken = require('./getToken');
 
 module.exports = {
   createSkill() {

diff --git a/lib/deleteSkill.js b/lib/deleteSkill.js
@@ -2,11 +2,10 @@
 
 const BbPromise = require('bluebird');
 const AlexaApi = require('./AlexaApi');
-const getToken = require('./getToken');
 
 module.exports = {
   deleteSkill() {
-    const alexaApi = new AlexaApi(getToken(this.tokenFilePath));
+    const alexaApi = new AlexaApi(this.getToken());
     return BbPromise.bind(this)
       .then(alexaApi.deleteSkill(this.options.id))
       .then(function () {

diff --git a/lib/getRemoteModels.js b/lib/getRemoteModels.js
@@ -1,7 +1,6 @@
 'use strict';
 
 const AlexaApi = require('./AlexaApi');
-const getToken = require('./getToken');
 
 module.exports = {
   getRemoteModels() {

diff --git a/lib/getRemoteSkills.js b/lib/getRemoteSkills.js
@@ -1,7 +1,6 @@
 'use strict';
 
 const AlexaApi = require('./AlexaApi');
-const getToken = require('./getToken');
 
 module.exports = {
   getRemoteSkills() {

diff --git a/lib/getToken.js b/lib/getToken.js
@@ -2,7 +2,9 @@
 
 const fs = require('fs-extra');
 
-module.exports = function (tokenFilePath) {
-  const accessToken = fs.readJsonSync(tokenFilePath);
-  return accessToken.token.access_token;
+module.exports = {
+  getToken() {
+    const accessToken = fs.readJsonSync(this.tokenFilePath);
+    return this.oauth2.accessToken.create(accessToken.token);
+  }
 };
diff --git a/lib/initialize.js b/lib/initialize.js
@@ -7,7 +7,7 @@ const homedir = require('os').homedir();
 module.exports = {
   initialize() {
     this.localServerPort = this.serverless.service.custom.alexa.localServerPort || 9090;
-    this.tokenFilePath = path.join(homedir, '.serverless', this.TOKEN_FILE_NAME);
+    this.tokenFilePath = this.serverless.service.custom.alexa.tokenFilePath || path.join(homedir, '.serverless', this.TOKEN_FILE_NAME);
     this.oauth2 = so2.create({
       client: {
         id: this.serverless.service.custom.alexa.clientId || 'amzn1.application-oa2-client.aad322b5faab44b980c8f87f94fbac56',

diff --git a/lib/updateModels.js b/lib/updateModels.js
@@ -2,11 +2,10 @@
 
 const BbPromise = require('bluebird');
 const AlexaApi = require('./AlexaApi');
-const getToken = require('./getToken');
 
 module.exports = {
   updateModels(diffs) {
-    const alexaApi = new AlexaApi(getToken(this.tokenFilePath));
+    const alexaApi = new AlexaApi(this.getToken());
     return BbPromise.bind(this)
       .then(() => BbPromise.resolve(diffs))
       .map(function (diff) {

diff --git a/lib/updateSkills.js b/lib/updateSkills.js
@@ -2,11 +2,10 @@
 
 const BbPromise = require('bluebird');
 const AlexaApi = require('./AlexaApi');
-const getToken = require('./getToken');
 
 module.exports = {
   updateSkills(diffs) {
-    const alexaApi = new AlexaApi(getToken(this.tokenFilePath));
+    const alexaApi = new AlexaApi(this.getToken());
     return BbPromise.bind(this)
       .then(() => BbPromise.resolve(diffs))
       .map(function (diff) {

diff --git a/test/AlexaApi.js b/test/AlexaApi.js
@@ -9,13 +9,13 @@ describe('AlexaApi', () => {
   let alexaApi;
 
   beforeEach(() => {
-    alexaApi = new AlexaApi('token');
+    alexaApi = new AlexaApi({ expired: () => false, token: { access_token: 'token' } });
   });
 
   describe('#constructor()', () => {
 
     it('should have Authorization header', () => {
-      expect(alexaApi.headers.Authorization).to.equal('token');
+      return alexaApi.getHeaders().then(headers => expect(headers.Authorization).to.equal('token'));
     });
 
   });