commit b60fe5e788e0954bc5aa5cb6b4e688ec90f1358c
author David Ostrovsky <david@ostrovsky.org> Sun Jun 07 10:43:56 2020 +0200
committer David Ostrovsky <david@ostrovsky.org> Sun Jun 07 10:51:01 2020 +0200
tree 2b52743ddc01775033a3d530a65a583dd59919c7
parent 1bdae74ca0455972e26b9b69fdf07f6688965ddd

Prevent NPE in Cas service

Bug: https://github.com/davido/gerrit-oauth-provider/issues/143
Change-Id: I4e170b1c3f2d4980d04d752687fe490c52e06cfb

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

diff --git a/src/main/java/com/googlesource/gerrit/plugins/oauth/CasOAuthService.java b/src/main/java/com/googlesource/gerrit/plugins/oauth/CasOAuthService.java
index 14fc080..7b318b8 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/oauth/CasOAuthService.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/oauth/CasOAuthService.java
@@ -14,6 +14,7 @@
 
 package com.googlesource.gerrit.plugins.oauth;
 
+import static com.google.common.base.Strings.nullToEmpty;
 import static com.google.gerrit.server.OutputFormat.JSON;
 
 import com.github.scribejava.core.builder.ServiceBuilder;
@@ -159,7 +160,9 @@
     try {
       OAuth2AccessToken accessToken = service.getAccessToken(rv.getValue());
       return new OAuthToken(
-          accessToken.getAccessToken(), accessToken.getTokenType(), accessToken.getRawResponse());
+          accessToken.getAccessToken(),
+          nullToEmpty(accessToken.getTokenType()),
+          accessToken.getRawResponse());
     } catch (InterruptedException | ExecutionException | IOException e) {
       String msg = "Cannot retrieve access token";
       log.error(msg, e);