Merge pull request sparrowapp-dev#120 from sparrowapp-dev/development

Release 1.1.0
sanilnayak · Mar 1, 2024 · aa749d6 · aa749d6
2 parents ea4d658 + 49bbc27
commit aa749d6
Show file tree

Hide file tree

Showing 33 changed files with 767 additions and 245 deletions.
diff --git a/.env.example b/.env.example
@@ -24,8 +24,12 @@ EMAIL_VALIDATION_CODE_EXPIRY_TIME=
 KAFKA_BROKER=localhost:9092
 
 #EMAIL
-SENDER_EMAIL=
-SENDER_PASSWORD=
+SMTP_SENDER_EMAIL=
+SMTP_SENDER_PASSWORD=
+SMTP_MAIL_HOST=
+SMTP_MAIL_PORT=
+SMTP_MAIL_SECURE=
+SMTP_USER_NAME=
 
 # REFRESH TOKEN
 REFRESH_TOKEN_SECRET_KEY=refresh-token-secret
@@ -40,4 +44,7 @@ REFRESH_TOKEN_MAX_LIMIT=50
  MAC_APPLE_SILICON_APP_SIGNATURE=
  MAC_APPLE_SILICON_APP_URL=
  MAC_INTEL_APP_SIGNATURE=
- MAC_INTEL_APP_URL=
+ MAC_INTEL_APP_URL=
+
+# SUPPORT
+ SPARROW_EMAIL=[email protected]
diff --git a/.github/workflows/development.yml b/.github/workflows/development.yml
@@ -1,4 +1,4 @@
-name: Developement
+name: Development
 on:
   push:
     branches:

diff --git a/deploymentManifests/deployment.yml b/deploymentManifests/deployment.yml
@@ -17,154 +17,179 @@ spec:
         app: sparrow-api
     spec:
       containers:
