Calendly oauth updated from ApiKey to Oauth2

clientIO · Oct 4, 2024 · dd3bdb1 · dd3bdb1
1 parent 3ec64e3
commit dd3bdb1
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 22 deletions.
diff --git a/src/appmixer/calendly/auth.js b/src/appmixer/calendly/auth.js
@@ -2,35 +2,31 @@
 
 module.exports = {
 
-    type: 'apiKey',
+    type: 'oauth2',
 
     definition: {
 
-        accountNameFromProfileInfo: 'data.attributes.email',
+        accountNameFromProfileInfo: 'resource.email',
 
-        auth: {
-            apiKey: {
-                type: 'text',
-                name: 'API Key',
-                tooltip: 'Log into your calendly account and find <i>integration</i> page in settings. ' +
-                    '<br/>You have to have Premium or Pro Calendly subscription in order make Calendly components work. ' +
-                    '<br/>It also works with free 14 days trial.'
-            }
-        },
+        authUrl: 'https://auth.calendly.com/oauth/authorize',
+
+        requestAccessToken: 'https://auth.calendly.com/oauth/token',
 
         requestProfileInfo: {
             method: 'GET',
-            url: 'https://calendly.com/api/v1/users/me',
+            url: 'https://api.calendly.com/users/me',
             headers: {
-                'X-TOKEN': '{{apiKey}}'
+                'Authorization': 'Bearer {{accessToken}}'
             }
         },
 
-        validate: {
+        refreshAccessToken: 'https://auth.calendly.com/oauth/token',
+
+        validateAccessToken: {
             method: 'GET',
-            url: 'https://calendly.com/api/v1/users/me',
+            url: 'https://api.calendly.com/users/me',
             headers: {
-                'X-TOKEN': '{{apiKey}}'
+                'Authorization': 'Bearer {{accessToken}}'
             }
         }
     }

diff --git a/src/appmixer/calendly/calendly-commons.js b/src/appmixer/calendly/calendly-commons.js
@@ -16,7 +16,7 @@ module.exports = {
             method: 'POST',
             url: 'https://calendly.com/api/v1/hooks',
             headers: {
-                'X-TOKEN': token
+                'Authorization': `Bearer ${token}`,
             },
             json: true,
             body: {
@@ -38,7 +38,7 @@ module.exports = {
             method: 'DELETE',
             url: `https://calendly.com/api/v1/hooks/${webhookId}`,
             headers: {
-                'X-TOKEN': token
+                'Authorization': `Bearer ${token}`,
             }
         });
     }

diff --git a/src/appmixer/calendly/events/InviteeCanceled/InviteeCanceled.js b/src/appmixer/calendly/events/InviteeCanceled/InviteeCanceled.js
@@ -46,7 +46,7 @@ module.exports = {
 
         return this.unregisterWebhook(context)
             .then(() => {
-                return commons.registerWebhookSubscription(context.auth.apiKey, 'invitee.canceled', url);
+                return commons.registerWebhookSubscription(context.auth.accessToken, 'invitee.canceled', url);
             }).then(response => {
                 return context.saveState({ webhookId: response.id });
             });
@@ -64,6 +64,6 @@ module.exports = {
             return Promise.resolve();
         }
 
-        return commons.removeWebhookSubscription(webhookId, context.auth.apiKey);
+        return commons.removeWebhookSubscription(webhookId, context.auth.accessToken);
     }
 };
diff --git a/src/appmixer/calendly/events/InviteeCreated/InviteeCreated.js b/src/appmixer/calendly/events/InviteeCreated/InviteeCreated.js
@@ -48,7 +48,7 @@ module.exports = {
 
         return this.unregisterWebhook(context)
             .then(() => {
-                return commons.registerWebhookSubscription(context.auth.apiKey, 'invitee.created', url);
+                return commons.registerWebhookSubscription(context.auth.accessToken, 'invitee.created', url);
             }).then(response => {
                 return context.saveState({ webhookId: response.id });
             });
@@ -66,6 +66,6 @@ module.exports = {
             return Promise.resolve();
         }
 
-        return commons.removeWebhookSubscription(webhookId, context.auth.apiKey);
+        return commons.removeWebhookSubscription(webhookId, context.auth.accessToken);
     }
 };