Merge userbase to main (#67)

* removed specific files and changed small things * added scopes, roles, and scope_roles * added new sql tables and infrastructure * added id to user table * editUser endpoint * editUser testing * added createUser * updated createUser.ts * fixed small typo * update createUser.ts * createUser got id to return correctly * implement getUser and getUsers endpoints * delete user working * delete user update * add scope checking * added gh actions for userbase branch * middleware scope handling * #38: role and scope handling * scope and authorizer implementation * scope verification * #38 - comments --------- Co-authored-by: Aryan Gandhi <[email protected]> Co-authored-by: Will Howell <[email protected]> Co-authored-by: Xavier Lam <[email protected]> Co-authored-by: Xavier Lam <[email protected]>
ubclaunchpad · Mar 9, 2024 · 3f758ff · 3f758ff
1 parent e991608
commit 3f758ff
Show file tree

Hide file tree

Showing 29 changed files with 1,044 additions and 994 deletions.
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -2,7 +2,7 @@ name: PR
 
 on:
   pull_request:
-    branches: [ "main" ]
+    branches: [ "main", "userbase" ]
 
 jobs:
   build:

diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
@@ -2,7 +2,7 @@ name: PR
 
 on:
   push:
-    branches: [ "main" ]
+    branches: [ "main", "userbase" ]
 
 jobs:
   deploy-lamda:

diff --git a/lib/posting.stack.ts b/lib/posting.stack.ts
diff --git a/lib/project.stack.ts b/lib/project.stack.ts
diff --git a/lib/user.stack.ts b/lib/user.stack.ts
@@ -68,7 +68,6 @@ export class UserStack extends LPStack {
                             subresources: {
                                 roles: {
                                     endpoints: {
-
                                         GET: {
                                             id: 'getUserRoles',
                                             path: `${baseLambdaDir}/roles/getUserRoles`,
@@ -91,15 +90,6 @@ export class UserStack extends LPStack {
                                 },
                             },
                         },
-
-                        me: {
-                            endpoints: {
-                                GET: {
-                                    id: 'getUserId',
-                                    path: `${usersLambdaDir}/getUserId`,
-                                },
-                            },
-                        },
                     },
                 },
                 faculties: {
@@ -112,8 +102,6 @@ export class UserStack extends LPStack {
                             id: 'createFaculty',
                             path: `${facultiesLambdaDir}/createFaculty`,
                         },
-
-
                     },
                     subresources: {
                         "{id}": {
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,7 +2,7 @@ name: PR @@
     on:
       pull_request:
-        branches: [ "main" ]
+        branches: [ "main", "userbase" ]
     jobs:
       build:
@@ Expand Down @@