rudi
/
MTGClone
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity
Browse Source

Fixed login

pull/7/head
Gregory Rudolph 4 years ago
parent
499156f90b
commit
7be72e8523
Signed by: rudi
GPG Key ID: EF64F3CBD1A1EBDD
5 changed files with 57 additions and 6 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      pom.xml
  2. 36
      src/main/java/MTGClone/CustomAuthenticationProvider.java
  3. 10
      src/main/java/MTGClone/WebSecurityConfig.java
  4. 3
      src/main/java/MTGClone/controller/CardController.java
  5. 10
      src/main/webapp/WEB-INF/jsp/card.jsp

4
pom.xml
Unescape View File

@ -37,6 +37,10 @@
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-security</artifactId> <artifactId>spring-boot-starter-security</artifactId>
</dependency> </dependency>
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-taglibs</artifactId>
</dependency>
<!-- jstl --> <!-- jstl -->
<dependency> <dependency>
<groupId>jstl</groupId> <groupId>jstl</groupId>

36
src/main/java/MTGClone/CustomAuthenticationProvider.java
Unescape View File

@ -0,0 +1,36 @@
package MTGClone;
import org.springframework.security.authentication.AuthenticationProvider;
import org.springframework.security.core.Authentication;
import org.springframework.security.core.AuthenticationException;
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
import org.springframework.stereotype.Component;
import java.util.ArrayList;
@Component
public class CustomAuthenticationProvider implements AuthenticationProvider {
@Override
public Authentication authenticate(Authentication authentication)
throws AuthenticationException {
String name = authentication.getName();
String password = authentication.getCredentials().toString();
SQLDriver d = new SQLDriver();
if (d.authenticateUser(name, password)) {
// use the credentials
// and authenticate against the third-party system
return new UsernamePasswordAuthenticationToken(
name, password, new ArrayList<>());
} else {
return null;
}
}
@Override
public boolean supports(Class<?> authentication) {
return authentication.equals(UsernamePasswordAuthenticationToken.class);
}
}

10
src/main/java/MTGClone/WebSecurityConfig.java
Unescape View File

@ -1,6 +1,8 @@
package MTGClone; package MTGClone;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.builders.HttpSecurity;
import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
@ -16,7 +18,13 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
.csrf().disable().logout(); .csrf().disable().logout();
} }
// TODO: Login using SQLDriver.authenticateUser(username, password) @Autowired
private CustomAuthenticationProvider authProvider;
@Override
protected void configure(AuthenticationManagerBuilder auth) throws Exception {
auth.authenticationProvider(authProvider);
}
} }

3
src/main/java/MTGClone/controller/CardController.java
Unescape View File

@ -26,11 +26,8 @@ public class CardController {
@RequestParam("power") int power, @RequestParam("toughness") int toughness, @RequestParam("description") String description, @RequestParam("power") int power, @RequestParam("toughness") int toughness, @RequestParam("description") String description,
@RequestParam("creaturetype") String creaturetype, ModelMap modelMap) { @RequestParam("creaturetype") String creaturetype, ModelMap modelMap) {
SQLDriver d = new SQLDriver(); SQLDriver d = new SQLDriver();
System.out.println(creaturetype);
System.out.println("Posting to /card detected");
Card newCard = new Card(cardname, manacost, power, toughness, description, "", creaturetype); Card newCard = new Card(cardname, manacost, power, toughness, description, "", creaturetype);
d.insertCard(newCard); d.insertCard(newCard);
//modelMap.addAttribute("allcards", d.getAllCards());
return "card"; return "card";
} }

10
src/main/webapp/WEB-INF/jsp/card.jsp
Unescape View File

@ -1,5 +1,6 @@
<!DOCTYPE html> <!DOCTYPE html>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib prefix="sec" uri="http://www.springframework.org/security/tags" %>
<html lang="en" xmlns:th="http://www.thymeleaf.org"> <html lang="en" xmlns:th="http://www.thymeleaf.org">
<head> <head>
<link href="https://fonts.googleapis.com/css2?family=Ubuntu&display=swap" rel="stylesheet"> <link href="https://fonts.googleapis.com/css2?family=Ubuntu&display=swap" rel="stylesheet">
@ -33,11 +34,16 @@ table, td, th{
<title>Hello ${name}!</title> <title>Hello ${name}!</title>
</head> </head>
<body style="background-color:#0F0F0F;font-family: 'Ubuntu', sans-serif;"> <body style="background-color:#0F0F0F;font-family: 'Ubuntu', sans-serif;">
<sec:authorize access="isAnonymous()">
<li><a href="/login" style="color:#C10E0E">Login / Sign Up</a></li> </ul> <li><a href="/login" style="color:#C10E0E">Login / Sign Up</a></li> </ul>
</sec:authorize>
<sec:authorize access="isAuthenticated()">
<li><a href="/logout" style="color:#C10E0E">Log Out</a></li> </ul>
</sec:authorize>
<h2 style="color:#CFCACA;position:relative;left:820px;">Magic Card Creator</h2> <h2 style="color:#CFCACA;position:relative;left:820px;">Magic Card Creator</h2>
<div class="container"> <div class="container">
<sec:authorize access="isAuthenticated()">
<form action="#" method="post" th:action="@{/card}" > <form action="#" method="post" th:action="@{/card}" >
<br><br><label style="left:210px;font-size:26px;"for="cardname">Card Name:</label> <br><br><label style="left:210px;font-size:26px;"for="cardname">Card Name:</label>
<input style="left:210px;font-size:24px;width:300px;"placeholder="Card Title"type="text" id="cardname" name="cardname"><br><br> <input style="left:210px;font-size:24px;width:300px;"placeholder="Card Title"type="text" id="cardname" name="cardname"><br><br>
@ -61,7 +67,7 @@ table, td, th{
</form> </form>
</div> </div>
<br> <br>
</sec:authorize>
<table style> <table style>
<tr> <tr>

Write Preview
Loading…
Cancel
Save