Merge branch 'master' into code_of_conduct

asyncapi · Jan 24, 2024 · 47abfb0 · 47abfb0
2 parents 13f28d0 + d97f8c1
commit 47abfb0
Show file tree

Hide file tree

Showing 53 changed files with 601 additions and 220 deletions.
diff --git a/.all-contributorsrc b/.all-contributorsrc
@@ -416,6 +416,38 @@
       "contributions": [
         "code"
       ]
+    },
+    {
+      "login": "meteatamel",
+      "name": "Mete Atamel",
+      "avatar_url": "https://avatars.githubusercontent.com/u/1177542?v=4",
+      "profile": "http://atamel.dev",
+      "contributions": [
+        "talk",
+        "review",
+        "maintenance",
+        "ideas",
+        "blog",
+        "promotion"
+      ]
+    },
+    {
+      "login": "akkshitgupta",
+      "name": "Akshit Gupta",
+      "avatar_url": "https://avatars.githubusercontent.com/u/96991785?v=4",
+      "profile": "https://github.com/akkshitgupta",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "nikhilkalburgi",
+      "name": "nikhilkalburgi",
+      "avatar_url": "https://avatars.githubusercontent.com/u/70331875?v=4",
+      "profile": "https://github.com/nikhilkalburgi",
+      "contributions": [
+        "doc"
+      ]
     }
   ],
   "commitConvention": "angular",

diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml
@@ -45,7 +45,7 @@ jobs:
         env:
           GITHUB_TOKEN: "${{ secrets.GH_TOKEN }}"
           GITHUB_LOGIN: asyncapi-bot
-          MERGE_LABELS: ""
+          MERGE_LABELS: "!do-not-merge"
           MERGE_METHOD: "squash"
           MERGE_COMMIT_MESSAGE: "{pullRequest.title} (#{pullRequest.number})"
           MERGE_RETRIES: "20"

diff --git a/.github/workflows/create-event-ad-hoc.yml b/.github/workflows/create-event-ad-hoc.yml
@@ -35,8 +35,8 @@ jobs:
       create_zoom: true
     secrets:
       GH_TOKEN: ${{ secrets.GH_TOKEN }}
-      ZOOM_API_KEY: ${{ secrets.ZOOM_API_KEY }}
-      ZOOM_API_SECRET: ${{ secrets.ZOOM_API_SECRET }}
+      ZOOM_ACCOUNT_ID: ${{ secrets.ZOOM_ACCOUNT_ID }}
+      ZOOM_TOKEN: ${{ secrets.ZOOM_TOKEN }}
       STREAM_URL: ${{ secrets.STREAM_URL }}
       STREAM_KEY: ${{ secrets.STREAM_KEY }}
       CALENDAR_ID: ${{ secrets.CALENDAR_ID }}

diff --git a/.github/workflows/create-event-community-meeting.yml b/.github/workflows/create-event-community-meeting.yml
@@ -28,8 +28,8 @@ jobs:
       create_zoom: true
     secrets:
       GH_TOKEN: ${{ secrets.GH_TOKEN }}
-      ZOOM_API_KEY: ${{ secrets.ZOOM_API_KEY }}
-      ZOOM_API_SECRET: ${{ secrets.ZOOM_API_SECRET }}
+      ZOOM_ACCOUNT_ID: ${{ secrets.ZOOM_ACCOUNT_ID }}
+      ZOOM_TOKEN: ${{ secrets.ZOOM_TOKEN }}
       STREAM_URL: ${{ secrets.STREAM_URL }}
       STREAM_KEY: ${{ secrets.STREAM_KEY }}
       CALENDAR_ID: ${{ secrets.CALENDAR_ID }}

diff --git a/.github/workflows/create-event-helpers/package-lock.json b/.github/workflows/create-event-helpers/package-lock.json
diff --git a/.github/workflows/create-event-helpers/package.json b/.github/workflows/create-event-helpers/package.json
@@ -6,7 +6,6 @@
     "@actions/core": "^1.6.0",
     "@mailchimp/mailchimp_marketing": "^3.0.74",
     "googleapis": "^99.0.0",
-    "jsonwebtoken": "^8.5.1",
     "node-fetch": "2.6.1"
   }
 }
diff --git a/.github/workflows/create-event-helpers/zoom/index.js b/.github/workflows/create-event-helpers/zoom/index.js
@@ -1,5 +1,5 @@
 const fetch = require('node-fetch');
