Merge pull request #84 from Holo-Host/staging

Staging2Main-4.4.24

.github/workflows/deploy-to-alphaNet.yml

@@ -8,13 +8,12 @@ on:
 jobs:
   deploy:
     runs-on: ubuntu-latest
-    name: Deploy
+    name: Deploy server
     steps:
       - uses: actions/checkout@v2
       - name: Publish to alphaNet
-        uses: cloudflare/wrangler-action@2.0.0
+        uses: cloudflare/wrangler-action@v3
         with:
           apiToken: ${{ secrets.CF_API_TOKEN }}
-          preCommands: 'yarn add @cloudflare/kv-asset-handler'
           workingDirectory: 'server'
           environment: alphanet

.github/workflows/deploy-to-devNet.yml

@@ -8,12 +8,11 @@ on:
 jobs:
   deploy:
     runs-on: ubuntu-latest
-    name: Deploy
+    name: Deploy server
     steps:
       - uses: actions/checkout@v2
       - name: Publish to devNet
-        uses: cloudflare/wrangler-action@2.0.0
+        uses: cloudflare/wrangler-action@v3
         with:
           apiToken: ${{ secrets.CF_API_TOKEN }}
-          preCommands: 'yarn add @cloudflare/kv-asset-handler'
           workingDirectory: 'server'

.github/workflows/deploy-to-qaNet.yml

@@ -0,0 +1,19 @@
+name: Continuous Deployment to qaNet
+
+on:
+  push:
+    branches:
+      - QA
+
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+    name: Deploy server
+    steps:
+      - uses: actions/checkout@v2
+      - name: Publish to qaNet
+        uses: cloudflare/wrangler-action@v3
+        with:
+          apiToken: ${{ secrets.CF_API_TOKEN }}
+          workingDirectory: 'server'
+          environment: qanet

server/src/routes/zt_registration.js

@@ -72,6 +72,45 @@ const cleanUpMembers = (address, apiToken, networkId) => {
     .catch((e) => console.log("Unable to deauthorize - Error: ", e))
 }
 
+/**
+ * Check if a given user (identified by email) is alredy registered and if registration parameters are correct
+ * @param email
+ */
+const isVerifiedUser = async (email) => {
+  const mongodbApiKey = await SETTINGS.get('mongodb_api_key')
+  const mongodbApiUrl = await SETTINGS.get('mongodb_api_url')
+
+  let headers = new Headers()
+  headers.append("Content-Type", "application/json")
+  headers.append("api-key", mongodbApiKey)
+
+  let filter = {
+    "collection":"registrations",
+    "database":"opsconsoledb",
+    "dataSource":"Cluster0",
+    "filter": {
+      "email": email
+    }
+  }
+
+  let resp = await fetch(`${mongodbApiUrl}/action/findOne`, {
+    headers,
+    method: "POST",
+    body: JSON.stringify(filter)
+  })
+
+  let user = await resp.json()
+
+  if (user.document && user.document.registrationCode.length > 0) {
+    let host = user.document.registrationCode.find(el => el.role === "host")
+
+    if (host.approved) return true
+  }
+
+  console.log(`user ${email} was not found in registration database`)
+  return false
+}
+
 /**
  * It adds a new member to the ZeroTier network.
  * @returns A 200 status code and a message.
@@ -82,7 +121,9 @@ const handle = async req => {
     const { data } = payload
     const { email, holochain_agent_id, zerotier_address, holoport_url } = data
 
-    return addZeroTierMember(zerotier_address, holochain_agent_id, email)
+    if (await isVerifiedUser(email)) return addZeroTierMember(zerotier_address, holochain_agent_id, email)
+
+    return respond(401)
   } catch (e) {
     console.log(e)
     return respond(401)

server/wrangler.toml

@@ -1,7 +1,8 @@
 name = "devnet-auth-server"
 account_id = "18ff2b4e6205b938652998cfca0d8cff"
-route = "devnet-auth-server.holo.host/*"
+route = "dev-auth-server.holotest.net/*"
 compatibility_date = "2024-02-19"
+main = "dist/main.js"
 kv_namespaces = [
     { binding = "SETTINGS", id = "5181f479e6d84fc9835c5195b08a7029"}
 ]
@@ -13,7 +14,12 @@ command = "npm install && npm run build"
 name = "auth-server"
 route = "auth-server.holo.host/*"
 kv_namespaces = [
-    { binding = "SETTINGS", id = "5181f479e6d84fc9835c5195b08a7029"}
+    { binding = "SETTINGS", id = "56ecfe1cf54d43839e2c867798e5003b"}
 ]
 
-main = "dist/main.js"
+[env.qanet]
+name = "qa-auth-server"
+route = "qa-auth-server.holotest.net/*"
+kv_namespaces = [
+    { binding = "SETTINGS", id = "1cfdf3a9b75545408f9058d846648349"}
+]