You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2017/10/06 11:48:27 UTC
openmeetings git commit: [OPENMEETINGS-1717] code simplified
Repository: openmeetings
Updated Branches:
refs/heads/master 56dd77e52 -> 39cbb3e35
[OPENMEETINGS-1717] code simplified
Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/39cbb3e3
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/39cbb3e3
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/39cbb3e3
Branch: refs/heads/master
Commit: 39cbb3e35c9400d0cc1783bb4012f402193baffb
Parents: 56dd77e
Author: Maxim Solodovnik <so...@gmail.com>
Authored: Fri Oct 6 18:48:20 2017 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
Committed: Fri Oct 6 18:48:20 2017 +0700
----------------------------------------------------------------------
.../apache/openmeetings/web/pages/auth/SignInDialog.java | 8 +-------
.../apache/openmeetings/web/pages/auth/SignInPage.java | 11 +++++++----
2 files changed, 8 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/39cbb3e3/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java
index f19cb72..d0196cb 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java
@@ -24,8 +24,6 @@ import static org.apache.openmeetings.web.app.Application.getAuthenticationStrat
import static org.apache.openmeetings.web.app.Application.getBean;
import static org.apache.openmeetings.web.pages.auth.SignInPage.allowOAuthLogin;
import static org.apache.openmeetings.web.pages.auth.SignInPage.allowRegister;
-import static org.apache.openmeetings.web.pages.auth.SignInPage.getRedirectUri;
-import static org.apache.openmeetings.web.pages.auth.SignInPage.prepareUrlParams;
import static org.apache.openmeetings.web.room.SwfPanel.SWF;
import static org.apache.openmeetings.web.room.SwfPanel.SWF_TYPE_NETWORK;
@@ -67,7 +65,6 @@ import org.apache.wicket.markup.html.list.ListItem;
import org.apache.wicket.markup.html.list.ListView;
import org.apache.wicket.model.Model;
import org.apache.wicket.model.PropertyModel;
-import org.apache.wicket.request.flow.RedirectToUrlException;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.wicket.util.string.Strings;
import org.red5.logging.Red5LoggerFactory;
@@ -287,10 +284,7 @@ public class SignInDialog extends NonClosableDialog<String> {
@Override
protected void onEvent(AjaxRequestTarget target) {
- String authUrl = prepareUrlParams(s.getRequestKeyUrl(), s.getClientId(),
- null, null, getRedirectUri(s, SignInDialog.this), null);
- log.debug("redirectUrl={}", authUrl);
- throw new RedirectToUrlException(authUrl);
+ SignInPage.showAuth(s, SignInDialog.this);
}
});
item.add(btn);
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/39cbb3e3/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInPage.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInPage.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInPage.java
index bb92def..9bb1eb8 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInPage.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInPage.java
@@ -102,10 +102,7 @@ public class SignInPage extends BaseInitedPage {
Map<String, String> authParams = getAuthParams(authInfo.accessToken, code, server);
loginViaOAuth2(authParams, serverId);
} else { // redirect to get code
- String redirectUrl = prepareUrlParams(server.getRequestKeyUrl(), server.getClientId(),
- null, null, getRedirectUri(server, this), null);
- log.debug("redirectUrl={}", redirectUrl);
- throw new RedirectToUrlException(redirectUrl);
+ showAuth(server, this);
}
} catch (IOException|NoSuchAlgorithmException e) {
log.error("OAuth2 login error", e);
@@ -152,6 +149,12 @@ public class SignInPage extends BaseInitedPage {
}
// ============= OAuth2 methods =============
+ public static void showAuth(final OAuthServer s, Component c) {
+ String authUrl = prepareUrlParams(s.getRequestKeyUrl(), s.getClientId()
+ , null, null, getRedirectUri(s, c), null);
+ log.debug("redirectUrl={}", authUrl);
+ throw new RedirectToUrlException(authUrl);
+ }
public static String prepareUrlParams(String urlTemplate, String clientId, String clientSecret,
String clientToken, String redirectUri, String code) {