Release v2.0.2

README.md

@@ -46,6 +46,7 @@ The update to v2 is progressing well - here is a list of work to do and done:
   - [X] Delete extra values for Attributes that support multiple values
   - [ ] Delete Attributes
 - [ ] Templates to enable entries to conform to a custom standard
+  - [ ] Autopopulate attribute values
 - [X] Login to LDAP server
   - [X] Configure login by a specific attribute
 - [X] Logout LDAP server
@@ -53,6 +54,7 @@ The update to v2 is progressing well - here is a list of work to do and done:
 - [X] Import LDIF
 - [X] Schema Browser
 - [ ] Searching
+- [ ] Enforcing attribute uniqueness
 - [ ] Is there something missing?
 
 Support is known for these LDAP servers:

app/Http/Controllers/HomeController.php

@@ -383,6 +383,11 @@ class HomeController extends Controller
 			: view('frames.'.$key['cmd']))
 			->with('bases',$this->bases());
 
+		// If we are rendering a DN, rebuild our object
+		$o = config('server')->fetch($key['dn']);
+		foreach (collect(old())->except(['dn','_token']) as $attr => $value)
+			$o->{$attr} = $value;
+
 		return match ($key['cmd']) {
 			'create' => $view
 				->with('container',old('container',$key['dn']))
@@ -390,7 +395,8 @@ class HomeController extends Controller
 
 			'dn' => $view
 				->with('dn',$key['dn'])
-				->with('page_actions',collect(['edit'=>TRUE,'copy'=>TRUE])),
+				->with('o',$o)
+				->with('page_actions',collect(['edit'=>TRUE])),
 
 			'import' => $view,
 

app/Ldap/Entry.php

@@ -94,12 +94,10 @@ class Entry extends Model
 
 		$key = $this->normalizeAttributeKey($key);
 
-		if ((! $this->objects->get($key)) && $value) {
+		if ((! $this->objects->get($key)) && $value)
-			$this->objects->put($key,Factory::create($key,$value));
+			$this->objects->put($key,Factory::create($key,[]));
 
-		} elseif ($this->objects->get($key)) {
+		$this->objects->get($key)->value = $this->attributes[$key];
-			$this->objects->get($key)->value = $this->attributes[$key];
-		}
 
 		return $this;
 	}
@@ -164,7 +162,6 @@ class Entry extends Model
 	/**
 	 * Convert all our attribute values into an array of Objects
 	 *
-	 * @param array $attributes
 	 * @return Collection
 	 */
 	public function getAttributesAsObjects(): Collection

bootstrap/app.php

@@ -16,20 +16,21 @@ return Application::configure(basePath: dirname(__DIR__))
 	)
 	->withMiddleware(function (Middleware $middleware) {
 		$middleware->appendToGroup('web', [
-			ApplicationSession::class,
 			SwapinAuthUser::class,
+			ApplicationSession::class,
 			CheckUpdate::class,
 		]);
 
 		$middleware->prependToGroup('api', [
 			EncryptCookies::class,
-			ApplicationSession::class,
 			SwapinAuthUser::class,
+			ApplicationSession::class,
 			AllowAnonymous::class,
 		]);
 
 		$middleware->trustProxies(at: [
 			'10.0.0.0/8',
+			'127.0.0.0/8',
 			'172.16.0.0/12',
 			'192.168.0.0/12',
 		]);

public/VERSION

@@ -1 +1 @@
-v2.0.1-dev
+v2.0.2-rel

public/css/custom.css

@@ -1,5 +1,5 @@
 /** ensure our userpassword has select is next to the password input */
-div#userPassword .select2-container--bootstrap-5 .select2-selection {
+attribute#userPassword .select2-container--bootstrap-5 .select2-selection {
 	font-size: inherit;
 	width: 9em;
 	border: #444054 1px solid;
@@ -11,7 +11,7 @@ div#userPassword .select2-container--bootstrap-5 .select2-selection {
 	border-top-right-radius: unset;
 }
 
-div#objectClass .input-group-end:not(input.form-control) {
+attribute#objectClass .input-group-end:not(input.form-control) {
 	position: absolute;
 	right: 1em;
 	top: 0.5em;

public/css/fixes.css

@@ -248,3 +248,8 @@ select2-container--bootstrap-5 .select2-selection--multiple .select2-selection__
 .input-group-text {
 	background-color: #fafafa;
 }
+
+/* Stop showing a border on our user's drop down menu when open */
+.btn-check:checked+.btn, .btn.active, .btn.show, .btn:first-child:active, :not(.btn-check)+.btn:active {
+	border-color: var(--bs-btn-bg);
+}

resources/themes/architect/views/layouts/partials/contentheader.blade.php

@@ -27,7 +27,7 @@
 							@endif
 							@if(isset($page_actions) && $page_actions->contains('copy'))
 								<li>
-									<button class="btn btn-outline-dark p-1 m-1" id="entry-copy-move" data-bs-toggle="tooltip" data-bs-placement="bottom" title="@lang('Copy/Move')"><i class="fas fa-fw fa-copy fs-5"></i></button>
+									<button class="btn btn-outline-dark p-1 m-1" id="entry-copy-move" data-bs-toggle="tooltip" data-bs-placement="bottom" title="@lang('Copy/Move')" disabled><i class="fas fa-fw fa-copy fs-5"></i></button>
 								</li>
 							@endif
 							@if((isset($page_actions) && $page_actions->contains('edit')) || old())

resources/themes/architect/views/layouts/partials/topmenu.blade.php

@@ -124,7 +124,7 @@
 						--}}
 						<div class="widget-content-left header-user-info ms-3">
 							<div class="widget-heading">
