Changeset ae83647

Timestamp:

06/26/26 16:32:12 (42 hours ago)

Author:

veronika-ils <ilioskaveronika@…>

Branches:

master

Parents:

fa32d0f

Message:

add functionality so that users can change passwords

Files:

• petify-backend/pom.xml (modified) (1 diff)
• petify-backend/src/main/java/com/petify/petify/api/AdminClinicApplicationsController.java (modified) (3 diffs)
• petify-backend/src/main/java/com/petify/petify/api/AuthController.java (modified) (2 diffs)
• petify-backend/src/main/java/com/petify/petify/dto/ChangePasswordRequest.java (added)
• petify-backend/src/main/java/com/petify/petify/dto/ForgotPasswordRequest.java (added)
• petify-backend/src/main/java/com/petify/petify/repo/VetClinicRepository.java (modified) (1 diff)
• petify-backend/src/main/java/com/petify/petify/service/AuthService.java (modified) (5 diffs)
• petify-backend/src/main/java/com/petify/petify/service/ClinicApprovalService.java (added)
• petify-backend/src/main/java/com/petify/petify/service/ClinicCredentialsEmailService.java (added)
• petify-backend/src/main/resources/application.properties (modified) (1 diff)
• petify-frontend/src/api/auth.ts (modified) (2 diffs)
• petify-frontend/src/views/LoginView.vue (modified) (9 diffs)
• petify-frontend/src/views/ProfileView.vue (modified) (5 diffs)

petify-backend/pom.xml

@@ -46 +46 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-webmvc</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-mail</artifactId>
         </dependency>
 

petify-backend/src/main/java/com/petify/petify/api/AdminClinicApplicationsController.java

@@ -1 +1 @@
 package com.petify.petify.api;
 
-import com.petify.petify.domain.VetClinic;
 import com.petify.petify.domain.VetClinicApplication;
 import com.petify.petify.dto.VetClinicApplicationDTO;
 import com.petify.petify.repo.AdminRepository;
 import com.petify.petify.repo.VetClinicApplicationRepository;
-import com.petify.petify.repo.VetClinicRepository;
+import com.petify.petify.service.ClinicApprovalService;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -20 +19 @@
 
     private final VetClinicApplicationRepository applicationRepository;
-    private final VetClinicRepository clinicRepository;
     private final AdminRepository adminRepository;
+    private final ClinicApprovalService clinicApprovalService;
 
     public AdminClinicApplicationsController(VetClinicApplicationRepository applicationRepository,
-                                             VetClinicRepository clinicRepository,
-                                             AdminRepository adminRepository) {
+                                             AdminRepository adminRepository,
+                                             ClinicApprovalService clinicApprovalService) {
         this.applicationRepository = applicationRepository;
-        this.clinicRepository = clinicRepository;
         this.adminRepository = adminRepository;
+        this.clinicApprovalService = clinicApprovalService;
     }
 
@@ -56 +55 @@
                         .body(Map.of("error", "Admin access required"));
             }
-            VetClinicApplication application = applicationRepository.findById(applicationId)
-                .orElseThrow(() -> new RuntimeException("Application not found"));
-
-            application.setStatus("APPROVED");
-            application.setReviewedAt(LocalDateTime.now());
-            application.setReviewedBy(adminUserId);
-            application.setDenialReason(null);
-            VetClinicApplication saved = applicationRepository.save(application);
-
-            boolean clinicExists = clinicRepository.findAll().stream()
-                .anyMatch(clinic -> applicationId.equals(clinic.getApplicationId()));
-            if (!clinicExists) {
-                VetClinic clinic = new VetClinic();
-                clinic.setApplicationId(application.getApplicationId());
-                clinic.setName(application.getName());
-                clinic.setEmail(application.getEmail());
-                clinic.setPhone(application.getPhone());
-                clinic.setCity(application.getCity());
-                clinic.setAddress(application.getAddress());
-                clinicRepository.save(clinic);
-            }
+            VetClinicApplication saved = clinicApprovalService.approveApplication(applicationId, adminUserId);
 
             return ResponseEntity.ok(new VetClinicApplicationDTO(saved));

petify-backend/src/main/java/com/petify/petify/api/AuthController.java

@@ -2 +2 @@
 
 import com.petify.petify.dto.AuthResponse;
