79 feature create role id into token

.github/ISSUE_TEMPLATE/bug.md

@@ -0,0 +1,27 @@
+---
+name: "🐞 Bug Fix"
+about: "Report a bug or something that is not working as expected"
+title: "[FIX] "
+labels: bug
+assignees: ""
+---
+
+## 🐛 Bug Description
+A clear and concise description of what the bug is.
+
+## 🔄 Steps to Reproduce
+Steps to reproduce the behavior:
+1. Go to ...
+2. Click on ...
+3. See error ...
+
+## ✅ Expected Behavior
+What should have happened instead?
+
+## 📸 Screenshots / Logs
+If applicable, add screenshots or error messages.
+
+## 🖥️ Environment
+- OS:
+- Version:
+- Other relevant info:

.github/ISSUE_TEMPLATE/feature.md

@@ -0,0 +1,19 @@
+---
+name: "✨ Feature Request"
+about: "Suggest a new feature or improvement"
+title: "[FEATURE] "
+labels: enhancement
+assignees: ""
+---
+
+## ✨ Description
+What would you like to add or improve?
+
+## 🎯 Use Case
+Why is this useful? Who benefits from it?
+
+## 💡 Proposed Solution
+How could this be implemented? (optional)
+
+## 📎 Additional Info
+Anything else you’d like to share? (related issues, links, references, etc.)

.github/ISSUE_TEMPLATE/other.md

@@ -0,0 +1,16 @@
+---
+name: "📌 Other"
+about: "Questions, discussions, or anything else"
+title: "[OTHER] "
+labels: question
+assignees: ""
+---
+
+## 📌 Description
+What is this about?
+
+## 🌍 Context
+Why is this relevant?
+
+## 📎 Additional Info
+Anything else that might be useful.

.github/workflows/gradle.yml

