Added AWS config and identity store

config/custom-environment-variables.js

@@ -10,6 +10,22 @@ module.exports = {
     __name: "PORT",
     __format: "number",
   },
+
+  aws: {
+    region: {
+      __name: "AWS_REGION",
+    },
+    access_key: {
+      __name: "AWS_ACCESS_KEY",
+    },
+    secret_key: {
+      __name: "AWS_SECRET_KEY",
+    },
+    identity_store_id: {
+      __name: "IDENTITY_STORE_ID",
+    },
+  },
+
   enableFileLogs: {
     __name: "ENABLE_FILE_LOGS",
     __format: "boolean",

config/default.js

@@ -20,6 +20,13 @@
     org: "Real-Dev-Squad",
   },
 
+  aws: {
+    region: "<aws-region>",
+    access_key: "<aws-access-key>",
+    secret_key: "<aws-secret-key>",
+    identity_store_id: "<identity-store-id>",
+  },
+
   githubOauth: {
     clientId: "<clientId>",
     clientSecret: "<clientSecret>",
@@ -66,7 +73,7 @@
   },
 
   cors: {
     allowedOrigins: /(https:\/\/([a-zA-Z0-9-_]+\.)?realdevsquad\.com$)/, // Allow realdevsquad.com, *.realdevsquad.com
   },
 
   userToken: {

constants/urls.ts

@@ -1,5 +1,7 @@
 export const GITHUB_URL = "https://github.com";
+export const PROFILE_SVC_GITHUB_URL = "https://github.com/Real-Dev-Squad/sample-profile-service";
 
 module.exports = {
   GITHUB_URL,
+  PROFILE_SVC_GITHUB_URL,
 };

constants/userDataLevels.ts

@@ -7,7 +7,7 @@ const ACCESS_LEVEL = {
 
 const ROLE_LEVEL = {
   private: ["super_user"],
-  internal: ["super_user"],
+  internal: ["super_user", "cloudfare_worker"],
   confidential: ["super_user"],
 };
 

controllers/awsAccess.ts

@@ -0,0 +1,43 @@
+import { PROFILE_SVC_GITHUB_URL } from "../constants/urls";
+import {addUserToGroup, createUser, fetchAwsUserIdByUsername} from "../utils/awsFunctions";
+const dataAccess = require("../services/dataAccessLayer");
+const userDataLevels = require('../constants/userDataLevels');
+
+export const addUserToAWSGroup = async (req, res) => {
+    const { groupId, userId } = req.body;
+
+    try {
+      const userInfoData = await dataAccess.retrieveUsers({ discordId: userId, level: userDataLevels.ACCESS_LEVEL.INTERNAL, role: 'cloudfare_worker'});
+      if (!userInfoData.userExists) {
+        return res.status(400).json({ error: "User not found" });
+      } else if(!userInfoData.user.email) {
+        return res.status(400).json({ error: `User email is required to create an AWS user. Please update your email by setting up Profile service, url : ${PROFILE_SVC_GITHUB_URL}` });
+      }
+
+      let awsUserId = await fetchAwsUserIdByUsername(userInfoData.user.username);
+
+      let userCreationResponse = null;
+
+      if (awsUserId === null){
+        // We need to create the user in AWS before and then fetch its Id
+        userCreationResponse = await createUser(userInfoData.user.username, userInfoData.user.email);
+        awsUserId = userCreationResponse.UserId;
+      }
+
+      let userAdditionResponse = await addUserToGroup(groupId, awsUserId)
+
+      if (userAdditionResponse.conflict){
+        return res.status(200).json({
+          message: `User ${userId} is already part of the AWS group, please try signing in.`
+        })
+      }
+
+      if (userAdditionResponse)
+        return res.status(200).json({
+          message: `User ${userId} successfully added to group ${groupId}.`
+        });
+    } catch (error) {
+      logger.error(`Error in adding user - ${userId} to AWS group - ${groupId} error - ${error}`);
+      throw error;
+    }
+};

package.json

@@ -16,6 +16,7 @@
     "tdd:watch": "sh scripts/tests/tdd.sh"
   },
   "dependencies": {
+    "@aws-sdk/client-identitystore": "^3.665.0",
     "@types/nodemailer": "^6.4.15",
     "axios": "1.7.2",
     "cloudinary": "2.0.3",

routes/awsAccess.ts

@@ -0,0 +1,8 @@
+import express from "express"
+import { addUserToAWSGroup } from "../controllers/awsAccess";
+const router = express.Router();
+const { verifyDiscordBot } = require("../middlewares/authorizeBot");
+
+router.post("", verifyDiscordBot, addUserToAWSGroup);
+
+module.exports = router;

routes/index.ts

@@ -2,6 +2,7 @@ import express from "express";
 const app = express.Router();
 import { devFlagMiddleware } from "../middlewares/devFlag";
 
+app.use("/aws-access", devFlagMiddleware, require("./awsAccess"))
 app.use("/answers", require("./answers"));
 app.use("/auctions", require("./auctions"));
 app.use("/arts", require("./arts"));

test/config/test.js

@@ -23,6 +23,13 @@ module.exports = {
     clientId: "clientId",
     clientSecret: "clientSecret",
   },
+  aws: {
+    region: "us-east-1",
+    access_key: "test-access-key",
+    secret_key: "test-secret-key",
+    identity_store_id: "test-identity-store-id",
+  },
+
   firestore: `{
     "type": "service_account",
     "project_id": "test-project-id-for-emulator",

test/fixtures/user/user.js

@@ -54,7 +54,6 @@ module.exports = () => {
       twitter_id: "whatifi",
       discordJoinedAt: "2023-04-06T01:47:34.488000+00:00",
       phone: "1234567891",
-      email: "abc1@gmail.com",
       picture: {
         publicId: "profile/mtS4DhUvNYsKqI7oCWVB/aenklfhtjldc5ytei3ar",
         url: "https://res.cloudinary.com/realdevsquad/image/upload/v1667685133/profile/mtS4DhUvNYsKqI7oCWVB/aenklfhtjldc5ytei3ar.jpg",

test/integration/awsAccess.test.ts

@@ -0,0 +1,149 @@
+import chai, {expect} from "chai";
+import sinon from 'sinon';
+import chaiHttp from 'chai-http';
+import * as awsFunctions from '../../utils/awsFunctions';
+import bot from "../utils/generateBotToken";
+import { PROFILE_SVC_GITHUB_URL } from '../../constants/urls';
+
+const app = require("../../server");
+const userData = require("../fixtures/user/user")();
+const authorizeBot = require("../../middlewares/authorizeBot");
+const addUser = require("../utils/addUser");
+const cleanDb = require("../utils/cleanDb");
+const { CLOUDFLARE_WORKER } = require("../../constants/bot")
+
+chai.use(chaiHttp);
+
+describe('addUserToAWSGroup', function(){
+  let req: any;
+  const AWS_ACCESS_API_URL = `/aws-access?dev=true`
+
+  beforeEach(async () => {
+    await addUser(userData[0]);
+    await addUser(userData[1]);
+    sinon.restore();
+    req = {
+      headers: {},
+    };
+    const jwtToken = bot.generateToken({ name: CLOUDFLARE_WORKER });
+    req.headers.authorization = `Bearer ${jwtToken}`;
+  })
+
+  afterEach(async () => {
+    await cleanDb();
+  });
+
+  it('should return 400 and user not found with wrong discord Id passed', function(done){
+    const res = chai
+    .request(app)
+    .post(AWS_ACCESS_API_URL)
+    .set('Authorization', req.headers.authorization)
+    .send({
+      groupId: 'test-group-id',
+      userId: '3000230293'
+    })
+    .end((err, res) => {
+      if (err) {
+        return done(err);
+      }
+      expect(res.status).to.be.equal(400);
+      expect(res.body).to.have.property('error')
+          .that.equals(`User not found`);
+      return done();
+    })
+  });
+
+  it('should return 400 when user email is missing', function(done) {    
+    const res = chai
+      .request(app)
+      .post(AWS_ACCESS_API_URL)
+      .set('Authorization', req.headers.authorization)
+      .send({
+        groupId: 'test-group-id',
+        userId: '1234567890'
+      })
+      .end((err, res) => {
+        if (err) {
+          return done(err);
+        }
+        expect(res.status).to.be.equal(400);
+        expect(res.body).to.have.property('error')
+            .that.equals(`User email is required to create an AWS user. Please update your email by setting up Profile service, url : ${PROFILE_SVC_GITHUB_URL}`);
+        return done();
+      });
+  });
+
+
+  it("Should create user and add to group, if the user is not present in AWS already", function(done){
+    sinon.stub(awsFunctions, "createUser").resolves({ UserId: "new-aws-user-id" });
+    sinon.stub(awsFunctions, "addUserToGroup").resolves({ conflict: false });
+    sinon.stub(awsFunctions, "fetchAwsUserIdByUsername").resolves(null);
+
+    const res = chai
+    .request(app)
+    .post(AWS_ACCESS_API_URL)
+    .set('Authorization', req.headers.authorization)
+    .send({
+      groupId: 'test-group-id',
+      userId: '12345'
+    })
+    .end((err, res) => {
+      if (err) {
+        return done(err);
+      }
+      expect(res.status).to.be.equal(200);
+      expect(res.body).to.have.property('message', 
+        `User 12345 successfully added to group test-group-id.`
+      );
+      return done();
+    });
+  });
+
+  it("Should add the user to the group if the user is already part of AWS account", function(done){
+    sinon.stub(awsFunctions, "addUserToGroup").resolves({ conflict: false });
+    sinon.stub(awsFunctions, "fetchAwsUserIdByUsername").resolves("existing-user-id-123");
+
+    const res =  chai
+    .request(app)
+    .post(AWS_ACCESS_API_URL)
+    .set('Authorization', req.headers.authorization)
+    .send({
+      groupId: 'test-group-id',
+      userId: '12345'
+    })
+    .end((err, res) => {
+      if (err) {
+        return done(err);
+      }
+      expect(res.status).to.be.equal(200)
+      expect(res.body).to.have.property('message', 
+        'User 12345 successfully added to group test-group-id.'
+      );
+      return done();
+    });
+  });
+
+  it("Should return the signin URL if the user is already added to the group", function(done) {
+    sinon.stub(awsFunctions, "addUserToGroup").resolves({ conflict: true });
+    sinon.stub(awsFunctions, "fetchAwsUserIdByUsername").resolves("existing-user-id-123");
+
+    const res = chai
+    .request(app)
+    .post(AWS_ACCESS_API_URL)
+    .set('Authorization', req.headers.authorization)
+    .send({
+      groupId: 'test-group-id',
+      userId: '12345'
+    })
+    .end((err, res) => {
+      if (err) {
+        return done(err);
+      }
+      expect(res.status).to.be.equal(200);
+      expect(res.body).to.have.property('message', 
+        'User 12345 is already part of the AWS group, please try signing in.'
+      );
+      return done();
+    });
+  });
+});