-const jwt = require('jsonwebtoken');
+const { URLSearchParams } = require('url');
 const core = require('@actions/core');
 
 /**
@@ -11,15 +11,25 @@ const core = require('@actions/core');
 module.exports = async(date, time, host, cohost) => {
 
     const meetingTitle = process.env.MEETING_NAME;
-    let meetingDetails;
+    let meetingDetails, token;
 
-    const tokenConfig = {
-        iss: process.env.ZOOM_API_KEY,
-        exp: ((new Date()).getTime() + 5000)
+    //getting request token
+    try {
+        const params = new URLSearchParams();
+        params.append('grant_type', 'account_credentials');
+        params.append('account_id', process.env.ZOOM_ACCOUNT_ID);
+        const tokenCreationResponse = await fetch('https://zoom.us/oauth/token', {
+            method: 'POST',
+            body: params,
+            headers: {
+                Authorization: `Basic ${ process.env.ZOOM_TOKEN }`
+            },
+        });
+        token = (await tokenCreationResponse.json()).access_token;
+    } catch (error) {
+        return core.setFailed(`Failed getting token: ${ error }`)
     }
 
-    const token = jwt.sign(tokenConfig, process.env.ZOOM_API_SECRET);
-
     const zoomSettings = JSON.stringify({
         topic: meetingTitle,
         type: '2',
@@ -57,8 +67,11 @@ module.exports = async(date, time, host, cohost) => {
         return core.setFailed(`Meeting creation failed: ${ error }`)
     }
 
-    //core.debug(JSON.stringify(meetingDetails));
     const meetingId = meetingDetails.id;
+    if (!meetingId) {
+        core.info(JSON.stringify(meetingDetails, null, 4));
+        return core.setFailed('meetingId is not available which means something went wrong in communication with Zoom');
+    }
     const meetingUrl = meetingDetails.join_url;
 
     const streamOptions = JSON.stringify({
@@ -84,7 +97,6 @@ module.exports = async(date, time, host, cohost) => {
         return core.setFailed(`Meeting update with streaming info failed: ${ error }`)
     }
 
-    if (!meetingId) return core.setFailed('meetingId is not available which means something went wrong in communication with Zoom. Most probably the host that you defined is not yet part of related Zoom account');
     core.info(`Created meeting ${ meetingId } that you can join at ${ meetingUrl }`);
     core.setOutput('meetingUrl', meetingUrl);
-}
+}
diff --git a/.github/workflows/create-event-lets-talk-about.yml b/.github/workflows/create-event-lets-talk-about.yml
@@ -32,8 +32,8 @@ jobs:
       create_zoom: false
     secrets:
       GH_TOKEN: ${{ secrets.GH_TOKEN }}
-      ZOOM_API_KEY: ${{ secrets.ZOOM_API_KEY }}
-      ZOOM_API_SECRET: ${{ secrets.ZOOM_API_SECRET }}
+      ZOOM_ACCOUNT_ID: ${{ secrets.ZOOM_ACCOUNT_ID }}
+      ZOOM_TOKEN: ${{ secrets.ZOOM_TOKEN }}
       STREAM_URL: ${{ secrets.STREAM_URL }}
       STREAM_KEY: ${{ secrets.STREAM_KEY }}
       CALENDAR_ID: ${{ secrets.CALENDAR_ID }}

diff --git a/.github/workflows/create-event-spec-3-0.yml b/.github/workflows/create-event-spec-3-0.yml
@@ -29,8 +29,8 @@ jobs:
       create_zoom: true
     secrets:
       GH_TOKEN: ${{ secrets.GH_TOKEN }}
-      ZOOM_API_KEY: ${{ secrets.ZOOM_API_KEY }}
-      ZOOM_API_SECRET: ${{ secrets.ZOOM_API_SECRET }}
+      ZOOM_ACCOUNT_ID: ${{ secrets.ZOOM_ACCOUNT_ID }}
+      ZOOM_TOKEN: ${{ secrets.ZOOM_TOKEN }}
       STREAM_URL: ${{ secrets.STREAM_URL }}
       STREAM_KEY: ${{ secrets.STREAM_KEY }}
       CALENDAR_ID: ${{ secrets.CALENDAR_ID }}

diff --git a/.github/workflows/create-event-spec-3-docs.yml b/.github/workflows/create-event-spec-3-docs.yml
@@ -28,8 +28,8 @@ jobs:
       create_zoom: true
     secrets:
       GH_TOKEN: ${{ secrets.GH_TOKEN }}
-      ZOOM_API_KEY: ${{ secrets.ZOOM_API_KEY }}
-      ZOOM_API_SECRET: ${{ secrets.ZOOM_API_SECRET }}
+      ZOOM_ACCOUNT_ID: ${{ secrets.ZOOM_ACCOUNT_ID }}
+      ZOOM_TOKEN: ${{ secrets.ZOOM_TOKEN }}
       STREAM_URL: ${{ secrets.STREAM_URL }}
       STREAM_KEY: ${{ secrets.STREAM_KEY }}
       CALENDAR_ID: ${{ secrets.CALENDAR_ID }}

diff --git a/.github/workflows/create-event-thinking-out-loud.yml b/.github/workflows/create-event-thinking-out-loud.yml
@@ -34,8 +34,8 @@ jobs:
       create_zoom: true
     secrets:
       GH_TOKEN: ${{ secrets.GH_TOKEN }}
-      ZOOM_API_KEY: ${{ secrets.ZOOM_API_KEY }}
-      ZOOM_API_SECRET: ${{ secrets.ZOOM_API_SECRET }}
+      ZOOM_ACCOUNT_ID: ${{ secrets.ZOOM_ACCOUNT_ID }}
+      ZOOM_TOKEN: ${{ secrets.ZOOM_TOKEN }}
       STREAM_URL: ${{ secrets.STREAM_URL }}
       STREAM_KEY: ${{ secrets.STREAM_KEY }}
       CALENDAR_ID: ${{ secrets.CALENDAR_ID }}