Workaround, refresh page on 403 error in profile and search. Update S…

…pring.
Alovoa · Oct 29, 2021 · dac792e · dac792e
1 parent 3088c71
commit dac792e
Show file tree

Hide file tree

Showing 5 changed files with 67 additions and 4 deletions.
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.5.3</version>
+		<version>2.5.6</version>
 		<relativePath />
 	</parent>
 	<groupId>com.alovoa</groupId>

diff --git a/src/main/java/com/nonononoki/alovoa/service/CaptchaService.java b/src/main/java/com/nonononoki/alovoa/service/CaptchaService.java
@@ -44,7 +44,8 @@ public class CaptchaService {
 
 	public Captcha generate() throws NoSuchAlgorithmException, IOException {
 
-		Captcha oldCaptcha = captchaRepo.findByHashCode(getIpHash(request.getRemoteAddr()));
+		String ipHash = getIpHash(request.getRemoteAddr());
+		Captcha oldCaptcha = captchaRepo.findByHashCode(ipHash);
 		if (oldCaptcha != null) {
 			captchaRepo.delete(oldCaptcha);
 			captchaRepo.flush();
@@ -59,7 +60,7 @@ public Captcha generate() throws NoSuchAlgorithmException, IOException {
 		captcha.setDate(new Date());
 		captcha.setImage(encoded);
 		captcha.setText(ox.getText());
-		captcha.setHashCode(getIpHash(request.getRemoteAddr()));
+		captcha.setHashCode(ipHash);
 		captcha = captchaRepo.saveAndFlush(captcha);
 		return captcha;
 	}

diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
@@ -32,7 +32,8 @@ spring.security.oauth2.client.registration.google.scope[1]=profile
 spring.security.oauth2.client.registration.facebook.scope[0]=email
 spring.security.oauth2.client.registration.facebook.scope[1]=public_profile
 
-server.servlet.session.timeout=24h
+server.servlet.session.timeout=1h
+server.servlet.session.cookie.max-age=1h
 
 spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQL5InnoDBDialect
 spring.jpa.database-platform=org.hibernate.dialect.MySQL5InnoDBDialect

diff --git a/src/main/resources/static/js/profile.js b/src/main/resources/static/js/profile.js
@@ -66,6 +66,9 @@ $(function() {
 						console.log(e);
 						hideLoader();
 						alert(getGenericErrorText());
+						if(e.status == 403) {
+							location.reload();
+						}
 					}
 				});
 			}
@@ -97,6 +100,10 @@ $(function() {
 						console.log(e);
 						hideLoader();
 						alert(getGenericErrorText());
+						if(e.status == 403) {
+							location.reload();
+						}
+
 					}
 				});
 			}
@@ -136,6 +143,9 @@ $(function() {
 						error: function(e) {
 							console.log(e);
 							alert(getGenericErrorText());
+							if(e.status == 403) {
+								location.reload();
+							}
 						}
 					});
 				}, timeoutDescription);
@@ -186,6 +196,9 @@ $(function() {
 				error: function(e) {
 					console.log(e);
 					alert(getGenericErrorText());
+					if(e.status == 403) {
+						location.reload();
+					}
 				}
 			});
 		}
@@ -211,6 +224,9 @@ $(function() {
 				error: function(e) {
 					console.log(e);
 					alert(getGenericErrorText());
+					if(e.status == 403) {
+						location.reload();
+					}
 				}
 			});
 		}
@@ -240,6 +256,9 @@ $(function() {
 				error: function(e) {
 					console.log(e);
 					alert(getGenericErrorText());
+					if(e.status == 403) {
+						location.reload();
+					}
 				}
 			});
 		}
@@ -262,6 +281,9 @@ $(function() {
 			error: function() {
 				console.log(e);
 				alert(getGenericErrorText());
+				if(e.status == 403) {
+					location.reload();
+				}
 			}
 		});
 	});
@@ -282,6 +304,9 @@ $(function() {
 			error: function(e) {
 				console.log(e);
 				alert(getGenericErrorText());
+				if(e.status == 403) {
+					location.reload();
+				}
 			}
 		});
 	});
@@ -301,6 +326,9 @@ $(function() {
 			error: function(e) {
 				console.log(e);
 				alert(getGenericErrorText());
+				if(e.status == 403) {
+					location.reload();
+				}
 			}
 		});
 	});
@@ -338,6 +366,9 @@ $(function() {
 						console.log(e);
 						hideLoader();
 						alert(getGenericErrorText());
+						if(e.status == 403) {
+							location.reload();
+						}
 					}
 				});
 			}
@@ -359,6 +390,9 @@ function deleteAudio() {
 			error: function(e) {
 				console.log(e);
 				alert(getGenericErrorText());
+				if(e.status == 403) {
+					location.reload();
+				}
 			}
 		});
 	}
@@ -377,6 +411,9 @@ function deleteInterest(id) {
 		error: function(e) {
 			console.log(e);
 			alert(getGenericErrorText());
+			if(e.status == 403) {
+				location.reload();
+			}
 		}
 	});
 }
@@ -395,6 +432,9 @@ function deleteImage(id) {
 			error: function(e) {
 				console.log(e);
 				alert(getGenericErrorText());
+				if(e.status == 403) {
+					location.reload();
+				}
 			}
 		});
 	}
@@ -413,6 +453,9 @@ function updateAccentColor(color) {
 		error: function(e) {
 			console.log(e);
 			alert(getGenericErrorText());
+			if(e.status == 403) {
+				location.reload();
+			}
 		}
 	});
 }
@@ -431,6 +474,9 @@ function updateUiDesign() {
 		error: function(e) {
 			console.log(e);
 			alert(getGenericErrorText());
+			if(e.status == 403) {
+				location.reload();
+			}
 		}
 	});
 }
@@ -449,6 +495,9 @@ function updateShowZodiac() {
 		error: function(e) {
 			console.log(e);
 			alert(getGenericErrorText());
+			if(e.status == 403) {
+				location.reload();
+			}
 		}
 	});
 }
@@ -467,6 +516,9 @@ function updateUnits() {
 		error: function(e) {
 			console.log(e);
 			alert(getGenericErrorText());
+			if(e.status == 403) {
+				location.reload();
+			}
 		}
 	});
 }
@@ -522,6 +574,9 @@ function updateProfileWarning() {
 		error: function(e) {
 			console.log(e);
 			alert(getGenericErrorText());
+			if(e.status == 403) {
+				location.reload();
+			}
 		}
 	});
 

diff --git a/src/main/resources/static/js/search.js b/src/main/resources/static/js/search.js
@@ -147,6 +147,9 @@ function likeUser(idEnc) {
 			console.log(e);
 			hideProfileTile(idEnc);
 			alert(getGenericErrorText());
+			if(e.status == 403) {
+				location.reload();
+			}
 		}
 	});
 
@@ -166,6 +169,9 @@ function hideUser(idEnc) {
 			console.log(e);
 			hideProfileTile(idEnc);
 			alert(getGenericErrorText());
+			if(e.status == 403) {
+				location.reload();
+			}
 		}
 	});
 }