Merge branch 'Andrea'

Author: ultramani

backend/gamelink/src/main/java/urjc/gamelink/Configuration/Security/RestSecurityConfig.java

@@ -49,7 +49,8 @@ protected void configure(HttpSecurity http) throws Exception {
 		http.antMatcher("/api/**");
 
 		// URLs that need authentication to access to it
-		http.authorizeRequests().antMatchers(HttpMethod.POST, "/api/users/").hasAnyRole("ADMIN");
+		http.authorizeRequests().antMatchers(HttpMethod.GET, "/api/users/").hasAnyRole("ADMIN");
+		http.authorizeRequests().antMatchers(HttpMethod.POST, "/api/users/").not().hasAnyRole("USERO");
 		http.authorizeRequests().antMatchers(HttpMethod.POST, "/api/users/**").hasAnyRole("USERO");
 		http.authorizeRequests().antMatchers(HttpMethod.PUT, "/api/users/**").hasAnyRole("USERO");
 		http.authorizeRequests().antMatchers(HttpMethod.DELETE, "/api/users/**").hasAnyRole("USERO");

backend/gamelink/src/main/java/urjc/gamelink/Controllers/UserRestController.java

@@ -12,6 +12,7 @@
 
 import org.hibernate.engine.jdbc.BlobProxy;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.InputStreamResource;
 import org.springframework.core.io.Resource;
 import org.springframework.http.HttpHeaders;
@@ -72,12 +73,21 @@ public ResponseEntity<Usero> getUser(@PathVariable long id) {
     // Creates a user
     @PostMapping("/")
     @ResponseStatus(HttpStatus.CREATED)
-    public ResponseEntity<Usero> createUser(Usero user, @RequestParam String password) {
+    public ResponseEntity<Usero> createUser(Usero user, @RequestParam String nick,
+    @RequestParam String name, @RequestParam String lastName,
+    @RequestParam String email, @RequestParam String password) throws IOException{
 
+        Resource image = new ClassPathResource("/static/Photos/defaultProfilePhoto.jpg");
+        user.setImageFile(BlobProxy.generateProxy(image.getInputStream(), image.contentLength()));
+        user.setImage(true);
         user.setEncodedPassword(passwordEncoder.encode(password));
         ArrayList<String> list = new ArrayList<>();
         list.add("USERO");
         user.setRoles(list);
+        user.setNick(nick);
+        user.setName(name);
+        user.setLastName(lastName);
+        user.setEmail(email);
         us.save(user);
         URI location = ServletUriComponentsBuilder.fromCurrentRequest().path("/{id}").buildAndExpand(user.getId())
                 .toUri();

backend/gamelink/src/main/resources/templates/signin.html

@@ -53,8 +53,8 @@ <h3 class="card-title text-center">Registro</h3>
                                                         <span id="passwordMessage"></span>
                                                     </div>
                                                     <button onclick="location.href='/'; return false;">Cancelar</button>
-                                                    <button type="submit" (click)="logIn($event, nick.value, name.value, lastName.value, email.value, password.value)" 
-                                                    class="btn btn-default">Login</button>
+                                                    <input id="createUserBtn" type="submit" value="Crear">
+                                                    <input type="hidden" name="_csrf" value="{{token}}"/>
                                                 </form>
                                                 <!-- Right after creating the button disable "Create User button"-->
                                                 <script>
@@ -76,5 +76,6 @@ <h3 class="card-title text-center">Registro</h3>
         <!-- Bootstrap core JS-->
         <script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/js/bootstrap.bundle.min.js"></script>
         <!-- Core theme JS-->
+        <script src="js/scripts.js"></script>
     </body>
-</html>
+</html>

backend/gamelink/Docker-compose.yml renamed to docker/Docker-compose.yml

@@ -34,3 +34,27 @@ EXPOSE 8443
 
 # Command that is executed when doing docker run
 CMD [ "java", "-jar", "gamelink-0.0.1-SNAPSHOT.jar" ]
+
+#################################################
+# Base image for the application container
+#################################################
+
+#Primera Etapa
+FROM node:10-alpine as build-step
+
+RUN mkdir -p /app
+
+WORKDIR /app
+
+COPY package.json /app
+
+RUN npm install
+
+COPY . /app
+
+RUN npm run build --prod
+
+#Segunda Etapa
+FROM nginx:1.17.1-alpine
+	#Si estas utilizando otra aplicacion cambia PokeApp por el nombre de tu app
+COPY --from=build-step /app/dist/PokeApp /usr/share/nginx/html

backend/gamelink/Dockerfile renamed to docker/Dockerfile

@@ -1,23 +1,26 @@
 import { Component } from '@angular/core';
 import { LoginService } from '../../services/login.service';
+import { Router } from '@angular/router';
 
 @Component({
   selector: 'login',
   templateUrl: './login.component.html'
 })
 export class LoginComponent {
 
-  constructor(public loginService: LoginService) { }
+  constructor(private router: Router, public loginService: LoginService) { }
 
   logIn(event: any, user: string, pass: string) {
 
     event.preventDefault();
 
     this.loginService.logIn(user, pass);
+    this.router.navigate(['/home']);
   }
 
   logOut() {
     this.loginService.logOut();
+    this.router.navigate(['/home']);
   }
 
 }