From e47a96f9939584ca711983844fbc191eb6d81a85 Mon Sep 17 00:00:00 2001
From: Westly Wright <westly.wright@gmail.com>
Date: Tue, 15 May 2018 11:55:22 -0700
Subject: [PATCH] azure ad add edit

---
 .../security/authentication/azuread/controller.js  | 14 ++++++++++----
 .../security/authentication/azuread/template.hbs   | 10 +++++++---
 .../addon/security/authentication/controller.js    |  2 +-
 translations/en-us.yaml                            |  2 +-
 4 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/lib/global-admin/addon/security/authentication/azuread/controller.js b/lib/global-admin/addon/security/authentication/azuread/controller.js
index 2e2d60c1a..300ed00d6 100644
--- a/lib/global-admin/addon/security/authentication/azuread/controller.js
+++ b/lib/global-admin/addon/security/authentication/azuread/controller.js
@@ -23,7 +23,7 @@ export default Controller.extend({
   //new
   azureADConfig:  alias('model.azureADConfig'),
   isEnabled:      alias('azureADConfig.enabled'),
-  // isEnabled:      true,
+  editing:        false,
   mode:           'global',
   modeClass:      'span-4',
 
@@ -36,6 +36,11 @@ export default Controller.extend({
   }),
 
   actions: {
+
+    edit() {
+      set(this, 'editing', true);
+    },
+
     toggleMode() {
 
       if (get(this, 'mode') === 'global') {
@@ -59,6 +64,7 @@ export default Controller.extend({
       this.send('clearError');
 
       const model = get(this, 'azureADConfig');
+      const enabled = get(this, 'azureADConfig.enabled');
 
       model.setProperties({
         accessMode: 'unrestricted',
@@ -70,13 +76,13 @@ export default Controller.extend({
 
         set(this, 'errors', errors);
         set(this, 'testing', false);
-        model.set('enabled', false);
+        model.set('enabled', enabled);
 
       } else {
 
         set(this, 'testing', true);
 
-        delete model.enabled;
+        // delete model.enabled;
 
         model.doAction('testAndApply', {
           azureAdConfig: model,
@@ -89,7 +95,7 @@ export default Controller.extend({
 
         }).catch((err) => {
 
-          set(model, 'enabled', false);
+          set(model, 'enabled', enabled);
 
           this.send('gotError', err);
 
diff --git a/lib/global-admin/addon/security/authentication/azuread/template.hbs b/lib/global-admin/addon/security/authentication/azuread/template.hbs
index 90cfa5849..91b07b5a7 100644
--- a/lib/global-admin/addon/security/authentication/azuread/template.hbs
+++ b/lib/global-admin/addon/security/authentication/azuread/template.hbs
@@ -35,7 +35,10 @@
 
       <section class="">
         <div class="clearfix">
-          <div class="pull-right">
+          <div class="pull-right mt-10">
+            <button class="btn btn-sm bg-primary" {{action "edit"}}>
+              {{t 'generic.edit'}}
+            </button>
             <button class="btn btn-sm right-divider-btn bg-error" {{action "disable"}}>
               {{t 'authPage.azuread.enabled.promptDisable'}}
             </button>
@@ -69,7 +72,7 @@
   {{/if}}
 
 
-  {{#unless isEnabled}}
+  {{#if (or (not isEnabled) editing)}}
     <section class="box mt-30">
 
       <div class="row">
@@ -164,5 +167,6 @@
         </div>
       </div>
     </section>
-  {{/unless}}
+  {{/if}}
+
 {{/accordion-list}}
\ No newline at end of file
diff --git a/lib/global-admin/addon/security/authentication/controller.js b/lib/global-admin/addon/security/authentication/controller.js
index c516651c4..8634b3639 100644
--- a/lib/global-admin/addon/security/authentication/controller.js
+++ b/lib/global-admin/addon/security/authentication/controller.js
@@ -10,7 +10,7 @@ export default Controller.extend({
   drivers: computed(function() {
     return [
       {route: 'security.authentication.activedirectory', label: 'Active Directory',  css: 'activedirectory', available: this.hasRecord('activedirectoryconfig')  },
-      // {route: 'security.authentication.azuread',         label: 'Azure AD',          css: 'azuread',         available: this.hasRecord('azureadconfig')  },
+      {route: 'security.authentication.azuread',         label: 'Azure AD',          css: 'azuread',         available: this.hasRecord('azureadconfig')  },
       {route: 'security.authentication.github',          label: 'GitHub',            css: 'github',          available: this.hasRecord('githubconfig')  },
       // {route: 'security.authentication.openldap',        label: 'OpenLDAP',          css: 'openldap',        available: this.hasRecord('openldapconfig')  },
       // {route: 'security.authentication.shibboleth',      label: 'Shibboleth',        css: 'shibboleth',      available: this.hasRecord('shibbolethconfig')  },
diff --git a/translations/en-us.yaml b/translations/en-us.yaml
index f06807939..e342ac355 100644
--- a/translations/en-us.yaml
+++ b/translations/en-us.yaml
@@ -473,7 +473,7 @@ authPage:
       header: 'Danger Zone&trade;'
       warning: '<b class="text-danger">Caution:</b> Disabling access control will give complete control over {appName} to anyone that can reach this page or the API.'
       reallyDisable: 'Are you sure?  Click again to really disable access control'
-      promptDisable: Disable access control
+      promptDisable: Disable Azure AD
     configure:
       header: '1. Configure Azure AD Account'
       adminAccountUsername: