auth changes

README.md

@@ -51,3 +51,16 @@ Execute the following command to run the application. This will create 2 contain
 
 Execute the following command to destroy the above 2 containers in the private network:
 > **docker compose down**
+
+<hr/>
+
+**Executing mandatory index scripts**
+
+Before using the application, make sure to execute following index scripts. This is necessary for the search feature to work.
+
+	FT.CREATE idx-status ON JSON SCHEMA $.status as status TAG
+	FT.CREATE idx-aptDate ON JSON SCHEMA $.appointmentDateTime as appointmentDateTime NUMERIC SORTABLE
+	FT.CREATE idx-desc ON JSON SCHEMA $.description as description TEXT
+	FT.CREATE idx-createdTime ON JSON SCHEMA $.createdTime as createdTime NUMERIC SORTABLE
+
+

docker-compose.yaml

@@ -1,25 +1,27 @@
 version: "3.9"
 services:
   web:
-    image: "abhishekcoder/appointment-directory"
+    image: "abhishekcoder/appointment-directory:latest"
     networks: 
       - web-network
     environment:
      - SPRING_REDIS_HOST=redis
      - SPRING_REDIS_PORT=6379
-     - SPRING_REDIS_PASSWORD="e9gydixtEWqN4tYKgRnhUXysXADYJzZ9"
+     - SPRING_REDIS_PASSWORD="wUJjKN6j9VdVoWYPDKN8Zp910zeP9vWn"
+     - SPRING_REDIS_AUTH=false
     depends_on:
       - redis
     build: .
     ports:
       - "8080:8080"
   redis:
-    image: "redis"
+    image: "redis/redis-stack:latest"
     networks: 
       - web-network
     restart: always
     ports:
       - "6377:6379"
+      - "8001:8001"
 networks:
   web-network:
     driver: bridge

src/main/java/com/bestarch/demo/config/RedisConfiguration.java

@@ -26,7 +26,6 @@
 import org.springframework.data.redis.stream.Subscription;
 
 import com.bestarch.demo.domain.AppointmentRequestStream;
-//import com.redislabs.modules.rejson.JReJSON;
 import com.redislabs.modules.rejson.JReJSON;
 
 import redis.clients.jedis.DefaultJedisClientConfig;
@@ -49,22 +48,30 @@ class RedisConfiguration {
 	@Value("${spring.redis.password}")
 	private String pswd;
 
+	@Value("${spring.redis.auth}")
+	private boolean requiresPswd;
+
 	@Autowired
     private StreamListener<String, ObjectRecord<String, AppointmentRequestStream>> streamListener;
 
 	@Bean
 	public RedisConnectionFactory redisConnectionFactory() {
 		RedisStandaloneConfiguration redisStandaloneConfiguration = new RedisStandaloneConfiguration(server, Integer.valueOf(port));
-		RedisPassword rp = RedisPassword.of(pswd);
-		redisStandaloneConfiguration.setPassword(rp);
+		if (requiresPswd) {
+			RedisPassword rp = RedisPassword.of(pswd);
+			redisStandaloneConfiguration.setPassword(rp);
+		}
 		return new LettuceConnectionFactory(redisStandaloneConfiguration);
 	}
 
 
 	@Bean
 	public JReJSON jreJSON() {
 		HostAndPort hostAndPort = new HostAndPort(server, Integer.valueOf(port));
-		JedisClientConfig jedisClientConfig = DefaultJedisClientConfig.builder().password(pswd).build();
+		JedisClientConfig jedisClientConfig = DefaultJedisClientConfig.builder().build();
+		if (requiresPswd) {
+			jedisClientConfig.updatePassword(pswd);
+		}
 		Jedis jedis = new Jedis(hostAndPort, jedisClientConfig);
 		JReJSON jreJSON = new JReJSON(jedis);
 		return jreJSON;

src/main/resources/application.yml

@@ -8,6 +8,7 @@ spring:
     host: redis-10209.c100.us-east-1-4.ec2.cloud.redislabs.com
     port: 10209
     password: wUJjKN6j9VdVoWYPDKN8Zp910zeP9vWn
+    auth: true
   main:
     allow-circular-references: true
 

src/main/resources/script.txt

@@ -10,7 +10,7 @@ Data Model:
   "doctorName": "Dr. ABC",
   "contactNo": "12321",
   "appointmentDate": "2022-04-11T20:58",
-  "status": "Approved",
+  "status": "Confirmed",
   "description": "fweferferererre",
   "createdTime": "2022-04-19T20:58:21.748",
   "appointmentId": "ID2772",