로그인 로직 리팩토링

사용하지 않는 코드를 삭제하고 로직을 정비.
hangum · Jun 18, 2016 · 546eb64 · 546eb64
1 parent 62eb8c5
commit 546eb64
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 77 deletions.
diff --git a/...e.applicaion.start/src/com/hangum/tadpole/application/start/dialog/login/LoginDialog.java b/...e.applicaion.start/src/com/hangum/tadpole/application/start/dialog/login/LoginDialog.java
@@ -88,11 +88,6 @@ public class LoginDialog extends Dialog {
 	private Button btnNewUser;
 	private Button btnFindPasswd;
 
-//	String strPaypal = "<form action='https://www.paypal.com/cgi-bin/webscr' method='post' target='_top'> " + //$NON-NLS-1$
-//						"	<input type='hidden' name='cmd' value='_s-xclick'> " + //$NON-NLS-1$
-//						"	<input type='hidden' name='encrypted' value='-----BEGIN PKCS7-----MIIHNwYJKoZIhvcNAQcEoIIHKDCCByQCAQExggEwMIIBLAIBADCBlDCBjjELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAkNBMRYwFAYDVQQHEw1Nb3VudGFpbiBWaWV3MRQwEgYDVQQKEwtQYXlQYWwgSW5jLjETMBEGA1UECxQKbGl2ZV9jZXJ0czERMA8GA1UEAxQIbGl2ZV9hcGkxHDAaBgkqhkiG9w0BCQEWDXJlQHBheXBhbC5jb20CAQAwDQYJKoZIhvcNAQEBBQAEgYB3IDn/KYN412pCfvQWTnLBKX3PcmcRdBPjt6+XZqUrb0yVbZ+hzQETdyQMzULIj1PbATVrZpDzhgjCPNduIwN22ga9+MfiHwLPm6BUHJ67EV4SvY9zLKisBuaU2HfydW3q0lp1dPscQscFVmx/LoitJwt4G5t9C5kwhj37NESeIDELMAkGBSsOAwIaBQAwgbQGCSqGSIb3DQEHATAUBggqhkiG9w0DBwQIZ5TXQJMFnNWAgZDBYBl8qJb6fQdWnMDoM5S59A6tu+F7rnIrD0e7sg6FE1m+zo1B8SYRSfGuzWpi/s2Uuqa5tiwiosxcqL3dmcfK5ZKlsbJipa+098M9q5Ilugg/GN+kz8gUQqqJrwYA3DGuM+sg/BXoIjRj4NBXh6KG+eV4FLFRUD7EMoGA3u+KHMQ+0zqBq8NOgdCqI3ag99CgggOHMIIDgzCCAuygAwIBAgIBADANBgkqhkiG9w0BAQUFADCBjjELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAkNBMRYwFAYDVQQHEw1Nb3VudGFpbiBWaWV3MRQwEgYDVQQKEwtQYXlQYWwgSW5jLjETMBEGA1UECxQKbGl2ZV9jZXJ0czERMA8GA1UEAxQIbGl2ZV9hcGkxHDAaBgkqhkiG9w0BCQEWDXJlQHBheXBhbC5jb20wHhcNMDQwMjEzMTAxMzE1WhcNMzUwMjEzMTAxMzE1WjCBjjELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAkNBMRYwFAYDVQQHEw1Nb3VudGFpbiBWaWV3MRQwEgYDVQQKEwtQYXlQYWwgSW5jLjETMBEGA1UECxQKbGl2ZV9jZXJ0czERMA8GA1UEAxQIbGl2ZV9hcGkxHDAaBgkqhkiG9w0BCQEWDXJlQHBheXBhbC5jb20wgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAMFHTt38RMxLXJyO2SmS+Ndl72T7oKJ4u4uw+6awntALWh03PewmIJuzbALScsTS4sZoS1fKciBGoh11gIfHzylvkdNe/hJl66/RGqrj5rFb08sAABNTzDTiqqNpJeBsYs/c2aiGozptX2RlnBktH+SUNpAajW724Nv2Wvhif6sFAgMBAAGjge4wgeswHQYDVR0OBBYEFJaffLvGbxe9WT9S1wob7BDWZJRrMIG7BgNVHSMEgbMwgbCAFJaffLvGbxe9WT9S1wob7BDWZJRroYGUpIGRMIGOMQswCQYDVQQGEwJVUzELMAkGA1UECBMCQ0ExFjAUBgNVBAcTDU1vdW50YWluIFZpZXcxFDASBgNVBAoTC1BheVBhbCBJbmMuMRMwEQYDVQQLFApsaXZlX2NlcnRzMREwDwYDVQQDFAhsaXZlX2FwaTEcMBoGCSqGSIb3DQEJARYNcmVAcGF5cGFsLmNvbYIBADAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4GBAIFfOlaagFrl71+jq6OKidbWFSE+Q4FqROvdgIONth+8kSK//Y/4ihuE4Ymvzn5ceE3S/iBSQQMjyvb+s2TWbQYDwcp129OPIbD9epdr4tJOUNiSojw7BHwYRiPh58S1xGlFgHFXwrEBb3dgNbMUa+u4qectsMAXpVHnD9wIyfmHMYIBmjCCAZYCAQEwgZQwgY4xCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJDQTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzEUMBIGA1UEChMLUGF5UGFsIEluYy4xEzARBgNVBAsUCmxpdmVfY2VydHMxETAPBgNVBAMUCGxpdmVfYXBpMRwwGgYJKoZIhvcNAQkBFg1yZUBwYXlwYWwuY29tAgEAMAkGBSsOAwIaBQCgXTAYBgkqhkiG9w0BCQMxCwYJKoZIhvcNAQcBMBwGCSqGSIb3DQEJBTEPFw0xNTEwMzEwMzAyMjNaMCMGCSqGSIb3DQEJBDEWBBRJRxkqnn6TtfjQRDDRGzbcSP44qzANBgkqhkiG9w0BAQEFAASBgEJRwHPk6dra3xxTSHMU//jg3kYrk2qEYp/Zoq8s7mdcs3ezpdiaKXS+PPox2oDsYxYaKILBd4bh/6uelcVx5n3atULojdYVUdh/aq435GXwvPkTSO/XQIyIwOsKM1epzrMjgEEBMypuMnjqsQb9/KRdH6SfpJibe/5NHvjJ3E8F-----END PKCS7-----'> " + //$NON-NLS-1$
-//						"	<input type='image' src='https://www.paypalobjects.com/en_US/i/btn/btn_donate_LG.gif' border='0' name='submit' alt='PayPal - The safer, easier way to pay online!'> " + //$NON-NLS-1$
-//						"	</form>"; //$NON-NLS-1$
 	private Composite compositeHead;
 	private Composite compositeTail;
 
@@ -206,7 +201,6 @@ public void widgetSelected(SelectionEvent e) {
 			}
 		});
 		comboLanguage.add(Locale.ENGLISH.getDisplayLanguage(Locale.ENGLISH));
