Skip to content
Open
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
2 changes: 1 addition & 1 deletion .github/workflows/shared_workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ jobs:
uses: actions/checkout@v3
with:
repository: h2CK/oidc
ref: 1.6.0
ref: 1.14.1
fetch-tags: true
path: oidc

Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
### Changed
- Remove latest stable OpenProject version from warning message [#891](https://github.com/nextcloud/integration_openproject/pull/891)
- Replace internal method with public API for updating file metadata [#908](https://github.com/nextcloud/integration_openproject/pull/908)
- Bump minimum supported version of oidc app to 1.14.1 [#939](https://github.com/nextcloud/integration_openproject/pull/939)

### Fixed
- Show meaningful error message when deleting group folders [#884](https://github.com/nextcloud/integration_openproject/pull/884)
Expand Down
9 changes: 2 additions & 7 deletions integration_oidc_setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -146,8 +146,7 @@ fi
# Nextcloud Variables
# This script requires minimum versions of Nextcloud apps: OIDC, User OIDC, and OpenProject integration
MIN_SUPPORTED_USER_OIDC_APP_VERSION="7.1.0"
MIN_SUPPORTED_OIDC_APP_VERSION="1.5.0"
MIN_SUPPORTED_OIDC_APP_VERSION_FOR_CLIENT_CREATION="1.9.0"
MIN_SUPPORTED_OIDC_APP_VERSION="1.14.1"
MIN_SUPPORTED_INTEGRATION_APP_VERSION="2.9.0"
# These URLs are just to check if the Nextcloud instances have been started or not before running the script
NC_HOST_STATUS=$(curl -s -X GET "${NC_HOST}/status.php")
Expand Down Expand Up @@ -342,11 +341,7 @@ logAlreadyCompletedIntegrationConfiguration() {
}

if [[ $NC_INTEGRATION_PROVIDER_TYPE == "nextcloud_hub" ]]; then
if [[ -n $NC_INTEGRATION_OP_CLIENT_ID ]] && [[ -n $NC_INTEGRATION_OP_CLIENT_SECRET ]]; then
ncCheckAppVersion "oidc" $MIN_SUPPORTED_OIDC_APP_VERSION_FOR_CLIENT_CREATION
else
ncCheckAppVersion "oidc"
fi
ncCheckAppVersion "oidc"
fi
ncCheckAppVersion "user_oidc"
ncCheckAppVersion "integration_openproject"
Expand Down
2 changes: 2 additions & 0 deletions lib/OIDCClientMapper.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

use OCA\OIDCIdentityProvider\Db\Client;
use OCA\OIDCIdentityProvider\Db\ClientMapper;
use OCA\OIDCIdentityProvider\Db\CustomClaimMapper;
use OCA\OIDCIdentityProvider\Db\RedirectUriMapper;
use OCP\AppFramework\Services\IAppConfig;
use OCP\AppFramework\Utility\ITimeFactory;
Expand Down Expand Up @@ -42,6 +43,7 @@ public function getClient(string $clientIdentifier): ?Client {
$this->timeFactory,
$this->appConfig,
new RedirectUriMapper($this->db, $this->timeFactory, $this->appConfig),
new CustomClaimMapper($this->db, $this->logger),
$this->random,
$this->logger,
);
Expand Down
2 changes: 1 addition & 1 deletion lib/Service/OpenProjectAPIService.php
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ class OpenProjectAPIService {
public const AUTH_METHOD_OAUTH = 'oauth2';
public const AUTH_METHOD_OIDC = 'oidc';
public const MIN_SUPPORTED_USER_OIDC_APP_VERSION = '7.2.0';
public const MIN_SUPPORTED_OIDC_APP_VERSION = '1.6.0';
public const MIN_SUPPORTED_OIDC_APP_VERSION = '1.14.1';
public const MIN_SUPPORTED_GROUPFOLDERS_APP_VERSION = '1.0.0';
public const NEXTCLOUD_HUB_PROVIDER = "nextcloud_hub";

Expand Down
1 change: 1 addition & 0 deletions psalm.xml
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
<referencedClass name="OCA\TermsOfService\Db\Mapper\TermsMapper" />
<!-- these classes belong to the oidc app -->
<referencedClass name="OCA\OIDCIdentityProvider\Db\Client" />
<referencedClass name="OCA\OIDCIdentityProvider\Db\CustomClaimMapper" />
<referencedClass name="OCA\OIDCIdentityProvider\Db\ClientMapper" />
<referencedClass name="OCA\OIDCIdentityProvider\Db\RedirectUriMapper" />
<referencedClass name="OCA\OIDCIdentityProvider\Exceptions\ClientNotFoundException" />
Expand Down
Loading