+import com.petify.petify.dto.ChangePasswordRequest;
+import com.petify.petify.dto.ForgotPasswordRequest;
 import com.petify.petify.dto.LoginRequest;
 import com.petify.petify.dto.SignUpRequest;
@@ -47 +49 @@
     }
 
+    @PostMapping("/change-password")
+    public ResponseEntity<?> changePassword(@RequestBody ChangePasswordRequest request) {
+        try {
+            authService.changePassword(request.getUserId(), request.getCurrentPassword(), request.getNewPassword());
+            return ResponseEntity.ok(Map.of("message", "Password changed successfully"));
+        } catch (RuntimeException e) {
+            return ResponseEntity.badRequest()
+                    .body(Map.of("message", e.getMessage()));
+        }
+    }
+
+    @PostMapping("/forgot-password")
+    public ResponseEntity<?> forgotPassword(@RequestBody ForgotPasswordRequest request) {
+        try {
+            authService.sendForgotPasswordEmail(request.getIdentifier());
+            return ResponseEntity.ok(Map.of("message", "If an account matches that username or email, a temporary password has been sent."));
+        } catch (RuntimeException e) {
+            return ResponseEntity.badRequest()
+                    .body(Map.of("message", e.getMessage()));
+        }
+    }
+
 
     @GetMapping("/users")

petify-backend/src/main/java/com/petify/petify/repo/VetClinicRepository.java

@@ -10 +10 @@
 public interface VetClinicRepository extends JpaRepository<VetClinic, Long> {
     java.util.List<VetClinic> findAllByOrderByNameAsc();
+    Optional<VetClinic> findByApplicationId(Long applicationId);
     Optional<VetClinic> findByUserId(Long userId);
     boolean existsByUserId(Long userId);

petify-backend/src/main/java/com/petify/petify/service/AuthService.java

@@ -22 +22 @@
 import org.springframework.transaction.annotation.Transactional;
 
+import java.security.SecureRandom;
 import java.time.LocalDateTime;
 import java.util.List;
@@ -31 +32 @@
 
     private static final Logger logger = LoggerFactory.getLogger(AuthService.class);
+    private static final String PASSWORD_CHARS = "ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz23456789!@#$%";
+    private static final SecureRandom SECURE_RANDOM = new SecureRandom();
 
     private final UserRepository userRepository;
@@ -39 +42 @@
     private final AnalyticsRepository analyticsRepository;
     private final VetClinicRepository vetClinicRepository;
+    private final ClinicCredentialsEmailService credentialsEmailService;
 
     public AuthService(UserRepository userRepository, ClientRepository clientRepository,
                       OwnerRepository ownerRepository, AdminRepository adminRepository,
                       PasswordEncoder passwordEncoder, AnalyticsRepository analyticsRepository,
-                      VetClinicRepository vetClinicRepository) {
+                      VetClinicRepository vetClinicRepository,
+                      ClinicCredentialsEmailService credentialsEmailService) {
         this.userRepository = userRepository;
         this.clientRepository = clientRepository;
@@ -51 +56 @@
         this.analyticsRepository = analyticsRepository;
         this.vetClinicRepository = vetClinicRepository;
+        this.credentialsEmailService = credentialsEmailService;
     }
 
@@ -177 +183 @@
             isVerified
         );
