Merge pull request #220 from SaintAngeLs/notifications_service

(#126) (#125) (#216) Email service implementation, NotificationService udpate
SaintAngeLs · May 30, 2024 · 61b9f6f · 61b9f6f
2 parents c790eb6 + 1034f55
commit 61b9f6f
Show file tree

Hide file tree

Showing 234 changed files with 11,043 additions and 708 deletions.
diff --git a/.github/workflows/cloud_deploy.yml b/.github/workflows/cloud_deploy.yml
@@ -3,7 +3,7 @@ name: Deploy to Cloud
 on:
   push:
     branches:
-      - main 
+      - main
   pull_request:
     branches:
       - main 

diff --git a/MiniSpace.APIGateway/src/MiniSpace.APIGateway/ntrada-async.docker.yml b/MiniSpace.APIGateway/src/MiniSpace.APIGateway/ntrada-async.docker.yml
@@ -152,6 +152,18 @@ modules:
         downstream: identity-service/users/{userId}/ban
         auth: true
 
+      - upstream: /password/forgot
+        method: POST
+        use: downstream
+        downstream: identity-service/password/forgot
+        auth: false
+
+      - upstream: /password/reset
+        method: POST
+        use: downstream
+        downstream: identity-service/password/reset
+        auth: false
+
     services:
       identity-service:
         localUrl: localhost:5004
@@ -265,6 +277,11 @@ modules:
       notifications-service:
         localUrl: localhost:5006
         url: notifications-service
+
+
+
+
+
 
 
 
@@ -543,95 +560,95 @@ modules:
 
 
   friends:
-    path: /friends
-    routes:
-      - upstream: /
-        method: GET
-        use: downstream
-        downstream: friends-service/friends
-        auth: true
+      path: /friends
+      routes:
+        - upstream: /
+          method: GET
+          use: downstream
+          downstream: friends-service/friends
+          auth: true
 
-      - upstream: /{userId}
-        method: GET
-        use: downstream
-        downstream: friends-service/friends/{userId}
-        bind:
-          - userId: {userId}
-        auth: true
+        - upstream: /{userId}
+          method: GET
+          use: downstream
+          downstream: friends-service/friends/{userId}
+          bind:
+            - userId: {userId}
+          auth: true
 
-      - upstream: /{userId}/invite
-        method: POST
-        use: downstream
-        downstream: friends-service/friends/{userId}/invite
-        bind:
-          - userId: {userId}
-        auth: true
-        afterDispatch:
-          - use: publish
-            event: FriendInviteSent
-            target: notifications-service/events
-            routingKey: friend_request_created
+        - upstream: /{userId}/invite
+          method: POST
+          use: downstream
+          downstream: friends-service/friends/{userId}/invite
+          bind:
+            - userId: {userId}
+          auth: true
+          afterDispatch:
+            - use: publish
+              event: FriendInviteSent
+              target: notifications-service/events
+              routingKey: friend_request_created
 
-      - upstream: /{requesterId}/{friendId}/remove
-        method: DELETE
-        use: downstream
-        downstream: friends-service/friends/{requesterId}/{friendId}/remove
-        bind:
-          - friendId: {friendId}
-          - requesterId: {requesterId}
-        auth: true
+        - upstream: /{requesterId}/{friendId}/remove
+          method: DELETE
+          use: downstream
+          downstream: friends-service/friends/{requesterId}/{friendId}/remove
+          bind:
+            - friendId: {friendId}
+            - requesterId: {requesterId}
+          auth: true
 
-      - upstream: /requests/{userId}
-        method: GET
-        use: downstream
-        downstream: friends-service/friends/requests/{userId}
-        bind:
-          - userId: {userId}
-        auth: true
+        - upstream: /requests/{userId}
+          method: GET
+          use: downstream
+          downstream: friends-service/friends/requests/{userId}
+          bind:
+            - userId: {userId}
+          auth: true
 
-      - upstream: /requests/{userId}/accept
-        method: POST
-        use: downstream
-        downstream: friends-service/friends/requests/{userId}/accept
-        bind:
-          - userId: {userId}
-        auth: true
+        - upstream: /requests/{userId}/accept
+          method: POST
+          use: downstream
+          downstream: friends-service/friends/requests/{userId}/accept
+          bind:
+            - userId: {userId}
+          auth: true
 
-      - upstream: /requests/{userId}/decline
-        method: POST
-        use: downstream
-        downstream: friends-service/friends/requests/{userId}/decline
-        bind:
-          - userId: {userId}
-        auth: true
+        - upstream: /requests/{userId}/decline
+          method: POST
+          use: downstream
+          downstream: friends-service/friends/requests/{userId}/decline
+          bind:
+            - userId: {userId}
+          auth: true
 
-      - upstream: /pending
-        method: GET
-        use: downstream
-        downstream: friends-service/friends/pending
-        auth: true
+        - upstream: /pending
+          method: GET
+          use: downstream
+          downstream: friends-service/friends/pending
+          auth: true
 
-      - upstream: /pending/all
-        method: GET
-        use: downstream
-        downstream: friends-service/friends/pending/all
-        auth: true
+        - upstream: /pending/all
+          method: GET
+          use: downstream
+          downstream: friends-service/friends/pending/all
+          auth: true
 
-      - upstream: /requests/sent/{userId}
-        method: GET
-        use: downstream
-        downstream: friends-service/friends/requests/sent/{userId}
-        auth: true
+        - upstream: /requests/sent/{userId}
+          method: GET
+          use: downstream
+          downstream: friends-service/friends/requests/sent/{userId}
+          auth: true
 
-      - upstream: /requests/{userId}/withdraw
-        method: PUT
-        use: downstream
-        downstream: friends-service/friends/requests/{userId}/withdraw
-        bind:
-          - userId: {userId}
-        auth: true
+        - upstream: /requests/{userId}/withdraw
+          method: PUT
+          use: downstream
+          downstream: friends-service/friends/requests/{userId}/withdraw
+          bind:
+            - userId: {userId}
+          auth: true
 
-    services:
+      services:
         friends-service:
           localUrl: localhost:5012
           url: friends-service
@@ -646,7 +663,7 @@ modules:
         use: downstream
         downstream: posts-service/posts
         auth: true
-    
+
       - upstream: /search
         method: POST
         use: downstream
@@ -792,6 +809,4 @@ modules:
     services:
       organizations-service:
         localUrl: localhost:5015
-        url: organizations-service
-
-
+        url: organizations-service