#1 use login

yegor256 · Mar 8, 2016 · 41969d6 · 41969d6
1 parent 7e4df3d
commit 41969d6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/main/java/io/jare/tk/RqUser.java b/src/main/java/io/jare/tk/RqUser.java
@@ -26,6 +26,7 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import org.takes.Request;
+import org.takes.facets.auth.Identity;
 import org.takes.facets.auth.RqAuth;
 import org.takes.rq.RqWrap;
 
@@ -59,14 +60,15 @@ public RqUser(final Request req) {
      * @throws IOException If fails
      */
     public String name() throws IOException {
-        final String urn = new RqAuth(this).identity().urn();
+        final Identity identity = new RqAuth(this).identity();
+        final String urn = identity.urn();
         final Matcher mtr = RqUser.PTN.matcher(urn);
         if (!mtr.matches()) {
             throw new IllegalArgumentException(
                 String.format("URN \"%s\" is not from GitHub", urn)
             );
         }
-        return mtr.group(1);
+        return identity.properties().get("login");
     }
 
 }
diff --git a/src/test/java/io/jare/tk/RqUserTest.java b/src/test/java/io/jare/tk/RqUserTest.java
@@ -43,7 +43,7 @@ public final class RqUserTest {
     public void fetchesUserName() throws Exception {
         MatcherAssert.assertThat(
             new RqUser(new RqWithAuth("urn:github:yegor256")).name(),
-            Matchers.equalTo("yegor256")
+            Matchers.nullValue()
         );
     }