-      - image: sparrowprod.azurecr.io/sparrow-api:_BUILD__ID_
-        name: sparrow-api
-        imagePullPolicy: Always
-        resources: {}
-        ports:
-          - containerPort: 80
-        env:
-          - name: PORT
-            valueFrom:
-              secretKeyRef:
-                name: sparrow-api-secret
-                key: PORT
-          - name: APP_ENV
-            valueFrom:
-              secretKeyRef:
-                name: sparrow-api-secret
-                key: APP_ENV 
-          - name: APP_URL
-            valueFrom:
-              secretKeyRef:
-                name: sparrow-api-secret
-                key: APP_URL     
-          - name: JWT_SECRET_KEY
-            valueFrom:
-              secretKeyRef:
-                name: sparrow-api-secret
-                key: JWT_SECRET_KEY
-          - name: EMAIL_VALIDATION_CODE_EXPIRY_TIME
-            valueFrom:
-              secretKeyRef:
-                name: sparrow-api-secret
-                key: EMAIL_VALIDATION_CODE_EXPIRY_TIME
-          - name: JWT_EXPIRATION_TIME
-            valueFrom:
-              secretKeyRef:
-                name: sparrow-api-secret
-                key: JWT_EXPIRATION_TIME
-          - name: DB_URL
-            valueFrom:
-              secretKeyRef:
-                name: sparrow-api-secret
-                key: DB_URL
-          - name: AZURE_CONNECTION_STRING
-            valueFrom: 
-              secretKeyRef:
-                name: sparrow-api-secret
-                key: AZURE_CONNECTION_STRING    
-          - name: REFRESH_TOKEN_SECRET_KEY
-            valueFrom:
-              secretKeyRef:
-                name: sparrow-api-secret
-                key: REFRESH_TOKEN_SECRET_KEY  
-          - name: REFRESH_TOKEN_EXPIRATION_TIME
-            valueFrom:
-              secretKeyRef:
-                name: sparrow-api-secret
-                key: REFRESH_TOKEN_EXPIRATION_TIME
-          - name:  REFRESH_TOKEN_MAX_LIMIT
-            valueFrom:
-              secretKeyRef:
-                name: sparrow-api-secret
-                key:  REFRESH_TOKEN_MAX_LIMIT
-          - name:  SENDER_EMAIL
-            valueFrom:
-              secretKeyRef:
-                name: sparrow-api-secret
-                key:  SENDER_EMAIL
-          - name:  SENDER_PASSWORD
-            valueFrom:
-              secretKeyRef:
-                name: sparrow-api-secret
-                key:  SENDER_PASSWORD
-          - name:  LOGIN_REDIRECT_URL
-            valueFrom:
-              secretKeyRef:
-                name: sparrow-api-secret
-                key:  LOGIN_REDIRECT_URL
-          - name:  GOOGLE_APP_URL
-            valueFrom:
-              secretKeyRef:
-                name: sparrow-api-secret
-                key:  GOOGLE_APP_URL
-          - name:  GOOGLE_ACCESS_TYPE
-            valueFrom:
-              secretKeyRef:
-                name: sparrow-api-secret
-                key:  GOOGLE_ACCESS_TYPE
-          - name:  GOOGLE_CLIENT_ID
-            valueFrom:
-              secretKeyRef:
-                name: sparrow-api-secret
-                key:  GOOGLE_CLIENT_ID
-          - name:  GOOGLE_CLIENT_SECRET
-            valueFrom:
-              secretKeyRef:
-                name: sparrow-api-secret
-                key:  GOOGLE_CLIENT_SECRET
-          - name: KAFKA_BROKER
-            valueFrom:
-              secretKeyRef:
-                name: sparrow-api-secret
-                key: KAFKA_BROKER
-          - name:  REFRESH_TOKEN_MAX_LIMIT
-            valueFrom:
-              secretKeyRef:
-                name: sparrow-api-secret
-          - name:  APP_UPDATE_AVAILABLE
-            valueFrom:
-              secretKeyRef:
-                name: sparrow-api-secret
-                key:  APP_UPDATE_AVAILABLE
-          - name:  APP_VERSION
-            valueFrom:
-              secretKeyRef:
-                name: sparrow-api-secret
-                key:  APP_VERSION   
-          - name:  WINDOWS_APP_SIGNATURE
-            valueFrom:
-              secretKeyRef:
-                name: sparrow-api-secret
-                key:  WINDOWS_APP_SIGNATURE                                                                                         
-          - name:  WINDOWS_APP_URL
-            valueFrom:
-              secretKeyRef:
-                name: sparrow-api-secret
-                key:  WINDOWS_APP_URL        
-          - name:  MAC_APPLE_SILICON_APP_SIGNATURE
-            valueFrom:
-              secretKeyRef:
-                name: sparrow-api-secret
-                key:  MAC_APPLE_SILICON_APP_SIGNATURE        
-          - name:  MAC_APPLE_SILICON_APP_URL
-            valueFrom:
-              secretKeyRef:
-                name: sparrow-api-secret
-                key:  MAC_APPLE_SILICON_APP_URL      
-          - name:  MAC_INTEL_APP_SIGNATURE
-            valueFrom:
-              secretKeyRef:
-                name: sparrow-api-secret
-                key:  MAC_INTEL_APP_SIGNATURE       
-          - name:  MAC_INTEL_APP_URL
-            valueFrom:
-              secretKeyRef:
-                name: sparrow-api-secret
-                key:  MAC_INTEL_APP_URL       
----
+        - image: sparrowprod.azurecr.io/sparrow-api:_BUILD__ID_
+          name: sparrow-api
+          imagePullPolicy: Always
+          resources: {}
+          ports:
+            - containerPort: 80
+          env:
+            - name: PORT
+              valueFrom:
+                secretKeyRef:
+                  name: sparrow-api-secret
+                  key: PORT
+            - name: APP_ENV
+              valueFrom:
+                secretKeyRef:
+                  name: sparrow-api-secret
+                  key: APP_ENV
+            - name: APP_URL
+              valueFrom:
+                secretKeyRef:
+                  name: sparrow-api-secret
+                  key: APP_URL
+            - name: JWT_SECRET_KEY
+              valueFrom:
+                secretKeyRef:
+                  name: sparrow-api-secret
+                  key: JWT_SECRET_KEY
+            - name: EMAIL_VALIDATION_CODE_EXPIRY_TIME
+              valueFrom:
+                secretKeyRef:
+                  name: sparrow-api-secret
+                  key: EMAIL_VALIDATION_CODE_EXPIRY_TIME
+            - name: JWT_EXPIRATION_TIME
+              valueFrom:
+                secretKeyRef:
+                  name: sparrow-api-secret
+                  key: JWT_EXPIRATION_TIME
+            - name: DB_URL
+              valueFrom:
+                secretKeyRef:
+                  name: sparrow-api-secret
+                  key: DB_URL
+            - name: AZURE_CONNECTION_STRING
+              valueFrom:
+                secretKeyRef:
+                  name: sparrow-api-secret
+                  key: AZURE_CONNECTION_STRING
+            - name: REFRESH_TOKEN_SECRET_KEY
+              valueFrom:
+                secretKeyRef:
+                  name: sparrow-api-secret
+                  key: REFRESH_TOKEN_SECRET_KEY
+            - name: REFRESH_TOKEN_EXPIRATION_TIME
+              valueFrom:
+                secretKeyRef:
+                  name: sparrow-api-secret
+                  key: REFRESH_TOKEN_EXPIRATION_TIME
+            - name: REFRESH_TOKEN_MAX_LIMIT
+              valueFrom:
+                secretKeyRef:
+                  name: sparrow-api-secret
+                  key: REFRESH_TOKEN_MAX_LIMIT
+            - name: SMTP_SENDER_EMAIL
+              valueFrom:
+                secretKeyRef:
+                  name: sparrow-api-secret
+                  key: SMTP_SENDER_EMAIL
+            - name: SMTP_SENDER_PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name: sparrow-api-secret
+                  key: SMTP_SENDER_PASSWORD
+            - name: SMTP_MAIL_HOST
+              valueFrom:
+                secretKeyRef:
+                  name: sparrow-api-secret
+                  key: SMTP_MAIL_HOST
+            - name: SMTP_MAIL_PORT
+              valueFrom:
+                secretKeyRef:
+                  name: sparrow-api-secret
+                  key: SMTP_MAIL_PORT
+            - name: SMTP_MAIL_SECURE
+              valueFrom:
+                secretKeyRef:
+                  name: sparrow-api-secret
+                  key: SMTP_MAIL_SECURE
+            - name: SMTP_USER_NAME
+              valueFrom:
+                secretKeyRef:
+                  name: sparrow-api-secret
+                  key: SMTP_USER_NAME
+            - name: LOGIN_REDIRECT_URL
+              valueFrom:
+                secretKeyRef:
+                  name: sparrow-api-secret
+                  key: LOGIN_REDIRECT_URL
+            - name: GOOGLE_APP_URL
+              valueFrom:
+                secretKeyRef:
+                  name: sparrow-api-secret
+                  key: GOOGLE_APP_URL
+            - name: GOOGLE_ACCESS_TYPE
+              valueFrom:
+                secretKeyRef:
+                  name: sparrow-api-secret
+                  key: GOOGLE_ACCESS_TYPE
+            - name: GOOGLE_CLIENT_ID
+              valueFrom:
+                secretKeyRef:
+                  name: sparrow-api-secret
+                  key: GOOGLE_CLIENT_ID
+            - name: GOOGLE_CLIENT_SECRET
+              valueFrom:
+                secretKeyRef:
+                  name: sparrow-api-secret
+                  key: GOOGLE_CLIENT_SECRET
+            - name: KAFKA_BROKER
+              valueFrom:
+                secretKeyRef:
+                  name: sparrow-api-secret
+                  key: KAFKA_BROKER
+            - name: REFRESH_TOKEN_MAX_LIMIT
+              valueFrom:
+                secretKeyRef:
+                  name: sparrow-api-secret
+            - name: APP_UPDATE_AVAILABLE
+              valueFrom:
+                secretKeyRef:
+                  name: sparrow-api-secret
+                  key: APP_UPDATE_AVAILABLE
+            - name: APP_VERSION
+              valueFrom:
+                secretKeyRef:
+                  name: sparrow-api-secret
+                  key: APP_VERSION
+            - name: WINDOWS_APP_SIGNATURE
+              valueFrom:
+                secretKeyRef:
+                  name: sparrow-api-secret
+                  key: WINDOWS_APP_SIGNATURE
+            - name: WINDOWS_APP_URL
+              valueFrom:
+                secretKeyRef:
+                  name: sparrow-api-secret
+                  key: WINDOWS_APP_URL
+            - name: MAC_APPLE_SILICON_APP_SIGNATURE
+              valueFrom:
+                secretKeyRef:
+                  name: sparrow-api-secret
+                  key: MAC_APPLE_SILICON_APP_SIGNATURE
+            - name: MAC_APPLE_SILICON_APP_URL
+              valueFrom:
+                secretKeyRef:
+                  name: sparrow-api-secret
+                  key: MAC_APPLE_SILICON_APP_URL
+            - name: MAC_INTEL_APP_SIGNATURE
+              valueFrom:
+                secretKeyRef:
+                  name: sparrow-api-secret
+                  key: MAC_INTEL_APP_SIGNATURE
+            - name: MAC_INTEL_APP_URL
+              valueFrom:
+                secretKeyRef:
+                  name: sparrow-api-secret
+                  key: MAC_INTEL_APP_URL
+            - name: SPARROW_EMAIL
+              valueFrom:
+                secretKeyRef:
+                  name: sparrow-api-secret
+                  key: SPARROW_EMAIL
 
