Skip to content

S
solo-1
Commit 56ce2204 authored by Liang Ding's avatar Liang Ding
Browse files
Options

🎨 Fix #12

parent 62c2d1a8
Hide whitespace changes
Inline Side-by-side
Showing with 21 additions and 100 deletions
src/main/java/org/b3log/solo/processor/OAuthProcessor.java
View file @ 56ce2204
......@@ -17,11 +17,8 @@
*/
package org.b3log.solo.processor;
import jodd.http.HttpRequest;
import jodd.http.HttpResponse;
import org.apache.commons.lang.RandomStringUtils;
import org.apache.commons.lang.StringUtils;
import org.b3log.latke.Keys;
import org.b3log.latke.Latkes;
import org.b3log.latke.http.HttpMethod;
import org.b3log.latke.http.Request;
......@@ -39,7 +36,6 @@ import org.b3log.latke.util.Requests;
import org.b3log.latke.util.URLs;
import org.b3log.solo.model.UserExt;
import org.b3log.solo.service.*;
import org.b3log.solo.util.GitHubs;
import org.b3log.solo.util.Solos;
import org.json.JSONObject;
......@@ -49,12 +45,12 @@ import java.util.concurrent.ConcurrentHashMap;
/**
* OAuth processor.
* <ul>
* <li>Redirects to auth page (/oauth/github/redirect), GET</li>
* <li>OAuth callback (/oauth/github), GET</li>
* <li>Redirects to HacPai auth page (/login/redirect), GET</li>
* <li>OAuth callback (/login/callback), GET</li>
* </ul>
*
* @author <a href="http://88250.b3log.org">Liang Ding</a>
* @version 1.0.1.1, Sep 12, 2019
* @version 1.0.1.2, Dec 14, 2019
* @since 2.9.5
*/
@RequestProcessor
......@@ -107,41 +103,22 @@ public class OAuthProcessor {
private LangPropsService langPropsService;
/**
* Redirects to auth page.
* Redirects to HacPai auth page.
*
* @param context the specified context
*/
@RequestProcessing(value = "/oauth/github/redirect", method = HttpMethod.GET)
@RequestProcessing(value = "/login/redirect", method = HttpMethod.GET)
public void redirectAuth(final RequestContext context) {
final HttpResponse res = HttpRequest.get("https://hacpai.com/oauth/solo/client2").trustAllCerts(true).
connectionTimeout(3000).timeout(7000).header("User-Agent", Solos.USER_AGENT).send();
if (200 != res.statusCode()) {
LOGGER.log(Level.ERROR, "Gets oauth client id failed: " + res.toString());
context.sendError(404);
return;
}
res.charset("UTF-8");
final JSONObject result = new JSONObject(res.bodyText());
if (0 != result.optInt(Keys.CODE)) {
LOGGER.log(Level.ERROR, "Gets oauth client id failed: " + result.optString(Keys.MSG));
return;
}
final JSONObject data = result.optJSONObject(Keys.DATA);
final String clientId = data.optString("clientId");
final String loginAuthURL = data.optString("loginAuthURL");
String referer = context.param("referer");
if (StringUtils.isBlank(referer)) {
referer = Latkes.getServePath();
}
final String cb = Latkes.getServePath() + "/oauth/github";
String state = referer + ":::" + RandomStringUtils.randomAlphanumeric(16) + ":::cb=" + cb + ":::";
STATES.add(state);
final String path = loginAuthURL + "?client_id=" + clientId + "&state=" + URLs.encode(state) + "&scope=public_repo,read:user";
String state = RandomStringUtils.randomAlphanumeric(16) + referer;
STATES.add(state);
final String loginAuthURL = "https://hacpai.com/login?goto=" + Latkes.getServePath() + "/login/callback";
final String path = loginAuthURL + "?state=" + URLs.encode(state);
context.sendRedirect(path);
}
......@@ -150,7 +127,7 @@ public class OAuthProcessor {
*
* @param context the specified context
*/
@RequestProcessing(value = "/oauth/github", method = HttpMethod.GET)
@RequestProcessing(value = "/login/callback", method = HttpMethod.GET)
public synchronized void authCallback(final RequestContext context) {
String state = context.param("state");
if (!STATES.contains(state)) {
......@@ -159,21 +136,14 @@ public class OAuthProcessor {
return;
}
STATES.remove(state);
final String referer = URLs.decode(state);
final String accessToken = context.param("ak");
final JSONObject userInfo = GitHubs.getGitHubUserInfo(accessToken);
if (null == userInfo) {
LOGGER.log(Level.WARN, "Can't get user info with token [" + accessToken + "]");
context.sendError(401);
return;
}
String referer = URLs.decode(state);
referer = StringUtils.substring(referer, 16);
final Response response = context.getResponse();
final Request request = context.getRequest();
final String openId = userInfo.optString("openId");
final String userName = userInfo.optString(User.USER_NAME);
final String userAvatar = userInfo.optString(UserExt.USER_AVATAR);
final String openId = context.param("userId");
final String userName = context.param(User.USER_NAME);
final String userAvatar = context.param("avatar");
JSONObject user = userQueryService.getUserByGitHubId(openId);
if (null == user) {
......@@ -214,8 +184,6 @@ public class OAuthProcessor {
}
}
} else {
// 更改账号后无法登录 https://github.com/b3log/solo/issues/12879
// 使用 GitHub 登录名覆盖本地用户名，解决 GitHub 改名后引起的登录问题
user.put(User.USER_NAME, userName);
try {
userMgmtService.updateUser(user);
......@@ -235,9 +203,8 @@ public class OAuthProcessor {
return;
}
final String redirect = StringUtils.substringBeforeLast(referer, "__");
Solos.login(user, response);
context.sendRedirect(redirect);
context.sendRedirect(referer);
LOGGER.log(Level.INFO, "Logged in [name={0}, remoteAddr={1}] with oauth", userName, Requests.getRemoteAddr(request));
}
}
src/main/java/org/b3log/solo/util/GitHubs.java
View file @ 56ce2204
......@@ -19,13 +19,10 @@ package org.b3log.solo.util;
import jodd.http.HttpRequest;
import jodd.http.HttpResponse;
import org.apache.commons.lang.StringUtils;
import org.b3log.latke.Keys;
import org.b3log.latke.logging.Level;
import org.b3log.latke.logging.Logger;
import org.b3log.latke.model.User;
import org.b3log.solo.model.Common;
import org.b3log.solo.model.UserExt;
import org.json.JSONArray;
import org.json.JSONObject;
......@@ -33,7 +30,7 @@ import org.json.JSONObject;
* GitHub utilities.
*
* @author <a href="http://88250.b3log.org">Liang Ding</a>
* @version 1.0.0.0, Feb 8, 2019
* @version 1.0.0.1, Dec 14, 2019
* @since 3.0.0
*/
public final class GitHubs {
......@@ -72,48 +69,6 @@ public final class GitHubs {
}
}
/**
* Gets GitHub user info.
*
* @param accessToken the specified access token
* @return GitHub user info, for example, <pre>
* {
* "openId": "",
* "userName": "D",
* "userAvatar": "https://avatars3.githubusercontent.com/u/873584?v=4"
* }
* </pre>, returns {@code null} if not found QQ user info
*/
public static JSONObject getGitHubUserInfo(final String accessToken) {
try {
final HttpResponse res = HttpRequest.get("https://hacpai.com/github/user?ak=" + accessToken).trustAllCerts(true).
connectionTimeout(3000).timeout(7000).header("User-Agent", Solos.USER_AGENT).send();
if (200 != res.statusCode()) {
return null;
}
res.charset("UTF-8");
final JSONObject result = new JSONObject(res.bodyText());
if (0 != result.optInt(Keys.STATUS_CODE)) {
return null;
}
final JSONObject data = result.optJSONObject(Common.DATA);
final String userName = StringUtils.trim(data.optString("userName"));
final String openId = data.optString("userId");
final String avatarUrl = data.optString("userAvatarURL");
final JSONObject ret = new JSONObject();
ret.put("openId", openId);
ret.put(User.USER_NAME, userName);
ret.put(UserExt.USER_AVATAR, avatarUrl);
return ret;
} catch (final Exception e) {
LOGGER.log(Level.ERROR, "Gets GitHub user info failed", e);
return null;
}
}
/**
* Private constructor.
*/
......
src/main/resources/common-template/start.ftl
View file @ 56ce2204
......@@ -29,7 +29,7 @@
<div id="github">
<div class="github__icon startAction">
<img src="${staticServePath}/images/github.png"/>
<img src="${staticServePath}/images/hacpai.png"/>
</div>
<br>
<button class="startAction">${useGitHubAccountLoginLabel}</button><br>
......@@ -47,8 +47,7 @@
(function () {
try {
$('.startAction').click(function () {
var isAgreen = $('#isAgreenCheck').prop('checked') ? '0' : '1'
window.location.href = '${servePath}/oauth/github/redirect?referer=${referer}__' + isAgreen
window.location.href = '${servePath}/login/redirect?referer=${referer}'
$('#github').addClass('github--loading')
})
} catch (e) {
......
src/main/resources/scss/start.scss
View file @ 56ce2204
......@@ -189,14 +189,14 @@ input[type=text]:focus {
#github .github__icon {
height: 200px;
width: 266px;
background-image: url("../images/github.png");
background-image: url("../images/hacpai.png");
margin: 0 auto;
background-size: contain;
cursor: pointer;
}
#github .github__icon:hover {
background-image: url("../images/github.gif");
background-image: url("../images/hacpai.png");
}
#github img {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment