Added Dockerfile to payment and authentication services

ujjavaldesai07 · ujjavaldesai07 · commit d9cc0626db88 · 2020-08-06T20:50:00.000-07:00
diff --git a/client/src/actions/index.js b/client/src/actions/index.js
@@ -83,22 +83,65 @@ export const signInUsingOAuth = googleAuth => async dispatch => {
         log.info('[signInUsingOAuth] User has not signed in yet')
 
         // sign in
-        googleAuth.signIn(JSON.parse(googleAuth.currentUser.get().getId())).then(() => {
-            // if sign in works
-            if (googleAuth.isSignedIn.get()) {
-                log.info('[signInUsingOAuth] User is signed in successfully')
-                // here we are sure that we signed in and now dispatch.
-                dispatch({
-                    type: HANDLE_GOOGLE_AUTH_SIGN_IN,
-                    payload: {
-                        firstName: "Norman",
-                        oAuth: googleAuth
-                    }
-                })
-
-                history.push("/");
+        googleAuth.signIn(JSON.parse(googleAuth.currentUser.get().getId())).then(async () => {
+
+                // if sign in works
+                if (googleAuth.isSignedIn.get()) {
+                    log.info('[signInUsingOAuth] User is signed in successfully')
+
+                    dispatch({
+                        type: HANDLE_GOOGLE_AUTH_SIGN_IN,
+                        payload: {
+                            firstName: googleAuth.currentUser.get().getBasicProfile().getGivenName(),
+                            oAuth: googleAuth
+                        }
+                    })
+                    history.push("/");
+
+                    // try {
+                        // let userProfile = googleAuth.currentUser.get().getBasicProfile()
+                        // if (userProfile) {
+                        //     authServiceAPI.defaults.timeout = 15000;
+                        //     const response = await authServiceAPI.post('/signin-using-google-auth', {
+                        //         'id': userProfile.getId(),
+                        //         'firstname': userProfile.getGivenName(),
+                        //         'lastname': userProfile.getFamilyName(),
+                        //         'email': userProfile.getEmail(),
+                        //         'username': null,
+                        //         'password': null,
+                        //     }).catch(err => {
+                        //         log.info(`[ACTION]: signUp dispatch HANDLE_SIGN_UP_ERROR err.message = ${err.message}.`)
+                        //     });
+                        //
+                        //     if(response.data === "success") {
+                        //         // here we are sure that we signed in and now dispatch.
+                        //         dispatch({
+                        //             type: HANDLE_GOOGLE_AUTH_SIGN_IN,
+                        //             payload: {
+                        //                 oAuth: googleAuth
+                        //             }
+                        //         })
+                        //         history.push("/");
+                        //     } else {
+                        //         dispatch({type: HANDLE_SIGN_IN_ERROR, payload: response.data.error});
+                        //     }
+
+                        // dispatch({
+                        //     type: HANDLE_GOOGLE_AUTH_SIGN_IN,
+                        //     payload: {
+                        //         oAuth: googleAuth
+                        //     }
+                        // })
+                        // history.push("/");
+                        // }
+                        // } catch
+                        //     (e) {
+                        //     log.info(`[signInUsingOAuth] Unable to retrieve user profile.`)
+                        //     dispatch({type: HANDLE_SIGN_IN_ERROR, payload: "Unable to retrieve user profile."});
+                        // }
+                }
             }
-        })
+        )
     }
 }
 
