Merge pull request #79 from paulcwatts/cognito-sdk

Cognito SDK fix
adopted-ember-addons · Mar 31, 2018 · 5277335 · 5277335
2 parents ef3b03f + d63f6c3
commit 5277335
Show file tree

Hide file tree

Showing 5 changed files with 459 additions and 516 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -19,6 +19,7 @@ env:
   matrix:
     # we recommend new addons test the current and previous LTS
     # as well as latest stable release (bonus points to beta/canary)
+    - EMBER_TRY_SCENARIO=amazon-cognito-identity-js-1.x
     - EMBER_TRY_SCENARIO=ember-lts-2.12
     - EMBER_TRY_SCENARIO=ember-lts-2.16
     - EMBER_TRY_SCENARIO=ember-lts-2.18

diff --git a/config/ember-try.js b/config/ember-try.js
@@ -11,6 +11,14 @@ module.exports = function() {
     return {
       useYarn: true,
       scenarios: [
+        {
+          name: 'amazon-cognito-identity-js-1.x',
+          npm: {
+            dependencies: {
+              'amazon-cognito-identity-js': '^1.31.0'
+            }
+          }
+        },
         {
           name: 'ember-lts-2.12',
           npm: {

diff --git a/index.js b/index.js
@@ -1,5 +1,6 @@
 /* eslint-env node */
 'use strict';
+const VersionChecker = require('ember-cli-version-checker');
 
 module.exports = {
   name: 'ember-cognito',
@@ -21,7 +22,11 @@ module.exports = {
   },
   included: function(app) {
     this._super.included.apply(this, arguments);
-    app.import('vendor/amazon-cognito-identity-js/aws-cognito-sdk.js');
+    let checker = new VersionChecker(this);
+    let cognito = checker.for('amazon-cognito-identity-js');
+    if (cognito.lt('2.0.2')) {
+      app.import('vendor/amazon-cognito-identity-js/aws-cognito-sdk.js');
+    }
     app.import('vendor/amazon-cognito-identity-js/amazon-cognito-identity.min.js');
     app.import('vendor/shims/amazon-cognito-identity-js.js');
   }

diff --git a/package.json b/package.json
@@ -38,15 +38,16 @@
     "ember-cli-shims": "^1.2.0",
     "ember-cli-sri": "^2.1.0",
     "ember-cli-uglify": "^2.0.0",
-    "ember-cli-update": "^0.14.0",
+    "ember-cli-update": "^0.15.0",
+    "ember-cli-version-checker": "^2.1.0",
     "ember-disable-prototype-extensions": "^1.1.2",
     "ember-export-application-global": "^2.0.0",
     "ember-load-initializers": "^1.0.0",
     "ember-maybe-import-regenerator-for-testing": "^1.0.0",
     "ember-native-dom-helpers": "^0.6.2",
     "ember-resolver": "^4.0.0",
     "ember-simple-auth": "^1.5.1",
-    "ember-sinon": "^1.0.0",
+    "ember-sinon": "^2.1.0",
     "ember-sinon-qunit": "^3.1.0",
     "ember-source": "~3.0.0",
     "ember-source-channel-url": "^1.0.1",