Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions auth-service/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,15 @@
<artifactId>jaxb-runtime</artifactId>
<version>2.3.2</version>
</dependency>
<!--<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-stream</artifactId>
</dependency>-->

<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-stream-kafka</artifactId>
</dependency>
</dependencies>

<dependencyManagement>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,17 @@
import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
import org.springframework.cloud.client.loadbalancer.LoadBalanced;
import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
import org.springframework.cloud.stream.annotation.EnableBinding;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.EnableMBeanExport;
import org.springframework.web.client.RestTemplate;

import java.util.Random;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.function.Consumer;
import java.util.function.Function;
import java.util.function.Supplier;

@SpringBootApplication
@EnableEurekaClient
public class AuthServiceApplication {
Expand All @@ -21,5 +29,4 @@ public static void main(String[] args) {
public RestTemplate restTemplate() {
return new RestTemplate();
}

}
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,11 @@
import com.javatab.authservice.domain.AuthRequest;
import com.javatab.authservice.domain.AuthResponse;
import com.javatab.authservice.domain.User;
import com.javatab.authservice.domain.UserEvent;
import com.javatab.authservice.security.JwtUserDetailService;
import com.javatab.authservice.services.UserService;
import lombok.RequiredArgsConstructor;
import org.springframework.cloud.stream.function.StreamBridge;
import org.springframework.web.bind.annotation.*;

@RestController
Expand All @@ -14,6 +16,9 @@ public class AuthController {

private final JwtUserDetailService userDetailService;
private final UserService userService;
private final StreamBridge streamBridge;

static final String USER_CREATED_OUTPUT = "userCreatedOutput";

@PostMapping("/login")
public AuthResponse login(@RequestBody AuthRequest request) throws Exception {
Expand All @@ -22,6 +27,10 @@ public AuthResponse login(@RequestBody AuthRequest request) throws Exception {

@PostMapping("/register")
public User registerNewUser(@RequestBody User user) {
return userService.createNewUser(user);
User newUser = userService.createNewUser(user);
UserEvent userEvent = UserEvent.builder().username(newUser.getUsername()).email(newUser.getEmail()).build();
boolean sent = streamBridge.send(USER_CREATED_OUTPUT, userEvent);
System.out.println("Message sent " + sent);
return newUser;
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
package com.javatab.authservice.domain;

import lombok.Builder;
import lombok.Data;

@Data
@Builder
public class UserEvent {
private String username;
private String email;
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.http.HttpHeaders;
import org.springframework.security.authentication.AuthenticationManager;
import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
Expand Down Expand Up @@ -34,7 +35,7 @@ protected void configure(HttpSecurity http) throws Exception {
http.csrf().disable()
.authorizeRequests()
.antMatchers("/register", "/login").permitAll()
//.antMatchers(HttpHeaders.ALLOW).permitAll()
.antMatchers(HttpHeaders.ALLOW).permitAll()
.anyRequest().authenticated()
.and()
.exceptionHandling().authenticationEntryPoint(jwtAuthenticationEntityPoint)
Expand Down
16 changes: 16 additions & 0 deletions auth-service/src/main/resources/application.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,22 @@ spring:
enabled: true
service-id: config-server

#function:
# defination: userCreatedOutput
stream:
#kafka:
# binder:
# brokers: 192.168.1.8
# defaultBrokerPort: 9092
bindings:
userCreatedOutput-out-0:
destination: userCreatedOutput
#binder: kafka
#group: group
#consumer:
# concurrency: 10
# max-attempts: 3

datasource:
url: jdbc:postgresql://localhost:5432/testdb
username: postgres
Expand Down
39 changes: 39 additions & 0 deletions docker/docker-compose-kafka.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
version: '3.8'
services:
zookeeper:
image: wurstmeister/zookeeper:latest
ports:
- "2181:2181"
networks:
backend:
aliases:
- "zookeeper"
kafkaserver:
image: wurstmeister/kafka:latest
ports:
- "9092:9092"
environment:
- KAFKA_ADVERTISED_HOST_NAME=192.168.1.8
- KAFKA_ADVERTISED_PORT=9092
- KAFKA_ZOOKEEPER_CONNECT=zookeeper:2181
- KAFKA_CREATE_TOPICS=users:1:1,students:1:1,userCreatedOutput:1:1
volumes:
- "/var/run/docker.sock:/var/run/docker.sock"
depends_on:
- zookeeper
networks:
backend:
aliases:
- "kafka"

networks:
backend:
driver: bridge
# redisserver:
# image: redis:alpine
# ports:
# - 6379:6379
# networks:
# backend:
# aliases:
# - "redis"
14 changes: 14 additions & 0 deletions docker/docker-compose-redis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
version: "3.8"
services:
redisserver:
image: redis:alpine
ports:
- "6379:6379"
networks:
backend:
aliases:
- "redis"

networks:
backend:
driver: bridge
2 changes: 1 addition & 1 deletion docker/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: '3.8' # Migrate to version 3
version: '3.8'
services:
discoveryservice:
image: javatab/discovery-service:1.0.0
Expand Down
9 changes: 9 additions & 0 deletions student-service/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,15 @@
</exclusion>
</exclusions>
</dependency>
<!--<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-stream</artifactId>
</dependency>-->

<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-stream-kafka</artifactId>
</dependency>
</dependencies>

<dependencyManagement>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
package com.javatab.student;

import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;

import java.util.function.Consumer;

@Configuration
public class MessageFunctionConfiguration {

@Bean
Consumer<UserEvent> getNewlyCreatedUser() {
return userEvent -> System.out.println("New created user " + userEvent);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,9 @@
@Data
@Document(collection = "users")
public class Student {


@JsonSerialize(using = ToStringSerializer.class)
private ObjectId id;
private String username;
private String email;
private String password;
private String role;

}
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@
import org.springframework.context.annotation.Bean;
import org.springframework.web.client.RestTemplate;

import java.util.function.Consumer;
import java.util.function.Function;

@SpringBootApplication
public class StudentServiceApplication {

Expand Down
11 changes: 11 additions & 0 deletions student-service/src/main/java/com/javatab/student/UserEvent.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
package com.javatab.student;

import lombok.Builder;
import lombok.Data;

@Data
@Builder
public class UserEvent {
private String username;
private String email;
}
12 changes: 12 additions & 0 deletions student-service/src/main/resources/application.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,18 @@ spring:
discovery:
enabled: true
service-id: config-server

stream:
# kafka:
# binder:
# brokers: 192.168.1.8
#function:
# defination: getNewlyCreatedUser
bindings:
getNewlyCreatedUser-in-0:
destination: userCreatedOutput
#binder: kafka
group: mygroup
data:
mongodb:
host: localhost
Expand Down