-		// 쿠키에 한글 저장시오류라... 좀 이상해도 영어로 놔둬야 할듯합니다. - hangum(16.6.12)
 		comboLanguage.add(Locale.KOREAN.getDisplayLanguage(Locale.KOREAN));
 
 		comboLanguage.setData(Locale.ENGLISH.getDisplayLanguage(Locale.ENGLISH), Locale.ENGLISH);
@@ -339,8 +333,6 @@ private void registLoginID(String userId, String userPwd) {
 
 		CookieUtils.saveCookie(PublicTadpoleDefine.TDB_COOKIE_USER_SAVE_CKECK, Boolean.toString(btnCheckButton.getSelection()));
 		CookieUtils.saveCookie(PublicTadpoleDefine.TDB_COOKIE_USER_ID, userId);
-//		CookieUtils.saveCookie(PublicTadpoleDefine.TDB_COOKIE_USER_PWD, userPwd);
-
 		Locale locale = (Locale)comboLanguage.getData(comboLanguage.getText());
 		CookieUtils.saveCookie(PublicTadpoleDefine.TDB_COOKIE_USER_LANGUAGE, locale.toLanguageTag());
 	}
@@ -395,36 +387,6 @@ protected void createButtonsForButtonBar(Composite parent) {
 	 * initialize ui
 	 */
 	private void initUI() {
-		String defaultLanguage = RWT.getUISession().getLocale().getDisplayLanguage(Locale.ENGLISH);
-		boolean isExist = false;
-		for(String strName : comboLanguage.getItems()) {
-			if(strName.equals(defaultLanguage)) {
-				isExist = true;
-				comboLanguage.setText(strName);
-				changeUILocale(comboLanguage.getText());
-				break;
-			}
-		}
-
-		// 쿠키에서 사용자 정보를 찾지 못했으면..
-		if(!isExist) {
-			// 사용자 브라우저 랭귀지를 가져와서, 올챙이가 지원하는 랭귀지인지 검사해서..
-			String locale = RequestInfoUtils.getDisplayLocale();
-			for(String strLocale : comboLanguage.getItems()) {
-				if(strLocale.equals(locale)) {
-					isExist = true;
-					break;
-				}
-			}
-			// 있으면... 
-			if(isExist) comboLanguage.setText(locale);
-			else comboLanguage.setText(Locale.ENGLISH.getDisplayLanguage(Locale.ENGLISH));
-
-			// 랭귀지를 바꾸어 준다.
-			changeUILocale(comboLanguage.getText());
-		}
-
-		// find login id
 		initCookieData();
 		if("".equals(textEMail.getText())) {
 			textEMail.setFocus();
@@ -452,9 +414,6 @@ private void initCookieData() {
 				if(PublicTadpoleDefine.TDB_COOKIE_USER_ID.equals(cookie.getName())) {
 					textEMail.setText(cookie.getValue());
 					intCount++;
-				} else if(PublicTadpoleDefine.TDB_COOKIE_USER_PWD.equals(cookie.getName())) {
-					textPasswd.setText(cookie.getValue());
-					intCount++;
 				} else if(PublicTadpoleDefine.TDB_COOKIE_USER_SAVE_CKECK.equals(cookie.getName())) {
 					btnCheckButton.setSelection(Boolean.parseBoolean(cookie.getValue()));
 					intCount++;
@@ -465,9 +424,13 @@ private void initCookieData() {
 					intCount++;
 				}
 
-				if(intCount == 4) break;
+				if(intCount == 3) return;
 			}
 		}
+
+		// 세션에 발견되지 않았으면.
+		comboLanguage.select(0);
+		changeUILocale(comboLanguage.getText());
 	}
 
 	/**

diff --git a/...caion.start/src/com/hangum/tadpole/application/start/dialog/login/ServiceLoginDialog.java b/...caion.start/src/com/hangum/tadpole/application/start/dialog/login/ServiceLoginDialog.java
@@ -371,8 +371,6 @@ private void registLoginID(String userId, String userPwd) {
 
 		CookieUtils.saveCookie(PublicTadpoleDefine.TDB_COOKIE_USER_SAVE_CKECK, Boolean.toString(btnCheckButton.getSelection()));
 		CookieUtils.saveCookie(PublicTadpoleDefine.TDB_COOKIE_USER_ID, userId);
-//		CookieUtils.saveCookie(PublicTadpoleDefine.TDB_COOKIE_USER_PWD, userPwd);
-
 		Locale locale = (Locale)comboLanguage.getData(comboLanguage.getText());
 		CookieUtils.saveCookie(PublicTadpoleDefine.TDB_COOKIE_USER_LANGUAGE, locale.toLanguageTag());
 	}
@@ -421,35 +419,6 @@ protected void createButtonsForButtonBar(Composite parent) {
 	 * initialize ui
 	 */
 	private void initUI() {
-		String defaultLanguage = RWT.getUISession().getLocale().getDisplayLanguage(Locale.ENGLISH);
-		boolean isExist = false;
-		for(String strName : comboLanguage.getItems()) {
-			if(strName.equals(defaultLanguage)) {
-				isExist = true;
-				comboLanguage.setText(strName);
-				changeUILocale(comboLanguage.getText());
-				break;
-			}
-		}
-
-		// 쿠키에서 사용자 정보를 찾지 못했으면..
-		if(!isExist) {
-			// 사용자 브라우저 랭귀지를 가져와서, 올챙이가 지원하는 랭귀지인지 검사해서..
-			String locale = RequestInfoUtils.getDisplayLocale();
-			for(String strLocale : comboLanguage.getItems()) {
-				if(strLocale.equals(locale)) {
-					isExist = true;
-					break;
-				}
-			}
-			// 있으면... 
-			if(isExist) comboLanguage.setText(locale);
-			else comboLanguage.setText(Locale.ENGLISH.getDisplayLanguage(Locale.ENGLISH));
-
-			// 랭귀지를 바꾸어 준다.
-			changeUILocale(comboLanguage.getText());
-		}
-
 		// find login id
 		initCookieData();
 		if("".equals(textEMail.getText())) {
@@ -478,9 +447,6 @@ private void initCookieData() {
 				if(PublicTadpoleDefine.TDB_COOKIE_USER_ID.equals(cookie.getName())) {
 					textEMail.setText(cookie.getValue());
 					intCount++;
-				} else if(PublicTadpoleDefine.TDB_COOKIE_USER_PWD.equals(cookie.getName())) {
-					textPasswd.setText(cookie.getValue());
-					intCount++;
 				} else if(PublicTadpoleDefine.TDB_COOKIE_USER_SAVE_CKECK.equals(cookie.getName())) {
 					btnCheckButton.setSelection(Boolean.parseBoolean(cookie.getValue()));
 					intCount++;
@@ -491,9 +457,13 @@ private void initCookieData() {
 					intCount++;
 				}
 
-				if(intCount == 4) break;
+				if(intCount == 3) return;
 			}
 		}
+
+		// 세션에 발견되지 않았으면.
+		comboLanguage.select(0);
+		changeUILocale(comboLanguage.getText());
 	}
 
 	/**