@@ -0,0 +1,43 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+# This workflow will build a Java project with Gradle and cache/restore any dependencies to improve the workflow execution time
+# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-java-with-gradle
+
+name: Java CI with Gradle
+
+on:
+  push:
+    branches: [ "main" ]
+  pull_request:
+    branches: [ "main" ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+
+    steps:
+    - uses: actions/checkout@v4
+    - name: Set up JDK 17
+      uses: actions/setup-java@v4
+      with:
+        java-version: '17'
+        distribution: 'temurin'
+
+    # Configure Gradle for optimal use in GitHub Actions, including caching of downloaded dependencies.
+    # See: https://github.com/gradle/actions/blob/main/setup-gradle/README.md
+    - name: Setup Gradle
+      uses: gradle/actions/setup-gradle@af1da67850ed9a4cedd57bfd976089dd991e2582 # v4.0.0
+
+    - name: Build with Gradle Wrapper
+      run: ./gradlew build --exclude-task test
+
+    - name: Upload build artifacts
+      uses: actions/upload-artifact@v4
+      with:
+        name: Package
+        path: build/libs

.gitignore

@@ -36,4 +36,8 @@ out/
 ### VS Code ###
 .vscode/
 
+### Project specific
 application.yml
+build
+.DS_Store
+application-azuread.yml

README.md

@@ -24,4 +24,6 @@ Once you are fully up to speed and working on the project it is perfectly accept
 
 Once you have your teams set up, enjoy working on the code.
 
-We look forward to seeing what you manage to produce from it!
+We look forward to seeing what you manage to produce from it!
+
+----Test access Magnus-----

build.gradle

@@ -43,6 +43,14 @@ dependencies {
 	testImplementation 'org.springframework.security:spring-security-test'
 	testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
 
+    // https://mvnrepository.com/artifact/org.springframework/spring-test
+    testImplementation 'org.springframework:spring-test'
+    // https://mvnrepository.com/artifact/org.junit.jupiter/junit-jupiter-api
+    testImplementation 'org.junit.jupiter:junit-jupiter-api'
+    // https://mvnrepository.com/artifact/org.junit.jupiter/junit-jupiter-engine
+    testImplementation 'org.junit.jupiter:junit-jupiter-engine'
+
+
 	// https://mvnrepository.com/artifact/jakarta.validation/jakarta.validation-api
 	implementation 'jakarta.validation:jakarta.validation-api:3.1.1'
 }

src/main/java/com/booleanuk/Main.java

@@ -8,6 +8,7 @@
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.security.crypto.password.PasswordEncoder;
 
+import java.time.LocalDate;
 import java.util.HashSet;
 import java.util.Set;
 
@@ -32,6 +33,13 @@ public static void main(String[] args) {
 
     @Override
     public void run(String... args) {
+        // Create a cohort.
+        Cohort cohort;
+        if (!this.cohortRepository.existsById(1)) {
+            cohort = this.cohortRepository.save(new Cohort());
+        } else {
+            cohort = this.cohortRepository.findById(1).orElse(null);
+        }
         Role teacherRole;
         if (!this.roleRepository.existsByName(ERole.ROLE_TEACHER)) {
             teacherRole = this.roleRepository.save(new Role(ERole.ROLE_TEACHER));
@@ -51,49 +59,5 @@ public void run(String... args) {
         if (!this.roleRepository.existsByName(ERole.ROLE_ADMIN)) {
             this.roleRepository.save(new Role(ERole.ROLE_ADMIN));
         }
-        // Create a cohort.
-        Cohort cohort;
-        if (!this.cohortRepository.existsById(1)) {
-             cohort = this.cohortRepository.save(new Cohort());
-        } else {
-            cohort = this.cohortRepository.findById(1).orElse(null);
-        }
-        // Create some users
-        User studentUser;
-        if (!this.userRepository.existsById(1)) {
-            studentUser = new User("[email protected]", this.encoder.encode("Testpassword1!"), cohort);
-            studentUser.setRoles(studentRoles);
-            studentUser = this.userRepository.save(studentUser);
-        } else {
-            studentUser = this.userRepository.findById(1).orElse(null);
-        }
-        Profile studentProfile;
-        if (!this.profileRepository.existsById(1)) {
-            studentProfile = this.profileRepository.save(new Profile(studentUser, "Joe", "Bloggs", "Hello world!", "student1"));
-        } else {
-            studentProfile = this.profileRepository.findById(1).orElse(null);
-        }
-
-        User teacherUser;
-        if (!this.userRepository.existsById(2)) {
-            teacherUser = new User("[email protected]", this.encoder.encode("password"));
-            teacherUser.setRoles(teacherRoles);
-            teacherUser = this.userRepository.save(teacherUser);
-        } else {
-            teacherUser = this.userRepository.findById(2).orElse(null);
-        }
-        Profile teacherProfile;
-        if (!this.profileRepository.existsById(2)) {
-            teacherProfile = this.profileRepository.save(new Profile(teacherUser, "Rick", "Sanchez", "Hello there!", "teacher1"));
-        } else {
-            teacherProfile = this.profileRepository.findById(2).orElse(null);
-        }
-
-        if (!this.postRepository.existsById(1)) {
-            this.postRepository.save(new Post(studentUser, "My first post!"));
-        }
-        if (!this.postRepository.existsById(2)) {
-            this.postRepository.save(new Post(teacherUser, "Hello, students!"));
-        }
     }
 }

src/main/java/com/booleanuk/cohorts/controllers/AuthController.java

@@ -1,5 +1,23 @@
 package com.booleanuk.cohorts.controllers;
 
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+import org.springframework.security.authentication.AuthenticationManager;
+import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.security.crypto.password.PasswordEncoder;
+import org.springframework.web.bind.annotation.CrossOrigin;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
 import com.booleanuk.cohorts.models.ERole;
 import com.booleanuk.cohorts.models.Role;
 import com.booleanuk.cohorts.models.User;
@@ -12,21 +30,10 @@
 import com.booleanuk.cohorts.repository.UserRepository;
 import com.booleanuk.cohorts.security.jwt.JwtUtils;
 import com.booleanuk.cohorts.security.services.UserDetailsImpl;
-import jakarta.validation.Valid;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.ResponseEntity;
-import org.springframework.security.authentication.AuthenticationManager;
-import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
-import org.springframework.security.core.Authentication;
-import org.springframework.security.core.context.SecurityContextHolder;
-import org.springframework.security.crypto.password.PasswordEncoder;
-import org.springframework.web.bind.annotation.*;
 
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.stream.Collectors;
+import jakarta.validation.Valid;
 
+//fixed issue with login.
 @CrossOrigin(origins = "*", maxAge = 3600)
 @RestController
 @RequestMapping
@@ -69,6 +76,17 @@ public ResponseEntity<?> registerUser(@Valid @RequestBody SignupRequest signupRe
         if (userRepository.existsByEmail(signupRequest.getEmail())) {
             return ResponseEntity.badRequest().body(new MessageResponse("Error: Email is already in use!"));
         }
+
+
+        String emailRegex = "^\\w+([.-]?\\w+)*@\\w+([.-]?\\w+)*(\\.\\w{2,3})+$";
+        String passwordRegex = "^(?=.*[A-Z])(?=.*[0-9])(?=.*[#?!@$%^&-]).{8,}$";
+
+        if(!signupRequest.getEmail().matches(emailRegex))
+            return ResponseEntity.badRequest().body(new MessageResponse("Email is incorrectly formatted"));
+
+        if(!signupRequest.getPassword().matches(passwordRegex))
+            return  ResponseEntity.badRequest().body(new MessageResponse("Password is incorrectly formatted"));
+
         // Create a new user add salt here if using one
         User user = new User(signupRequest.getEmail(), encoder.encode(signupRequest.getPassword()));
         if (signupRequest.getCohort() != null) {