+    }
+
+    @Transactional
+    public void changePassword(Long userId, String currentPassword, String newPassword) {
+        if (userId == null) {
+            throw new RuntimeException("User is required");
+        }
+        if (currentPassword == null || currentPassword.isBlank()) {
+            throw new RuntimeException("Current password is required");
+        }
+        if (newPassword == null || newPassword.isBlank()) {
+            throw new RuntimeException("New password is required");
+        }
+        if (newPassword.length() < 8) {
+            throw new RuntimeException("New password must be at least 8 characters long");
+        }
+        if (newPassword.equals(currentPassword)) {
+            throw new RuntimeException("New password must be different from the current password");
+        }
+
+        User user = userRepository.findById(userId)
+            .orElseThrow(() -> new RuntimeException("User not found"));
+
+        boolean passwordMatches = passwordEncoder.matches(currentPassword, user.getPassword());
+        if (!passwordMatches && !currentPassword.equals(user.getPassword())) {
+            throw new RuntimeException("Current password is incorrect");
+        }
+
+        user.setPassword(passwordEncoder.encode(newPassword));
+        userRepository.save(user);
+        logger.info("Password changed successfully for user: {}", user.getUsername());
+    }
+
+    @Transactional
+    public void sendForgotPasswordEmail(String identifier) {
+        if (identifier == null || identifier.isBlank()) {
+            throw new RuntimeException("Username or email is required");
+        }
+
+        Optional<User> user = userRepository.findByUsernameOrEmail(identifier.trim(), identifier.trim());
+        if (user.isEmpty()) {
+            logger.info("Password reset requested for unknown identifier: {}", identifier);
+            return;
+        }
+
+        User foundUser = user.get();
+        String temporaryPassword = generateTemporaryPassword();
+        foundUser.setPassword(passwordEncoder.encode(temporaryPassword));
+        userRepository.save(foundUser);
+
+        credentialsEmailService.sendTemporaryPassword(
+            foundUser.getEmail(),
+            foundUser.getFirstName(),
+            foundUser.getUsername(),
+            temporaryPassword
+        );
+        logger.info("Temporary password sent for user: {}", foundUser.getUsername());
+    }
+
+    private String generateTemporaryPassword() {
+        StringBuilder password = new StringBuilder();
+        for (int i = 0; i < 14; i++) {
+            password.append(PASSWORD_CHARS.charAt(SECURE_RANDOM.nextInt(PASSWORD_CHARS.length())));
+        }
+        return password.toString();
     }
 

petify-backend/src/main/resources/application.properties

@@ -33 +33 @@
 spring.flyway.baseline-version=0
 
+# Mail
+spring.mail.host=${MAIL_HOST:smtp.gmail.com}
+spring.mail.port=${MAIL_PORT:587}
+spring.mail.username=${MAIL_USERNAME:}
+spring.mail.password=${MAIL_PASSWORD:}
+spring.mail.properties.mail.smtp.auth=true
+spring.mail.properties.mail.smtp.starttls.enable=true
+spring.mail.properties.mail.smtp.starttls.required=true
+management.health.mail.enabled=false
+
 spring.profiles.active=local
-spring.config.import=optional:file:.env.properties
+spring.config.import=optional:file:.env.properties,optional:file:petify-backend/.env.properties
 
 

petify-frontend/src/api/auth.ts

@@ -24 +24 @@
   }
   message?: string
+}
+
+export interface ChangePasswordRequest {
+  userId: number
+  currentPassword: string
+  newPassword: string
+}
+
+export interface ForgotPasswordRequest {
+  identifier: string
 }
 
@@ -141 +151 @@
   return { message: data.message || "Registration successful" }
 }
+
+export async function changePassword(payload: ChangePasswordRequest, options?: { signal?: AbortSignal }): Promise<void> {
+  await postJson<{ message?: string }>('/api/auth/change-password', payload, options)
+}
+
+export async function forgotPassword(payload: ForgotPasswordRequest, options?: { signal?: AbortSignal }): Promise<string> {
+  const data = await postJson<{ message?: string }>('/api/auth/forgot-password', payload, options)
+  return data.message || 'If an account matches that username or email, a temporary password has been sent.'
+}

petify-frontend/src/views/LoginView.vue

@@ -29 +29 @@
         <div v-if="error" class="alert alert-danger auth-alert" role="alert">
           <strong class="me-1">Oops.</strong>{{ error }}
+        </div>
+        <div v-if="forgotSuccess" class="alert alert-success auth-alert" role="alert">
+          {{ forgotSuccess }}
         </div>
 
@@ -113 +116 @@
           <!-- Remember me -->
           <div class="d-flex justify-content-between align-items-center mt-2 mb-3">
-
-
-            <!-- enable later if you implement route -->
-            <!-- <RouterLink class="link small accent" to="/forgot">Forgot password?</RouterLink> -->
+            <span></span>
+            <button class="link-button small accent" type="button" @click="toggleForgotPassword">
+              Forgot password?
+            </button>
           </div>
 
@@ -123 +126 @@
             <span v-if="loading" class="spinner-border spinner-border-sm me-2" aria-hidden="true"></span>
             {{ loading ? 'Logging in…' : 'Log in' }}
