More work on work on adding/removing objectclasses to an entry, still need to automatically remove attrs from removed objectclasses

app/Classes/LDAP/Attribute.php

@@ -33,9 +33,6 @@ class Attribute implements \Countable, \ArrayAccess, \Iterator
 	// Is this attribute the RDN?
 	protected bool $is_rdn = FALSE;
 
-	// Objectclasses that require this attribute
-	protected Collection $required_by;
-
 	// MIN/MAX number of values
 	protected int $min_values_count = 0;
 	protected int $max_values_count = 0;
@@ -102,7 +99,6 @@ class Attribute implements \Countable, \ArrayAccess, \Iterator
 		$this->name = $name;
 		$this->values = collect($values);
 		$this->lang_tags = collect();
-		$this->required_by = collect();
 		$this->oldValues = collect($values);
 
 		// No need to load our schema for internal attributes
@@ -149,6 +145,10 @@ class Attribute implements \Countable, \ArrayAccess, \Iterator
 			'old_values' => $this->oldValues,
 			// Attribute values
 			'values' => $this->values,
+			// Required by Object Classes
+			'required_by' => $this->schema->required_by_object_classes,
+			// Used in Object Classes
+			'used_in' => $this->schema->used_in_object_classes,
 
 			default => throw new \Exception('Unknown key:' . $key),
 		};
@@ -296,19 +296,6 @@ class Attribute implements \Countable, \ArrayAccess, \Iterator
 		return Arr::get($this->values,$key);
 	}
 
-	/**
-	 * Set the objectclasses that require this attribute
-	 *
-	 * @param Collection $oc
-	 * @return Collection
-	 */
-	public function required_by(Collection $oc): Collection
-	{
-		return $this->required_by = ($this->schema
-			? $oc->intersect($this->schema->required_by_object_classes)
-			: collect());
-	}
-
 	/**
 	 * If this attribute has RFC3866 Language Tags, this will enable those values to be captured
 	 *

app/Classes/LDAP/Schema/AttributeType.php

@@ -549,17 +549,6 @@ final class AttributeType extends Base {
 			$this->aliases->forget($x);
 	}
 
-	/**
-	 * Given a list of object classes, determine if this is a required attribute
-	 *
-	 * @param Collection $oc List of objectclasses to compare.
-	 * @return Collection
-	 */
-	public function required_by(Collection $oc): Collection
-	{
-		return $oc->diff($this->required_by_object_classes);
-	}
-
 	/**
 	 * Sets this attribute's list of aliases.
 	 *

app/Http/Controllers/APIController.php

@@ -82,4 +82,21 @@ class APIController extends Controller
 				abort(404);
 		}
 	}
-}
+
+	/**
+	 * Return the required and additional attributes for an object class
+	 *
+	 * @param Request $request
+	 * @param string $objectclass
+	 * @return array
+	 */
+	public function schema_objectclass_attrs(Request $request,string $objectclass): array
+	{
+		$oc = config('server')->schema('objectclasses',$objectclass);
+
+		return [
+			'must' => $oc->getMustAttrs()->pluck('name'),
+			'may' => $oc->getMayAttrs()->pluck('name'),
+		];
+	}
+}

app/Http/Controllers/HomeController.php

@@ -85,7 +85,7 @@ class HomeController extends Controller
 				->with('o',new Attribute($id,[]))
 				->with('value',$request->value)
 				->with('loop',$xx)
-			: (new AttributeType(new Attribute($id,[]),TRUE))->render();
+			: (new AttributeType(new Attribute($id,[]),TRUE,collect($request->oc ?: [])))->render();
 
 		return $x;
 	}

app/Ldap/Entry.php

@@ -186,12 +186,8 @@ class Entry extends Model
 				if (preg_match('/^'.$attribute.'=/i',$this->dn))
 					$o->setRDN();
 
-				// Set required flag
-				$o->required_by(collect($this->getAttribute('objectclass')));
-
 				// Store our original value to know if this attribute has changed
-				if ($x=Arr::get($this->original,$attribute))
-					$o->oldValues($x);
+				$o->oldValues(Arr::get($this->original,$attribute,[]));
 
 				$result->put($attribute,$o);
 			}

app/View/Components/AttributeType.php

@@ -4,21 +4,24 @@ namespace App\View\Components;
 
 use Closure;
 use Illuminate\Contracts\View\View;
+use Illuminate\Support\Collection;
 use Illuminate\View\Component;
 
 use App\Classes\LDAP\Attribute as LDAPAttribute;
 
 class AttributeType extends Component
 {
+	public Collection $oc;
 	public LDAPAttribute $o;
 	public bool $new;
 
 	/**
 	 * Create a new component instance.
 	 */
-	public function __construct(LDAPAttribute $o,bool $new=FALSE)
+	public function __construct(LDAPAttribute $o,bool $new=FALSE,Collection $oc=NULL)
 	{
 		$this->o = $o;
+		$this->oc = $oc;
 		$this->new = $new;
 	}
 
@@ -29,6 +32,7 @@ class AttributeType extends Component
 	{
 		return view('components.attribute-type')
 			->with('o',$this->o)
+			->with('oc',$this->oc)
 			->with('new',$this->new);
 	}
 }