implement projectId usage for requests

Author: mkilincaslan

Readme.md

@@ -51,7 +51,7 @@ import { useInitiate } from "@commt/rn-sdk/hooks";
 
 const ClientConfig = {
   apiKey: "123456789?",
-  subscriptionKey: "0987654321?",
+  projectId: "0987654321?",
   secret: "123456789018A_7JzPo?23F+4y#erPL" // This is just and example you don't have to add secret here for initialization
 };
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@commt/rn-sdk",
-  "version": "0.0.3",
+  "version": "0.1.0",
   "description": "Ultimate chat plugin for react native applications",
   "main": "src/index.tsx",
   "scripts": {

src/components/Chat/index.tsx

@@ -47,7 +47,7 @@ const Chat = ({
       rooms,
       messages,
       app: {
-        configs: { indicators, tenantId, apiKey, subscriptionKey, projectName },
+        configs: { indicators, tenantId, apiKey, projectId },
       },
     },
     dispatch,
@@ -94,8 +94,7 @@ const Chat = ({
         //handle Log params
         {
           apiKey,
-          subscriptionKey,
-          projectName,
+          projectId,
           chatAuthId: selfUser!.chatAuthId,
         },
       );
@@ -114,8 +113,7 @@ const Chat = ({
         //handle Log params
         {
           apiKey,
-          subscriptionKey,
-          projectName,
+          projectId,
           chatAuthId: selfUser!.chatAuthId,
         },
       );
@@ -208,8 +206,7 @@ const Chat = ({
           //handle Log params
           {
             apiKey,
-            subscriptionKey,
-            projectName,
+            projectId,
             chatAuthId: selfUser!.chatAuthId,
           },
         );

src/context/reducers/appReducer.ts

@@ -14,9 +14,8 @@ export type ConfigsProps = {
   indicators: IndicatorProps[];
   tenantId: string;
   apiKey: string;
-  subscriptionKey: string;
   secretKey: string;
-  projectName: string;
+  projectId: string;
 };
 
 export type AppState = {
@@ -34,9 +33,8 @@ export const AppValues: AppState = {
     indicators: [],
     tenantId: "",
     apiKey: "",
-    subscriptionKey: "",
     secretKey: "",
-    projectName: "",
+    projectId: "",
   },
 };
 

src/hooks/useSendMessage.ts

@@ -18,7 +18,7 @@ const useSendMessage = () => {
       users: { selfUser, users },
       rooms,
       app: {
-        configs: { secretKey, apiKey, subscriptionKey, projectName, e2e },
+        configs: { secretKey, apiKey, projectId, e2e },
       },
     },
     dispatch,
@@ -89,8 +89,7 @@ const useSendMessage = () => {
       //handle Log params
       {
         apiKey,
-        subscriptionKey,
-        projectName,
+        projectId,
         chatAuthId: selfUser!.chatAuthId,
         chatRoomAuthId,
       },

src/hooks/useSetRooms.ts

@@ -10,7 +10,7 @@ const useSetRooms = () => {
     state: {
       users: { selfUser },
       app: {
-        configs: { apiKey, subscriptionKey, indicators, projectName },
+        configs: { apiKey, indicators, projectId },
       },
     },
     dispatch,
@@ -21,8 +21,7 @@ const useSetRooms = () => {
       const activeRooms = await getRoomsReadToken({
         roomIds: rooms.map((room) => room.chatRoomAuthId).join(","),
         apiKey,
-        subscriptionKey,
-        projectName,
+        projectId,
         chatAuthId: selfUser!.chatAuthId,
       });
 

src/hooks/useSetUsers.ts

@@ -10,7 +10,7 @@ const useSetUsers = () => {
     state: {
       users: { selfUser },
       app: {
-        configs: { apiKey, subscriptionKey, indicators, projectName },
+        configs: { apiKey, indicators, projectId },
       },
     },
     dispatch,
@@ -26,8 +26,7 @@ const useSetUsers = () => {
       const activeUsers = await getUsersOnlineInfo({
         userIds,
         apiKey,
-        subscriptionKey,
-        projectName,
+        projectId,
         chatAuthId: selfUser!.chatAuthId,
       });
 

src/service/index.ts

@@ -7,8 +7,7 @@ import * as events from "../utils/events";
 
 export interface InitiateProps {
   apiKey: string;
-  subscriptionKey: string;
-  projectName: string;
+  projectId: string;
 }
 
 interface OnlineInfoProps extends InitiateProps {
@@ -46,19 +45,17 @@ const project = {
 };
 
 export const initiate = async (props: InitiateProps) => {
-  const { apiKey, subscriptionKey, projectName } = props;
+  const { apiKey, projectId } = props;
 
   try {
-    const response = await axios.get<ConfigsProps>(`/api/v1/tenant/config/`, {
+    const response = await axios.get<ConfigsProps>(`/api/v1/project/config/`, {
       params: {
-        plugin: true, // This is for backend compatibility
         SDK: project.SDK, // This is for backend compatibility & analytics
         version: project.version, // This is for backend compatibility & analytics
-        name: projectName, // This is for backend compatibility & analytics
+        projectId, // This is for backend compatibility & analytics
       },
       headers: {
         apiKey,
-        subscriptionKey,
       },
     });
 
@@ -71,8 +68,7 @@ export const initiate = async (props: InitiateProps) => {
     // Log error to service
     handleLogger({
       apiKey,
-      subscriptionKey,
-      projectName,
+      projectId,
       error: {
         error,
         event: events.INITIATE_TENANT_CONFIGS,
@@ -82,7 +78,7 @@ export const initiate = async (props: InitiateProps) => {
 };
 
 export const getUsersOnlineInfo = async (props: OnlineInfoProps) => {
-  const { userIds, apiKey, subscriptionKey, projectName, chatAuthId } = props;
+  const { userIds, apiKey, projectId, chatAuthId } = props;
 
   try {
     const response = await axios.get<OnlineInfoReturnProps[]>(
@@ -93,7 +89,6 @@ export const getUsersOnlineInfo = async (props: OnlineInfoProps) => {
         },
         headers: {
           apiKey,
-          subscriptionKey,
         },
       },
     );
@@ -103,8 +98,7 @@ export const getUsersOnlineInfo = async (props: OnlineInfoProps) => {
     // Log error to service
     handleLogger({
       apiKey,
-      subscriptionKey,
-      projectName,
+      projectId,
       error: {
         error,
         event: events.GET_USERS_ONLINE_INFO,
@@ -115,7 +109,7 @@ export const getUsersOnlineInfo = async (props: OnlineInfoProps) => {
 };
 
 export const getRoomsReadToken = async (props: ReadTokenProps) => {
-  const { roomIds, apiKey, subscriptionKey, projectName, chatAuthId } = props;
+  const { roomIds, apiKey, projectId, chatAuthId } = props;
 
   try {
     const response = await axios.get<ReadTokenReturnProps[]>(
@@ -126,7 +120,6 @@ export const getRoomsReadToken = async (props: ReadTokenProps) => {
         },
         headers: {
           apiKey,
-          subscriptionKey,
         },
       },
     );
@@ -135,8 +128,7 @@ export const getRoomsReadToken = async (props: ReadTokenProps) => {
     // TODO: Log error
     handleLogger({
       apiKey,
-      subscriptionKey,
-      projectName,
+      projectId,
       error: {
         error,
         event: events.GET_ROOMS_READ_TOKEN,
@@ -147,17 +139,10 @@ export const getRoomsReadToken = async (props: ReadTokenProps) => {
 };
 
 export const handleLogger = async (props: HandleLoggerProps) => {
-  const {
-    apiKey,
-    subscriptionKey,
-    projectName,
-    error,
-    chatAuthId,
-    chatRoomAuthId,
-  } = props;
+  const { apiKey, projectId, error, chatAuthId, chatRoomAuthId } = props;
 
   const logObject = {
-    projectName,
+    projectId,
     SDK: project.SDK,
     version: project.version,
     error,
@@ -169,7 +154,6 @@ export const handleLogger = async (props: HandleLoggerProps) => {
     axios.post("/system/logger", logObject, {
       headers: {
         apiKey,
-        subscriptionKey,
       },
     });
   } catch (error_) {