+          </button>
+        </form>
+
+        <form v-if="showForgotPassword" class="forgot-panel mt-4" @submit.prevent="submitForgotPassword">
+          <label class="form-label" for="forgot-identifier">Username or email</label>
+          <div class="input-group auth-input">
+            <span class="input-group-text">
+              <svg width="18" height="18" viewBox="0 0 24 24" fill="none">
+                <path
+                  d="M4 6.5A2.5 2.5 0 0 1 6.5 4h11A2.5 2.5 0 0 1 20 6.5v11a2.5 2.5 0 0 1-2.5 2.5h-11A2.5 2.5 0 0 1 4 17.5v-11Zm2.5-.5a.5.5 0 0 0-.5.5v.8l6 3.7 6-3.7v-.8a.5.5 0 0 0-.5-.5h-11Zm11.5 3.6-5.5 3.4a1 1 0 0 1-1 0L6 9.6v7.9a.5.5 0 0 0 .5.5h11a.5.5 0 0 0 .5-.5V9.6Z"
+                  fill="currentColor"
+                  opacity=".85"
+                />
+              </svg>
+            </span>
+            <input
+              id="forgot-identifier"
+              v-model.trim="forgotIdentifier"
+              class="form-control"
+              type="text"
+              autocomplete="username"
+              required
+              placeholder="username or email"
+            />
+          </div>
+          <div v-if="forgotError" class="text-danger small mt-2">{{ forgotError }}</div>
+          <button class="btn btn-outline-primary w-100 mt-3" type="submit" :disabled="forgotLoading">
+            <span v-if="forgotLoading" class="spinner-border spinner-border-sm me-2" aria-hidden="true"></span>
+            {{ forgotLoading ? 'Sending...' : 'Send temporary password' }}
           </button>
         </form>
@@ -144 +176 @@
 import { useRoute, useRouter } from 'vue-router'
 import { useAuthStore } from '../stores/auth'
+import { forgotPassword } from '../api/auth'
 
 const auth = useAuthStore()
@@ -153 +186 @@
 const loading = ref(false)
 const error = ref<string | null>(null)
+const forgotLoading = ref(false)
+const forgotError = ref<string | null>(null)
+const forgotSuccess = ref<string | null>(null)
+const showForgotPassword = ref(false)
+const forgotIdentifier = ref('')
 
 const showPassword = ref(false)
@@ -159 +197 @@
 function togglePassword() {
   showPassword.value = !showPassword.value
+}
+
+function toggleForgotPassword() {
+  showForgotPassword.value = !showForgotPassword.value
+  forgotError.value = null
+  forgotSuccess.value = null
+  if (showForgotPassword.value && !forgotIdentifier.value) {
+    forgotIdentifier.value = username.value
+  }
 }
 
@@ -175 +222 @@
   } finally {
     loading.value = false
+  }
+}
+
+async function submitForgotPassword() {
+  forgotError.value = null
+  forgotSuccess.value = null
+  forgotLoading.value = true
+  try {
+    forgotSuccess.value = await forgotPassword({ identifier: forgotIdentifier.value })
+    showForgotPassword.value = false
+  } catch (e) {
+    forgotError.value = e instanceof Error ? e.message : String(e)
+  } finally {
+    forgotLoading.value = false
   }
 }
@@ -276 +337 @@
 }
 
+.forgot-panel {
+  border-top: 1px solid rgba(31, 41, 55, 0.1);
+  padding-top: 1rem;
+}
+
 /* Input styling */
 .auth-input .input-group-text {
@@ -371 +437 @@
 }
 
