Merge pull request #2135 from westlywright/2.0.7

2.0.7 Auth Bugs

lib/global-admin/addon/mixins/saml-auth.js

@@ -22,7 +22,7 @@ export default Mixin.create({
   providerName:     null,
 
   actions: {
-    authTest() {
+    authTest(cb) {
       this.send('clearError');
 
       const model = get(this, 'authConfig');
@@ -39,6 +39,7 @@ export default Mixin.create({
         });
 
         set(model, 'enabled', false);
+        cb(false);
       } else {
         set(this, 'testing', true);
 
@@ -49,14 +50,21 @@ export default Mixin.create({
 
         model.save().then(() => {
           model.doAction('testAndEnable', { finalRedirectUrl: `${ window.location.origin }/verify-auth?config=${ get(this, 'providerName') }` }).then( ( resp ) => {
-            get(this, 'saml').test(resp, () => {
-              this.send('waitAndRefresh');
+            get(this, 'saml').test(resp, (popupResults) => {
+              if (popupResults.type === 'error') {
+                this.set('errors', [popupResults.message]);
+                cb(false);
+              } else {
+                this.send('waitAndRefresh');
+              }
             });
           }).catch((err) => {
             this.set('errors', [err]);
+            cb(false);
           });
         }).catch((err) => {
           this.set('errors', [err]);
+          cb(false);
         });
       }
     },

lib/shared/addon/azure-ad/service.js

@@ -48,8 +48,9 @@ export default Service.extend({
     url = Util.addQueryParams(url, additionalRedirectParams);
 
     const popup = window.open(url, 'rancherAuth', Util.popupWindowOptions());
+    const intl = get(this, 'intl');
 
-    const timer = setInterval(function() {
+    const timer = setInterval(() => {
       if (popup && popup.closed ) {
         clearInterval(timer);
 
@@ -58,7 +59,7 @@ export default Service.extend({
 
           cb({
             type:    'error',
-            message: get(this, 'intl').t('authPage.azuread.test.authError')
+            message: intl.t('authPage.azuread.test.authError')
           });
         }
       } else if (popup === null || typeof (popup) === 'undefined') {
@@ -69,7 +70,7 @@ export default Service.extend({
 
           cb({
             type:    'error',
-            message: get(this, 'intl').t('authPage.azuread.test.popupError')
+            message: intl.t('authPage.azuread.test.popupError')
           });
         }
       }

lib/shared/addon/components/cluster-driver/driver-amazoneks/component.js

@@ -213,6 +213,13 @@ export default Component.extend(ClusterDriver, {
       this.loadSubnets(auth).catch((err) => {
         get(this, 'errors').pushObject(err);
       });
+    } else if (mode === 'default') {
+      setProperties(get(this, 'config'), {
+        virtualNetwork: null,
+        subnets:        [],
+      });
+
+      set(this, 'step', 3);
     }
   }),
 
@@ -222,7 +229,7 @@ export default Component.extend(ClusterDriver, {
         subnetName:  nameFromResource(subnet, 'SubnetId'),
         subnetId:    subnet.SubnetId,
       }
-    });
+    }).sortBy('subnetName');
   }),
 
 
@@ -232,11 +239,11 @@ export default Component.extend(ClusterDriver, {
         id:    get(vpc, 'VpcId'),
         label: `${ get(vpc, 'VpcId') } (${ get(vpc, 'CidrBlock') })`
       };
-    });
+    }).sortBy('label');
   }),
 
   filteredSecurityGroups: computed('allSecurityGroups', function() {
-    return get(this, 'allSecurityGroups').filterBy('VpcId', get(this, 'config.virtualNetwork'));
+    return get(this, 'allSecurityGroups').filterBy('VpcId', get(this, 'config.virtualNetwork')).sortBy('GroupName');
   }),
 
   readableServiceRole: computed('config.serviceRole', function() {

lib/shared/addon/github/service.js

@@ -70,9 +70,10 @@ export default Service.extend({
 
     let url = Util.addQueryParams(`${ window.location.origin }/verify-auth`, { config: 'github', });
 
-    let popup = window.open(url, 'rancherAuth', Util.popupWindowOptions());
+    const popup = window.open(url, 'rancherAuth', Util.popupWindowOptions());
+    const intl = get(this, 'intl');
 
-    let timer = setInterval(function() {
+    let timer = setInterval(() => {
       if (popup && popup.closed ) {
         clearInterval(timer);
 
@@ -80,7 +81,7 @@ export default Service.extend({
           responded = true;
           cb({
             type:    'error',
-            message: get(this, 'intl').t('authPage.github.test.authError')
+            message: intl.t('authPage.github.test.authError')
           });
         }
       } else if (popup === null || typeof (popup) === 'undefined') {
@@ -91,7 +92,7 @@ export default Service.extend({
 
           cb({
             type:    'error',
-            message: get(this, 'intl').t('authPage.github.test.popupError')
+            message: intl.t('authPage.github.test.popupError')
           });
         }
       }

lib/shared/addon/saml/service.js

@@ -39,7 +39,9 @@ export default Service.extend({
     let url   = get(config, 'idpRedirectUrl');
     let popup = window.open(url, 'rancherAuth', Util.popupWindowOptions());
 
-    let timer = setInterval(function() {
+    const intl = get(this, 'intl');
+
+    let timer = setInterval(() => {
       if (popup && popup.closed ) {
         clearInterval(timer);
 
@@ -48,7 +50,7 @@ export default Service.extend({
 
           cb({
             type:    'error',
-            message: get(this, 'intl').t('authPage.saml.authError')
+            message: intl.t('authPage.saml.authError')
           });
         }
       } else if (popup === null || typeof (popup) === 'undefined') {
@@ -59,7 +61,7 @@ export default Service.extend({
 
           cb({
             type:    'error',
-            message: get(this, 'intl').t('authPage.saml.popupError')
+            message: intl.t('authPage.saml.popupError')
           });
         }
       }