Page MenuHomePhorge
Files F33059461

D7311.1768432207.diff
No OneTemporary
Actions

Size
3 KB
Referenced Files
None
Subscribers
None

D7311.1768432207.diff
View Options

diff --git a/keyserver/src/keyserver.js b/keyserver/src/keyserver.js
--- a/keyserver/src/keyserver.js
+++ b/keyserver/src/keyserver.js
@@ -3,17 +3,15 @@
import olm from '@matrix-org/olm';
import cluster from 'cluster';
import cookieParser from 'cookie-parser';
-import { detect as detectBrowser } from 'detect-browser';
import express from 'express';
import expressWs from 'express-ws';
import os from 'os';
-import stores from 'lib/facts/stores.js';
-
import './cron/cron.js';
import { migrate } from './database/migrations.js';
import { jsonEndpoints } from './endpoints.js';
import { emailSubscriptionResponder } from './responders/comm-landing-responders.js';
+import { deepLinkResponder } from './responders/deep-link-responder.js';
import {
jsonHandler,
httpGetHandler,
@@ -42,8 +40,6 @@
getCommAppURLFacts,
} from './utils/urls.js';
-const inviteSecretRegex = /^[a-z0-9]+$/i;
-
(async () => {
await olm.init();
await prefetchAllURLFacts();
@@ -129,23 +125,7 @@
// receives this request, it means that the app is not installed and we
// should redirect the user to a place from which the app can be
// downloaded.
- router.get('/invite/:secret', (req, res) => {
- const { secret } = req.params;
- const userAgent = req.get('User-Agent');
- const detectionResult = detectBrowser(userAgent);
- let redirectUrl = stores.appStoreUrl;
- if (detectionResult.os === 'Android OS') {
- const isSecretValid = inviteSecretRegex.test(secret);
- const referrer = isSecretValid
- ? `&referrer=${encodeURIComponent(`utm_source=invite/${secret}`)}`
- : '';
- redirectUrl = `${stores.googlePlayUrl}${referrer}`;
- }
- res.writeHead(301, {
- Location: redirectUrl,
- });
- res.end();
- });
+ router.get('/invite/:secret', deepLinkResponder);
// $FlowFixMe express-ws has side effects that can't be typed
router.ws('/ws', onConnection);
diff --git a/keyserver/src/responders/deep-link-responder.js b/keyserver/src/responders/deep-link-responder.js
new file mode 100644
--- /dev/null
+++ b/keyserver/src/responders/deep-link-responder.js
@@ -0,0 +1,28 @@
+// @flow
+
+import { detect as detectBrowser } from 'detect-browser';
+import type { $Response, $Request } from 'express';
+
+import stores from 'lib/facts/stores.js';
+
+const inviteSecretRegex = /^[a-z0-9]+$/i;
+
+function deepLinkResponder(req: $Request, res: $Response) {
+ const { secret } = req.params;
+ const userAgent = req.get('User-Agent');
+ const detectionResult = detectBrowser(userAgent);
+ let redirectUrl = stores.appStoreUrl;
+ if (detectionResult.os === 'Android OS') {
+ const isSecretValid = inviteSecretRegex.test(secret);
+ const referrer = isSecretValid
+ ? `&referrer=${encodeURIComponent(`utm_source=invite/${secret}`)}`
+ : '';
+ redirectUrl = `${stores.googlePlayUrl}${referrer}`;
+ }
+ res.writeHead(301, {
+ Location: redirectUrl,
+ });
+ res.end();
+}
+
+export { deepLinkResponder };

File Metadata

Mime Type
text/plain
Expires
Wed, Jan 14, 11:10 PM (9 h, 38 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5934520
Default Alt Text
D7311.1768432207.diff (3 KB)

Event Timeline