API Remove deprecated code (#47)

silverstripe · Jan 25, 2023 · b9c070e · b9c070e
1 parent 972af65
commit b9c070e
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 13 deletions.
diff --git a/docs/en/tech_notes.md b/docs/en/tech_notes.md
@@ -9,7 +9,7 @@ LDAP-only sequence:
 1. `LDAPAuthenticator::authenticate` is called
 1. Authentication against LDAP is performed by SilverStripe's backend.
 1. If `Member` record is not found, stub is created with some basic fields (i.e. GUID), but no group mapping.
-1. A login hook is triggered at `LDAPMemberExtension::memberLoggedIn`
+1. A login hook is triggered at `LDAPMemberExtension::afterMemberLoggedIn`
 1. LDAP synchronisation is performed by looking up the GUID. All `Member` fields are overwritten with the data obtained
 from LDAP, and LDAP group mappings are added.
 1. User is logged into SilverStripe as that member, considered authenticated and authorised (since the group mappings
@@ -21,7 +21,7 @@ are in place)
 and SAML components.
 
 * `LDAPAuthenticator::authenticate`: creates stub `Member` after authorisation (if non-existent).
-* `LDAPMemberExtension::memberLoggedIn`: triggers LDAP synchronisation, rewriting all `Member` fields.
+* `LDAPMemberExtension::afterMemberLoggedIn`: triggers LDAP synchronisation, rewriting all `Member` fields.
 * `LDAPMemberSyncTask::run`: pulls all LDAP records and creates relevant `Members`.
 
 ## Password change synchronisation

diff --git a/src/Authenticators/LDAPAuthenticator.php b/src/Authenticators/LDAPAuthenticator.php
@@ -148,7 +148,7 @@ public function authenticate(array $data, HTTPRequest $request, ValidationResult
             return null;
         }
 
-        // LDAPMemberExtension::memberLoggedIn() will update any other AD attributes mapped to Member fields
+        // LDAPMemberExtension::afterMemberLoggedIn() will update any other AD attributes mapped to Member fields
         $member = Member::get()->filter('GUID', $data['objectguid'])->limit(1)->first();
         if (!($member && $member->exists())) {
             $member = new Member();

diff --git a/src/Extensions/LDAPMemberExtension.php b/src/Extensions/LDAPMemberExtension.php
@@ -2,7 +2,6 @@
 
 namespace SilverStripe\LDAP\Extensions;
 
-use SilverStripe\Dev\Deprecation;
 use Exception;
 use SilverStripe\Core\Injector\Injector;
 use SilverStripe\Forms\FieldList;
@@ -289,15 +288,6 @@ public function sync()
         $service->updateLDAPGroupsForMember($this->owner);
     }
 
-    /**
-     * @deprecated 1.1.0 Will be removed without equivalent functionality to replace it
-     */
-    public function memberLoggedIn()
-    {
-        Deprecation::notice('1.1.0', 'Will be removed without equivalent functionality to replace it');
-        return $this->afterMemberLoggedIn();
-    }
-
     /**
      * Triggered by {@link IdentityStore::logIn()}. When successfully logged in,
      * this will update the Member record from LDAP data.