Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release 8.0.0-pre.0 - remove LDAP #311

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -66,14 +66,6 @@ upTestDb:
broker:
docker compose up -d broker

ldap:
docker compose up -d ldap

ldapload:
docker compose kill ldap
docker compose rm -f ldap
docker compose run --rm ldapload

bounce:
docker compose up -d api

Expand Down
7 changes: 2 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -112,13 +112,10 @@ auth component could be written to implement OAuth or use Google, etc.

### Password Store Component

You can store your passwords wherever you like, whether it is LDAP, Active Directory, a database, or even Redis.

#### NOTE: LDAP is deprecated
You can store your passwords wherever you like, whether it is Active Directory, a database, or even Redis.

* Component ID: ```passwordstore```
* Implement interface: ```common\components\passwordStore\PasswordStoreInterface```
* [Example implementation](application/common/components/passwordStore/Ldap.php)

### Personnel Component

Expand Down Expand Up @@ -226,7 +223,7 @@ The chart below summarizes the test configuration.
| | | env. | common.env, test.env | actions-services.yml |
| | | bootstrap | tests/_bootstrap.php | (same) |
| | | config | tests/unit.suite.yml, tests/codeception/config/unit.php | (same) |
| | | coverage | IdBroker, IdBrokerPw, Ldap | (same) |
| | | coverage | IdBroker, IdBrokerPw | (same) |
| ------- | ------------- | ----------- | ---------------------- | ----------------------- |
| Unit | Behat | container | unittest | api |
| | | script | run-tests.sh | (same) |
Expand Down
21 changes: 0 additions & 21 deletions actions-services.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,6 @@ services:
condition: service_started
broker:
condition: service_healthy
# ldapload:
# condition: service_started
environment:
MYSQL_HOST: db
MYSQL_DATABASE: test
Expand Down Expand Up @@ -111,22 +109,3 @@ services:
interval: 5s
timeout: 1s
retries: 30

ldap:
build: ./dockerbuild/ldap
environment:
DEBUG_LEVEL: 320
healthcheck:
test: nc -vz localhost 389
start_period: 1s
interval: 5s
timeout: 1s
retries: 90

ldapload:
build: ./dockerbuild/ldap
depends_on:
ldap:
condition: service_healthy
working_dir: /data
command: ./load_ldap.sh
2 changes: 1 addition & 1 deletion application/common/components/passwordStore/Google.php
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ protected function getUser(string $employeeId): Google_Service_Directory_User
*/
protected static function hasCorrectEmployeeId(Google_Service_Directory_User $user, string $employeeId): bool
{
foreach($user['externalIds'] as $externalId) {
foreach ($user['externalIds'] as $externalId) {
if ($externalId['value'] === $employeeId && $externalId['type'] === 'organization') {
return true;
}
Expand Down
Loading
Loading