@@ -160,7 +203,7 @@ export const sendPaymentToken = (token) => async dispatch => {
     log.info(`Token = ${JSON.stringify(token)}`)
     let config = {
         method: 'post',
-        url: 'http://localhost:9050/payment',
+        url: `http://localhost:${process.env.REACT_APP_PAYMENT_SERVICE_PORT}/payment`,
         headers: {
             'Content-Type': 'application/json'
         },
diff --git a/client/src/api/service_api.js b/client/src/api/service_api.js
@@ -1,15 +1,14 @@
 import axios from 'axios';
 
-const {REACT_APP_COMMON_DATA_SERVICE_IP, REACT_APP_COMMON_DATA_SERVICE_PORT} = process.env
-
-export const paymentServiceAPI = axios.create({
-    baseURL: 'http://localhost:9050'
-})
+const {
+    REACT_APP_COMMON_DATA_SERVICE_PORT,
+    REACT_APP_AUTHENTICATION_SERVICE_PORT
+} = process.env
 
 export const authServiceAPI = axios.create({
-    baseURL: 'http://localhost:7000'
+    baseURL: `http://localhost:${REACT_APP_AUTHENTICATION_SERVICE_PORT}`
 })
 
 export const commonServiceAPI = axios.create({
-    baseURL: `http://${REACT_APP_COMMON_DATA_SERVICE_IP}:${REACT_APP_COMMON_DATA_SERVICE_PORT}`
+    baseURL: `http://localhost:${REACT_APP_COMMON_DATA_SERVICE_PORT}`
 })
diff --git a/client/src/components/routes/navbar/navBar.js b/client/src/components/routes/navbar/navBar.js
@@ -87,13 +87,14 @@ const NavBar = props => {
                 window.gapi.load('client:auth2', () => {
                     window.gapi.client.init({
                         clientId: process.env.REACT_APP_GOOGLE_AUTH_CLIENT_ID,
-                        scope: 'email'
+                        scope: 'profile'
                     }).then(() => {
                         const auth = window.gapi.auth2.getAuthInstance();
                         dispatch({
                             type: SET_GOOGLE_AUTH,
                             payload: {
-                                firstName: "Norman",
+                                firstName: auth.currentUser.get().getBasicProfile() ?
+                                    auth.currentUser.get().getBasicProfile().getGivenName() : null,
                                 oAuth: auth
                             }
                         })
@@ -102,7 +103,9 @@ const NavBar = props => {
             } catch (e) {
                 log.info(`[Navbar] Failed to load google OAuth.`)
             }
-        } else if (isSignedIn === null) {
+        }
+
+        if (isSignedIn === null) {
             // if user is not signed in then signed it in using
             // account details from the cookie.
 
@@ -148,12 +151,19 @@ const NavBar = props => {
     }
 
     if (isSignedIn || googleAuthReducer.isSignedInUsingOAuth) {
+        let fName
+        if (firstName) {
+            fName = firstName
+        } else if (googleAuthReducer.isSignedInUsingOAuth) {
+            fName = googleAuthReducer.firstName
+        } else {
+            fName = "S"
+        }
+
         authIcon = <Avatar className={classes.orange} sizes="small"
                            style={{width: 20, height: 20, marginBottom: 3}}>
-            {firstName ? firstName.charAt(0)
-                : googleAuthReducer.isSignedInUsingOAuth ?
-                    googleAuthReducer.firstName.charAt(0) : "S"}
-        </Avatar>
+                            {fName.charAt(0).toUpperCase()}
+                    </Avatar>
         authLabel = "Sign Out"
     } else {
         authIcon = <AccountCircle/>
diff --git a/client/src/components/routes/signin/GoogleAuthButton.js b/client/src/components/routes/signin/GoogleAuthButton.js
@@ -11,11 +11,6 @@ class GoogleAuthButton extends React.Component {
     };
 
     render() {
-        if(!this.props.googleAuthReducer.oAuth) {
-            log.info(`[GoogleAuthButton] Failed to load Google OAuth`)
-            return null
-        }
-
         log.info('[GoogleAuthButton] Rendering GoogleAuthButton Component')
         return (
             <Button className='googleButtonStyle' color='google plus' onClick={this.onSignInClick}>
diff --git a/client/src/components/routes/signin/signIn.js b/client/src/components/routes/signin/signIn.js
@@ -22,6 +22,7 @@ const SignIn = () => {
         log.info(`[SignIn]: Component did mount...`)
         setIsLoading(false)
 
+        // eslint-disable-next-line
     }, [timestamp])
 
     if ((isSignedIn !== null && isSignedIn)
diff --git a/client/src/reducers/screens/commonScreenReducer.js b/client/src/reducers/screens/commonScreenReducer.js
@@ -33,14 +33,14 @@ import _ from "lodash";
 
 
 export const signInReducer = (state
-                                  = {isSignedIn: null, timestamp: null, firstName: null, oAuth: null}, action) => {
+                                  = {isSignedIn: null, timestamp: null, firstName: null}, action) => {
 
     // timestamp is used to update the state so that
     // we can stop loading progress component
     switch (action.type) {
         case HANDLE_SIGN_IN:
             return {
-                ...state, isSignedIn: true, tokenId: action.payload.jwt,
+                ...state, isSignedIn: true, tokenId: action.payload.jwt, errorMsg: null,
                 firstName: action.payload.firstName, timestamp: Date.now()
             };
         case HANDLE_SIGN_IN_ERROR:
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -25,6 +25,33 @@ services:
     networks:
       - spring-cloud-microservices
 
+  authentication-service:
+    build:
+      context: .
+      dockerfile: ./server/authentication-service/Dockerfile
+    container_name: authentication-service-container
+    restart: always
+    depends_on:
+      - mysql-db
+      - redis-cache
+      - react-ui
+    environment:
+      - DB_HOST=mysql-db
+      - DB_PORT=${DB_PORT}
+      - DB_USER=${DB_USER}
+      - DB_PASS=${DB_PASS}
+      - DB_SCHEMA=${DB_SCHEMA}
+      - ACTIVE_PROFILE=${ACTIVE_PROFILE}
+      - REACT_APP_AUTHENTICATION_SERVICE_PORT=${AUTHENTICATION_SERVICE_PORT}
+    links:
+      - mysql-db:mysql
+    expose:
+      - ${AUTHENTICATION_SERVICE_PORT}
+    ports:
+      - ${AUTHENTICATION_SERVICE_PORT}:${AUTHENTICATION_SERVICE_PORT}
+    networks:
+      - spring-cloud-microservices
+
   common-data-service:
     build:
       context: .
@@ -55,6 +82,33 @@ services:
     networks:
       - spring-cloud-microservices
 
+  payment-service:
+    build:
+      context: .
+      dockerfile: ./server/payment-service/Dockerfile
+    container_name: payment-service-container
+    restart: always
+    depends_on:
+      - mysql-db
+      - redis-cache
+      - react-ui
+    environment:
+      - DB_HOST=mysql-db
+      - DB_PORT=${DB_PORT}
+      - DB_USER=${DB_USER}
+      - DB_PASS=${DB_PASS}
+      - DB_SCHEMA=${DB_SCHEMA}
+      - ACTIVE_PROFILE=${ACTIVE_PROFILE}
+      - REACT_APP_PAYMENT_SERVICE_PORT=${PAYMENT_SERVICE_PORT}
+    links:
+      - mysql-db:mysql
+    expose:
+      - ${PAYMENT_SERVICE_PORT}
+    ports:
+      - ${PAYMENT_SERVICE_PORT}:${PAYMENT_SERVICE_PORT}
+    networks:
+      - spring-cloud-microservices
+
   react-ui:
     build:
       context: .
@@ -68,7 +122,6 @@ services:
       - ${REACT_APP_PORT}:${REACT_APP_PORT}
     environment:
       - REACT_APP_STRIPE_PUBLISH_KEY=${REACT_APP_STRIPE_PUBLISH_KEY}
-      - REACT_APP_COMMON_DATA_SERVICE_IP=${REACT_APP_COMMON_DATA_SERVICE_IP}
       - REACT_APP_COMMON_DATA_SERVICE_PORT=${COMMON_DATA_SERVICE_PORT}
     volumes:
       - ./client:/usr/src/app
diff --git a/server/authentication-service/Dockerfile b/server/authentication-service/Dockerfile
@@ -0,0 +1,26 @@
+# Docker multi-stage build
+
+# 1. Building the App with Maven
+FROM maven:3-jdk-11
+
+ADD ./server/authentication-service /authentication_service_staging
+
+WORKDIR /authentication_service_staging
+
+# Just echo so we can see, if everything is there
+RUN ls -l
+
+# Run Maven build
+RUN mvn clean install -DskipTests
+
+# 2. Just using the build artifact and then removing the build-container
+FROM openjdk:11-jdk
+
+VOLUME /tmp
+
+# Add Spring Boot authentication-service.jar to Container
+COPY --from=0 /authentication_service_staging/target/authentication-service.jar authentication-service.jar
+
+# Fire up our Spring Boot app by default
+CMD ["sh", "-c", "java -Dserver.port=$AUTHENTICATION_SERVICE_PORT -Xmx300m -Xss512k -XX:CICompilerCount=2 -Dfile.encoding=UTF-8 -XX:+UseContainerSupport -Dspring.profiles.active=$ACTIVE_PROFILE -Djava.security.egd=file:/dev/./urandom -jar authentication-service.jar" ]
+
diff --git a/server/authentication-service/pom.xml b/server/authentication-service/pom.xml
@@ -87,10 +87,19 @@
 	</dependencies>
 
 	<build>
+		<finalName>authentication-service</finalName>
 		<plugins>
 			<plugin>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>repackage</id>
+						<goals>
+							<goal>repackage</goal>
+						</goals>
+					</execution>
+				</executions>
 			</plugin>
 		</plugins>
 	</build>
diff --git a/server/authentication-service/src/main/resources/application.properties b/server/authentication-service/src/main/resources/application.properties
@@ -1,14 +1,13 @@
 spring.application.name=authentication-service
-server.port=7000
-spring.datasource.url=jdbc:mysql://localhost:3306/ecommerce_data?useSSL=false&serverTimezone=UTC
-spring.datasource.username=springstudent
-spring.datasource.password=springstudent
-#spring.datasource.url=jdbc:mysql://${DB_HOST:localhost}:${DB_PORT:6603}/${DB_SCHEMA}?autoReconnect=true&failOverReadOnly=false&maxReconnects=2
+server.port=${AUTHENTICATION_SERVICE_PORT}
+spring.datasource.url=jdbc:mysql://${DB_HOST}:${DB_PORT}/${DB_SCHEMA}?allowPublicKeyRetrieval=true&useSSL=false&serverTimezone=UTC
+spring.datasource.username=${DB_USER}
+spring.datasource.password=${DB_PASS}
+
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
+spring.jpa.generate-ddl=true
 #spring.datasource.initialization-mode=always
 #spring.jpa.hibernate.ddl-auto=create-drop
-spring.jpa.generate-ddl=true
-spring.profiles.active=dev
 
 # debugging purpose
 spring.jpa.properties.hibernate.format_sql=true
diff --git a/server/authentication-service/src/main/resources/static/images/b1.png b/server/authentication-service/src/main/resources/static/images/b1.png
diff --git a/server/authentication-service/src/main/resources/static/images/s1.webp b/server/authentication-service/src/main/resources/static/images/s1.webp
diff --git a/server/common-data-service/Dockerfile b/server/common-data-service/Dockerfile
@@ -18,7 +18,7 @@ FROM openjdk:11-jdk
 
 VOLUME /tmp
 
-# Add Spring Boot app.jar to Container
+# Add Spring Boot common-data-service.jar to Container
 COPY --from=0 /common_data_service_staging/target/common-data-service.jar common-data-service.jar
 
 # Fire up our Spring Boot app by default
diff --git a/server/common-data-service/src/main/java/com/ujjaval/ecommerce/commondataservice/controller/CommonDataController.java b/server/common-data-service/src/main/java/com/ujjaval/ecommerce/commondataservice/controller/CommonDataController.java
@@ -9,6 +9,7 @@
 import com.ujjaval.ecommerce.commondataservice.service.interfaces.CommonDataService;
 import com.ujjaval.ecommerce.commondataservice.service.interfaces.LoadFakeDataService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.env.Environment;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -21,21 +22,23 @@
 @RestController
 public class CommonDataController {
 
+    @Autowired
+    Environment environment;
+
     @Autowired
     CommonDataService commonDataService;
 
     @Autowired
     LoadFakeDataService loadFakeDataService;
 
     @GetMapping("/load")
-    public ResponseEntity<?> loadTestData() {
-
-        if (!loadFakeDataService.loadTestData()) {
-            return ResponseEntity.status(HttpStatus.FORBIDDEN).body("An error has " +
-                    "occurred while loading the data in database");
-        }
-
-        return ResponseEntity.ok("Success");
+    public ResponseEntity<String> loadTestData() {
+        
+            if (!loadFakeDataService.loadTestData()) {
+                return new ResponseEntity<>("An error has occurred " +
+                        "while loading the data in database", HttpStatus.FORBIDDEN);
+            }
+            return new ResponseEntity<>("Success", HttpStatus.OK);
     }
 
     @GetMapping(value = "/products", params = "q")
diff --git a/server/common-data-service/src/main/resources/application.properties b/server/common-data-service/src/main/resources/application.properties
diff --git a/server/payment-service/Dockerfile b/server/payment-service/Dockerfile
diff --git a/server/payment-service/pom.xml b/server/payment-service/pom.xml
diff --git a/server/payment-service/src/main/resources/application.properties b/server/payment-service/src/main/resources/application.properties
