Subversion Repositories SmartDukaan

Rev

Rev 20177 | Rev 20180 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 20177 Rev 20178
Line 95... Line 95...
95
	private boolean loginUser() {
95
	private boolean loginUser() {
96
		try {
96
		try {
97
			log.info("in loginuser");
97
			log.info("in loginuser");
98
			String email, password = null, isFacebookUser;
98
			String email, password = null, isFacebookUser;
99
 
99
 
100
			isFacebookUser = (String)this.request.getAttribute("isFacebookUser");
100
			isFacebookUser = (String)this.request.getParameter("isFacebookUser");
101
			if (isFacebookUser!=null && isFacebookUser.equals("true")) {
101
			if (isFacebookUser!=null && isFacebookUser.equals("true")) {
102
				email = (String)this.request.getAttribute("email");
102
				email = (String)this.request.getParameter("email");
103
			} else {
103
			} else {
104
				email = this.request.getParameter("email");
104
				email = this.request.getParameter("email");
105
				password = this.request.getParameter("password");
105
				password = this.request.getParameter("password");
106
			}
106
			}
107
			log.info("here email "+email+" password "+password+" isfbuser "+isFacebookUser);
107
			log.info("here email "+email+" password "+password+" isfbuser "+isFacebookUser);
Line 122... Line 122...
122
			User user = null;
122
			User user = null;
123
			
123
			
124
			boolean shouldChangeCookieExpiry = false;
124
			boolean shouldChangeCookieExpiry = false;
125
			boolean isNewFacebookUser = false;
125
			boolean isNewFacebookUser = false;
126
			if (isFacebookUser!=null && isFacebookUser.equals("true") && !email.equals("undefined")) {
126
			if (isFacebookUser!=null && isFacebookUser.equals("true") && !email.equals("undefined")) {
127
				String accessToken = (String)this.request.getAttribute("accessToken");
127
				String accessToken = (String)this.request.getParameter("accessToken");
128
				String facebookId = (String)this.request.getAttribute("facebookId");
128
				String facebookId = (String)this.request.getParameter("facebookId");
129
				if (userClient.userExists(email)){
129
				if (userClient.userExists(email)){
130
					shouldChangeCookieExpiry = true;
130
					shouldChangeCookieExpiry = true;
131
					user = userClient.getUserByEmail(email);
131
					user = userClient.getUserByEmail(email);
132
					userId = user.getUserId();
132
					userId = user.getUserId();
133
					if(!user.isIsFacebookUser()) {
133
					if(!user.isIsFacebookUser()) {
Line 226... Line 226...
226
	
226
	
227
	private boolean createNewUserForFacebook(String email) {
227
	private boolean createNewUserForFacebook(String email) {
228
    	String password;
228
    	String password;
229
    	password = RandomStringUtils.randomAlphabetic(8);
229
    	password = RandomStringUtils.randomAlphabetic(8);
230
    	
230
    	
231
    	String name = (String)this.request.getAttribute("name");
231
    	String name = (String)this.request.getParameter("name");
232
    	String accessToken = (String)this.request.getAttribute("accessToken");
232
    	String accessToken = (String)this.request.getParameter("accessToken");
233
    	String facebookId = (String)this.request.getAttribute("facebookId");
233
    	String facebookId = (String)this.request.getParameter("facebookId");
234
		User user = new User();
234
		User user = new User();
235
		user.setEmail(email);
235
		user.setEmail(email);
236
		String encryptedPassword = desEncrypter.encrypt(password);
236
		String encryptedPassword = desEncrypter.encrypt(password);
237
		user.setPassword(encryptedPassword);
237
		user.setPassword(encryptedPassword);
238
		user.setCommunicationEmail(email);
238
		user.setCommunicationEmail(email);