commit d4f5dad024d8278c59848cc0a54d86f8bae9baac
author David Ostrovsky <david.ostrovsky@gmail.com> Mon Jan 17 18:03:19 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Jan 17 18:03:19 2022 +0000
tree deaa11264b9de915514dcf2abc17e50e572f4f4e
parent a681283d9f05d041a00f3c9b6a7136ab3e6242ef
parent 0ba53fd4ea93654d8c41213b7a39749e8fc61668

Merge "Make preferred_username optional for Keycloak"

BUILD

diff --git a/BUILD b/BUILD
index 0d2e0e4..81871ad 100644
--- a/BUILD
+++ b/BUILD
@@ -21,6 +21,7 @@
     resources = glob(["src/main/resources/**/*"]),
     deps = [
         "@commons-codec//jar:neverlink",
+        "@jackson-core//jar",
         "@jackson-databind//jar",
         "@scribejava-apis//jar",
         "@scribejava-core//jar",

external_plugin_deps.bzl

diff --git a/external_plugin_deps.bzl b/external_plugin_deps.bzl
index ffe8a31..aaab198 100644
--- a/external_plugin_deps.bzl
+++ b/external_plugin_deps.bzl
@@ -26,6 +26,11 @@
             "@jackson-annotations//jar",
         ],
     )
+    maven_jar(
+        name = "jackson-core",
+        artifact = "com.fasterxml.jackson.core:jackson-core:" + JACKSON_VERS,
+        sha1 = "73d4322a6bda684f676a2b5fe918361c4e5c7cca",
+    )
     if not omit_commons_codec:
         maven_jar(
             name = "commons-codec",

src/main/java/com/googlesource/gerrit/plugins/oauth/AzureActiveDirectoryService.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/oauth/AzureActiveDirectoryService.java b/src/main/java/com/googlesource/gerrit/plugins/oauth/AzureActiveDirectoryService.java
index 81dc53f..49077fb 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/oauth/AzureActiveDirectoryService.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/oauth/AzureActiveDirectoryService.java
@@ -236,7 +236,7 @@
     // Extract the payload part from the JWT token (header.payload.signature) by retrieving
     // tokenParts[1].
     return gson.fromJson(
-        new String(Base64.getDecoder().decode(tokenParts[1]), StandardCharsets.UTF_8),
+        new String(Base64.getUrlDecoder().decode(tokenParts[1]), StandardCharsets.UTF_8),
         JsonObject.class);
   }
 }