Merge pull request #332 from SaintAngeLs/identity_service

#329 2fa feature, students/users service, identity service update, layout update
SaintAngeLs · Jul 26, 2024 · 7a21111 · 7a21111
2 parents 4acf5c6 + aa581d0
commit 7a21111
Show file tree

Hide file tree

Showing 184 changed files with 8,195 additions and 1,868 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -0,0 +1,8 @@
+version: 2
+updates:
+  - package-ecosystem: "nuget" 
+    directory: "/" 
+    schedule:
+      interval: "weekly"
+    target-branch: "dev"
+    open-pull-requests-limit: 5
diff --git a/MiniSpace.APIGateway/src/MiniSpace.APIGateway/.gitignore b/MiniSpace.APIGateway/src/MiniSpace.APIGateway/.gitignore
@@ -0,0 +1,3 @@
+appsettings.local.json
+appsettings.docker.json
+appsettings.json
diff --git a/MiniSpace.APIGateway/src/MiniSpace.APIGateway/ntrada-async.docker.yml b/MiniSpace.APIGateway/src/MiniSpace.APIGateway/ntrada-async.docker.yml
@@ -41,7 +41,7 @@ extensions:
       - Total-Count
 
   jwt:
-    issuerSigningKey: eiquief5phee9pazo0Faegaez9gohThailiur5woy2befiech1oarai4aiLi6ahVecah3ie9Aiz6Peij
+    issuerSigningKey: Gtn9vBDB5RCDLJSMqZQQmN75J8hgzbQwWkcD8jMIXnvCLAmlL0QVacUAbyootWihMrPIz
     validIssuer: minispace
     validateAudience: false
     validateIssuer: true
@@ -106,13 +106,13 @@ modules:
         auth: true
         claims:
           role: admin
-    
+
       - upstream: /me
         method: GET
         use: downstream
         downstream: identity-service/me
         auth: true
-    
+
       - upstream: /sign-up
         method: POST
         use: downstream
@@ -121,25 +121,13 @@ modules:
         resourceId:
           property: userId
           generate: true
-    
+
       - upstream: /sign-in
         method: POST
         use: downstream
         downstream: identity-service/sign-in
         auth: false
 
-      - upstream: /users/{userId}/organizer-rights
-        method: POST
-        use: downstream
-        downstream: identity-service/users/{userId}/organizer-rights
-        auth: true
-
-      - upstream: /users/{userId}/organizer-rights
-        method: DELETE
-        use: downstream
-        downstream: identity-service/users/{userId}/organizer-rights
-        auth: true
-
       - upstream: /users/{userId}/ban
         method: POST
         use: downstream
@@ -188,17 +176,29 @@ modules:
         downstream: identity-service/2fa/generate-secret
         auth: true
 
+      - upstream: /2fa/verify-code
+        method: POST
+        use: downstream
+        downstream: identity-service/2fa/verify-code
+        auth: false
+
+      - upstream: /access-tokens/revoke
+        method: POST
+        use: downstream
+        downstream: identity-service/access-tokens/revoke
+        auth: true
+
       - upstream: /refresh-tokens/use
         method: POST
         use: downstream
         downstream: identity-service/refresh-tokens/use
-        auth: false
+        auth: true
 
       - upstream: /refresh-tokens/revoke
         method: POST
         use: downstream
         downstream: identity-service/refresh-tokens/revoke
-        auth: false
+        auth: true
 
     services:
       identity-service:
@@ -328,12 +328,6 @@ modules:
         url: notifications-service
 
 
-
-
-
-
-
-
   students:
     path: /students
     routes:
@@ -349,24 +343,48 @@ modules:
         downstream: students-service/students/{studentId}
         auth: true
 
-      - upstream: /{studentId}
-        method: PUT
+      - upstream: /{studentId}/settings
+        method: GET
         use: downstream
-        downstream: students-service/students/{studentId}
-        bind:
-          - studentId:{studentId}
+        downstream: students-service/students/{studentId}/settings
+        auth: true
+
+      - upstream: /{studentId}/gallery
+        method: GET
+        use: downstream
+        downstream: students-service/students/{studentId}/gallery
+        auth: true
+
+      - upstream: /{studentId}/visibility-settings
+        method: GET
+        use: downstream
+        downstream: students-service/students/{studentId}/visibility-settings
+        auth: true
+
+      - upstream: /{studentId}/events
+        method: GET
+        use: downstream
+        downstream: students-service/students/{studentId}/events
+        auth: true
+
+      - upstream: /{studentId}/notifications
+        method: GET
+        use: downstream
+        downstream: students-service/students/{studentId}/notifications
         auth: true
 
       - upstream: /{studentId}
-        method: DELETE
+        method: PUT
         use: downstream
         downstream: students-service/students/{studentId}
+        bind:
+          - studentId:{studentId}
         auth: true
 
-      - upstream: /
-        method: POST
+      - upstream: /{studentId}/settings
+        method: PUT
         use: downstream
-        downstream: students-service/students
+        downstream: students-service/students/{studentId}/settings
         auth: true
 
       - upstream: /{studentId}/state/{state}
@@ -377,19 +395,17 @@ modules:
           - studentId:{studentId}
           - state:{state}
         auth: true
-        claims:
-          role: admin
 