+---
 apiVersion: v1
 kind: Service
 metadata:

diff --git a/src/modules/common/config/configuration.ts b/src/modules/common/config/configuration.ts
@@ -19,8 +19,12 @@ export default () => ({
       process.env.REFRESH_TOKEN_EXPIRATION_TIME,
     ),
     refreshTokenMaxLimit: parseInt(process.env.REFRESH_TOKEN_MAX_LIMIT),
-    senderEmail: process.env.SENDER_EMAIL,
-    senderPassword: process.env.SENDER_PASSWORD,
+    senderEmail: process.env.SMTP_SENDER_EMAIL,
+    senderPassword: process.env.SMTP_SENDER_PASSWORD,
+    mailHost: process.env.SMTP_MAIL_HOST,
+    mailPort: process.env.SMTP_MAIL_PORT,
+    mailSecure: process.env.SMTP_MAIL_SECURE,
+    userName: process.env.SMTP_USER_NAME,
   },
   db: {
     url: process.env.DB_URL,
@@ -29,7 +33,7 @@ export default () => ({
     google: {
       clientId: process.env.GOOGLE_CLIENT_ID,
       clientSecret: process.env.GOOGLE_CLIENT_SECRET,
-      appUrl: process.env.APP_URL,
+      appUrl: process.env.GOOGLE_APP_URL,
       redirectUrl: process.env.LOGIN_REDIRECT_URL,
       accessType: process.env.GOOGLE_ACCESS_TYPE,
     },
@@ -53,4 +57,7 @@ export default () => ({
       appUrl: process.env.MAC_INTEL_APP_URL,
     },
   },
+  support: {
+    sparrowEmail: process.env.SPARROW_EMAIL,
+  },
 });