Commit 607dd8ee authored by Neil Drumm's avatar Neil Drumm 👋
Browse files

Issue #3319007 by drumm, fjgarlin: Delete users from versioncontrol_gitlab_users on user deletion

parent 7fbcacd6

versioncontrol_gitlab.install

+9 −0
Original line number Diff line number Diff line
@@ -170,3 +170,12 @@ function versioncontrol_gitlab_update_7000() { 
    ],

  ]);

}



/**

 * Remove {versioncontrol_gitlab_users} rows for deleted users.

 */

function versioncontrol_gitlab_update_7001() {

  db_delete('versioncontrol_gitlab_users')

    ->condition('uid', db_query('SELECT vgu.uid FROM {versioncontrol_gitlab_users} vgu LEFT JOIN {users} u ON vgu.uid = u.uid WHERE u.uid IS NULL')->fetchCol())

    ->execute();

}

versioncontrol_gitlab.module

+5 −0
Original line number Diff line number Diff line
@@ -170,6 +170,11 @@ function _versioncontrol_gitlab_user_delete($account) { 
    if ($gitlab_user = versioncontrol_gitlab_get_user($account)) {

      $client = versioncontrol_gitlab_get_client();

      $client->api('users')->remove($gitlab_user['id']);



      db_delete('versioncontrol_gitlab_users')

        ->condition('gitlab_user_id', $gitlab_user['id'])

        ->execute();

      drupal_static_reset('versioncontrol_gitlab_get_user_id');

    }

  }

  catch (Exception $e) {