Integrate react-native-network-client

app/client/rest/general.ts

@@ -20,23 +20,23 @@ export interface ClientGeneralMix {
 const ClientGeneral = (superclass: any) => class extends superclass {
     getOpenGraphMetadata = async (url: string) => {
         return this.doFetch(
-            `${this.getBaseRoute()}/opengraph`,
+            `${this.apiVersion}/opengraph`,
             {method: 'post', body: JSON.stringify({url})},
         );
     };
 
     ping = async () => {
         return this.doFetch(
-            `${this.getBaseRoute()}/system/ping?time=${Date.now()}`,
+            `${this.apiVersion}/system/ping?time=${Date.now()}`,
             {method: 'get'},
         );
     };
 
     logClientError = async (message: string, level = 'ERROR') => {
-        const url = `${this.getBaseRoute()}/logs`;
+        const url = `${this.apiVersion}/logs`;
 
         if (!this.enableLogging) {
-            throw new ClientError(this.getUrl(), {
+            throw new ClientError(this.client.baseUrl, {
                 message: 'Logging disabled.',
                 url,
             });
@@ -50,14 +50,14 @@ const ClientGeneral = (superclass: any) => class extends superclass {
 
     getClientConfigOld = async () => {
         return this.doFetch(
-            `${this.getBaseRoute()}/config/client?format=old`,
+            `${this.apiVersion}/config/client?format=old`,
             {method: 'get'},
         );
     };
 
     getClientLicenseOld = async () => {
         return this.doFetch(
-            `${this.getBaseRoute()}/license/client?format=old`,
+            `${this.apiVersion}/license/client?format=old`,
             {method: 'get'},
         );
     };

app/client/rest/groups.ts

@@ -16,7 +16,7 @@ export interface ClientGroupsMix {
 const ClientGroups = (superclass: any) => class extends superclass {
     getGroups = async (filterAllowReference = false, page = 0, perPage = PER_PAGE_DEFAULT, since = 0) => {
         return this.doFetch(
-            `${this.getBaseRoute()}/groups${buildQueryString({filter_allow_reference: filterAllowReference, page, per_page: perPage, since})}`,
+            `${this.apiVersion}/groups${buildQueryString({filter_allow_reference: filterAllowReference, page, per_page: perPage, since})}`,
             {method: 'get'},
         );
     };
@@ -29,21 +29,21 @@ const ClientGroups = (superclass: any) => class extends superclass {
     }
     getAllGroupsAssociatedToTeam = async (teamID: string, filterAllowReference = false) => {
         return this.doFetch(
-            `${this.getBaseRoute()}/teams/${teamID}/groups${buildQueryString({paginate: false, filter_allow_reference: filterAllowReference})}`,
+            `${this.apiVersion}/teams/${teamID}/groups${buildQueryString({paginate: false, filter_allow_reference: filterAllowReference})}`,
             {method: 'get'},
         );
     };
 
     getAllGroupsAssociatedToChannelsInTeam = async (teamID: string, filterAllowReference = false) => {
         return this.doFetch(
-            `${this.getBaseRoute()}/teams/${teamID}/groups_by_channels${buildQueryString({paginate: false, filter_allow_reference: filterAllowReference})}`,
+            `${this.apiVersion}/teams/${teamID}/groups_by_channels${buildQueryString({paginate: false, filter_allow_reference: filterAllowReference})}`,
             {method: 'get'},
         );
     };
 
     getAllGroupsAssociatedToChannel = async (channelID: string, filterAllowReference = false) => {
         return this.doFetch(
-            `${this.getBaseRoute()}/channels/${channelID}/groups${buildQueryString({paginate: false, filter_allow_reference: filterAllowReference})}`,
+            `${this.apiVersion}/channels/${channelID}/groups${buildQueryString({paginate: false, filter_allow_reference: filterAllowReference})}`,
             {method: 'get'},
         );
     };

app/client/rest/index.ts

@@ -49,8 +49,11 @@ class Client extends mix(ClientBase).with(
     ClientTeams,
     ClientTos,
     ClientUsers,
-) {}
+) {
+    // TODO: types
+    constructor(client, serverUrl) {
+        super(client, serverUrl)
+    }
+}
 
-const Client4 = new Client();
-
-export {Client4, Client, DEFAULT_LIMIT_AFTER, DEFAULT_LIMIT_BEFORE, HEADER_X_VERSION_ID};
+export {Client, DEFAULT_LIMIT_AFTER, DEFAULT_LIMIT_BEFORE, HEADER_X_VERSION_ID};

app/client/rest/integrations.ts

@@ -57,7 +57,7 @@ const ClientIntegrations = (superclass: any) => class extends superclass {
     submitInteractiveDialog = async (data: DialogSubmission) => {
         this.analytics.trackAPI('api_interactive_messages_dialog_submitted');
         return this.doFetch(
-            `${this.getBaseRoute()}/actions/dialogs/submit`,
+            `${this.apiVersion}/actions/dialogs/submit`,
             {method: 'post', body: JSON.stringify(data)},
         );
     };

app/client/rest/tos.ts

@@ -16,7 +16,7 @@ const ClientTos = (superclass: any) => class extends superclass {
 
     getTermsOfService = async () => {
         return this.doFetch(
-            `${this.getBaseRoute()}/terms_of_service`,
+            `${this.apiVersion}/terms_of_service`,
             {method: 'get'},
         );
     }

app/client/rest/users.ts

@@ -142,11 +142,11 @@ const ClientUsers = (superclass: any) => class extends superclass {
             body.ldap_only = 'true';
         }
 
-        const {data} = await this.doFetchWithResponse(
+        const {data} = await this.doFetch(
             `${this.getUsersRoute()}/login`,
             {
                 method: 'post',
-                body: JSON.stringify(body),
+                body,
                 headers: {'Cache-Control': 'no-store'},
             },
         );
@@ -163,7 +163,7 @@ const ClientUsers = (superclass: any) => class extends superclass {
             token,
         };
 
-        const {data} = await this.doFetchWithResponse(
+        const {data} = await this.doFetch(
             `${this.getUsersRoute()}/login`,
             {method: 'post', body: JSON.stringify(body)},
         );
@@ -172,18 +172,20 @@ const ClientUsers = (superclass: any) => class extends superclass {
     };
 
     logout = async () => {
-        this.analytics.trackAPI('api_users_logout');
+        // this.analytics.trackAPI('api_users_logout');
 
-        const {response} = await this.doFetchWithResponse(
+        const {response} = await this.doFetch(
             `${this.getUsersRoute()}/logout`,
             {method: 'post'},
         );
 
-        if (response.ok) {
-            this.token = '';
-        }
+        // TODO: Invalidate client?
+        // if (response.ok) {
+        //     this.token = '';
+        // }
 
-        this.serverVersion = '';
+        // TODO: Remove server version from DB?
+        // this.serverVersion = '';
 
         return response;
     };