Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

User login registration #1

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions src/main/java/com/planets/app/config/WebAppConfig.java
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
*/
package com.planets.app.config;

import org.h2.server.web.WebServlet;
import org.springframework.boot.context.embedded.ServletRegistrationBean;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.boot.orm.jpa.EntityScan;
import org.springframework.context.annotation.Bean;
Expand Down Expand Up @@ -50,5 +52,13 @@ public AppRestInterceptor restInterceptor() {
public void addInterceptors(InterceptorRegistry registry) {
registry.addInterceptor(restInterceptor()).addPathPatterns("/**");
}

@Bean
public ServletRegistrationBean h2servletRegistration() {
ServletRegistrationBean registrationBean = new ServletRegistrationBean(new WebServlet());
registrationBean.addUrlMappings("/admin/h2console/*");
registrationBean.addInitParameter("-webAllowOthers", "true");
return registrationBean;
}

}
52 changes: 0 additions & 52 deletions src/main/java/com/planets/app/controller/AdminController.java

This file was deleted.

209 changes: 0 additions & 209 deletions src/main/java/com/planets/app/controller/AppAuthController.java

This file was deleted.

96 changes: 96 additions & 0 deletions src/main/java/com/planets/app/controller/AuthController.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,96 @@
package com.planets.app.controller;

import java.io.UnsupportedEncodingException;
import java.security.InvalidKeyException;
import java.security.NoSuchAlgorithmException;
import java.util.HashMap;
import java.util.Map;

import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.RequestMethod;

import com.fasterxml.jackson.core.JsonProcessingException;
import com.planets.app.model.AppUser;
import com.planets.app.model.repo.AppUserRepo;

import static edu.tamu.framework.enums.ApiResponseType.SUCCESS;
import static edu.tamu.framework.enums.ApiResponseType.ERROR;
import edu.tamu.framework.aspect.annotation.ApiMapping;
import edu.tamu.framework.aspect.annotation.Data;
import edu.tamu.framework.aspect.annotation.Parameters;
import edu.tamu.framework.controller.CoreAuthController;
import edu.tamu.framework.model.ApiResponse;

@Controller
@ApiMapping("/auth")
public class AuthController extends CoreAuthController {

@Autowired
AppUserRepo appUserRepo;

@ApiMapping(value="/login", method=RequestMethod.POST)
public ApiResponse login(@Parameters Map<String, String[]> parameters) {

String email = parameters.get("email")[0];
String password = parameters.get("password")[0];

AppUser user = appUserRepo.findByEmail(email);

if(user == null) {
String errorMessage = "No user found with email " + email + "!";
logger.debug(errorMessage);
return new ApiResponse(ERROR, errorMessage);
}

if(!authUtility.validatePassword(password, user.getPassword())) {
String errorMessage = "Authentication failed!";
logger.debug(errorMessage);
return new ApiResponse(ERROR, errorMessage);
}

try {
Map<String, String> userMap = new HashMap<String, String>();
userMap.put("lastName", user.getLastName());
userMap.put("firstName", user.getFirstName());
userMap.put("uin", String.valueOf(user.getUin()));
userMap.put("email", user.getEmail());
return new ApiResponse(SUCCESS, jwtUtility.makeToken(userMap));
} catch (InvalidKeyException | JsonProcessingException | NoSuchAlgorithmException | IllegalStateException | UnsupportedEncodingException e) {
logger.debug("Unable to generate token!");
return new ApiResponse(ERROR, "Unable to generate token!");
}
}

@ApiMapping(value="/register", method=RequestMethod.POST)
@Transactional
public ApiResponse registration(@Parameters Map<String, String[]> parameters) {
ApiResponse apiResponse = null;

if( parameters.get("email") == null
|| parameters.get("password") == null
) {

String error = "Missing neccessary information:";

error = parameters.get("email") == null ? (error + " email") : error;
error = parameters.get("password") == null ? (error + " pssword") : error;

apiResponse = new ApiResponse(ERROR, error);
} else {

System.out.println(authUtility);
AppUser user = appUserRepo.create(parameters.get("email")[0], "", "", authUtility.encodePassword(parameters.get("password")[0]));
user.setRole("ROLE_USER");
appUserRepo.save(user);
apiResponse = new ApiResponse(SUCCESS, "The email " +parameters.get("email")[0]+" was registered.", user);
}

return apiResponse;
}

public ApiResponse login(@Data String data) {return null;}
public ApiResponse registration(String data, @Parameters Map<String, String[]> parameters) {return null;}

}
Loading