-      - upstream: /{studentId}/events
-        method: GET
+      - upstream: /{studentId}
+        method: DELETE
         use: downstream
-        downstream: students-service/students/{studentId}/events
+        downstream: students-service/students/{studentId}
         auth: true
 
-      - upstream: /{studentId}/notifications
-        method: GET
+      - upstream: /
+        method: POST
         use: downstream
-        downstream: students-service/students/{studentId}/notifications
+        downstream: students-service/students
         auth: true
 
       - upstream: /{studentId}/notifications

diff --git a/MiniSpace.APIGateway/src/MiniSpace.APIGateway/ntrada-async.yml b/MiniSpace.APIGateway/src/MiniSpace.APIGateway/ntrada-async.yml
@@ -41,7 +41,7 @@ extensions:
       - Total-Count
 
   jwt:
-    issuerSigningKey: eiquief5phee9pazo0Faegaez9gohThailiur5woy2befiech1oarai4aiLi6ahVecah3ie9Aiz6Peij
+    issuerSigningKey: Gtn9vBDB5RCDLJSMqZQQmN75J8hgzbQwWkcD8jMIXnvCLAmlL0QVacUAbyootWihMrPIz
     validIssuer: minispace
     validateAudience: false
     validateIssuer: true
@@ -106,13 +106,13 @@ modules:
         auth: true
         claims:
           role: admin
-    
+
       - upstream: /me
         method: GET
         use: downstream
         downstream: identity-service/me
         auth: true
-    
+
       - upstream: /sign-up
         method: POST
         use: downstream
@@ -121,25 +121,13 @@ modules:
         resourceId:
           property: userId
           generate: true
-    
+
       - upstream: /sign-in
         method: POST
         use: downstream
         downstream: identity-service/sign-in
         auth: false
 
-      - upstream: /users/{userId}/organizer-rights
-        method: POST
-        use: downstream
-        downstream: identity-service/users/{userId}/organizer-rights
-        auth: true
-
-      - upstream: /users/{userId}/organizer-rights
-        method: DELETE
-        use: downstream
-        downstream: identity-service/users/{userId}/organizer-rights
-        auth: true
-
       - upstream: /users/{userId}/ban
         method: POST
         use: downstream
@@ -188,17 +176,29 @@ modules:
         downstream: identity-service/2fa/generate-secret
         auth: true
 
+      - upstream: /2fa/verify-code
+        method: POST
+        use: downstream
+        downstream: identity-service/2fa/verify-code
+        auth: false
+
+      - upstream: /access-tokens/revoke
+        method: POST
+        use: downstream
+        downstream: identity-service/access-tokens/revoke
+        auth: true
+
       - upstream: /refresh-tokens/use
         method: POST
         use: downstream
         downstream: identity-service/refresh-tokens/use
-        auth: false
+        auth: true
 
       - upstream: /refresh-tokens/revoke
         method: POST
         use: downstream
         downstream: identity-service/refresh-tokens/revoke
-        auth: false
+        auth: true
 
     services:
       identity-service:
@@ -327,12 +327,6 @@ modules:
         url: notifications-service
 
 
-
-
-
-
-
-
   students:
     path: /students
     routes:
@@ -348,24 +342,48 @@ modules:
         downstream: students-service/students/{studentId}
         auth: true
 
-      - upstream: /{studentId}
-        method: PUT
+      - upstream: /{studentId}/settings
+        method: GET
         use: downstream
-        downstream: students-service/students/{studentId}
-        bind:
-          - studentId:{studentId}
+        downstream: students-service/students/{studentId}/settings
+        auth: true
+
+      - upstream: /{studentId}/gallery
+        method: GET
+        use: downstream
+        downstream: students-service/students/{studentId}/gallery
+        auth: true
+
+      - upstream: /{studentId}/visibility-settings
+        method: GET
+        use: downstream
+        downstream: students-service/students/{studentId}/visibility-settings
+        auth: true
+
+      - upstream: /{studentId}/events
+        method: GET
+        use: downstream
+        downstream: students-service/students/{studentId}/events
+        auth: true
+
+      - upstream: /{studentId}/notifications
+        method: GET
+        use: downstream
+        downstream: students-service/students/{studentId}/notifications
         auth: true
 
       - upstream: /{studentId}
-        method: DELETE
+        method: PUT
         use: downstream
         downstream: students-service/students/{studentId}
+        bind:
+          - studentId:{studentId}
         auth: true
 
-      - upstream: /
-        method: POST
+      - upstream: /{studentId}/settings
+        method: PUT
         use: downstream
-        downstream: students-service/students
+        downstream: students-service/students/{studentId}/settings
         auth: true
 
       - upstream: /{studentId}/state/{state}
@@ -376,19 +394,17 @@ modules:
           - studentId:{studentId}
           - state:{state}
         auth: true
-        claims:
-          role: admin
 
-      - upstream: /{studentId}/events
-        method: GET
+      - upstream: /{studentId}
+        method: DELETE
         use: downstream
-        downstream: students-service/students/{studentId}/events
+        downstream: students-service/students/{studentId}
         auth: true
 
-      - upstream: /{studentId}/notifications
-        method: GET
+      - upstream: /
+        method: POST
         use: downstream
-        downstream: students-service/students/{studentId}/notifications
+        downstream: students-service/students
         auth: true
 
       - upstream: /{studentId}/notifications