use $auth organization_id

Author: michelle0927

components/messagebird/actions/create-contact/create-contact.mjs

@@ -8,19 +8,10 @@ export default {
   type: "action",
   props: {
     messagebird,
-    organizationId: {
-      propDefinition: [
-        messagebird,
-        "organizationId",
-      ],
-    },
     workspaceId: {
       propDefinition: [
         messagebird,
         "workspaceId",
-        (c) => ({
-          organizationId: c.organizationId,
-        }),
       ],
     },
     displayName: {

components/messagebird/actions/send-sms/send-sms.mjs

@@ -8,19 +8,10 @@ export default {
   type: "action",
   props: {
     messagebird,
-    organizationId: {
-      propDefinition: [
-        messagebird,
-        "organizationId",
-      ],
-    },
     workspaceId: {
       propDefinition: [
         messagebird,
         "workspaceId",
-        (c) => ({
-          organizationId: c.organizationId,
-        }),
       ],
     },
     channelId: {

components/messagebird/actions/send-voice-message/send-voice-message.mjs

@@ -8,19 +8,10 @@ export default {
   type: "action",
   props: {
     messagebird,
-    organizationId: {
-      propDefinition: [
-        messagebird,
-        "organizationId",
-      ],
-    },
     workspaceId: {
       propDefinition: [
         messagebird,
         "workspaceId",
-        (c) => ({
-          organizationId: c.organizationId,
-        }),
       ],
     },
     channelId: {

components/messagebird/messagebird.app.mjs

@@ -4,26 +4,16 @@ export default {
   type: "app",
   app: "messagebird",
   propDefinitions: {
-    organizationId: {
-      type: "string",
-      label: "Organization ID",
-      description: "The unique identifier of an organization. Found in Organization Settings",
-    },
     workspaceId: {
       type: "string",
       label: "Workspace ID",
       description: "The unique identifier of a workspace",
-      async options({
-        organizationId, prevContext,
-      }) {
-        if (!organizationId) {
-          return [];
-        }
+      async options({ prevContext }) {
         const { next: pageToken } = prevContext;
         const {
           results, nextPageToken,
         } = await this.listWorkspaces({
-          organizationId,
+          organizationId: this._organizationId(),
           params: pageToken
             ? {
               pageToken,
@@ -136,6 +126,9 @@ export default {
     _baseUrl() {
       return "https://api.bird.com";
     },
+    _organizationId() {
+      return this.$auth.organization_id;
+    },
     _makeRequest({
       $ = this,
       path,
@@ -150,28 +143,26 @@ export default {
       });
     },
     createWebhook({
-      organizationId, workspaceId, ...opts
+      workspaceId, ...opts
     }) {
       return this._makeRequest({
         method: "POST",
-        path: `/organizations/${organizationId}/workspaces/${workspaceId}/webhook-subscriptions`,
+        path: `/organizations/${this._organizationId()}/workspaces/${workspaceId}/webhook-subscriptions`,
         ...opts,
       });
     },
     deleteWebhook({
-      organizationId, workspaceId, hookId, ...opts
+      workspaceId, hookId, ...opts
     }) {
       return this._makeRequest({
         method: "DELETE",
-        path: `/organizations/${organizationId}/workspaces/${workspaceId}/webhook-subscriptions/${hookId}`,
+        path: `/organizations/${this._organizationId()}/workspaces/${workspaceId}/webhook-subscriptions/${hookId}`,
         ...opts,
       });
     },
-    listWorkspaces({
-      organizationId, ...opts
-    }) {
+    listWorkspaces(opts = {}) {
       return this._makeRequest({
-        path: `/organizations/${organizationId}/workspaces`,
+        path: `/organizations/${this._organizationId()}/workspaces`,
         ...opts,
       });
     },

components/messagebird/sources/new-message-received/new-message-received.mjs

@@ -12,19 +12,10 @@ export default {
     messagebird,
     http: "$.interface.http",
     db: "$.service.db",
-    organizationId: {
-      propDefinition: [
-        messagebird,
-        "organizationId",
-      ],
-    },
     workspaceId: {
       propDefinition: [
         messagebird,
         "workspaceId",
-        (c) => ({
-          organizationId: c.organizationId,
-        }),
       ],
     },
     platform: {
@@ -48,7 +39,6 @@ export default {
   hooks: {
     async activate() {
       const { id } = await this.messagebird.createWebhook({
-        organizationId: this.organizationId,
         workspaceId: this.workspaceId,
         data: {
           service: "channels",
@@ -62,7 +52,6 @@ export default {
       const hookId = this._getHookId();
       if (hookId) {
         await this.messagebird.deleteWebhook({
-          organizationId: this.organizationId,
           workspaceId: this.workspaceId,
           hookId,
         });