Commit 239c8af4 authored by Stefan Busemann's avatar Stefan Busemann
Browse files

[TASK] Merge branch 'develop' into 27-edit-a-personal-profile

* develop:
  [TASK] change repo for femanager
  [TASK] Disable Mail for admin notifications
  [BUGFIX] adjust hook names
  [TASK] Require femanager
  [TASK] Update signal slot names
  [TASK] remove delete operation
  Fix composer build with new docker image
  [TASK] Add just ts settings for version 4
  [TASK] Add femanager confirmation view

# Conflicts:
#	html/typo3conf/ext/t3omy/ext_emconf.php
parents 9e1447c0 3a82f2bf
Pipeline #3059 failed with stages
in 13 seconds
......@@ -13,15 +13,19 @@ stages:
build:
stage: build
image: composer
image: php:7.0-alpine
variables:
GIT_STRATEGY: "clone"
GIT_SUBMODULE_STRATEGY: "recursive"
before_script:
- apk add bash --no-cache
- apk add git --update
- curl https://getcomposer.org/composer.phar -o composer.phar --silent
- chmod +x composer.phar
script:
- composer config store-auths false
- composer config http-basic.git-t3o.typo3.org gitlab-ci-token ${CI_BUILD_TOKEN}
- composer config github-oauth.github.com ${GITHUB_TOKEN}
- composer install
- ./composer.phar config store-auths false
- ./composer.phar config http-basic.git-t3o.typo3.org gitlab-ci-token ${CI_BUILD_TOKEN}
- ./composer.phar install
artifacts:
paths:
- ./
......
......@@ -11,7 +11,7 @@
"repositories": [
{
"type": "vcs",
"url": "https://github.com/in2code-de/femanager.git"
"url": "https://github.com/einpraegsam/femanager.git"
},
{
"type": "composer",
......@@ -37,7 +37,7 @@
"t3o/t3o_slack": "dev-master",
"t3o/t3olayout": "dev-develop",
"t3o/t3o_ldap": "dev-master",
"in2code/femanager": "@dev"
"in2code/femanager": "dev-develop"
},
"config": {
"bin-dir": "bin"
......
......@@ -27,7 +27,7 @@ return [
'documentation' => 'a:0:{}',
'extensionmanager' => 'a:2:{s:21:"automaticInstallation";s:1:"1";s:11:"offlineMode";s:1:"0";}',
'felogin' => 'a:0:{}',
'femanager' => 'a:2:{s:13:"disableModule";s:1:"0";s:10:"disableLog";s:1:"0";}',
'femanager' => 'a:4:{s:13:"disableModule";s:1:"0";s:24:"enableConfirmationModule";s:1:"1";s:10:"disableLog";s:1:"0";s:16:"setCookieOnLogin";s:1:"0";}',
'fluid_styled_content' => 'a:0:{}',
'form' => 'a:0:{}',
'ig_ldap_sso_auth' => 'a:18:{s:18:"checkConfiguration";s:1:"0";s:21:"throwExceptionAtLogin";s:1:"1";s:22:"forceLowerCaseUsername";s:1:"1";s:26:"enableBELDAPAuthentication";s:1:"0";s:17:"TYPO3BEGroupExist";s:1:"0";s:16:"TYPO3BEUserExist";s:1:"0";s:10:"BEfailsafe";s:1:"0";s:27:"TYPO3BEGroupsNotSynchronize";s:1:"0";s:12:"keepBEGroups";s:1:"0";s:11:"enableBESSO";s:1:"0";s:26:"enableFELDAPAuthentication";s:1:"1";s:31:"TYPO3FEDeleteUserIfNoLDAPGroups";s:1:"0";s:32:"TYPO3FEDeleteUserIfNoTYPO3Groups";s:1:"0";s:17:"TYPO3FEGroupExist";s:1:"0";s:16:"TYPO3FEUserExist";s:1:"0";s:27:"TYPO3FEGroupsNotSynchronize";s:1:"1";s:12:"keepFEGroups";s:1:"1";s:11:"enableFESSO";s:1:"0";}',
......
......@@ -125,6 +125,7 @@ class FeManagerHooks
*/
public function newUserAdminApprovement(User $user, UserBackendController $plugin)
{
#User was approved via backend
$this->sendSlackBotMessage(
'User approved',
......@@ -188,28 +189,6 @@ class FeManagerHooks
return $result;
}
/**
* Use DataHandler "afterAllOperations" hook to update or create FE Users
* in LDAP.
*
* @param \In2code\Femanager\Domain\Model\User $user
* @return bool
*/
public function deleteUser(User $user)
{
$ldap = GeneralUtility::makeInstance(Ldap::class);
$result = false;
if ($ldap->userExists($user->getUsername())) {
$result = $ldap->deleteUser($user->getUsername());
// TODO: Handle the response as needed
}
return $result;
}
/**
* @param array $_funcRef
* @param array $_params
......@@ -280,6 +259,7 @@ class FeManagerHooks
*/
protected function sendConfirmationEmail(User $user)
{
$objectManager = GeneralUtility::makeInstance(ObjectManager::class);
$femanagerSettings = $this->fullTS['plugin.']['tx_femanager.']['settings.'];
......
......@@ -39,19 +39,24 @@ plugin.tx_femanager {
}
}
autoApprovement = 1
autoApprovement {
enable = 1
whitelistDomains {
allowTopLevelDomains = .de, .nl, .ch, .at, .it, .edu, .uk, .org, .fr, .au, .eu, .net, .ca, .gr, .be, .dk, .ro, .biz, .pl, .se, .rw, .nz
exceptions = google.com, gmail.com, googlemail.com, yahoo.com, dermatologyconference.org
}
blacklistDomains = infectiousconferences.com
}
confirmByAdmin = 1
email.createUserNotify._enable.value = 1
email.createAdminNotify._enable.value = 0
}
page.termsAndConditions = 6
# Femanager autoAdminConfirmation classes
autoAdminConfirmation = 1
autoAdminConfirmation {
10 {
class = In2code\Femanager\Domain\Service\AutoAdminConfirmation\EmailDomainConfirmation
config {
# Just look at the domains of the given Email-Addresses
confirmByEmailDomains = .de, .nl, .ch, .at, .it, .edu, .uk, .org, .fr, .au, .eu, .net, .ca, .gr, .be, .dk, .ro, .biz, .pl, .se, .rw, .nz
confirmByEmailDomainsExceptions = google.com, gmail.com, googlemail.com, yahoo.com, dermatologyconference.org
}
}
}
}
}
......
......@@ -13,6 +13,7 @@ $EM_CONF[$_EXTKEY] = array(
't3o_slack' => '0.1.0-',
'fluid_styled_content' => '7.6.0-8.99.99',
'userprofile'=> '0.0.1-',
'femanager' => '3.1.0-'
),
'conflicts' => array(
),
......
......@@ -25,36 +25,28 @@ if (!defined('TYPO3_MODE')) {
$dispatcher = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\TYPO3\CMS\Extbase\SignalSlot\Dispatcher::class);
$dispatcher->connect(
\In2code\Femanager\Controller\NewController::class,
'doApprovementAutoApprovementDone',
'createAdminConfirmationRequestAutoConfirmation',
\T3o\T3omy\Hooks\FeManagerHooks::class,
'newUserAutoApprovement'
);
$dispatcher->connect(
\In2code\Femanager\Controller\NewController::class,
'isAdminConfirmationMissingAutoApprovementRefused',
'createAdminConfirmationRequestManualConfirmation',
\T3o\T3omy\Hooks\FeManagerHooks::class,
'newUserNotification'
);
$dispatcher->connect(
\In2code\Femanager\Controller\UserBackendController::class,
'deleteAction',
\T3o\T3omy\Hooks\FeManagerHooks::class,
'deleteUser'
);
$dispatcher->connect(
\In2code\Femanager\Controller\UserBackendController::class,
'approveUserAction',
'confirmUserAction',
\T3o\T3omy\Hooks\FeManagerHooks::class,
'newUserAdminApprovement'
);
$dispatcher->connect(
\In2code\Femanager\Controller\UserBackendController::class,
'declineUserAction',
'refuseUserAction',
\T3o\T3omy\Hooks\FeManagerHooks::class,
'newUserAdminDecline'
);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment