HW3

.gitignore

@@ -7,6 +7,8 @@
 *.env
 *.idea*
 *.vscode*
+*auth-data/*
+*ticket-data/*
 # Test binary, built with `go test -c`
 *.test
 

backend/auth-service/Dockerfile

@@ -0,0 +1,12 @@
+# syntax=docker/dockerfile:1
+
+FROM golang:1.19
+
+WORKDIR /
+
+COPY ./ ./
+RUN go mod download
+RUN chmod 0777 /run.sh
+
+
+ENTRYPOINT ["/run.sh"]

auth-service/config/cache.go → backend/auth-service/config/cache.go

@@ -6,6 +6,6 @@ var RedisClient *redis.Client
 
 func ConnectRedis() {
 	RedisClient = redis.NewClient(&redis.Options{
-		Addr: "localhost:6379",
+		Addr: "authRedis:6380",
 	})
 }

auth-service/grpc_server/auth/auth.go → backend/auth-service/grpc_server/auth/auth.go

@@ -105,6 +105,13 @@ func checkIfTokenHasBeenExpired(tokenData *TokenData) (error, *SignOutResponse,
 			Status: SignOutResponse_OK_201,
 		}, nil, true
 
+	}
+	if err != nil {
+		_, _, err := utils.CheckTokenIsNotUnAuthorized(tokenData.AccessToken)
+		if err != nil {
+			return err, nil, nil, false
+		}
+
 	}
 	return err, nil, nil, false
 }

auth-service/grpc_server/client.go → backend/auth-service/grpc_server/client.go

@@ -4,6 +4,7 @@ import (
 	authorization "awesomeProject/grpc_server/auth"
 	"context"
 	"google.golang.org/grpc"
+	"fmt"
 	"log"
 )
 
@@ -30,25 +31,5 @@ func main() {
 	if err != nil {
 		log.Printf("Could not sign up: %s", err)
 	}
-
-	signInData := authorization.SignInData{
-		PhoneNumber: "0933041sdf2310360",
-		Email:       "[email protected]",
-		Password:    "Ali is near 999",
-	}
-
-	res, err := c.SignIn(context.Background(), &signInData)
-	if err != nil {
-		log.Printf("Could not sign up: %s", err)
-	}
-	log.Println(res)
-	userInfoData := authorization.UserInfoData{
-		AccessToken:  string(res.AccessToken),
-		RefreshToken: string(res.RefreshToken),
-	}
-	res1, err1 := c.UserInfo(context.Background(), &userInfoData)
-	if err1 != nil {
-		log.Printf("Could not sign up: %s", err)
-	}
-	log.Println(res1)
+	fmt.Println("Fuck life")
 }

auth-service/grpc_server/server.go → backend/auth-service/grpc_server/server.go

@@ -16,11 +16,11 @@ func init() {
 }
 
 func main() {
-	lis, err := net.Listen("tcp", "localhost:50052")
+	lis, err := net.Listen("tcp", "0.0.0.0:50052")
 	if err != nil {
 		log.Fatal("Error running grpc_server!")
 	}
-
+    fmt.Println("HELLOO BABY")
 	s := authorization.Server{}
 	grpcServer := grpc.NewServer()
 

backend/auth-service/run.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+sleep 3
+echo "Running auth service..."
+
+exec go run ./grpc_server/server.go

auth-service/utils/jwt-utils.go → backend/auth-service/utils/jwt-utils.go

@@ -30,7 +30,7 @@ func GenerateOAuthToken(user models.User, secret string, expireTime time.Duratio
 func ExtractJwtToken(tokenString string, secret string) (jwt.MapClaims, models.User, error) {
 	var claims jwt.MapClaims
 
-	mapClaims, m, err := checkTokenIsNotUnAuthorized(tokenString)
+	mapClaims, m, err := CheckTokenIsNotUnAuthorized(tokenString)
 	if err != nil {
 		return mapClaims, m, err
 	}
@@ -59,7 +59,7 @@ func ExtractJwtToken(tokenString string, secret string) (jwt.MapClaims, models.U
 	return claims, user, nil
 }
 
-func checkTokenIsNotUnAuthorized(tokenString string) (jwt.MapClaims, models.User, error) {
+func CheckTokenIsNotUnAuthorized(tokenString string) (jwt.MapClaims, models.User, error) {
 	var unauthorized_toke models.UnauthorizedToken
 	config.DB.Where("token = ?", tokenString).First(&unauthorized_toke)
 	if unauthorized_toke.User_id != 0 {

backend/docker-compose.yml

@@ -6,6 +6,12 @@ services:
     expose:
       - "6379"
 
+  authRedis:
+    image: redis:6.2-alpine
+    command: --port 6380
+    expose:
+      - "6380"
+
   postgres:
     build:
       context: ./postgres
@@ -18,7 +24,31 @@ services:
       - POSTGRES_HOST_AUTH_METHOD=trust
     volumes:
       - ./postgres/csvs:/var/lib/postgresql/csvs
+      - ./ticket-data:/var/lib/postgresql/data
 
+  authdb:
+    image: postgres
+    expose:
+      - "5432"
+    environment:
+      - POSTGRES_USER=postgres
+      - POSTGRES_PASSWORD=postgres
+      - POSTGRES_DB=postgres
+    volumes:
+      - ./auth-service/sql/auth.sql:/docker-entrypoint-initdb.d/create_tables.sql
+      - ./auth-data:/var/lib/postgresql/data
+  auth:
+    build:
+      context: ./auth-service
+      dockerfile: Dockerfile
+    expose:
+      - "50052"
+    depends_on:
+      - authdb
+      - authRedis
+    links:
+      - authdb
+      - authRedis
   bank:
     build:
       context: ./bankService
@@ -46,13 +76,37 @@ services:
     build:
       context: ./server
       dockerfile: Dockerfile
+    expose:
+      - "8081"
+    depends_on:
+      - postgres
+      - ticket
+      - bank
+      - auth
+    links:
+      - postgres
+      - bank
+      - ticket
+      - auth
+  reverse-proxy:
+    restart: always
+    build:
+      context: ./reverse-proxy
+      dockerfile: Dockerfile
     ports:
-      - "8081:8081"
+        - "90:80"
     depends_on:
       - postgres
       - ticket
       - bank
+      - auth
     links:
       - postgres
       - bank
-      - ticket
+      - ticket
+      - auth
+
+networks:
+  default:
+    driver: bridge
+    name: flightservice

backend/reverse-proxy/Dockerfile

@@ -0,0 +1,2 @@
+FROM nginx
+COPY nginx.conf /etc/nginx/conf.d/default.conf

backend/reverse-proxy/nginx.conf

@@ -0,0 +1,10 @@
+server {
+    location / {
+        proxy_set_header Host $host;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Forwarded-Proto $scheme;
+
+        proxy_pass http://server:8081;
+    }
+}

backend/server/Dockerfile

@@ -2,7 +2,6 @@ FROM node:14
 WORKDIR /
 
 COPY . /
-RUN rm -rf node_modules
 RUN npm install
 RUN chmod 0777 /run.sh
 

backend/server/authHandler.js

@@ -2,6 +2,7 @@ const {auth_grpc} = require("./grpc_clients");
 
 
 module.exports = (req, res, next) => {
+    console.log("Looping in auth handler");
     if (!req.cookies.tokens) {
         return res.status(401).json({ok: false, data: req.cookies})
     }

backend/server/authRoutes.js

@@ -6,6 +6,7 @@ const {ticket_grpc, auth_grpc} = require("./grpc_clients");
 const authHandler = require("./authHandler");
 
 router.post("/signup/", (req, res) => {
+    // console.log(auth_grpc.Signup);
     auth_grpc.Signup({
         email: req.body.email,
         first_name: req.body.first_name,
@@ -25,7 +26,7 @@ router.post("/signup/", (req, res) => {
 });
 
 
-router.get("/signin/", (req, res) => {
+router.post("/signin/", (req, res) => {
     auth_grpc.SignIn({
         email: req.body.email,
         phone_number: req.body.phone_number,
@@ -42,7 +43,7 @@ router.get("/signin/", (req, res) => {
 });
 
 
-router.get("/signout/", (req, res) => {
+router.post("/signout/", (req, res) => {
     if (!req.cookies.tokens) {
         return res.status(500).json({ok: false, data: req.cookies})
     }

backend/server/grpc_clients/index.js

@@ -15,7 +15,7 @@ const TicketService = ticketProto.TicketService;
 const AuthService = authProto.Authentication;
 
 const ticket_grpc = new TicketService('ticket:50050', grpc.credentials.createInsecure());
-const auth_grpc = new AuthService('127.0.0.1:50052', grpc.credentials.createInsecure() );
+const auth_grpc = new AuthService('auth:50052', grpc.credentials.createInsecure());
 
 
 module.exports = {

backend/server/main.js

@@ -14,13 +14,12 @@ app.use(cookieParser());
 app.use(bodyParser.urlencoded({ extended: true }));
 app.use(bodyParser.json());
 app.use("/auth", authRoutes);
-app.use(authHandler);
 app.use("/", ticketRoutes);
 app.use(validatorMiddleware);
 
 
 app.listen(8081, () => {
   const blue = chalk.blue
-  const target = blue(`http://localhost:8081`)
+  const target = blue(`http://server:8081`)
   console.log(`🚀 Server ready at ${target}`)
 })

backend/server/ticketRoutes.js

@@ -20,7 +20,9 @@ router.get("/news/", (req, res) => {
 });
 
 router.get("/flights/", (req, res) => {
+  console.log("Getting Flights");
   validators.validateSearchParams(req.query);
+  console.log("Validated Flights fields");
   ticket_grpc.searchFlights(req.query, (error, response) => {
     if (!error) {
       const { list } = response;

backend/ticketService/Dockerfile

@@ -2,7 +2,6 @@ FROM node:14
 WORKDIR /
 
 COPY . /
-RUN rm -rf node_modules
 RUN npm install
 RUN chmod 0777 /run.sh
 

backend/ticketService/data_access/db.js

@@ -48,18 +48,31 @@ const Indexes = {
 }
 
 async function removeCache(index, values) {
-    if(values){
-        const queryKey = createKey(index, values);
-        console.log("REMOVING", queryKey);
-        await redisClient.del(queryKey);
-    }else{
-        const keys = await redisClient.keys(index + "_$$$_*");
-        for(const key of keys) {
-            await redisClient.del(key);
+    try {
+        if(values){
+            const queryKey = createKey(index, values);
+            console.log("REMOVING", queryKey);
+            await redisClient.del(queryKey);
+        }else{
+            const keys = await redisClient.keys(index + "_$$$_*");
+            for(const key of keys) {
+                await redisClient.del(key);
+            }
         }
+    } catch (Error) {
+        return;
     }
 }
 
+async function redis_get(index, values) {
+    try {
+        return redisClient.get(queryKey);
+    } catch (Error) {
+        return null;
+    }
+}
+
+
 const functions = {
     update: async ({text, values, dirtyIndexes}) => {
         const result = await postgresClient.query(text, values);