+.link-button {
+  border: 0;
+  background: transparent;
+  padding: 0;
+  text-decoration: none;
+}
+
+.link-button.accent {
+  color: #ff7a18;
+  font-weight: 600;
+}
+
+.link-button.accent:hover {
+  color: #e76610;
+}
+
 /* Respect reduced motion */
 @media (prefers-reduced-motion: reduce) {

petify-frontend/src/views/ProfileView.vue

@@ -94 +94 @@
               </button>
             </li>
+            <li class="nav-item" role="presentation">
+              <button
+                class="nav-link"
+                :class="{ active: activeTab === 'account' }"
+                @click="activeTab = 'account'"
+                type="button"
+                role="tab"
+              >
+                <i class="bi bi-shield-lock-fill"></i> Account
+              </button>
+            </li>
           </ul>
+
+          <!-- Account Tab -->
+          <div v-if="activeTab === 'account'" class="tab-content-section">
+            <h2 class="section-title">Account</h2>
+            <form class="password-form" @submit.prevent="submitPasswordChange">
+              <div v-if="passwordSuccess" class="alert alert-success" role="alert">
+                {{ passwordSuccess }}
+              </div>
+              <div v-if="passwordError" class="alert alert-danger" role="alert">
+                {{ passwordError }}
+              </div>
+
+              <div class="mb-3">
+                <label class="form-label" for="current-password">Current password</label>
+                <input
+                  id="current-password"
+                  v-model="passwordForm.currentPassword"
+                  class="form-control"
+                  type="password"
+                  autocomplete="current-password"
+                  required
+                />
+              </div>
+
+              <div class="mb-3">
+                <label class="form-label" for="new-password">New password</label>
+                <input
+                  id="new-password"
+                  v-model="passwordForm.newPassword"
+                  class="form-control"
+                  type="password"
+                  autocomplete="new-password"
+                  minlength="8"
+                  required
+                />
+              </div>
+
+              <div class="mb-4">
+                <label class="form-label" for="confirm-new-password">Confirm new password</label>
+                <input
+                  id="confirm-new-password"
+                  v-model="passwordForm.confirmPassword"
+                  class="form-control"
+                  type="password"
+                  autocomplete="new-password"
+                  minlength="8"
+                  required
+                />
+              </div>
+
+              <button class="btn btn-primary" type="submit" :disabled="isPasswordSubmitting">
+                <span v-if="isPasswordSubmitting" class="spinner-border spinner-border-sm me-2" aria-hidden="true"></span>
+                {{ isPasswordSubmitting ? 'Changing...' : 'Change password' }}
+              </button>
+            </form>
+          </div>
 
           <!-- Listings Tab -->
@@ -746 +813 @@
   type Review,
 } from '../api/reviews'
+import { changePassword } from '../api/auth'
 
 const router = useRouter()
 const auth = useAuthStore()
 
-const activeTab = ref<'listings' | 'pets' | 'create-listing' | 'favorites' | 'appointments'>('listings')
+const activeTab = ref<'listings' | 'pets' | 'create-listing' | 'favorites' | 'appointments' | 'account'>('listings')
 const listings = ref<any[]>([])
 const pets = ref<any[]>([])
@@ -782 +850 @@
 const petPhotoFile = ref<File | null>(null)
 const petPhotoPreview = ref('')
+const isPasswordSubmitting = ref(false)
+const passwordError = ref('')
+const passwordSuccess = ref('')
+
+const passwordForm = ref({
+  currentPassword: '',
+  newPassword: '',
+  confirmPassword: '',
+})
 
 const newListing = ref({
@@ -859 +936 @@
   // Fall back to petNameMap (from pets list)
   return petNameMap.value[animalId] || 'Unknown Pet'
+}
+
+async function submitPasswordChange() {
+  passwordError.value = ''
+  passwordSuccess.value = ''
+
+  if (!auth.user?.userId) {
+    passwordError.value = 'You need to be logged in to change your password.'
+    return
+  }
+  if (passwordForm.value.newPassword.length < 8) {
+    passwordError.value = 'New password must be at least 8 characters long.'
+    return
+  }
+  if (passwordForm.value.newPassword !== passwordForm.value.confirmPassword) {
+    passwordError.value = 'New passwords do not match.'
+    return
+  }
+
+  isPasswordSubmitting.value = true
+  try {
+    await changePassword({
+      userId: auth.user.userId,
+      currentPassword: passwordForm.value.currentPassword,
+      newPassword: passwordForm.value.newPassword,
+    })
+    passwordForm.value = {
+      currentPassword: '',
+      newPassword: '',
+      confirmPassword: '',
+    }
+    passwordSuccess.value = 'Password changed successfully.'
+  } catch (error: any) {
+    passwordError.value = error?.message || 'Failed to change password.'
+  } finally {
+    isPasswordSubmitting.value = false
+  }
 }
 
@@ -1670 +1784 @@
 }
 
+.password-form {
+  max-width: 520px;
+}
+
 @keyframes fadeIn {
   from {