Merge pull request #17 from JohnRamberger/development

Development

Author: JohnRamberger

amplify/backend/api/hacklyticsportal2023/schema.graphql

@@ -64,6 +64,8 @@ type Query {
   getUserById(user_uuid: String): String
     @function(name: "hacklyticsportal20232e32fd51-${env}")
   listUsers: String @function(name: "hacklyticsportal2023listusers-${env}")
+  getUserByName(userName: String):String
+    @function(name: "hacklyticsportalGetUserByName-${env}")
 }
 
 type Points
@@ -136,3 +138,40 @@ type EventRSVP
   userName: String!
   eventID: String!
 }
+
+type Log
+  @model
+  @auth(
+    rules: [
+      {
+        allow: groups
+        groups: ["Administrator"]
+        operations: [read, create, update, delete]
+      }
+      { allow: private, operations: [read, create] }
+    ]
+  ) {
+  id: ID!
+  userID: String!
+  userName: String!
+  type: String!
+  message: String!
+  timestamp: AWSDateTime!
+}
+
+type ClaimShirt 
+  @model
+  @auth(
+    rules: [
+      {
+        allow: groups
+        groups: ["Administrator"]
+        operations: [read, create, update, delete]
+      }
+      { allow: private, operations: [read, create] }
+    ]
+  ) {
+  id: ID!
+  userID: String!
+  userName: String!
+}

amplify/backend/backend-config.json

@@ -95,6 +95,20 @@
       ],
       "providerPlugin": "awscloudformation",
       "service": "Lambda"
+    },
+    "hacklyticsportalGetUserByName": {
+      "build": true,
+      "dependsOn": [
+        {
+          "attributes": [
+            "UserPoolId"
+          ],
+          "category": "auth",
+          "resourceName": "hacklyticsportal2023"
+        }
+      ],
+      "providerPlugin": "awscloudformation",
+      "service": "Lambda"
     }
   },
   "parameters": {
@@ -129,6 +143,22 @@
           "resourceName": "hacklyticsportal2023listusers"
         }
       ]
+    },
+    "AMPLIFY_function_hacklyticsportalGetUserByName_deploymentBucketName": {
+      "usedBy": [
+        {
+          "category": "function",
+          "resourceName": "hacklyticsportalGetUserByName"
+        }
+      ]
+    },
+    "AMPLIFY_function_hacklyticsportalGetUserByName_s3Key": {
+      "usedBy": [
+        {
+          "category": "function",
+          "resourceName": "hacklyticsportalGetUserByName"
+        }
+      ]
     }
   },
   "storage": {

amplify/backend/function/hacklyticsportal2023listusers/src/index.js

@@ -34,22 +34,14 @@ exports.handler = async (event) => {
     });
     var users = x.Users;
     if (users.length > 0) {
-      users = users.map((user) => {
-        return {
-          username: user.Username,
-          email: user.Attributes.find((attr) => attr.Name === "email").Value,
-          name: user.Attributes.find((attr) => attr.Name === "name").Value,
-          enabled: user.Enabled,
-        };
-      });
       return JSON.stringify({
         statusCode: 200,
         //  Uncomment below to enable CORS requests
         //  headers: {
         //      "Access-Control-Allow-Origin": "*",
         //      "Access-Control-Allow-Headers": "*"
         //  },
-        body: { ok: 1, userCount: users.length, users: users },
+        body: { ok: 1, users: users },
       });
     } else {
       return JSON.stringify({

amplify/backend/function/hacklyticsportal2023listusers/src/yarn.lock

@@ -2,6 +2,11 @@
 # yarn lockfile v1
 
 
+"@types/aws-lambda@^8.10.92":
+  version "8.10.110"
+  resolved "https://registry.yarnpkg.com/@types/aws-lambda/-/aws-lambda-8.10.110.tgz#32a1f9d40b855d69830243492bbb6408098f4c88"
+  integrity sha512-r6egf2Cwv/JaFTTrF9OXFVUB3j/SXTgM9BwrlbBRjWAa2Tu6GWoDoLflppAZ8uSfbUJdXvC7Br3DjuN9pQ2NUQ==
+
 available-typed-arrays@^1.0.5:
   version "1.0.5"
   resolved "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz"
@@ -97,7 +102,7 @@ has@^1.0.3:
   dependencies:
     function-bind "^1.1.1"
 
-ieee754@^1.1.4, [email protected].13:
+[email protected].13, ieee754@^1.1.4:
   version "1.1.13"
   resolved "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz"
   integrity sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg==
@@ -158,7 +163,7 @@ [email protected]:
   resolved "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz"
   integrity sha512-X/xY82scca2tau62i9mDyU9K+I+djTMUsvwf7xnUX5GLvVzgJybOJf4Y6o9Zx3oJK/LSXg5tTZBjwzqVPaPO2g==
 
-sax@>=0.6.0, sax@1.2.1:
+sax@1.2.1, sax@>=0.6.0:
   version "1.2.1"
   resolved "https://registry.npmjs.org/sax/-/sax-1.2.1.tgz"
   integrity sha512-8I2a3LovHTOpm7NV5yOyO8IHqgVsfK4+UuySrXU8YXkSRX7k6hCV9b3HrkKCr3nMpgj+0bmocaJJWpvp1oc7ZA==

amplify/backend/function/hacklyticsportalGetUserByName/amplify.state

@@ -0,0 +1,6 @@
+{
+  "pluginId": "amplify-nodejs-function-runtime-provider",
+  "functionRuntime": "nodejs",
+  "useLegacyBuild": true,
+  "defaultEditorFile": "src\\index.js"
+}

amplify/backend/function/hacklyticsportalGetUserByName/custom-policies.json

@@ -0,0 +1,6 @@
+[
+  {
+    "Action": [],
+    "Resource": []
+  }
+]

amplify/backend/function/hacklyticsportalGetUserByName/function-parameters.json

@@ -0,0 +1,10 @@
+{
+  "lambdaLayers": [],
+  "permissions": {
+    "auth": {
+      "hacklyticsportal2023": [
+        "read"
+      ]
+    }
+  }
+}