コミット: e5039c95fa634af9a3230543b8368f16de196565 - moto_web_app (git)

moto web application

コミットメタ情報

• リビジョン: e5039c95fa634af9a3230543b8368f16de196565 (tree)
• 日時: 2014-02-07 18:26:09
• 作者: astoria-d <astoria-d@mail...>
• コミッター: astoria-d

ログメッセージ

google account supported.

変更サマリ

• modified: WEB-INF/classes/motoSample/OpenIdBean.java
• add: WEB-INF/lib/openid4java/aopalliance-1.0.jar
• add: WEB-INF/lib/openid4java/commons-logging-1.1.1.jar
• add: WEB-INF/lib/openid4java/nekohtml-1.9.10.jar
• add: WEB-INF/lib/openid4java/xercesImpl-2.8.1.jar
• add: WEB-INF/lib/openid4java/xml-apis-1.3.03.jar
• modified: build.xml
• add: img/Red-signin-Long-press-44dp.png
• modified: login.xhtml

差分

--- a/WEB-INF/classes/motoSample/OpenIdBean.java
+++ b/WEB-INF/classes/motoSample/OpenIdBean.java
@@ -20,6 +20,7 @@ import org.openid4java.discovery.DiscoveryException;
 
 import java.io.IOException;
 import java.util.List;
+
import java.util.Map;
 
 
import javax.servlet.http.HttpSession;
 
@@ -32,7 +33,10 @@ public class OpenIdBean implements Serializable {
     @Inject
     private FacesContext context;
 
-    
+    private String openid;
+    public void setOpenid (String openid) { this.openid = openid; }
+    public String getOpenid () { return openid; }
+
     private static ConsumerManager consumerManager;
     public static ConsumerManager getConsumerManager() {
 //        try {
@@ -89,11 +93,26 @@ public class OpenIdBean implements Serializable {
         return ret;
     }
     
-    public void yahooLogin() {
-        log.info("yahoo log in!");
+    public void doLogin() {
+
+        String userSuppliedIdentifier;
+
+        Map map = context.getExternalContext().getRequestParameterMap();
+        String loginTo = (String) map.get("loginTo");
+        log.info("loginTo: " + loginTo);
+
+        if (loginTo.equals("yahoo")) {
+            userSuppliedIdentifier = "yahoo.co.jp";
+        }
+        else if (loginTo.equals("google")) {
+            userSuppliedIdentifier = "https://www.google.com/accounts/o8/id";
+        }
+        else {
+            userSuppliedIdentifier = openid;
+        }
+        //log.info("yahoo log in!");
 
         // Delegate to Open ID code
-        String userSuppliedIdentifier = "yahoo.co.jp";
         String returnToUrl = getReturnUrl();
         /*
         */

Binary files /dev/null and b/WEB-INF/lib/openid4java/aopalliance-1.0.jar differ

Binary files /dev/null and b/WEB-INF/lib/openid4java/commons-logging-1.1.1.jar differ

Binary files /dev/null and b/WEB-INF/lib/openid4java/nekohtml-1.9.10.jar differ

Binary files /dev/null and b/WEB-INF/lib/openid4java/xercesImpl-2.8.1.jar differ

Binary files /dev/null and b/WEB-INF/lib/openid4java/xml-apis-1.3.03.jar differ

--- a/build.xml
+++ b/build.xml
@@ -76,6 +76,7 @@
      <fileset dir="${faceletsrc}">
        <include name="javascript/*.js"/>
        <include name="**/*.html"/>
+       <include name="**/*.png"/>
        <include name="**/*.xhtml"/>
        <include name="**/*.properties"/>
      </fileset>

Binary files /dev/null and b/img/Red-signin-Long-press-44dp.png differ

--- a/login.xhtml
+++ b/login.xhtml
@@ -28,8 +28,23 @@ password : <h:inputSecret value="#{userBean.pwd}"/>
 Open ID log in:
 <br />
 <h:form>
-    <h:commandLink action="#{openIdBean.yahooLogin}">
+    <h:commandLink action="#{openIdBean.doLogin}">
         <img src="http://i.yimg.jp/images/login/btn/btnXSYid.gif" width="241" height="28" alt="Yahoo! JAPAN IDでログイン" border="0" />
+        <f:param name="loginTo" value="yahoo" />
+    </h:commandLink>
+
+<br />
+
+    <h:commandLink action="#{openIdBean.doLogin}">
+        <img src="img/Red-signin-Long-press-44dp.png" alt="Google Accountでログイン" border="0" />
+        <f:param name="loginTo" value="google" />
+    </h:commandLink>
+
+<br />
+
+    <h:inputText value="#{openIdBean.openid}" />
+    <h:commandLink action="#{openIdBean.doLogin}" value="ELSE" >
+        <f:param name="loginTo" value="else" />
     </h:commandLink>
 </h:form>