Skip to content

[FIX] CORS error while interacting with any action button on Livechat #22150

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
murtaza98 merged 5 commits into from
May 30, 2021
Merged

[FIX] CORS error while interacting with any action button on Livechat #22150

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
73021d1
[FIX] CORS error while interacting with any action button on Livechat
murtaza98 May 24, 2021
c5968d2
remove unnecessary condition check
murtaza98 May 24, 2021
2ccefb1
Remove unwanted brackets
murtaza98 May 24, 2021
131cd2c
Fix CORS disable not working
murtaza98 May 25, 2021
e14bbc3
Merge branch 'develop' into apps-engine/fix-cors-issue-in-ui-interact…
murtaza98 May 30, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 21 additions & 1 deletion app/apps/server/communication/uikit.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import express from 'express';
import cors from 'cors';
import rateLimit from 'express-rate-limit';
import { Meteor } from 'meteor/meteor';
import { WebApp } from 'meteor/webapp';
Expand All @@ -14,6 +15,25 @@ const apiServer = express();

apiServer.disable('x-powered-by');

let corsEnabled = false;
let allowListOrigins = [];

settings.get('API_Enable_CORS', (_, value) => { corsEnabled = value; });

settings.get('API_CORS_Origin', (_, value) => {
allowListOrigins = value ? value.trim().split(',').map((origin) => String(origin).trim().toLocaleLowerCase()) : [];
});

const corsOptions = {
origin: (origin, callback) => {
if (!origin || (corsEnabled && (allowListOrigins.includes('*') || allowListOrigins.includes(origin))) || origin === settings.get('Site_Url')) {
callback(null, true);
} else {
callback('Not allowed by CORS', false);
}
},
};

WebApp.connectHandlers.use(apiServer);

// eslint-disable-next-line new-cap
Expand Down Expand Up @@ -59,7 +79,7 @@ router.use((req, res, next) => {
next();
});

apiServer.use('/api/apps/ui.interaction/', router);
apiServer.use('/api/apps/ui.interaction/', cors(corsOptions), router);

const getPayloadForType = (type, req) => {
if (type === UIKitIncomingInteractionType.BLOCK) {
Expand Down