PRovide LDAP sync and authentication

gui/app/pods/auth/forgot/controller.js

@@ -10,11 +10,11 @@
 // https://documize.com
 
 import { inject as service } from '@ember/service';
-
 import Controller from '@ember/controller';
 
 export default Controller.extend({
 	userService: service('user'),
+	appMeta: service('app-meta'),
 
 	actions: {
 		forgot: function (email) {

gui/app/pods/auth/forgot/route.js

@@ -19,7 +19,7 @@ export default Route.extend({
 	beforeModel() {
 		let constants = this.get('constants');
 
-		if (this.get('appMeta.authProvider') === constants.AuthProvider.Keycloak) {
+		if (this.get('appMeta.authProvider') !== constants.AuthProvider.Documize) {
 			this.transitionTo('auth.login');
 		}
 	},

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

@@ -2,6 +2,7 @@
 	<div class="auth-box">
 		<div class="logo">
 			<img src="/assets/img/logo-purple.png" title="Documize" alt="Documize" class="img-fluid" />
+			<div class="url">Authenticate with {{appMeta.appHost}}</div>
 		</div>
 		<div class="login-form">
 			{{forgot-password forgot=(action 'forgot')}}

gui/app/pods/auth/login/controller.js

@@ -10,8 +10,8 @@
 // https://documize.com
 
 import { inject as service } from '@ember/service';
-import Controller from '@ember/controller';
 import AuthProvider from '../../../mixins/auth';
+import Controller from '@ember/controller';
 
 export default Controller.extend(AuthProvider, {
 	appMeta: service('app-meta'),
@@ -19,10 +19,19 @@ export default Controller.extend(AuthProvider, {
 	invalidCredentials: false,
 
 	reset() {
-		this.setProperties({
-			email: '',
-			password: ''
-		});
+		if (this.get('sAuthProviderDocumize')) {
+			this.setProperties({
+				email: '',
+				password: ''
+			});
+		}
+
+		if (this.get('sAuthProviderLDAP')) {
+			this.setProperties({
+				username: '',
+				password: ''
+			});
+		}
 
 		let dbhash = document.head.querySelector("[property=dbhash]").content;
 		if (dbhash.length > 0 && dbhash !== "{{.DBhash}}") {
@@ -32,14 +41,27 @@ export default Controller.extend(AuthProvider, {
 
 	actions: {
 		login() {
-			let creds = this.getProperties('email', 'password');
+			if (this.get('isAuthProviderDocumize')) {
+				let creds = this.getProperties('email', 'password');
 
-			this.get('session').authenticate('authenticator:documize', creds).then((response) => {
-				this.transitionToRoute('folders');
-				return response;
-			}).catch(() => {
-				this.set('invalidCredentials', true);
-			});
+				this.get('session').authenticate('authenticator:documize', creds).then((response) => {
+					this.transitionToRoute('folders');
+					return response;
+				}).catch(() => {
+					this.set('invalidCredentials', true);
+				});
+			}
+
+			if (this.get('isAuthProviderLDAP')) {
+				let creds = this.getProperties('username', 'password');
+
+				this.get('session').authenticate('authenticator:ldap', creds).then((response) => {
+					this.transitionToRoute('folders');
+					return response;
+				}).catch(() => {
+					this.set('invalidCredentials', true);
+				});
+			}
 		}
 	}
 });

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

@@ -3,22 +3,27 @@
 		<div class="auth-box">
 			<div class="logo">
 				<img src="/assets/img/logo-purple.png" title="Documize" alt="Documize" class="img-fluid" />
+				<div class="url">Authenticate with {{appMeta.appHost}}</div>
 			</div>
 			<form {{action 'login' on="submit"}}>
 				<div class="form-group">
-					<label for="authEmail">Email</label>
-					{{focus-input type="email" value=email id="authEmail" class="form-control mousetrap" placeholder="" autocomplete="username email"}}
+					{{#if isAuthProviderDocumize}}
+						<label for="authEmail">Email</label>
+						{{focus-input type="email" value=email id="authEmail" class="form-control mousetrap" placeholder="" autocomplete="username email"}}
+					{{/if}}
+					{{#if isAuthProviderLDAP}}
+						<label for="authUsername">Network Username</label>
+						{{focus-input type="text" value=username id="authUsername" class="form-control mousetrap" placeholder="network domain username" autocomplete="username"}}
+					{{/if}}
 				</div>
 				<div class="form-group">
 					<label for="authPassword">Password</label>
-					{{input type="password" value=password id="authPassword" class="form-control" autocomplete="current-password"}}
+					{{input type="password" value=password id="authPassword" class="form-control" placeholder="network password" autocomplete="current-password"}}
 				</div>
 				<button type="submit" class="btn btn-success font-weight-bold text-uppercase mt-4">Sign in</button>
 				<div class="{{unless invalidCredentials "invisible"}} color-red mt-3">Invalid credentials</div>
 				{{#if isAuthProviderDocumize}}
-					<div class="mt-5">
-						{{#link-to 'auth.forgot'}}Forgot your password?{{/link-to}}
-					</div>
+					{{#link-to 'auth.forgot'}}Forgot your password?{{/link-to}}
 				{{/if}}
 			</form>
 		</div>

gui/app/pods/auth/logout/route.js

@@ -10,9 +10,7 @@
 // https://documize.com
 
 import { inject as service } from '@ember/service';
-
 import Route from '@ember/routing/route';
-// import config from 'documize/config/environment';
 
 export default Route.extend({
 	session: service(),
@@ -20,15 +18,6 @@ export default Route.extend({
 
 	activate: function () {
 		this.get('session').invalidate().then(() => {
-			// if (config.environment === 'test') {
-			// 	this.transitionTo('auth.login');
-			// } else {
-			// 	if (this.get("appMeta.allowAnonymousAccess")) {
-			// 		this.transitionTo('folders');
-			// 	} else {
-			// 		this.transitionTo('auth.login');
-			// 	}
-			// }
 		});
 	}
 });

gui/app/pods/auth/reset/controller.js

@@ -10,11 +10,11 @@
 // https://documize.com
 
 import { inject as service } from '@ember/service';
-
 import Controller from '@ember/controller';
 
 export default Controller.extend({
 	userService: service('user'),
+	appMeta: service('app-meta'),
 	password: "",
 	passwordConfirm: "",
 	mustMatch: false,

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

@@ -2,6 +2,7 @@
 	<div class="auth-box">
 		<div class="logo">
 			<img src="/assets/img/logo-purple.png" title="Documize" alt="Documize" class="img-fluid" />
+			<div class="url">Authenticate with {{appMeta.appHost}}</div>
 		</div>
 		{{password-reset reset=(action 'reset')}}
 	</div>

gui/app/pods/auth/share/route.js

@@ -1,18 +1,18 @@
 // Copyright 2016 Documize Inc. <legal@documize.com>. All rights reserved.
 //
-// This software (Documize Community Edition) is licensed under 
+// This software (Documize Community Edition) is licensed under
 // GNU AGPL v3 http://www.gnu.org/licenses/agpl-3.0.en.html
 //
 // You can operate outside the AGPL restrictions by purchasing
 // Documize Enterprise Edition and obtaining a commercial license
-// by contacting <sales@documize.com>. 
+// by contacting <sales@documize.com>.
 //
 // https://documize.com
 
 import $ from 'jquery';
 import { inject as service } from '@ember/service';
-import Route from '@ember/routing/route';
 import AuthenticatedRouteMixin from 'ember-simple-auth/mixins/authenticated-route-mixin';
+import Route from '@ember/routing/route';
 
 export default Route.extend(AuthenticatedRouteMixin, {
 	session: service(),
@@ -42,5 +42,5 @@ export default Route.extend(AuthenticatedRouteMixin, {
 
 	deactivate() {
 		$('body').removeClass('background-color-off-white');
-	}	
-});
+	}
+});

gui/app/pods/customize/auth/controller.js

@@ -32,7 +32,7 @@ export default Controller.extend(NotifierMixin, {
 			});
 		},
 
-		onSync() {
+		onSyncKeycloak() {
 			return new EmberPromise((resolve) => {
 				this.get('global').syncKeycloak().then((response) => {
 					resolve(response);
@@ -40,6 +40,14 @@ export default Controller.extend(NotifierMixin, {
 			});
 		},
 
+		onSyncLDAP() {
+			return new EmberPromise((resolve) => {
+				this.get('global').syncLDAP().then((response) => {
+					resolve(response);
+				});
+			});
+		},
+
 		onChange(data) {
 			this.get('session').logout();
 			this.set('appMeta.authProvider', data.authProvider);

gui/app/pods/customize/auth/route.js

@@ -33,32 +33,7 @@ export default Route.extend(AuthenticatedRouteMixin, {
 			authConfig: null,
 		};
 
-		let config = {
-			ServerType:               constants.AuthProvider.ServerTypeLDAP,
-			ServerHost:               "127.0.0.1",
-			ServerPort:               389,
-			EncryptionType:           constants.AuthProvider.EncryptionTypeStartTLS,
-			BaseDN:                   "ou=people,dc=planetexpress,dc=com",
-			BindDN:                   "cn=admin,dc=planetexpress,dc=com",
-			BindPassword:             "GoodNewsEveryone",
-			UserFilter:               "(|(objectClass=person)(objectClass=user)(objectClass=inetOrgPerson))",
-			GroupFilter:              "(&(objectClass=group)(|(cn=ship_crew)(cn=admin_staff)))",
-			AttributeUserRDN:         "uid",
-			AttributeUserFirstname:   "givenName",
-			AttributeUserLastname:    "sn",
-			AttributeUserEmail:       "mail",
-			AttributeUserDisplayName: "",
-			AttributeUserGroupName:   "",
-			AttributeGroupMember:     "member",
-		};
-
-		this.get('global').previewLDAP(config).then((r) => {
-			console.log(r);
-		});
-
 		return new EmberPromise((resolve) => {
-			let constants = this.get('constants');
-
 			this.get('global').getAuthConfig().then((config) => {
 				switch (data.authProvider) {
 					case constants.AuthProvider.Keycloak:

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

@@ -1,2 +1,7 @@
-{{customize/auth-settings authProvider=model.authProvider authConfig=model.authConfig
-    onSave=(action 'onSave') onSync=(action 'onSync') onChange=(action 'onChange')}}
+{{customize/auth-settings
+	authProvider=model.authProvider
+	authConfig=model.authConfig
+    onSave=(action 'onSave')
+	onSyncLDAP=(action 'onSyncLDAP')
+	onSyncKeycloak=(action 'onSyncKeycloak')
+	onChange=(action 'onChange')}}

gui/app/pods/customize/users/controller.js

@@ -57,12 +57,20 @@ export default Controller.extend({
 			this.loadUsers(filter);
 		},
 
-		onSync() {
+		onSyncKeycloak() {
 			this.set('syncInProgress', true);
 			this.get('globalSvc').syncKeycloak().then(() => {
 				this.set('syncInProgress', false);
 				this.loadUsers('');
 			});
+		},
+
+		onSyncLDAP() {
+			this.set('syncInProgress', true);
+			this.get('globalSvc').syncLDAP().then(() => {
+				this.set('syncInProgress', false);
+				this.loadUsers('');
+			});
 		}
 	}
 });

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

@@ -5,7 +5,8 @@
 {{customize/user-list users=model
 	syncInProgress=syncInProgress
 	userLimit=userLimit
-	onSync=(action "onSync")
+	onSyncKeycloak=(action "onSyncKeycloak")
+	onSyncLDAP=(action "onSyncLDAP")
 	onFilter=(action "onFilter")
 	onDelete=(action "onDelete")
 	onSave=(action "onSave")