Merge branch 'auth-with-cas' of github.com:dereknex/community into auth-with-cas

gui/app/authenticators/cas.js

@@ -10,10 +10,8 @@
 // https://documize.com
 
 import { isPresent } from '@ember/utils';
-
 import { reject, resolve } from 'rsvp';
 import { inject as service } from '@ember/service';
-
 import Base from 'ember-simple-auth/authenticators/base';
 import netUtil from "../utils/net";
 

gui/app/pods/customize/auth/template.hbs

@@ -1,6 +1,6 @@
 {{layout/logo-heading
 	title="Authentication"
-	desc="Choose user authentication provider — Documize, Redhat Keycloak, LDAP/AD, CAS"
+	desc="Choose user authentication provider — Documize, Redhat Keycloak, LDAP/AD, Central Authentication Server"
 	icon=constants.Icon.Locked}}
 
 {{customize/auth-settings

gui/app/templates/components/customize/auth-settings.hbs

@@ -18,14 +18,14 @@
 				</li>
 				<li class="option {{if isLDAPProvider "selected"}}" {{action "onLDAP"}}>
 					<div class="text-header">LDAP</div>
-					<div class="text">Connect to LDAP/ Active Directory</div>
+					<div class="text">Connect to LDAP/Active Directory</div>
 					{{#if isLDAPProvider}}
 						<i class="dicon {{constants.Icon.Tick}}" />
 					{{/if}}
 				</li>
                 <li class="option {{if isCASProvider "selected"}}" {{action "onCAS"}}>
                     <div class="text-header">CAS</div>
-                    <div class="text">Via authentication server</div>
+                    <div class="text">Via Central Authentication Server</div>
                     {{#if isCASProvider}}
                         <i class="dicon {{constants.Icon.Tick}}" />
                     {{/if}}

gui/app/templates/components/customize/user-list.hbs

@@ -8,7 +8,7 @@
 		{{/if}}
 	{{/if}}
 
-	{{#if (or isAuthProviderLDAP c)}}
+	{{#if (or isAuthProviderLDAP isDualAuth)}}
 		<Ui::UiSpacer @size="300" />
 		{{#if syncInProgress}}
 			{{ui/ui-button color=constants.Color.Gray light=true icon=constants.Icon.Locked label="LDAP user sync running..."}}