From b1ee555f4bb75eefe890630a552f32e4c52e3c54 Mon Sep 17 00:00:00 2001 From: Aleksey Pivovarov Date: Mon, 29 Jul 2013 18:47:26 +0400 Subject: [PATCH] Github: add getCurrentUser function --- .../org/jetbrains/plugins/github/GithubShareAction.java | 2 +- .../src/org/jetbrains/plugins/github/GithubUtil.java | 2 +- .../org/jetbrains/plugins/github/api/GithubApiUtil.java | 8 +++++++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/plugins/github/src/org/jetbrains/plugins/github/GithubShareAction.java b/plugins/github/src/org/jetbrains/plugins/github/GithubShareAction.java index b666347312d6..233079fc341a 100644 --- a/plugins/github/src/org/jetbrains/plugins/github/GithubShareAction.java +++ b/plugins/github/src/org/jetbrains/plugins/github/GithubShareAction.java @@ -212,7 +212,7 @@ public class GithubShareAction extends DumbAwareAction { } // check access to private repos (network) - final GithubUserDetailed userInfo = GithubApiUtil.getCurrentUserInfo(auth); + final GithubUserDetailed userInfo = GithubApiUtil.getCurrentUserDetailed(auth); githubInfoRef.set(new GithubInfo(auth, userInfo, names)); } catch (IOException e) { diff --git a/plugins/github/src/org/jetbrains/plugins/github/GithubUtil.java b/plugins/github/src/org/jetbrains/plugins/github/GithubUtil.java index 2ec56e2227e6..5a2f7fca4766 100644 --- a/plugins/github/src/org/jetbrains/plugins/github/GithubUtil.java +++ b/plugins/github/src/org/jetbrains/plugins/github/GithubUtil.java @@ -232,7 +232,7 @@ public class GithubUtil { } private static void testConnection(@NotNull GithubAuthData auth, @Nullable String login) throws IOException { - GithubUserDetailed user = GithubApiUtil.getCurrentUserInfo(auth); + GithubUserDetailed user = GithubApiUtil.getCurrentUserDetailed(auth); if (login != null && !login.equalsIgnoreCase(user.getLogin())) { throw new GithubAuthenticationException("Wrong login"); } diff --git a/plugins/github/src/org/jetbrains/plugins/github/api/GithubApiUtil.java b/plugins/github/src/org/jetbrains/plugins/github/api/GithubApiUtil.java index 60ebc3ec3b4b..59f4b0a827ad 100644 --- a/plugins/github/src/org/jetbrains/plugins/github/api/GithubApiUtil.java +++ b/plugins/github/src/org/jetbrains/plugins/github/api/GithubApiUtil.java @@ -404,7 +404,13 @@ public class GithubApiUtil { } @NotNull - public static GithubUserDetailed getCurrentUserInfo(@NotNull GithubAuthData auth) throws IOException { + public static GithubUser getCurrentUser(@NotNull GithubAuthData auth) throws IOException { + JsonElement result = getRequest(auth, "/user"); + return createDataFromRaw(fromJson(result, GithubUserRaw.class), GithubUser.class); + } + + @NotNull + public static GithubUserDetailed getCurrentUserDetailed(@NotNull GithubAuthData auth) throws IOException { JsonElement result = getRequest(auth, "/user"); return createDataFromRaw(fromJson(result, GithubUserRaw.class), GithubUserDetailed.class); }