Skip to content

fix #638 #639

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 4, 2023
Merged

fix #638 #639

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 18 additions & 15 deletions src/main/java/com/shuzijun/leetcode/plugin/window/login/LoginPanel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import com.intellij.openapi.progress.Task;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.ui.DialogWrapper;
import com.intellij.openapi.util.Disposer;
import com.intellij.ui.components.JBScrollPane;
import com.intellij.ui.components.JBTextArea;
import com.intellij.ui.jcef.JCEFHtmlPanel;
Expand Down Expand Up @@ -58,6 +59,7 @@ public LoginPanel(@Nullable Project project) {
} catch (IllegalArgumentException e) {
jcefPanel = new JcefPanel(project, okAction,true);
}
Disposer.register(getDisposable(),jcefPanel);
jcefPanel.getComponent().setMinimumSize(new Dimension(1000, 500));
jcefPanel.getComponent().setPreferredSize(new Dimension(1000, 500));
panel.addToCenter(new JBScrollPane(jcefPanel.getComponent(), JBScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED, JBScrollPane.HORIZONTAL_SCROLLBAR_NEVER));
Expand Down Expand Up @@ -140,6 +142,8 @@ public void actionPerformed(ActionEvent e) {
}




private static class JcefPanel extends JCEFHtmlPanel {


Expand Down Expand Up @@ -185,27 +189,26 @@ public void onLoadingStateChange(CefBrowser browser, boolean isLoading, boolean
@Override
public boolean visit(CefCookie cefCookie, int count, int total, BoolRef boolRef) {

boolean isSession = Boolean.FALSE;
if (cefCookie.domain.contains("leetcode")) {
HttpCookie cookie = new HttpCookie(cefCookie.name, cefCookie.value);
cookie.setDomain(cefCookie.domain);
cookie.setPath(cefCookie.path);
cookieList.add(cookie);
if ("LEETCODE_SESSION".equals(cefCookie.name)) {
isSession = Boolean.TRUE;
}
}
if (count == total - 1 && isSession) {
HttpRequestUtils.setCookie(cookieList);
if (HttpRequestUtils.isLogin(project)) {
HttpLogin.loginSuccess(project, cookieList);
MessageUtils.getInstance(project).showWarnMsg("", PropertiesUtils.getInfo("browser.login.success"));
ApplicationManager.getApplication().invokeLater(() -> okAction.actionPerformed(null));
successDispose = true;
} else {
cookieList.clear();
LogUtils.LOG.info("login failure");
}
if (count == total - 1) {
if (cookieList.stream().anyMatch(cookie -> cookie.getName().equals("LEETCODE_SESSION")) &&
!HttpRequestUtils.isLogin(project)) {
HttpRequestUtils.setCookie(cookieList);
if (HttpRequestUtils.isLogin(project)) {
HttpLogin.loginSuccess(project, cookieList);
MessageUtils.getInstance(project).showWarnMsg("", PropertiesUtils.getInfo("browser.login.success"));
ApplicationManager.getApplication().invokeLater(() -> okAction.actionPerformed(null));
successDispose = true;
} else {
cookieList.clear();
LogUtils.LOG.info("login failure");
}
}
}
return true;
}
Expand Down