refactor: more tenor url to config

Author: peterpeterparker

studio/src/app/services/environment/environment-config.tsx

@@ -7,11 +7,16 @@ export interface EnvironmentFirebaseConfig {
     messagingSenderId: string;
 }
 
+export interface EnvironmentTenorConfig {
+    url: string;
+    key: string;
+}
+
 export interface EnvironmentConfig {
     appUrl: string;
     apiUrl: string;
     firebase: EnvironmentFirebaseConfig;
-    tenorKey: string
+    tenor: EnvironmentTenorConfig;
 }
 
 export function setupConfig(config: EnvironmentConfig) {

studio/src/app/services/gif/gif.service.tsx

@@ -3,6 +3,7 @@ import {EnvironmentConfigService} from '../environment/environment-config.servic
 import {get, set} from 'idb-keyval';
 
 import {ErrorService} from '../error/error.service';
+import {EnvironmentTenorConfig} from '../environment/environment-config';
 
 export class GifService {
 
@@ -25,13 +26,14 @@ export class GifService {
     // call the trending and category endpoints
     getTrending(): Promise<TenorGif[]> {
         return new Promise<TenorGif[]>(async (resolve, reject) => {
-            const apiKey: string = EnvironmentConfigService.getInstance().get('tenorKey');
+            const config: EnvironmentTenorConfig = EnvironmentConfigService.getInstance().get('tenor');
+
             const searchTerm: string = 'excited';
 
             const anonymousId: string = await this.getAnonymousId();
 
-            const searchUrl = 'https://api.tenor.com/v1/search?tag=' + searchTerm + '&key=' +
-                apiKey + '&ar_range=wide&limit=' + 8 + '&anon_id=' + anonymousId + '&media_filter=minimal';
+            const searchUrl = config.url + 'search?tag=' + searchTerm + '&key=' +
+                config.key + '&ar_range=wide&limit=' + 8 + '&anon_id=' + anonymousId + '&media_filter=minimal';
 
             try {
                 const rawResponse: Response = await fetch(searchUrl);
@@ -59,10 +61,10 @@ export class GifService {
                 return;
             }
 
-            const apiKey: string = EnvironmentConfigService.getInstance().get('tenorKey');
+            const config: EnvironmentTenorConfig = EnvironmentConfigService.getInstance().get('tenor');
 
             try {
-                const rawResponse: Response = await fetch('https://api.tenor.com/v1/anonid?key=' + apiKey);
+                const rawResponse: Response = await fetch(config.url + '/anonid?key=' + config.key);
 
                 const response: TenorAnonymousResponse = JSON.parse(await rawResponse.text());
 

studio/src/components.d.ts

@@ -8,9 +8,9 @@
 import '@stencil/core';
 
 import '@ionic/core';
+import 'ionicons';
 import 'deckdeckgo';
 import 'deckdeckgo-inline-editor';
-import 'ionicons';
 import {
   EventEmitter,
 } from '@stencil/core';

studio/src/global/app-dev.ts

@@ -16,5 +16,8 @@ setupConfig({
         storageBucket: '<@FIREBASE_STORAGE_BUCKET@>',
         messagingSenderId: '<@FIREBASE_MESSAGING_SENDER_ID@>'
     },
-    tenorKey: '<@TENOR_KEY@>'
+    tenor: {
+        url: 'https://api.tenor.com/v1/',
+        key: '<@TENOR_KEY@>'
+    }
 });

studio/src/global/app.ts

@@ -16,5 +16,8 @@ setupConfig({
         storageBucket: '<@FIREBASE_STORAGE_BUCKET@>',
         messagingSenderId: '<@FIREBASE_MESSAGING_SENDER_ID@>'
     },
-    tenorKey: '<@TENOR_KEY@>'
+    tenor: {
+        url: 'https://api.tenor.com/v1/',
+        key: '<@TENOR_KEY@>'
+    }
 });