Skip to content

fix: handle GitHub SCIM empty array limitation #17

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.

Sign up for GitHub

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

Merged
wadahiro merged 2 commits into from
Jul 1, 2025
Merged

fix: handle GitHub SCIM empty array limitation #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
468a86a
fix: handle GitHub SCIM empty array limitation
wadahiro Jul 1, 2025
f8d8508
build: migrate from OSSRH to Maven Central Portal
wadahiro Jul 1, 2025
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
10 changes: 5 additions & 5 deletions .github/workflows/pull_request.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ jobs:
distribution: 'corretto'
java-version: 11
cache: 'maven'
server-id: ossrh
server-username: OSSRH_JIRA_USERNAME
server-password: OSSRH_JIRA_PASSWORD
server-id: central
server-username: MAVEN_USERNAME
server-password: MAVEN_PASSWORD
gpg-private-key: ${{ secrets.OSSRH_GPG_SECRET_KEY }}
gpg-passphrase: OSSRH_GPG_SECRET_KEY_PASSWORD

Expand All @@ -32,7 +32,7 @@ jobs:
run: mvn -B -DskipTests deploy
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
OSSRH_JIRA_USERNAME: ${{ secrets.OSSRH_JIRA_USERNAME }}
OSSRH_JIRA_PASSWORD: ${{ secrets.OSSRH_JIRA_PASSWORD }}
MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }}
MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
OSSRH_GPG_SECRET_KEY_PASSWORD: ${{ secrets.OSSRH_GPG_SECRET_KEY_PASSWORD }}

10 changes: 5 additions & 5 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ jobs:
distribution: 'corretto'
java-version: 11
cache: 'maven'
server-id: ossrh
server-username: OSSRH_JIRA_USERNAME
server-password: OSSRH_JIRA_PASSWORD
server-id: central
server-username: MAVEN_USERNAME
server-password: MAVEN_PASSWORD
gpg-private-key: ${{ secrets.OSSRH_GPG_SECRET_KEY }}
gpg-passphrase: OSSRH_GPG_SECRET_KEY_PASSWORD

Expand All @@ -44,7 +44,7 @@ jobs:
@semantic-release/git@10
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
OSSRH_JIRA_USERNAME: ${{ secrets.OSSRH_JIRA_USERNAME }}
OSSRH_JIRA_PASSWORD: ${{ secrets.OSSRH_JIRA_PASSWORD }}
MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }}
MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
OSSRH_GPG_SECRET_KEY_PASSWORD: ${{ secrets.OSSRH_GPG_SECRET_KEY_PASSWORD }}

24 changes: 6 additions & 18 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,17 +46,6 @@
<url>https://github.com/openstandia/connector-github</url>
</scm>

<distributionManagement>
<snapshotRepository>
<id>ossrh</id>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
</snapshotRepository>
<repository>
<id>ossrh</id>
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
</repository>
</distributionManagement>

<properties>
<connectorPackage>jp.openstandia.connector.github</connectorPackage>
<connectorClass>GitHubConnector</connectorClass>
Expand Down Expand Up @@ -103,15 +92,14 @@
</plugin>

<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>
<version>1.6.8</version>
<groupId>org.sonatype.central</groupId>
<artifactId>central-publishing-maven-plugin</artifactId>
<version>0.8.0</version>
<extensions>true</extensions>
<configuration>
<serverId>ossrh</serverId>
<nexusUrl>https://oss.sonatype.org/</nexusUrl>
<autoReleaseAfterClose>true</autoReleaseAfterClose>
<stagingProgressTimeoutMinutes>30</stagingProgressTimeoutMinutes>
<autoPublish>true</autoPublish>
<waitUntil>published</waitUntil>
<centralSnapshotsUrl>https://central.sonatype.com/repository/maven-snapshots</centralSnapshotsUrl>
</configuration>
</plugin>
<plugin>
Expand Down
36 changes: 32 additions & 4 deletions src/main/java/org/kohsuke/github/SCIMPatchOperations.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,7 @@
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonProperty;

import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.*;
import java.util.stream.Collectors;

@JsonIgnoreProperties(ignoreUnknown = true)
Expand Down Expand Up @@ -67,10 +65,40 @@ public void replace(SCIMRole value) {
}

private Operation removeAllOp(String path) {
// GitHub SCIM API workaround for removing optional multi-valued attributes:
// Use [{"value": ""}] to remove roles attribute.
//
// Standard approaches that don't work:
//
// 1. Empty array
// {"op": "replace", "path": "roles", "value": []}
// → Error 400: {"scimType": "invalidSyntax",
// "detail": "Misconfigured IdP, missing or misconfigured attributes:\n
// No subschema in \"oneOf\" matched.\n
// For 'oneOf/0', [] is not a string.\n
// For 'oneOf/1', [] is not a boolean.\n
// For 'oneOf/2', [] is not an object.\n
// 1 item required; only 0 were supplied."}
//
// 2. Remove operation:
// {"op": "remove", "path": "roles"}
// → HTTP 200 OK (success response) but roles attribute is NOT removed
//
// Workaround results:
// - roles (optional): [{"value": ""}] → Success, attribute removed
// - emails (required): [{"value": ""}] → Error 400:
// {"scimType": "invalidSyntax",
// "detail": "Email values must be valid email addresses."}
Operation op = new Operation();
op.op = "replace";
op.path = path;
op.value = Collections.emptyList();

List<Map<String, String>> values = new ArrayList<>();
Map<String, String> valueMap = new HashMap<>();
valueMap.put("value", "");
values.add(valueMap);

op.value = values;
return op;
}

Expand Down