-								{{ $user->exists ? Arr::get($user->getAttribute('cn'),0,'Anonymous') : 'Anonymous' }}
+								{{ $user->exists ? Arr::get($user->getAttribute('cn'),0,Arr::get($user->getAttribute('entryuuid'),0,'Secret Person')) : 'Anonymous' }}
 							</div>
 							<div class="widget-subheading">
 								{{ $user->exists ? Arr::get($user->getAttribute('mail'),0,'') : '' }}

resources/views/components/attribute/binary/jpegphoto.blade.php

@@ -14,7 +14,7 @@
 							@if ($edit)
 								<br>
 								<!-- @todo TO IMPLEMENT -->
-								<span class="btn btn-sm btn-danger deletable d-none mt-3"><i class="fas fa-trash-alt"></i> @lang('Delete')</span>
+								<button class="btn btn-sm btn-danger deletable d-none mt-3" disabled><i class="fas fa-trash-alt"></i> @lang('Delete')</button>
 
 								<div class="invalid-feedback pb-2">
 									@if($e)

resources/views/components/attribute/layout.blade.php

@@ -1,9 +1,9 @@
 <div class="row pt-2">
 	<div @class(['col-1','d-none'=>(! $edit)])></div>
 	<div class="col-10 p-2">
-		<div id="{{ $o->name }}">
+		<attribute id="{{ $o->name }}">
 			{{ $slot }}
-		</div>
+		</attribute>
 
 		<x-attribute.widget.options :o="$o" :edit="$edit" :new="$new"/>
 	</div>

resources/views/components/attribute/widget/options.blade.php

@@ -1,15 +1,18 @@
+@use(App\Classes\LDAP\Attribute\Binary\JpegPhoto)
+@use(App\Classes\LDAP\Attribute\ObjectClass)
 @php($clone=FALSE)
-@if($o->is_rdn)
+<span class="p-0 m-0">
-	<span class="btn btn-sm btn-outline-focus mt-3"><i class="fas fa-fw fa-exchange"></i> @lang('Rename')</span>
+	@if($o->is_rdn)
-@elseif($edit && $o->can_addvalues)
+		<br/>
-	<span class="p-0 m-0">
+		<button class="btn btn-sm btn-outline-focus mt-3" disabled><i class="fas fa-fw fa-exchange"></i> @lang('Rename')</button>
+	@elseif($edit && $o->can_addvalues)
 		@switch(get_class($o))
-			@case('App\Classes\LDAP\Attribute\Binary\JpegPhoto')
+			@case(JpegPhoto::class)
-				<span @class(['btn','btn-sm','btn-outline-primary','mt-3','addable','d-none'=>(! $new)]) id="{{ $o->name_lc }}"><i class="fas fa-fw fa-plus"></i> @lang('Upload JpegPhoto')</span>
+				<button @class(['btn','btn-sm','btn-outline-primary','mt-3','addable','d-none'=>(! $new)]) id="{{ $o->name_lc }}" disabled><i class="fas fa-fw fa-plus"></i> @lang('Upload JpegPhoto')</button>
 
 				@break
 
-			@case('App\Classes\LDAP\Attribute\ObjectClass')
+			@case(ObjectClass::class)
 				<button type="button" @class(['btn','btn-sm','btn-outline-primary','mt-3','addable','d-none'=>(! $new)]) data-bs-toggle="modal" data-bs-target="#new_objectclass-modal"><i class="fas fa-fw fa-plus"></i> @lang('Add Objectclass')</button>
 
 				<!-- NEW OBJECT CLASS -->
