Merge pull request #194 from madfish-solutions/TW-1595-migration-of-ads-endpoints-to-t-ads-api

TW-1595 Implement redirection to the new entrypoints of temple-ads-api

Author: keshan3262

.env.dist

@@ -14,3 +14,4 @@ TEMPLE_TAP_API_URL=
 EVM_API_URL=
 WERT_API_KEY=
 GOOGLE_DRIVE_API_KEY=
+TEMPLE_ADS_API_URL=

package.json

@@ -32,9 +32,6 @@
     "pino-pretty": "^4.7.1",
     "qs": "^6.10.3",
     "semaphore": "^1.1.0",
-    "semver": "^7.6.0",
-    "swagger-jsdoc": "^6.2.8",
-    "swagger-ui-express": "^5.0.0",
     "yup": "^1.3.2"
   },
   "scripts": {

src/advertising/advertising.interface.ts

@@ -16,7 +16,8 @@ export const EnvVars = {
   TEMPLE_TAP_API_URL: getEnv('TEMPLE_TAP_API_URL'),
   EVM_API_URL: getEnv('EVM_API_URL'),
   WERT_API_KEY: getEnv('WERT_API_KEY'),
-  GOOGLE_DRIVE_API_KEY: getEnv('GOOGLE_DRIVE_API_KEY')
+  GOOGLE_DRIVE_API_KEY: getEnv('GOOGLE_DRIVE_API_KEY'),
+  TEMPLE_ADS_API_URL: getEnv('TEMPLE_ADS_API_URL')
 };
 
 for (const name in EnvVars) {

src/advertising/advertising.ts

@@ -6,10 +6,7 @@ import express, { Request, Response } from 'express';
 import firebaseAdmin from 'firebase-admin';
 import { stdSerializers } from 'pino';
 import pinoHttp from 'pino-http';
-import swaggerJSDoc from 'swagger-jsdoc';
-import swaggerUi from 'swagger-ui-express';
 
-import { getAdvertisingInfo } from './advertising/advertising';
 import { MIN_ANDROID_APP_VERSION, MIN_IOS_APP_VERSION } from './config';
 import getDAppsStats from './getDAppsStats';
 import { getMagicSquareQuestParticipants, startMagicSquareQuest } from './magic-square';
@@ -337,16 +334,6 @@ app.get('/api/mobile-check', async (_req, res) => {
   }
 });
 
-app.get('/api/advertising-info', (_req, res) => {
-  try {
-    const data = getAdvertisingInfo();
-
-    res.status(200).send({ data });
-  } catch (error) {
-    res.status(500).send({ error });
-  }
-});
-
 app.use('/api/slise-ad-rules', adRulesRouter);
 
 app.use('/api/evm', evmRouter);
@@ -424,19 +411,6 @@ app.post('/api/temple-tap/check-airdrop-confirmation', tezosSigAuthMiddleware, (
   handleTempleTapApiProxyRequest(req, res, 'v1/check-airdrop-address-confirmation')
 );
 
-const swaggerOptions = {
-  swaggerDefinition: {
-    openapi: '3.0.0',
-    info: {
-      title: 'Temple Wallet backend',
-      version: '1.0.0'
-    }
-  },
-  apis: ['./src/index.ts', './src/routers/**/*.ts']
-};
-const swaggerSpec = swaggerJSDoc(swaggerOptions);
-app.use('/docs', swaggerUi.serve, swaggerUi.setup(swaggerSpec));
-
 // start the server listening for requests
 const port = Boolean(process.env.PORT) ? process.env.PORT : 3000;
 app.listen(port, () => console.info(`Server is running on port ${port}...`));

src/advertising/external-ads.ts

@@ -30,9 +30,3 @@ export const objectStorageMethodsFactory = <V, F = V>(storageKey: string, fallba
     ),
   removeValues: (keys: string[]) => redisClient.hdel(storageKey, ...keys)
 });
-
-export const setStorageMethodsFactory = (storageKey: string) => ({
-  addValues: (values: string[]) => redisClient.sadd(storageKey, ...values),
-  removeValues: (values: string[]) => redisClient.srem(storageKey, ...values),
-  getAllValues: () => redisClient.smembers(storageKey)
-});

src/config.ts

@@ -0,0 +1,18 @@
+import { Router } from 'express';
+
+import { addTempleAdsRedirection } from '../utils/temple-ads-redirection';
+
+export const adRulesRouter = Router();
+
+addTempleAdsRedirection(adRulesRouter, '/ad-places/permanent-native', true);
+addTempleAdsRedirection(adRulesRouter, '/ad-places/permanent', false);
+addTempleAdsRedirection(adRulesRouter, '/ad-places', false, '/ad-places/replace');
+
+addTempleAdsRedirection(adRulesRouter, '/providers/all-sites', false);
+addTempleAdsRedirection(adRulesRouter, '/providers/by-sites', false);
+addTempleAdsRedirection(adRulesRouter, '/providers/categories', false);
+addTempleAdsRedirection(adRulesRouter, '/providers/negative-selectors', false);
+addTempleAdsRedirection(adRulesRouter, '/providers', true, '/providers/selectors');
+
+addTempleAdsRedirection(adRulesRouter, '/replace-urls-blacklist', false);
+addTempleAdsRedirection(adRulesRouter, '/elements-to-hide-or-remove', false);