Subversion Repositories SmartDukaan

Rev

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

Rev 28248 Rev 28256
Line 115... Line 115...
115 
	private String googleApiKey;
 115 
	private String googleApiKey;
116
116
117 
	@Value("${app.token.url}")
 117 
	@Value("${app.token.url}")
118 
	private String appTokenUrl;
 118 
	private String appTokenUrl;
119
119
- 
 
 120 
	@Value("${angular.app.url}")
- 
 
 121 
	private String appUrl;
- 
 
 122
120 
	@Value("${admin.token}")
 123 
	@Value("${admin.token}")
121 
	private String adminToken;
 124 
	private String adminToken;
122 
 
 125 
 
123 
	@Autowired
 126 
	@Autowired
124 
	private AuthService authService;
 127 
	private AuthService authService;
Line 178... Line 181...
178 
		} else {
 181 
		} else {
179 
			emailId = fofoDetails.getEmailId();
 182 
			emailId = fofoDetails.getEmailId();
180 
			model.addAttribute("authToken", getToken(emailId));
 183 
			model.addAttribute("authToken", getToken(emailId));
181 
			model.addAttribute("androidId", getAndroidId(emailId));
 184 
			model.addAttribute("androidId", getAndroidId(emailId));
182 
		}
 185 
		}
- 
 
 186 
		model.addAttribute("appUrl", appUrl);
183 
		return "mobileapp";
 187 
		return "mobileapp";
184 
	}
 188 
	}
185 
 
 189 
 
186 
	private String getAndroidId(String emailId) throws Exception {
 190 
	private String getAndroidId(String emailId) throws Exception {
187 
		User user = userRepository.selectByEmailId(emailId);
 191 
		User user = userRepository.selectByEmailId(emailId);