@@ -37,42 +40,12 @@
 						$(document).ready(function() {
 							var added_oc = [];	// Object classes being added to this entry
 							var rendered = false;
+							var newadded = [];
 
-							// Show our ObjectClass modal so that we can add more objectclasses
+							if (newadded.length)
-							$('#new_objectclass-modal').on('shown.bs.modal',function() {
+								process_oc();
-								if (! rendered)
-									$.ajax({
-										method: 'POST',
-										url: '{{ url('entry/objectclass/add') }}',
-										data: {
-											oc: oc,
-										},
-										cache: false,
-										success: function(data) {
-											$('select#newoc').select2({
-												dropdownParent: $('#new_objectclass-modal'),
-												theme: 'bootstrap-5',
-												multiple: true,
-												data: data,
-											});
-										},
-										error: function(e) {
-											if (e.status !== 412)
-												alert('That didnt work? Please try again....');
-										},
-									});
-
-								rendered = true;
-							})
-
-							// When the ObjectClass modal is closed, process what was selected
-							$('#new_objectclass-modal').on('hide.bs.modal',function() {
-								var newadded = $('select#newoc').val();
-
-								// If nothing selected, we dont have anything to do
-								if (added_oc.sort().join('|') === newadded.sort().join('|'))
-									return;
 
+							function process_oc() {
 								// Find out what was selected, and add them
 								newadded.forEach(function (item) {
 									if (added_oc.indexOf(item) !== -1)
@@ -97,6 +70,7 @@
 										},
 									});
 
+									// Get a list of attributes already on the page, so we dont double up
 									$.ajax({
 										method: 'POST',
 										url: '{{ url('api/schema/objectclass/attrs') }}/'+item,
@@ -105,6 +79,9 @@
 											// Render any must attributes
 											if (data.must.length) {
 												data.must.forEach(function(item) {
+													if ($('attribute#'+item).length)
+														return;
+
 													// Add attribute to the page
 													$.ajax({
 														method: 'POST',
@@ -174,7 +151,7 @@
 														if (x.length) {
 															x.remove();
 
-														// Add this to the must attrs list, because its been rendered
+															// Add this to the must attrs list, because its been rendered
 														} else {
 															attrs.push(mayitem);
 														}
@@ -196,13 +173,51 @@
 								});
 
 								added_oc = newadded;
+							}
+
+							// Show our ObjectClass modal so that we can add more objectclasses
+							$('#new_objectclass-modal').on('shown.bs.modal',function() {
+								if (! rendered)
+									$.ajax({
+										method: 'POST',
+										url: '{{ url('entry/objectclass/add') }}',
+										data: {
+											oc: oc,
+										},
+										cache: false,
+										success: function(data) {
+											$('select#newoc').select2({
+												dropdownParent: $('#new_objectclass-modal'),
+												theme: 'bootstrap-5',
+												multiple: true,
+												data: data,
+											});
+										},
+										error: function(e) {
+											if (e.status !== 412)
+												alert('That didnt work? Please try again....');
+										},
+									});
+
+								rendered = true;
+							})
+
+							// When the ObjectClass modal is closed, process what was selected
+							$('#new_objectclass-modal').on('hide.bs.modal',function() {
+								newadded = $('select#newoc').val();
+
+								// If nothing selected, we dont have anything to do
+								if (added_oc.sort().join('|') === newadded.sort().join('|'))
+									return;
+
+								process_oc();
 							});
 						});
 					</script>
 				@append
 				@break
 
-			@case('App\Classes\LDAP\Attribute')
+			<!-- All other attributes -->
 			@default
 				@php($clone=TRUE)
 				<span @class(['btn','btn-sm','btn-outline-primary','mt-3','addable','d-none'=>(! $new)]) id="{{ $o->name }}-addnew"><i class="fas fa-fw fa-plus"></i> @lang('Add Value')</span>
@@ -222,5 +237,5 @@
 					@endif
 				@append
 		@endswitch
-	</span>
+	@endif
-@endif
+</span>

resources/views/components/file-note.blade.php

@@ -1,7 +1,7 @@
 @if(file_exists($file))
 	<div class="row pb-3">
-		<div class="col-12">
+		<div class="col-12 offset-md-2 col-md-8">
-			<div class="mx-auto card text-white card-body bg-primary w-50">
+			<div class="mx-auto card text-white card-body bg-primary">
 				<h5 class="text-white card-title"><i class="icon fa-2x fas fa-info pe-3"></i><span class="font-size-xlg">NOTE</span></h5>
 				<span class="w-100 pb-0">
 					{!! file_get_contents($file) !!}

resources/views/fragment/dn/add_attr.blade.php

@@ -13,10 +13,9 @@
 
 			<div class="row">
 				<div class="col-12 pt-2">
-					<x-form.select id="newattr" label="Select from..." :options="$o->getMissingAttributes()->sortBy('name')->map(fn($item)=>['id'=>$item->name,'value'=>$item->name_lc])"/>
+					<x-form.select id="newattr" label="Select from..." :options="$o->getMissingAttributes()->sortBy('name')->unique('name')->map(fn($item)=>['id'=>$item->name,'value'=>$item->name_lc])"/>
 				</div>
 			</div>
 		</div>
 	</div>
-	<div class="col-2"></div>
 </div>

resources/views/frames/dn.blade.php

@@ -1,7 +1,7 @@
 @extends('layouts.dn')
 
 @section('page_title')
-	@include('fragment.dn.header',['o'=>($o=config('server')->fetch($dn))])
+	@include('fragment.dn.header',['o'=>($o ?? $o=config('server')->fetch($dn))])
 @endsection
 
 @section('main-content')