@activepieces/piece-slack 0.13.0 → 0.14.0

package/src/lib/triggers/new-message-in-channel.js

@@ -5,6 +5,7 @@ const tslib_1 = require("tslib");
 const pieces_framework_1 = require("@activepieces/pieces-framework");
 const props_1 = require("../common/props");
 const auth_1 = require("../auth");
+const auth_helpers_1 = require("../common/auth-helpers");
 exports.newMessageInChannelTrigger = (0, pieces_framework_1.createTrigger)({
     auth: auth_1.slackAuth,
     name: 'new-message-in-channel',
@@ -23,9 +24,7 @@ exports.newMessageInChannelTrigger = (0, pieces_framework_1.createTrigger)({
     sampleData: undefined,
     onEnable(context) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            var _a;
-            // Older OAuth2 has team_id, newer has team.id
-            const teamId = (_a = context.auth.data['team_id']) !== null && _a !== void 0 ? _a : context.auth.data['team']['id'];
+            const teamId = yield (0, auth_helpers_1.getTeamId)(context.auth);
             context.app.createListeners({
                 events: ['message'],
                 identifierValue: teamId,

package/src/lib/triggers/new-message-in-channel.js.map

@@ -1 +1 @@
-{"version":3,"file":"new-message-in-channel.js","sourceRoot":"","sources":["../../../../src/lib/triggers/new-message-in-channel.ts"],"names":[],"mappings":";;;;AAAA,qEAA0F;AAC1F,2CAAwE;AACxE,kCAAoC;AAOvB,QAAA,0BAA0B,GAAG,IAAA,gCAAa,EAAC;IACvD,IAAI,EAAE,gBAAS;IACf,IAAI,EAAE,wBAAwB;IAC9B,WAAW,EAAE,+BAA+B;IAC5C,WAAW,EAAE,0EAA0E;IACvF,KAAK,EAAE;QACN,IAAI,EAAE,+BAAuB;QAC7B,OAAO,EAAE,IAAA,oBAAY,EAAC,IAAI,CAAC;QAC3B,UAAU,EAAE,2BAAQ,CAAC,QAAQ,CAAC;YAC7B,WAAW,EAAE,uBAAuB;YACpC,QAAQ,EAAE,IAAI;YACd,YAAY,EAAE,KAAK;SACnB,CAAC;KACF;IACD,IAAI,EAAE,kCAAe,CAAC,WAAW;IACjC,UAAU,EAAE,SAAS;IACf,QAAQ,CAAC,OAAO;;;YACrB,8CAA8C;YAC9C,MAAM,MAAM,GAAG,MAAA,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,mCAAI,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC;YAC/E,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC;gBAC3B,MAAM,EAAE,CAAC,SAAS,CAAC;gBACnB,eAAe,EAAE,MAAM;aACvB,CAAC,CAAC;QACJ,CAAC;KAAA;IACK,SAAS,CAAC,OAAO;;YACtB,UAAU;QACX,CAAC;KAAA;IAEK,GAAG,CAAC,OAAO;;YAChB,MAAM,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC,IAAmB,CAAC;YAExD,gCAAgC;YAChC,IAAI,CAAC,CAAC,SAAS,EAAC,OAAO,CAAC,CAAC,QAAQ,CAAC,WAAW,CAAC,KAAK,CAAC,YAAY,CAAC,EAAE,CAAC;gBACnE,OAAO,EAAE,CAAC;YACX,CAAC;YAED,IAAI,WAAW,CAAC,KAAK,CAAC,OAAO,KAAK,OAAO,CAAC,UAAU,CAAC,OAAO,EAAE,CAAC;gBAC9D,yBAAyB;gBACzB,IAAI,OAAO,CAAC,UAAU,CAAC,UAAU,IAAI,WAAW,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC;oBAC/D,OAAO,EAAE,CAAC;gBACX,CAAC;gBACD,OAAO,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;YAC5B,CAAC;YAED,OAAO,EAAE,CAAC;QACX,CAAC;KAAA;CACD,CAAC,CAAC"}
+{"version":3,"file":"new-message-in-channel.js","sourceRoot":"","sources":["../../../../src/lib/triggers/new-message-in-channel.ts"],"names":[],"mappings":";;;;AAAA,qEAA0F;AAC1F,2CAAwE;AACxE,kCAAoC;AACpC,yDAAmE;AAItD,QAAA,0BAA0B,GAAG,IAAA,gCAAa,EAAC;IACvD,IAAI,EAAE,gBAAS;IACf,IAAI,EAAE,wBAAwB;IAC9B,WAAW,EAAE,+BAA+B;IAC5C,WAAW,EAAE,0EAA0E;IACvF,KAAK,EAAE;QACN,IAAI,EAAE,+BAAuB;QAC7B,OAAO,EAAE,IAAA,oBAAY,EAAC,IAAI,CAAC;QAC3B,UAAU,EAAE,2BAAQ,CAAC,QAAQ,CAAC;YAC7B,WAAW,EAAE,uBAAuB;YACpC,QAAQ,EAAE,IAAI;YACd,YAAY,EAAE,KAAK;SACnB,CAAC;KACF;IACD,IAAI,EAAE,kCAAe,CAAC,WAAW;IACjC,UAAU,EAAE,SAAS;IACf,QAAQ,CAAC,OAAO;;YACrB,MAAM,MAAM,GAAG,MAAM,IAAA,wBAAS,EAAC,OAAO,CAAC,IAAsB,CAAC,CAAC;YAC/D,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC;gBAC3B,MAAM,EAAE,CAAC,SAAS,CAAC;gBACnB,eAAe,EAAE,MAAM;aACvB,CAAC,CAAC;QACJ,CAAC;KAAA;IACK,SAAS,CAAC,OAAO;;YACtB,UAAU;QACX,CAAC;KAAA;IAEK,GAAG,CAAC,OAAO;;YAChB,MAAM,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC,IAAmB,CAAC;YAExD,gCAAgC;YAChC,IAAI,CAAC,CAAC,SAAS,EAAC,OAAO,CAAC,CAAC,QAAQ,CAAC,WAAW,CAAC,KAAK,CAAC,YAAY,CAAC,EAAE,CAAC;gBACnE,OAAO,EAAE,CAAC;YACX,CAAC;YAED,IAAI,WAAW,CAAC,KAAK,CAAC,OAAO,KAAK,OAAO,CAAC,UAAU,CAAC,OAAO,EAAE,CAAC;gBAC9D,yBAAyB;gBACzB,IAAI,OAAO,CAAC,UAAU,CAAC,UAAU,IAAI,WAAW,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC;oBAC/D,OAAO,EAAE,CAAC;gBACX,CAAC;gBACD,OAAO,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;YAC5B,CAAC;YAED,OAAO,EAAE,CAAC;QACX,CAAC;KAAA;CACD,CAAC,CAAC"}

package/src/lib/triggers/new-message.d.ts

@@ -1,11 +1,23 @@
 import { TriggerStrategy } from '@activepieces/pieces-framework';
-export declare const newMessageTrigger: import("@activepieces/pieces-framework").ITrigger<TriggerStrategy.WEBHOOK, import("@activepieces/pieces-framework").OAuth2Property<import("@activepieces/pieces-framework").OAuth2Props>, {
+export declare const newMessageTrigger: import("@activepieces/pieces-framework").ITrigger<TriggerStrategy.WEBHOOK, (import("@activepieces/pieces-framework").OAuth2Property<import("@activepieces/pieces-framework").OAuth2Props> | import("@activepieces/pieces-framework").CustomAuthProperty<{
+    botToken: import("@activepieces/pieces-framework").SecretTextProperty<true>;
+    userToken: import("@activepieces/pieces-framework").SecretTextProperty<false>;
+}>)[], {
     ignoreBots: import("@activepieces/pieces-framework").CheckboxProperty<true>;
-}> | import("@activepieces/pieces-framework").ITrigger<TriggerStrategy.POLLING, import("@activepieces/pieces-framework").OAuth2Property<import("@activepieces/pieces-framework").OAuth2Props>, {
+}> | import("@activepieces/pieces-framework").ITrigger<TriggerStrategy.POLLING, (import("@activepieces/pieces-framework").OAuth2Property<import("@activepieces/pieces-framework").OAuth2Props> | import("@activepieces/pieces-framework").CustomAuthProperty<{
+    botToken: import("@activepieces/pieces-framework").SecretTextProperty<true>;
+    userToken: import("@activepieces/pieces-framework").SecretTextProperty<false>;
+}>)[], {
     ignoreBots: import("@activepieces/pieces-framework").CheckboxProperty<true>;
-}> | import("@activepieces/pieces-framework").ITrigger<TriggerStrategy.MANUAL, import("@activepieces/pieces-framework").OAuth2Property<import("@activepieces/pieces-framework").OAuth2Props>, {
+}> | import("@activepieces/pieces-framework").ITrigger<TriggerStrategy.MANUAL, (import("@activepieces/pieces-framework").OAuth2Property<import("@activepieces/pieces-framework").OAuth2Props> | import("@activepieces/pieces-framework").CustomAuthProperty<{
+    botToken: import("@activepieces/pieces-framework").SecretTextProperty<true>;
+    userToken: import("@activepieces/pieces-framework").SecretTextProperty<false>;
+}>)[], {
     ignoreBots: import("@activepieces/pieces-framework").CheckboxProperty<true>;
-}> | import("@activepieces/pieces-framework").ITrigger<TriggerStrategy.APP_WEBHOOK, import("@activepieces/pieces-framework").OAuth2Property<import("@activepieces/pieces-framework").OAuth2Props>, {
+}> | import("@activepieces/pieces-framework").ITrigger<TriggerStrategy.APP_WEBHOOK, (import("@activepieces/pieces-framework").OAuth2Property<import("@activepieces/pieces-framework").OAuth2Props> | import("@activepieces/pieces-framework").CustomAuthProperty<{
+    botToken: import("@activepieces/pieces-framework").SecretTextProperty<true>;
+    userToken: import("@activepieces/pieces-framework").SecretTextProperty<false>;
+}>)[], {
     ignoreBots: import("@activepieces/pieces-framework").CheckboxProperty<true>;
 }>;
 //# sourceMappingURL=new-message.d.ts.map

package/src/lib/triggers/new-message.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"new-message.d.ts","sourceRoot":"","sources":["../../../../src/lib/triggers/new-message.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,eAAe,EAAiB,MAAM,gCAAgC,CAAC;AAG1F,eAAO,MAAM,iBAAiB;;;;;;;;EAwC5B,CAAC"}
+{"version":3,"file":"new-message.d.ts","sourceRoot":"","sources":["../../../../src/lib/triggers/new-message.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,eAAe,EAAiB,MAAM,gCAAgC,CAAC;AAI1F,eAAO,MAAM,iBAAiB;;;;;;;;;;;;;;;;;;;;EAuC5B,CAAC"}

package/src/lib/triggers/new-message.js

@@ -4,6 +4,7 @@ exports.newMessageTrigger = void 0;
 const tslib_1 = require("tslib");
 const pieces_framework_1 = require("@activepieces/pieces-framework");
 const auth_1 = require("../auth");
+const auth_helpers_1 = require("../common/auth-helpers");
 exports.newMessageTrigger = (0, pieces_framework_1.createTrigger)({
     auth: auth_1.slackAuth,
     name: 'new-message',
@@ -19,9 +20,7 @@ exports.newMessageTrigger = (0, pieces_framework_1.createTrigger)({
     type: pieces_framework_1.TriggerStrategy.APP_WEBHOOK,
     sampleData: undefined,
     onEnable: (context) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
-        var _a;
-        // Older OAuth2 has team_id, newer has team.id
-        const teamId = (_a = context.auth.data['team_id']) !== null && _a !== void 0 ? _a : context.auth.data['team']['id'];
+        const teamId = yield (0, auth_helpers_1.getTeamId)(context.auth);
         context.app.createListeners({
             events: ['message'],
             identifierValue: teamId,

package/src/lib/triggers/new-message.js.map

@@ -1 +1 @@
-{"version":3,"file":"new-message.js","sourceRoot":"","sources":["../../../../src/lib/triggers/new-message.ts"],"names":[],"mappings":";;;;AAAA,qEAA0F;AAC1F,kCAAoC;AAEvB,QAAA,iBAAiB,GAAG,IAAA,gCAAa,EAAC;IAC9C,IAAI,EAAE,gBAAS;IACf,IAAI,EAAE,aAAa;IACnB,WAAW,EAAE,oCAAoC;IACjD,WAAW,EAAE,uDAAuD;IACpE,KAAK,EAAE;QACN,UAAU,EAAE,2BAAQ,CAAC,QAAQ,CAAC;YAC7B,WAAW,EAAE,uBAAuB;YACpC,QAAQ,EAAE,IAAI;YACd,YAAY,EAAE,KAAK;SACnB,CAAC;KACF;IACD,IAAI,EAAE,kCAAe,CAAC,WAAW;IACjC,UAAU,EAAE,SAAS;IACrB,QAAQ,EAAE,CAAO,OAAO,EAAE,EAAE;;QAC3B,8CAA8C;QAC9C,MAAM,MAAM,GAAG,MAAA,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,mCAAI,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC;QAC/E,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC;YAC3B,MAAM,EAAE,CAAC,SAAS,CAAC;YACnB,eAAe,EAAE,MAAM;SACvB,CAAC,CAAC;IACJ,CAAC,CAAA;IACD,SAAS,EAAE,CAAO,OAAO,EAAE,EAAE;QAC5B,UAAU;IACX,CAAC,CAAA;IAED,GAAG,EAAE,CAAO,OAAO,EAAE,EAAE;QACtB,MAAM,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC,IAAmB,CAAC;QAExD,gCAAgC;QAChC,IAAI,CAAC,CAAC,SAAS,EAAC,OAAO,CAAC,CAAC,QAAQ,CAAC,WAAW,CAAC,KAAK,CAAC,YAAY,CAAC,EAAE,CAAC;YACnE,OAAO,EAAE,CAAC;QACX,CAAC;QAED,yBAAyB;QACzB,IAAI,OAAO,CAAC,UAAU,CAAC,UAAU,IAAI,WAAW,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC;YAC/D,OAAO,EAAE,CAAC;QACX,CAAC;QACD,OAAO,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;IAC5B,CAAC,CAAA;CACD,CAAC,CAAC"}
+{"version":3,"file":"new-message.js","sourceRoot":"","sources":["../../../../src/lib/triggers/new-message.ts"],"names":[],"mappings":";;;;AAAA,qEAA0F;AAC1F,kCAAoC;AACpC,yDAAmE;AAEtD,QAAA,iBAAiB,GAAG,IAAA,gCAAa,EAAC;IAC9C,IAAI,EAAE,gBAAS;IACf,IAAI,EAAE,aAAa;IACnB,WAAW,EAAE,oCAAoC;IACjD,WAAW,EAAE,uDAAuD;IACpE,KAAK,EAAE;QACN,UAAU,EAAE,2BAAQ,CAAC,QAAQ,CAAC;YAC7B,WAAW,EAAE,uBAAuB;YACpC,QAAQ,EAAE,IAAI;YACd,YAAY,EAAE,KAAK;SACnB,CAAC;KACF;IACD,IAAI,EAAE,kCAAe,CAAC,WAAW;IACjC,UAAU,EAAE,SAAS;IACrB,QAAQ,EAAE,CAAO,OAAO,EAAE,EAAE;QAC3B,MAAM,MAAM,GAAG,MAAM,IAAA,wBAAS,EAAC,OAAO,CAAC,IAAsB,CAAC,CAAC;QAC/D,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC;YAC3B,MAAM,EAAE,CAAC,SAAS,CAAC;YACnB,eAAe,EAAE,MAAM;SACvB,CAAC,CAAC;IACJ,CAAC,CAAA;IACD,SAAS,EAAE,CAAO,OAAO,EAAE,EAAE;QAC5B,UAAU;IACX,CAAC,CAAA;IAED,GAAG,EAAE,CAAO,OAAO,EAAE,EAAE;QACtB,MAAM,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC,IAAmB,CAAC;QAExD,gCAAgC;QAChC,IAAI,CAAC,CAAC,SAAS,EAAC,OAAO,CAAC,CAAC,QAAQ,CAAC,WAAW,CAAC,KAAK,CAAC,YAAY,CAAC,EAAE,CAAC;YACnE,OAAO,EAAE,CAAC;QACX,CAAC;QAED,yBAAyB;QACzB,IAAI,OAAO,CAAC,UAAU,CAAC,UAAU,IAAI,WAAW,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC;YAC/D,OAAO,EAAE,CAAC;QACX,CAAC;QACD,OAAO,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;IAC5B,CAAC,CAAA;CACD,CAAC,CAAC"}

package/src/lib/triggers/new-modal-interaction.d.ts

@@ -1,11 +1,23 @@
 import { TriggerStrategy } from '@activepieces/pieces-framework';
-export declare const newModalInteractionTrigger: import("@activepieces/pieces-framework").ITrigger<TriggerStrategy.WEBHOOK, import("@activepieces/pieces-framework").OAuth2Property<import("@activepieces/pieces-framework").OAuth2Props>, {
+export declare const newModalInteractionTrigger: import("@activepieces/pieces-framework").ITrigger<TriggerStrategy.WEBHOOK, (import("@activepieces/pieces-framework").OAuth2Property<import("@activepieces/pieces-framework").OAuth2Props> | import("@activepieces/pieces-framework").CustomAuthProperty<{
+    botToken: import("@activepieces/pieces-framework").SecretTextProperty<true>;
+    userToken: import("@activepieces/pieces-framework").SecretTextProperty<false>;
+}>)[], {
     interactionType: import("@activepieces/pieces-framework").StaticDropdownProperty<string, true>;
-}> | import("@activepieces/pieces-framework").ITrigger<TriggerStrategy.POLLING, import("@activepieces/pieces-framework").OAuth2Property<import("@activepieces/pieces-framework").OAuth2Props>, {
+}> | import("@activepieces/pieces-framework").ITrigger<TriggerStrategy.POLLING, (import("@activepieces/pieces-framework").OAuth2Property<import("@activepieces/pieces-framework").OAuth2Props> | import("@activepieces/pieces-framework").CustomAuthProperty<{
+    botToken: import("@activepieces/pieces-framework").SecretTextProperty<true>;
+    userToken: import("@activepieces/pieces-framework").SecretTextProperty<false>;
+}>)[], {
     interactionType: import("@activepieces/pieces-framework").StaticDropdownProperty<string, true>;
-}> | import("@activepieces/pieces-framework").ITrigger<TriggerStrategy.MANUAL, import("@activepieces/pieces-framework").OAuth2Property<import("@activepieces/pieces-framework").OAuth2Props>, {
+}> | import("@activepieces/pieces-framework").ITrigger<TriggerStrategy.MANUAL, (import("@activepieces/pieces-framework").OAuth2Property<import("@activepieces/pieces-framework").OAuth2Props> | import("@activepieces/pieces-framework").CustomAuthProperty<{
+    botToken: import("@activepieces/pieces-framework").SecretTextProperty<true>;
+    userToken: import("@activepieces/pieces-framework").SecretTextProperty<false>;
+}>)[], {
     interactionType: import("@activepieces/pieces-framework").StaticDropdownProperty<string, true>;
-}> | import("@activepieces/pieces-framework").ITrigger<TriggerStrategy.APP_WEBHOOK, import("@activepieces/pieces-framework").OAuth2Property<import("@activepieces/pieces-framework").OAuth2Props>, {
+}> | import("@activepieces/pieces-framework").ITrigger<TriggerStrategy.APP_WEBHOOK, (import("@activepieces/pieces-framework").OAuth2Property<import("@activepieces/pieces-framework").OAuth2Props> | import("@activepieces/pieces-framework").CustomAuthProperty<{
+    botToken: import("@activepieces/pieces-framework").SecretTextProperty<true>;
+    userToken: import("@activepieces/pieces-framework").SecretTextProperty<false>;
+}>)[], {
     interactionType: import("@activepieces/pieces-framework").StaticDropdownProperty<string, true>;
 }>;
 //# sourceMappingURL=new-modal-interaction.d.ts.map

package/src/lib/triggers/new-modal-interaction.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"new-modal-interaction.d.ts","sourceRoot":"","sources":["../../../../src/lib/triggers/new-modal-interaction.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,eAAe,EAAiB,MAAM,gCAAgC,CAAC;AAI1F,eAAO,MAAM,0BAA0B;;;;;;;;EA8CrC,CAAC"}
+{"version":3,"file":"new-modal-interaction.d.ts","sourceRoot":"","sources":["../../../../src/lib/triggers/new-modal-interaction.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,eAAe,EAAiB,MAAM,gCAAgC,CAAC;AAK1F,eAAO,MAAM,0BAA0B;;;;;;;;;;;;;;;;;;;;EA6CrC,CAAC"}

package/src/lib/triggers/new-modal-interaction.js

@@ -4,6 +4,7 @@ exports.newModalInteractionTrigger = void 0;
 const tslib_1 = require("tslib");
 const pieces_framework_1 = require("@activepieces/pieces-framework");
 const auth_1 = require("../auth");
+const auth_helpers_1 = require("../common/auth-helpers");
 exports.newModalInteractionTrigger = (0, pieces_framework_1.createTrigger)({
     auth: auth_1.slackAuth,
     name: 'new-modal-interaction',
@@ -27,9 +28,7 @@ exports.newModalInteractionTrigger = (0, pieces_framework_1.createTrigger)({
     type: pieces_framework_1.TriggerStrategy.APP_WEBHOOK,
     sampleData: undefined,
     onEnable: (context) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
-        var _a;
-        // Older OAuth2 has team_id, newer has team.id
-        const teamId = (_a = context.auth.data['team_id']) !== null && _a !== void 0 ? _a : context.auth.data['team']['id'];
+        const teamId = yield (0, auth_helpers_1.getTeamId)(context.auth);
         context.app.createListeners({
             events: [context.propsValue.interactionType],
             identifierValue: teamId,

package/src/lib/triggers/new-modal-interaction.js.map

@@ -1 +1 @@
-{"version":3,"file":"new-modal-interaction.js","sourceRoot":"","sources":["../../../../src/lib/triggers/new-modal-interaction.ts"],"names":[],"mappings":";;;;AAAA,qEAA0F;AAC1F,kCAAoC;AAGvB,QAAA,0BAA0B,GAAG,IAAA,gCAAa,EAAC;IACpD,IAAI,EAAE,gBAAS;IACf,IAAI,EAAE,uBAAuB;IAC7B,WAAW,EAAE,uBAAuB;IACpC,WAAW,EAAE,8CAA8C;IAC3D,KAAK,EAAE;QACH,eAAe,EAAE,2BAAQ,CAAC,cAAc,CAAC;YACrC,WAAW,EAAE,kBAAkB;YAC/B,WAAW,EAAE,qDAAqD;YAClE,QAAQ,EAAE,IAAI;YACd,YAAY,EAAE,iBAAiB;YAC/B,OAAO,EAAE;gBACL,QAAQ,EAAE,KAAK;gBACf,OAAO,EAAE;oBACL,EAAE,KAAK,EAAE,iBAAiB,EAAE,KAAK,EAAE,iBAAiB,EAAE;oBACtD,EAAE,KAAK,EAAE,aAAa,EAAE,KAAK,EAAE,aAAa,EAAE;iBACjD;aACJ;SACJ,CAAC;KACL;IACD,IAAI,EAAE,kCAAe,CAAC,WAAW;IACjC,UAAU,EAAE,SAAS;IACrB,QAAQ,EAAE,CAAO,OAAO,EAAE,EAAE;;QACxB,8CAA8C;QAC9C,MAAM,MAAM,GAAG,MAAA,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,mCAAI,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC;QAC/E,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC;YACxB,MAAM,EAAE,CAAC,OAAO,CAAC,UAAU,CAAC,eAAyB,CAAC;YACtD,eAAe,EAAE,MAAM;SAC1B,CAAC,CAAC;IACP,CAAC,CAAA;IACD,SAAS,EAAE,CAAO,OAAO,EAAE,EAAE;QACzB,UAAU;IACd,CAAC,CAAA;IAED,GAAG,EAAE,CAAO,OAAO,EAAE,EAAE;QACnB,MAAM,IAAI,GAAG,OAAO,CAAC,OAAO,CAAC,IAA2B,CAAC;QACzD,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAA0B,CAAC;QAElE,MAAM,eAAe,GAAG,OAAO,CAAC,UAAU,CAAC,eAAyB,CAAC;QACrE,IAAI,OAAO,CAAC,IAAI,KAAK,eAAe,EAAE,CAAC;YACnC,OAAO,EAAE,CAAC;QACd,CAAC;QAED,MAAM,EAAE,KAAK,EAAE,MAAM,KAAqB,OAAO,EAAvB,WAAW,kBAAK,OAAO,EAA3C,SAAiC,CAAU,CAAC;QAClD,OAAO,CAAC,WAAW,CAAC,CAAC;IACzB,CAAC,CAAA;CACJ,CAAC,CAAC"}
+{"version":3,"file":"new-modal-interaction.js","sourceRoot":"","sources":["../../../../src/lib/triggers/new-modal-interaction.ts"],"names":[],"mappings":";;;;AAAA,qEAA0F;AAC1F,kCAAoC;AACpC,yDAAmE;AAGtD,QAAA,0BAA0B,GAAG,IAAA,gCAAa,EAAC;IACpD,IAAI,EAAE,gBAAS;IACf,IAAI,EAAE,uBAAuB;IAC7B,WAAW,EAAE,uBAAuB;IACpC,WAAW,EAAE,8CAA8C;IAC3D,KAAK,EAAE;QACH,eAAe,EAAE,2BAAQ,CAAC,cAAc,CAAC;YACrC,WAAW,EAAE,kBAAkB;YAC/B,WAAW,EAAE,qDAAqD;YAClE,QAAQ,EAAE,IAAI;YACd,YAAY,EAAE,iBAAiB;YAC/B,OAAO,EAAE;gBACL,QAAQ,EAAE,KAAK;gBACf,OAAO,EAAE;oBACL,EAAE,KAAK,EAAE,iBAAiB,EAAE,KAAK,EAAE,iBAAiB,EAAE;oBACtD,EAAE,KAAK,EAAE,aAAa,EAAE,KAAK,EAAE,aAAa,EAAE;iBACjD;aACJ;SACJ,CAAC;KACL;IACD,IAAI,EAAE,kCAAe,CAAC,WAAW;IACjC,UAAU,EAAE,SAAS;IACrB,QAAQ,EAAE,CAAO,OAAO,EAAE,EAAE;QACxB,MAAM,MAAM,GAAG,MAAM,IAAA,wBAAS,EAAC,OAAO,CAAC,IAAsB,CAAC,CAAC;QAC/D,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC;YACxB,MAAM,EAAE,CAAC,OAAO,CAAC,UAAU,CAAC,eAAyB,CAAC;YACtD,eAAe,EAAE,MAAM;SAC1B,CAAC,CAAC;IACP,CAAC,CAAA;IACD,SAAS,EAAE,CAAO,OAAO,EAAE,EAAE;QACzB,UAAU;IACd,CAAC,CAAA;IAED,GAAG,EAAE,CAAO,OAAO,EAAE,EAAE;QACnB,MAAM,IAAI,GAAG,OAAO,CAAC,OAAO,CAAC,IAA2B,CAAC;QACzD,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAA0B,CAAC;QAElE,MAAM,eAAe,GAAG,OAAO,CAAC,UAAU,CAAC,eAAyB,CAAC;QACrE,IAAI,OAAO,CAAC,IAAI,KAAK,eAAe,EAAE,CAAC;YACnC,OAAO,EAAE,CAAC;QACd,CAAC;QAED,MAAM,EAAE,KAAK,EAAE,MAAM,KAAqB,OAAO,EAAvB,WAAW,kBAAK,OAAO,EAA3C,SAAiC,CAAU,CAAC;QAClD,OAAO,CAAC,WAAW,CAAC,CAAC;IACzB,CAAC,CAAA;CACJ,CAAC,CAAC"}

package/src/lib/triggers/new-reaction-added.d.ts

@@ -1,23 +1,59 @@
 import { TriggerStrategy } from '@activepieces/pieces-framework';
-export declare const newReactionAdded: import("@activepieces/pieces-framework").ITrigger<TriggerStrategy.WEBHOOK, import("@activepieces/pieces-framework").OAuth2Property<import("@activepieces/pieces-framework").OAuth2Props>, {
+export declare const newReactionAdded: import("@activepieces/pieces-framework").ITrigger<TriggerStrategy.WEBHOOK, (import("@activepieces/pieces-framework").OAuth2Property<import("@activepieces/pieces-framework").OAuth2Props> | import("@activepieces/pieces-framework").CustomAuthProperty<{
+    botToken: import("@activepieces/pieces-framework").SecretTextProperty<true>;
+    userToken: import("@activepieces/pieces-framework").SecretTextProperty<false>;
+}>)[], {
     info: import("@activepieces/pieces-framework/dist/src/lib/property/input/markdown-property").MarkDownProperty;
     emojis: import("@activepieces/pieces-framework").ArrayProperty<false>;
-    user: import("@activepieces/pieces-framework").DropdownProperty<string, false, import("@activepieces/pieces-framework").OAuth2Property<import("@activepieces/pieces-framework").OAuth2Props>>;
-    channels: import("@activepieces/pieces-framework").MultiSelectDropdownProperty<string, false, import("@activepieces/pieces-framework").OAuth2Property<import("@activepieces/pieces-framework").OAuth2Props>>;
-}> | import("@activepieces/pieces-framework").ITrigger<TriggerStrategy.POLLING, import("@activepieces/pieces-framework").OAuth2Property<import("@activepieces/pieces-framework").OAuth2Props>, {
+    user: import("@activepieces/pieces-framework").DropdownProperty<string, false, (import("@activepieces/pieces-framework").OAuth2Property<import("@activepieces/pieces-framework").OAuth2Props> | import("@activepieces/pieces-framework").CustomAuthProperty<{
+        botToken: import("@activepieces/pieces-framework").SecretTextProperty<true>;
+        userToken: import("@activepieces/pieces-framework").SecretTextProperty<false>;
+    }>)[]>;
+    channels: import("@activepieces/pieces-framework").MultiSelectDropdownProperty<string, false, (import("@activepieces/pieces-framework").OAuth2Property<import("@activepieces/pieces-framework").OAuth2Props> | import("@activepieces/pieces-framework").CustomAuthProperty<{
+        botToken: import("@activepieces/pieces-framework").SecretTextProperty<true>;
+        userToken: import("@activepieces/pieces-framework").SecretTextProperty<false>;
+    }>)[]>;
+}> | import("@activepieces/pieces-framework").ITrigger<TriggerStrategy.POLLING, (import("@activepieces/pieces-framework").OAuth2Property<import("@activepieces/pieces-framework").OAuth2Props> | import("@activepieces/pieces-framework").CustomAuthProperty<{
+    botToken: import("@activepieces/pieces-framework").SecretTextProperty<true>;
+    userToken: import("@activepieces/pieces-framework").SecretTextProperty<false>;
+}>)[], {
     info: import("@activepieces/pieces-framework/dist/src/lib/property/input/markdown-property").MarkDownProperty;
     emojis: import("@activepieces/pieces-framework").ArrayProperty<false>;
-    user: import("@activepieces/pieces-framework").DropdownProperty<string, false, import("@activepieces/pieces-framework").OAuth2Property<import("@activepieces/pieces-framework").OAuth2Props>>;
-    channels: import("@activepieces/pieces-framework").MultiSelectDropdownProperty<string, false, import("@activepieces/pieces-framework").OAuth2Property<import("@activepieces/pieces-framework").OAuth2Props>>;
-}> | import("@activepieces/pieces-framework").ITrigger<TriggerStrategy.MANUAL, import("@activepieces/pieces-framework").OAuth2Property<import("@activepieces/pieces-framework").OAuth2Props>, {
+    user: import("@activepieces/pieces-framework").DropdownProperty<string, false, (import("@activepieces/pieces-framework").OAuth2Property<import("@activepieces/pieces-framework").OAuth2Props> | import("@activepieces/pieces-framework").CustomAuthProperty<{
+        botToken: import("@activepieces/pieces-framework").SecretTextProperty<true>;
+        userToken: import("@activepieces/pieces-framework").SecretTextProperty<false>;
+    }>)[]>;
+    channels: import("@activepieces/pieces-framework").MultiSelectDropdownProperty<string, false, (import("@activepieces/pieces-framework").OAuth2Property<import("@activepieces/pieces-framework").OAuth2Props> | import("@activepieces/pieces-framework").CustomAuthProperty<{
+        botToken: import("@activepieces/pieces-framework").SecretTextProperty<true>;
+        userToken: import("@activepieces/pieces-framework").SecretTextProperty<false>;
+    }>)[]>;
+}> | import("@activepieces/pieces-framework").ITrigger<TriggerStrategy.MANUAL, (import("@activepieces/pieces-framework").OAuth2Property<import("@activepieces/pieces-framework").OAuth2Props> | import("@activepieces/pieces-framework").CustomAuthProperty<{
+    botToken: import("@activepieces/pieces-framework").SecretTextProperty<true>;
+    userToken: import("@activepieces/pieces-framework").SecretTextProperty<false>;
+}>)[], {
     info: import("@activepieces/pieces-framework/dist/src/lib/property/input/markdown-property").MarkDownProperty;
     emojis: import("@activepieces/pieces-framework").ArrayProperty<false>;
-    user: import("@activepieces/pieces-framework").DropdownProperty<string, false, import("@activepieces/pieces-framework").OAuth2Property<import("@activepieces/pieces-framework").OAuth2Props>>;
-    channels: import("@activepieces/pieces-framework").MultiSelectDropdownProperty<string, false, import("@activepieces/pieces-framework").OAuth2Property<import("@activepieces/pieces-framework").OAuth2Props>>;
-}> | import("@activepieces/pieces-framework").ITrigger<TriggerStrategy.APP_WEBHOOK, import("@activepieces/pieces-framework").OAuth2Property<import("@activepieces/pieces-framework").OAuth2Props>, {
+    user: import("@activepieces/pieces-framework").DropdownProperty<string, false, (import("@activepieces/pieces-framework").OAuth2Property<import("@activepieces/pieces-framework").OAuth2Props> | import("@activepieces/pieces-framework").CustomAuthProperty<{
+        botToken: import("@activepieces/pieces-framework").SecretTextProperty<true>;
+        userToken: import("@activepieces/pieces-framework").SecretTextProperty<false>;
+    }>)[]>;
+    channels: import("@activepieces/pieces-framework").MultiSelectDropdownProperty<string, false, (import("@activepieces/pieces-framework").OAuth2Property<import("@activepieces/pieces-framework").OAuth2Props> | import("@activepieces/pieces-framework").CustomAuthProperty<{
+        botToken: import("@activepieces/pieces-framework").SecretTextProperty<true>;
+        userToken: import("@activepieces/pieces-framework").SecretTextProperty<false>;
+    }>)[]>;
+}> | import("@activepieces/pieces-framework").ITrigger<TriggerStrategy.APP_WEBHOOK, (import("@activepieces/pieces-framework").OAuth2Property<import("@activepieces/pieces-framework").OAuth2Props> | import("@activepieces/pieces-framework").CustomAuthProperty<{
+    botToken: import("@activepieces/pieces-framework").SecretTextProperty<true>;
+    userToken: import("@activepieces/pieces-framework").SecretTextProperty<false>;
+}>)[], {
     info: import("@activepieces/pieces-framework/dist/src/lib/property/input/markdown-property").MarkDownProperty;
     emojis: import("@activepieces/pieces-framework").ArrayProperty<false>;
-    user: import("@activepieces/pieces-framework").DropdownProperty<string, false, import("@activepieces/pieces-framework").OAuth2Property<import("@activepieces/pieces-framework").OAuth2Props>>;
-    channels: import("@activepieces/pieces-framework").MultiSelectDropdownProperty<string, false, import("@activepieces/pieces-framework").OAuth2Property<import("@activepieces/pieces-framework").OAuth2Props>>;
+    user: import("@activepieces/pieces-framework").DropdownProperty<string, false, (import("@activepieces/pieces-framework").OAuth2Property<import("@activepieces/pieces-framework").OAuth2Props> | import("@activepieces/pieces-framework").CustomAuthProperty<{
+        botToken: import("@activepieces/pieces-framework").SecretTextProperty<true>;
+        userToken: import("@activepieces/pieces-framework").SecretTextProperty<false>;
+    }>)[]>;
+    channels: import("@activepieces/pieces-framework").MultiSelectDropdownProperty<string, false, (import("@activepieces/pieces-framework").OAuth2Property<import("@activepieces/pieces-framework").OAuth2Props> | import("@activepieces/pieces-framework").CustomAuthProperty<{
+        botToken: import("@activepieces/pieces-framework").SecretTextProperty<true>;
+        userToken: import("@activepieces/pieces-framework").SecretTextProperty<false>;
+    }>)[]>;
 }>;
 //# sourceMappingURL=new-reaction-added.d.ts.map

package/src/lib/triggers/new-reaction-added.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"new-reaction-added.d.ts","sourceRoot":"","sources":["../../../../src/lib/triggers/new-reaction-added.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,eAAe,EAEhB,MAAM,gCAAgC,CAAC;AAKxC,eAAO,MAAM,gBAAgB;;;;;;;;;;;;;;;;;;;;EA+E3B,CAAC"}
+{"version":3,"file":"new-reaction-added.d.ts","sourceRoot":"","sources":["../../../../src/lib/triggers/new-reaction-added.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,eAAe,EAEhB,MAAM,gCAAgC,CAAC;AAMxC,eAAO,MAAM,gBAAgB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA4E3B,CAAC"}

package/src/lib/triggers/new-reaction-added.js

@@ -5,6 +5,7 @@ const tslib_1 = require("tslib");
 const pieces_framework_1 = require("@activepieces/pieces-framework");
 const auth_1 = require("../auth");
 const props_1 = require("../common/props");
+const auth_helpers_1 = require("../common/auth-helpers");
 exports.newReactionAdded = (0, pieces_framework_1.createTrigger)({
     auth: auth_1.slackAuth,
     name: 'new_reaction_added',
@@ -33,8 +34,7 @@ exports.newReactionAdded = (0, pieces_framework_1.createTrigger)({
                             options: [],
                         };
                     }
-                    const authentication = auth;
-                    const accessToken = authentication['access_token'];
+                    const accessToken = (0, auth_helpers_1.getBotToken)(auth);
                     const channels = yield (0, props_1.getChannels)(accessToken);
                     return {
                         disabled: false,
@@ -48,9 +48,7 @@ exports.newReactionAdded = (0, pieces_framework_1.createTrigger)({
     type: pieces_framework_1.TriggerStrategy.APP_WEBHOOK,
     sampleData: undefined,
     onEnable: (context) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
-        var _a;
-        // Older OAuth2 has team_id, newer has team.id
-        const teamId = (_a = context.auth.data['team_id']) !== null && _a !== void 0 ? _a : context.auth.data['team']['id'];
+        const teamId = yield (0, auth_helpers_1.getTeamId)(context.auth);
         context.app.createListeners({
             events: ['reaction_added'],
             identifierValue: teamId,

package/src/lib/triggers/new-reaction-added.js.map

@@ -1 +1 @@
-{"version":3,"file":"new-reaction-added.js","sourceRoot":"","sources":["../../../../src/lib/triggers/new-reaction-added.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"new-reaction-added.js","sourceRoot":"","sources":["../../../../src/lib/triggers/new-reaction-added.ts"],"names":[],"mappings":";;;;AAAA,qEAIwC;AACxC,kCAAoC;AACpC,2CAA8E;AAC9E,yDAAgF;AAGnE,QAAA,gBAAgB,GAAG,IAAA,gCAAa,EAAC;IAC5C,IAAI,EAAE,gBAAS;IACf,IAAI,EAAE,oBAAoB;IAC1B,WAAW,EAAE,cAAc;IAC3B,WAAW,EAAE,oDAAoD;IACjE,KAAK,EAAE;QACL,IAAI,EAAE,8BAAsB;QAC5B,MAAM,EAAE,2BAAQ,CAAC,KAAK,CAAC;YACrB,WAAW,EAAE,0BAA0B;YACvC,WAAW,EAAE,6BAA6B;YAC1C,QAAQ,EAAE,KAAK;SAChB,CAAC;QACF,IAAI,EAAE,IAAA,cAAM,EAAC,KAAK,CAAC;QACnB,QAAQ,EAAE,2BAAQ,CAAC,mBAAmB,CAAC;YACrC,IAAI,EAAE,gBAAS;YACf,WAAW,EAAE,UAAU;YACvB,WAAW,EACT,2GAA2G;YAC7G,QAAQ,EAAE,KAAK;YACf,UAAU,EAAE,EAAE;YACR,OAAO;6EAAC,EAAE,IAAI,EAAE;oBACpB,IAAI,CAAC,IAAI,EAAE,CAAC;wBACV,OAAO;4BACL,QAAQ,EAAE,IAAI;4BACd,WAAW,EAAE,uBAAuB;4BACpC,OAAO,EAAE,EAAE;yBACZ,CAAC;oBACJ,CAAC;oBACD,MAAM,WAAW,GAAG,IAAA,0BAAW,EAAC,IAAsB,CAAC,CAAC;oBACxD,MAAM,QAAQ,GAAG,MAAM,IAAA,mBAAW,EAAC,WAAW,CAAC,CAAC;oBAChD,OAAO;wBACL,QAAQ,EAAE,KAAK;wBACf,WAAW,EAAE,iBAAiB;wBAC9B,OAAO,EAAE,QAAQ;qBAClB,CAAC;gBACJ,CAAC;aAAA;SACF,CAAC;KACH;IACD,IAAI,EAAE,kCAAe,CAAC,WAAW;IACjC,UAAU,EAAE,SAAS;IACrB,QAAQ,EAAE,CAAO,OAAO,EAAE,EAAE;QAC1B,MAAM,MAAM,GAAG,MAAM,IAAA,wBAAS,EAAC,OAAO,CAAC,IAAsB,CAAC,CAAC;QAC/D,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC;YAC1B,MAAM,EAAE,CAAC,gBAAgB,CAAC;YAC1B,eAAe,EAAE,MAAM;SACxB,CAAC,CAAC;IACL,CAAC,CAAA;IACD,SAAS,EAAE,CAAO,OAAO,EAAE,EAAE;QAC3B,UAAU;IACZ,CAAC,CAAA;IAID,GAAG,EAAE,CAAO,OAAO,EAAE,EAAE;;QACrB,MAAM,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC,IAAmB,CAAC;QACxD,MAAM,QAAQ,GAAG,MAAC,OAAO,CAAC,UAAU,CAAC,QAAqB,mCAAI,EAAE,CAAC;QAEjE,8BAA8B;QAC9B,IAAI,OAAO,CAAC,UAAU,CAAC,IAAI,IAAI,WAAW,CAAC,KAAK,CAAC,IAAI,KAAK,OAAO,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC;YAClF,OAAO,EAAE,CAAC;QACZ,CAAC;QAED,+BAA+B;QAC/B,IAAI,OAAO,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC;YAC9B,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,MAAM,CAAC,QAAQ,CAAC,WAAW,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE,CAAC;gBACpE,OAAO,EAAE,CAAC;YACZ,CAAC;QACH,CAAC;QAED,gEAAgE;QAChE,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,WAAW,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;YAC9E,OAAO,EAAE,CAAC;QACZ,CAAC;QAED,OAAO,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;IAC7B,CAAC,CAAA;CACF,CAAC,CAAC"}

package/src/lib/triggers/new-saved-message.d.ts

@@ -1,3 +1,15 @@
 import { TriggerStrategy } from '@activepieces/pieces-framework';
-export declare const newSavedMessageTrigger: import("@activepieces/pieces-framework").ITrigger<TriggerStrategy.WEBHOOK, import("@activepieces/pieces-framework").OAuth2Property<import("@activepieces/pieces-framework").OAuth2Props>, {}> | import("@activepieces/pieces-framework").ITrigger<TriggerStrategy.POLLING, import("@activepieces/pieces-framework").OAuth2Property<import("@activepieces/pieces-framework").OAuth2Props>, {}> | import("@activepieces/pieces-framework").ITrigger<TriggerStrategy.MANUAL, import("@activepieces/pieces-framework").OAuth2Property<import("@activepieces/pieces-framework").OAuth2Props>, {}> | import("@activepieces/pieces-framework").ITrigger<TriggerStrategy.APP_WEBHOOK, import("@activepieces/pieces-framework").OAuth2Property<import("@activepieces/pieces-framework").OAuth2Props>, {}>;
+export declare const newSavedMessageTrigger: import("@activepieces/pieces-framework").ITrigger<TriggerStrategy.WEBHOOK, (import("@activepieces/pieces-framework").OAuth2Property<import("@activepieces/pieces-framework").OAuth2Props> | import("@activepieces/pieces-framework").CustomAuthProperty<{
+    botToken: import("@activepieces/pieces-framework").SecretTextProperty<true>;
+    userToken: import("@activepieces/pieces-framework").SecretTextProperty<false>;
+}>)[], {}> | import("@activepieces/pieces-framework").ITrigger<TriggerStrategy.POLLING, (import("@activepieces/pieces-framework").OAuth2Property<import("@activepieces/pieces-framework").OAuth2Props> | import("@activepieces/pieces-framework").CustomAuthProperty<{
+    botToken: import("@activepieces/pieces-framework").SecretTextProperty<true>;
+    userToken: import("@activepieces/pieces-framework").SecretTextProperty<false>;
+}>)[], {}> | import("@activepieces/pieces-framework").ITrigger<TriggerStrategy.MANUAL, (import("@activepieces/pieces-framework").OAuth2Property<import("@activepieces/pieces-framework").OAuth2Props> | import("@activepieces/pieces-framework").CustomAuthProperty<{
+    botToken: import("@activepieces/pieces-framework").SecretTextProperty<true>;
+    userToken: import("@activepieces/pieces-framework").SecretTextProperty<false>;
+}>)[], {}> | import("@activepieces/pieces-framework").ITrigger<TriggerStrategy.APP_WEBHOOK, (import("@activepieces/pieces-framework").OAuth2Property<import("@activepieces/pieces-framework").OAuth2Props> | import("@activepieces/pieces-framework").CustomAuthProperty<{
+    botToken: import("@activepieces/pieces-framework").SecretTextProperty<true>;
+    userToken: import("@activepieces/pieces-framework").SecretTextProperty<false>;
+}>)[], {}>;
 //# sourceMappingURL=new-saved-message.d.ts.map

package/src/lib/triggers/new-saved-message.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"new-saved-message.d.ts","sourceRoot":"","sources":["../../../../src/lib/triggers/new-saved-message.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAiB,MAAM,gCAAgC,CAAC;AAGhF,eAAO,MAAM,sBAAsB,kwBA8BjC,CAAC"}
+{"version":3,"file":"new-saved-message.d.ts","sourceRoot":"","sources":["../../../../src/lib/triggers/new-saved-message.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAiB,MAAM,gCAAgC,CAAC;AAIhF,eAAO,MAAM,sBAAsB;;;;;;;;;;;;UA6BjC,CAAC"}

package/src/lib/triggers/new-saved-message.js

@@ -4,6 +4,7 @@ exports.newSavedMessageTrigger = void 0;
 const tslib_1 = require("tslib");
 const pieces_framework_1 = require("@activepieces/pieces-framework");
 const auth_1 = require("../auth");
+const auth_helpers_1 = require("../common/auth-helpers");
 exports.newSavedMessageTrigger = (0, pieces_framework_1.createTrigger)({
     auth: auth_1.slackAuth,
     name: 'new-saved-message',
@@ -13,9 +14,7 @@ exports.newSavedMessageTrigger = (0, pieces_framework_1.createTrigger)({
     type: pieces_framework_1.TriggerStrategy.APP_WEBHOOK,
     sampleData: undefined,
     onEnable: (context) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
-        var _a;
-        // Older OAuth2 has team_id, newer has team.id
-        const teamId = (_a = context.auth.data['team_id']) !== null && _a !== void 0 ? _a : context.auth.data['team']['id'];
+        const teamId = yield (0, auth_helpers_1.getTeamId)(context.auth);
         context.app.createListeners({
             events: ['star_added'],
             identifierValue: teamId,

package/src/lib/triggers/new-saved-message.js.map

@@ -1 +1 @@
-{"version":3,"file":"new-saved-message.js","sourceRoot":"","sources":["../../../../src/lib/triggers/new-saved-message.ts"],"names":[],"mappings":";;;;AAAA,qEAAgF;AAChF,kCAAoC;AAEvB,QAAA,sBAAsB,GAAG,IAAA,gCAAa,EAAC;IACnD,IAAI,EAAE,gBAAS;IACf,IAAI,EAAE,mBAAmB;IACzB,WAAW,EAAE,mBAAmB;IAChC,WAAW,EAAE,mCAAmC;IAChD,KAAK,EAAE,EAAE;IACT,IAAI,EAAE,kCAAe,CAAC,WAAW;IACjC,UAAU,EAAE,SAAS;IACrB,QAAQ,EAAE,CAAO,OAAO,EAAE,EAAE;;QAC3B,8CAA8C;QAC9C,MAAM,MAAM,GAAG,MAAA,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,mCAAI,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC;QAC/E,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC;YAC3B,MAAM,EAAE,CAAC,YAAY,CAAC;YACtB,eAAe,EAAE,MAAM;SACvB,CAAC,CAAC;IACJ,CAAC,CAAA;IACD,SAAS,EAAE,CAAO,OAAO,EAAE,EAAE;QAC5B,UAAU;IACX,CAAC,CAAA;IAED,GAAG,EAAE,CAAO,OAAO,EAAE,EAAE;QACtB,MAAM,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC,IAAmB,CAAC;QAExD,8BAA8B;QAC9B,IAAI,WAAW,CAAC,KAAK,CAAC,IAAI,KAAK,YAAY,IAAI,WAAW,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,KAAI,SAAS,EAAE,CAAC;YACzF,OAAO,CAAC,WAAW,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QACjC,CAAC;QAED,OAAO,EAAE,CAAC;IACX,CAAC,CAAA;CACD,CAAC,CAAC"}
+{"version":3,"file":"new-saved-message.js","sourceRoot":"","sources":["../../../../src/lib/triggers/new-saved-message.ts"],"names":[],"mappings":";;;;AAAA,qEAAgF;AAChF,kCAAoC;AACpC,yDAAmE;AAEtD,QAAA,sBAAsB,GAAG,IAAA,gCAAa,EAAC;IACnD,IAAI,EAAE,gBAAS;IACf,IAAI,EAAE,mBAAmB;IACzB,WAAW,EAAE,mBAAmB;IAChC,WAAW,EAAE,mCAAmC;IAChD,KAAK,EAAE,EAAE;IACT,IAAI,EAAE,kCAAe,CAAC,WAAW;IACjC,UAAU,EAAE,SAAS;IACrB,QAAQ,EAAE,CAAO,OAAO,EAAE,EAAE;QAC3B,MAAM,MAAM,GAAG,MAAM,IAAA,wBAAS,EAAC,OAAO,CAAC,IAAsB,CAAC,CAAC;QAC/D,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC;YAC3B,MAAM,EAAE,CAAC,YAAY,CAAC;YACtB,eAAe,EAAE,MAAM;SACvB,CAAC,CAAC;IACJ,CAAC,CAAA;IACD,SAAS,EAAE,CAAO,OAAO,EAAE,EAAE;QAC5B,UAAU;IACX,CAAC,CAAA;IAED,GAAG,EAAE,CAAO,OAAO,EAAE,EAAE;QACtB,MAAM,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC,IAAmB,CAAC;QAExD,8BAA8B;QAC9B,IAAI,WAAW,CAAC,KAAK,CAAC,IAAI,KAAK,YAAY,IAAI,WAAW,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,KAAI,SAAS,EAAE,CAAC;YACzF,OAAO,CAAC,WAAW,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QACjC,CAAC;QAED,OAAO,EAAE,CAAC;IACX,CAAC,CAAA;CACD,CAAC,CAAC"}

package/src/lib/triggers/new-team-custom-emoji.d.ts

@@ -1,3 +1,15 @@
 import { TriggerStrategy } from '@activepieces/pieces-framework';
-export declare const newTeamCustomEmojiTrigger: import("@activepieces/pieces-framework").ITrigger<TriggerStrategy.WEBHOOK, import("@activepieces/pieces-framework").OAuth2Property<import("@activepieces/pieces-framework").OAuth2Props>, {}> | import("@activepieces/pieces-framework").ITrigger<TriggerStrategy.POLLING, import("@activepieces/pieces-framework").OAuth2Property<import("@activepieces/pieces-framework").OAuth2Props>, {}> | import("@activepieces/pieces-framework").ITrigger<TriggerStrategy.MANUAL, import("@activepieces/pieces-framework").OAuth2Property<import("@activepieces/pieces-framework").OAuth2Props>, {}> | import("@activepieces/pieces-framework").ITrigger<TriggerStrategy.APP_WEBHOOK, import("@activepieces/pieces-framework").OAuth2Property<import("@activepieces/pieces-framework").OAuth2Props>, {}>;
+export declare const newTeamCustomEmojiTrigger: import("@activepieces/pieces-framework").ITrigger<TriggerStrategy.WEBHOOK, (import("@activepieces/pieces-framework").OAuth2Property<import("@activepieces/pieces-framework").OAuth2Props> | import("@activepieces/pieces-framework").CustomAuthProperty<{
+    botToken: import("@activepieces/pieces-framework").SecretTextProperty<true>;
+    userToken: import("@activepieces/pieces-framework").SecretTextProperty<false>;
+}>)[], {}> | import("@activepieces/pieces-framework").ITrigger<TriggerStrategy.POLLING, (import("@activepieces/pieces-framework").OAuth2Property<import("@activepieces/pieces-framework").OAuth2Props> | import("@activepieces/pieces-framework").CustomAuthProperty<{
+    botToken: import("@activepieces/pieces-framework").SecretTextProperty<true>;
+    userToken: import("@activepieces/pieces-framework").SecretTextProperty<false>;
+}>)[], {}> | import("@activepieces/pieces-framework").ITrigger<TriggerStrategy.MANUAL, (import("@activepieces/pieces-framework").OAuth2Property<import("@activepieces/pieces-framework").OAuth2Props> | import("@activepieces/pieces-framework").CustomAuthProperty<{
+    botToken: import("@activepieces/pieces-framework").SecretTextProperty<true>;
+    userToken: import("@activepieces/pieces-framework").SecretTextProperty<false>;
+}>)[], {}> | import("@activepieces/pieces-framework").ITrigger<TriggerStrategy.APP_WEBHOOK, (import("@activepieces/pieces-framework").OAuth2Property<import("@activepieces/pieces-framework").OAuth2Props> | import("@activepieces/pieces-framework").CustomAuthProperty<{
+    botToken: import("@activepieces/pieces-framework").SecretTextProperty<true>;
+    userToken: import("@activepieces/pieces-framework").SecretTextProperty<false>;
+}>)[], {}>;
 //# sourceMappingURL=new-team-custom-emoji.d.ts.map

package/src/lib/triggers/new-team-custom-emoji.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"new-team-custom-emoji.d.ts","sourceRoot":"","sources":["../../../../src/lib/triggers/new-team-custom-emoji.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAiB,MAAM,gCAAgC,CAAC;AAShF,eAAO,MAAM,yBAAyB,kwBA2CpC,CAAC"}
+{"version":3,"file":"new-team-custom-emoji.d.ts","sourceRoot":"","sources":["../../../../src/lib/triggers/new-team-custom-emoji.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAiB,MAAM,gCAAgC,CAAC;AAUhF,eAAO,MAAM,yBAAyB;;;;;;;;;;;;UA0CpC,CAAC"}

package/src/lib/triggers/new-team-custom-emoji.js

@@ -5,6 +5,7 @@ const tslib_1 = require("tslib");
 const pieces_framework_1 = require("@activepieces/pieces-framework");
 const auth_1 = require("../auth");
 const web_api_1 = require("@slack/web-api");
+const auth_helpers_1 = require("../common/auth-helpers");
 const sampleData = {
     id: 'heart',
     image: 'https://emoji.slack-edge.com/T06BTHUEFFF/heart/84a171ae62daacc7.jpg',
@@ -18,9 +19,7 @@ exports.newTeamCustomEmojiTrigger = (0, pieces_framework_1.createTrigger)({
     type: pieces_framework_1.TriggerStrategy.APP_WEBHOOK,
     sampleData,
     onEnable: (context) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
-        var _a;
-        // Older OAuth2 has team_id, newer has team.id
-        const teamId = (_a = context.auth.data['team_id']) !== null && _a !== void 0 ? _a : context.auth.data['team']['id'];
+        const teamId = yield (0, auth_helpers_1.getTeamId)(context.auth);
         context.app.createListeners({
             events: ['emoji_changed'],
             identifierValue: teamId,
@@ -30,7 +29,7 @@ exports.newTeamCustomEmojiTrigger = (0, pieces_framework_1.createTrigger)({
         // Ignored
     }),
     test: (context) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
-        const client = new web_api_1.WebClient(context.auth.access_token);
+        const client = new web_api_1.WebClient((0, auth_helpers_1.getBotToken)(context.auth));
         const response = yield client.emoji.list();
         if (!response.emoji)
             return [sampleData];

package/src/lib/triggers/new-team-custom-emoji.js.map

@@ -1 +1 @@
-{"version":3,"file":"new-team-custom-emoji.js","sourceRoot":"","sources":["../../../../src/lib/triggers/new-team-custom-emoji.ts"],"names":[],"mappings":";;;;AAAA,qEAAgF;AAChF,kCAAoC;AACpC,4CAA2C;AAE3C,MAAM,UAAU,GAAG;IAClB,EAAE,EAAE,OAAO;IACX,KAAK,EAAE,qEAAqE;CAC5E,CAAC;AAEW,QAAA,yBAAyB,GAAG,IAAA,gCAAa,EAAC;IACtD,IAAI,EAAE,gBAAS;IACf,IAAI,EAAE,uBAAuB;IAC7B,WAAW,EAAE,uBAAuB;IACpC,WAAW,EAAE,wDAAwD;IACrE,KAAK,EAAE,EAAE;IACT,IAAI,EAAE,kCAAe,CAAC,WAAW;IACjC,UAAU;IACV,QAAQ,EAAE,CAAO,OAAO,EAAE,EAAE;;QAC3B,8CAA8C;QAC9C,MAAM,MAAM,GAAG,MAAA,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,mCAAI,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC;QAC/E,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC;YAC3B,MAAM,EAAE,CAAC,eAAe,CAAC;YACzB,eAAe,EAAE,MAAM;SACvB,CAAC,CAAC;IACJ,CAAC,CAAA;IACD,SAAS,EAAE,CAAO,OAAO,EAAE,EAAE;QAC5B,UAAU;IACX,CAAC,CAAA;IAED,IAAI,EAAE,CAAO,OAAO,EAAE,EAAE;QACvB,MAAM,MAAM,GAAG,IAAI,mBAAS,CAAC,OAAO,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QAExD,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;QAE3C,IAAI,CAAC,QAAQ,CAAC,KAAK;YAAE,OAAO,CAAC,UAAU,CAAC,CAAC;QAEzC,OAAO,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC;YAC3D,EAAE;YACF,KAAK;SACL,CAAC,CAAC,CAAC;IACL,CAAC,CAAA;IAED,GAAG,EAAE,CAAO,OAAO,EAAE,EAAE;QACtB,MAAM,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC,IAAmB,CAAC;QAExD,8BAA8B;QAC9B,IAAI,WAAW,CAAC,KAAK,CAAC,IAAI,KAAK,eAAe,IAAI,WAAW,CAAC,KAAK,CAAC,OAAO,KAAK,KAAK,EAAE,CAAC;YACvF,OAAO,EAAE,CAAC;QACX,CAAC;QAED,OAAO,CAAC,EAAE,EAAE,EAAE,WAAW,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,EAAE,WAAW,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC,CAAC;IACzE,CAAC,CAAA;CACD,CAAC,CAAC"}
+{"version":3,"file":"new-team-custom-emoji.js","sourceRoot":"","sources":["../../../../src/lib/triggers/new-team-custom-emoji.ts"],"names":[],"mappings":";;;;AAAA,qEAAgF;AAChF,kCAAoC;AACpC,4CAA2C;AAC3C,yDAAgF;AAEhF,MAAM,UAAU,GAAG;IAClB,EAAE,EAAE,OAAO;IACX,KAAK,EAAE,qEAAqE;CAC5E,CAAC;AAEW,QAAA,yBAAyB,GAAG,IAAA,gCAAa,EAAC;IACtD,IAAI,EAAE,gBAAS;IACf,IAAI,EAAE,uBAAuB;IAC7B,WAAW,EAAE,uBAAuB;IACpC,WAAW,EAAE,wDAAwD;IACrE,KAAK,EAAE,EAAE;IACT,IAAI,EAAE,kCAAe,CAAC,WAAW;IACjC,UAAU;IACV,QAAQ,EAAE,CAAO,OAAO,EAAE,EAAE;QAC3B,MAAM,MAAM,GAAG,MAAM,IAAA,wBAAS,EAAC,OAAO,CAAC,IAAsB,CAAC,CAAC;QAC/D,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC;YAC3B,MAAM,EAAE,CAAC,eAAe,CAAC;YACzB,eAAe,EAAE,MAAM;SACvB,CAAC,CAAC;IACJ,CAAC,CAAA;IACD,SAAS,EAAE,CAAO,OAAO,EAAE,EAAE;QAC5B,UAAU;IACX,CAAC,CAAA;IAED,IAAI,EAAE,CAAO,OAAO,EAAE,EAAE;QACvB,MAAM,MAAM,GAAG,IAAI,mBAAS,CAAC,IAAA,0BAAW,EAAC,OAAO,CAAC,IAAsB,CAAC,CAAC,CAAC;QAE1E,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;QAE3C,IAAI,CAAC,QAAQ,CAAC,KAAK;YAAE,OAAO,CAAC,UAAU,CAAC,CAAC;QAEzC,OAAO,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC;YAC3D,EAAE;YACF,KAAK;SACL,CAAC,CAAC,CAAC;IACL,CAAC,CAAA;IAED,GAAG,EAAE,CAAO,OAAO,EAAE,EAAE;QACtB,MAAM,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC,IAAmB,CAAC;QAExD,8BAA8B;QAC9B,IAAI,WAAW,CAAC,KAAK,CAAC,IAAI,KAAK,eAAe,IAAI,WAAW,CAAC,KAAK,CAAC,OAAO,KAAK,KAAK,EAAE,CAAC;YACvF,OAAO,EAAE,CAAC;QACX,CAAC;QAED,OAAO,CAAC,EAAE,EAAE,EAAE,WAAW,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,EAAE,WAAW,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC,CAAC;IACzE,CAAC,CAAA;CACD,CAAC,CAAC"}

package/src/lib/triggers/new-user.d.ts

@@ -1,3 +1,15 @@
 import { TriggerStrategy } from '@activepieces/pieces-framework';
-export declare const newUserTrigger: import("@activepieces/pieces-framework").ITrigger<TriggerStrategy.WEBHOOK, import("@activepieces/pieces-framework").OAuth2Property<import("@activepieces/pieces-framework").OAuth2Props>, {}> | import("@activepieces/pieces-framework").ITrigger<TriggerStrategy.POLLING, import("@activepieces/pieces-framework").OAuth2Property<import("@activepieces/pieces-framework").OAuth2Props>, {}> | import("@activepieces/pieces-framework").ITrigger<TriggerStrategy.MANUAL, import("@activepieces/pieces-framework").OAuth2Property<import("@activepieces/pieces-framework").OAuth2Props>, {}> | import("@activepieces/pieces-framework").ITrigger<TriggerStrategy.APP_WEBHOOK, import("@activepieces/pieces-framework").OAuth2Property<import("@activepieces/pieces-framework").OAuth2Props>, {}>;
+export declare const newUserTrigger: import("@activepieces/pieces-framework").ITrigger<TriggerStrategy.WEBHOOK, (import("@activepieces/pieces-framework").OAuth2Property<import("@activepieces/pieces-framework").OAuth2Props> | import("@activepieces/pieces-framework").CustomAuthProperty<{
+    botToken: import("@activepieces/pieces-framework").SecretTextProperty<true>;
+    userToken: import("@activepieces/pieces-framework").SecretTextProperty<false>;
+}>)[], {}> | import("@activepieces/pieces-framework").ITrigger<TriggerStrategy.POLLING, (import("@activepieces/pieces-framework").OAuth2Property<import("@activepieces/pieces-framework").OAuth2Props> | import("@activepieces/pieces-framework").CustomAuthProperty<{
+    botToken: import("@activepieces/pieces-framework").SecretTextProperty<true>;
+    userToken: import("@activepieces/pieces-framework").SecretTextProperty<false>;
+}>)[], {}> | import("@activepieces/pieces-framework").ITrigger<TriggerStrategy.MANUAL, (import("@activepieces/pieces-framework").OAuth2Property<import("@activepieces/pieces-framework").OAuth2Props> | import("@activepieces/pieces-framework").CustomAuthProperty<{
+    botToken: import("@activepieces/pieces-framework").SecretTextProperty<true>;
+    userToken: import("@activepieces/pieces-framework").SecretTextProperty<false>;
+}>)[], {}> | import("@activepieces/pieces-framework").ITrigger<TriggerStrategy.APP_WEBHOOK, (import("@activepieces/pieces-framework").OAuth2Property<import("@activepieces/pieces-framework").OAuth2Props> | import("@activepieces/pieces-framework").CustomAuthProperty<{
+    botToken: import("@activepieces/pieces-framework").SecretTextProperty<true>;
+    userToken: import("@activepieces/pieces-framework").SecretTextProperty<false>;
+}>)[], {}>;
 //# sourceMappingURL=new-user.d.ts.map

package/src/lib/triggers/new-user.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"new-user.d.ts","sourceRoot":"","sources":["../../../../src/lib/triggers/new-user.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAiB,MAAM,gCAAgC,CAAC;AAoDhF,eAAO,MAAM,cAAc,kwBAwCzB,CAAC"}
+{"version":3,"file":"new-user.d.ts","sourceRoot":"","sources":["../../../../src/lib/triggers/new-user.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAiB,MAAM,gCAAgC,CAAC;AAqDhF,eAAO,MAAM,cAAc;;;;;;;;;;;;UAuCzB,CAAC"}

package/src/lib/triggers/new-user.js

@@ -5,6 +5,7 @@ const tslib_1 = require("tslib");
 const pieces_framework_1 = require("@activepieces/pieces-framework");
 const auth_1 = require("../auth");
 const web_api_1 = require("@slack/web-api");
+const auth_helpers_1 = require("../common/auth-helpers");
 const sampleData = {
     id: 'USLACKBOT',
     team_id: 'T06BTHUEFFF',
@@ -61,9 +62,7 @@ exports.newUserTrigger = (0, pieces_framework_1.createTrigger)({
     type: pieces_framework_1.TriggerStrategy.APP_WEBHOOK,
     sampleData,
     onEnable: (context) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
-        var _a;
-        // Older OAuth2 has team_id, newer has team.id
-        const teamId = (_a = context.auth.data['team_id']) !== null && _a !== void 0 ? _a : context.auth.data['team']['id'];
+        const teamId = yield (0, auth_helpers_1.getTeamId)(context.auth);
         context.app.createListeners({
             events: ['team_join'],
             identifierValue: teamId,
@@ -73,7 +72,7 @@ exports.newUserTrigger = (0, pieces_framework_1.createTrigger)({
         // Ignored
     }),
     test: (context) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
-        const client = new web_api_1.WebClient(context.auth.access_token);
+        const client = new web_api_1.WebClient((0, auth_helpers_1.getBotToken)(context.auth));
         const response = yield client.users.list({ limit: 10 });
         if (!response.members)
             return [sampleData];

package/src/lib/triggers/new-user.js.map

@@ -1 +1 @@
-{"version":3,"file":"new-user.js","sourceRoot":"","sources":["../../../../src/lib/triggers/new-user.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"new-user.js","sourceRoot":"","sources":["../../../../src/lib/triggers/new-user.ts"],"names":[],"mappings":"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"}