Skip to content

Commit 12e0e63

Browse files
committed
chore: bump oidc min supported version to 1.14.1
Signed-off-by: nabim777 <[email protected]>
1 parent 17e9dcb commit 12e0e63

File tree

4 files changed

+5
-9
lines changed

4 files changed

+5
-9
lines changed

.github/workflows/shared_workflow.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ jobs:
190190
uses: actions/checkout@v3
191191
with:
192192
repository: h2CK/oidc
193-
ref: 1.14.5
193+
ref: 1.14.1
194194
fetch-tags: true
195195
path: oidc
196196

integration_oidc_setup.sh

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -146,8 +146,7 @@ fi
146146
# Nextcloud Variables
147147
# This script requires minimum versions of Nextcloud apps: OIDC, User OIDC, and OpenProject integration
148148
MIN_SUPPORTED_USER_OIDC_APP_VERSION="7.1.0"
149-
MIN_SUPPORTED_OIDC_APP_VERSION="1.5.0"
150-
MIN_SUPPORTED_OIDC_APP_VERSION_FOR_CLIENT_CREATION="1.9.0"
149+
MIN_SUPPORTED_OIDC_APP_VERSION="1.14.1"
151150
MIN_SUPPORTED_INTEGRATION_APP_VERSION="2.9.0"
152151
# These URLs are just to check if the Nextcloud instances have been started or not before running the script
153152
NC_HOST_STATUS=$(curl -s -X GET "${NC_HOST}/status.php")
@@ -342,11 +341,7 @@ logAlreadyCompletedIntegrationConfiguration() {
342341
}
343342

344343
if [[ $NC_INTEGRATION_PROVIDER_TYPE == "nextcloud_hub" ]]; then
345-
if [[ -n $NC_INTEGRATION_OP_CLIENT_ID ]] && [[ -n $NC_INTEGRATION_OP_CLIENT_SECRET ]]; then
346-
ncCheckAppVersion "oidc" $MIN_SUPPORTED_OIDC_APP_VERSION_FOR_CLIENT_CREATION
347-
else
348-
ncCheckAppVersion "oidc"
349-
fi
344+
ncCheckAppVersion "oidc"
350345
fi
351346
ncCheckAppVersion "user_oidc"
352347
ncCheckAppVersion "integration_openproject"

lib/Service/OpenProjectAPIService.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ class OpenProjectAPIService {
6868
public const AUTH_METHOD_OAUTH = 'oauth2';
6969
public const AUTH_METHOD_OIDC = 'oidc';
7070
public const MIN_SUPPORTED_USER_OIDC_APP_VERSION = '7.2.0';
71-
public const MIN_SUPPORTED_OIDC_APP_VERSION = '1.6.0';
71+
public const MIN_SUPPORTED_OIDC_APP_VERSION = '1.14.1';
7272
public const MIN_SUPPORTED_GROUPFOLDERS_APP_VERSION = '1.0.0';
7373
public const NEXTCLOUD_HUB_PROVIDER = "nextcloud_hub";
7474

psalm.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
<referencedClass name="OCA\TermsOfService\Db\Mapper\TermsMapper" />
4242
<!-- these classes belong to the oidc app -->
4343
<referencedClass name="OCA\OIDCIdentityProvider\Db\Client" />
44+
<referencedClass name="OCA\OIDCIdentityProvider\Db\CustomClaimMapper" />
4445
<referencedClass name="OCA\OIDCIdentityProvider\Db\ClientMapper" />
4546
<referencedClass name="OCA\OIDCIdentityProvider\Db\RedirectUriMapper" />
4647
<referencedClass name="OCA\OIDCIdentityProvider\Exceptions\ClientNotFoundException" />

0 commit comments

Comments
 (0)