@maxzima/wa-communicator 1.0.5 → 1.0.7

package/README.md

@@ -87,7 +87,7 @@ communicator.signUp({
   .then((response) => callback(response));
 
 communicator.registration({
-  accessToken: 'some_auth_token...',
+  accessToken: 'some_access_token...',
   name: 'companyName',
   hash: 'some_tracking_hash...',
   deviceType: 'mobile',
@@ -96,7 +96,9 @@ communicator.registration({
 })
   .then((response) => callback(response));
 
-communicator.getCurrentUserProfile()
+communicator.getCurrentUserProfile({
+  accessToken: 'some_access_token...',
+})
   .then((response) => callback(response))
 ```
 

package/dist/engine/Communicator/Public/Communicator.d.ts

@@ -1,4 +1,4 @@
-import { TCreateSessionRequestData, TEmailUpdateRequestData, TRegistrationRequestData, TResponse, TSetupChallengeRequestData, TSignInByMobileRequestData, TSignUpByMobileRequestData, TVerifyChallengeRequestData } from "@root/types";
+import { TCreateSessionRequestData, TEmailUpdateRequestData, TGetCurrentUserProfileRequestData, TRegistrationRequestData, TResponse, TSetupChallengeRequestData, TSignInByMobileRequestData, TSignUpByMobileRequestData, TVerifyChallengeRequestData } from "@root/types";
 export declare class Communicator {
     private props;
     constructor(props: TCommunicatorProps);
@@ -8,7 +8,7 @@ export declare class Communicator {
     verifyChallenge(data: TVerifyChallengeRequestData): Promise<TResponse>;
     emailUpdate(data: TEmailUpdateRequestData): Promise<TResponse>;
     createSession(data: TCreateSessionRequestData): Promise<TResponse>;
-    getCurrentUserProfile(): Promise<TResponse>;
+    getCurrentUserProfile(data: TGetCurrentUserProfileRequestData): Promise<TResponse>;
     registration(data: TRegistrationRequestData): Promise<TResponse>;
     private send;
     private getMeta;

package/dist/engine/Communicator/Public/Communicator.js

@@ -2,15 +2,15 @@ import { __awaiter } from "tslib";
 import { CommunicatorDefaultRequestData } from "./../Constants/Communicator";
 export class Communicator {
     constructor(props) {
-        this.getMeta = () => {
+        this.getMeta = (browserData) => {
             return {
                 audit_source_type: CommunicatorDefaultRequestData.AUDIT_SOURCE_TYPE,
-                browser_page_resolution: `${window.innerWidth}x${window.innerHeight}`,
-                cookies_enabled: window.navigator.cookieEnabled,
+                browser_page_resolution: `${browserData.innerWidth}x${browserData.innerHeight}`,
+                cookies_enabled: browserData.isCookieEnabled,
                 ip: CommunicatorDefaultRequestData.IP,
                 js_enabled: true,
                 language: CommunicatorDefaultRequestData.LANG,
-                user_agent: window.navigator.userAgent,
+                user_agent: browserData.userAgent,
             };
         };
         this.processingQueryParams = (queryParams) => {
@@ -29,7 +29,10 @@ export class Communicator {
     }
     signIn(data) {
         return __awaiter(this, void 0, void 0, function* () {
-            const meta = this.getMeta();
+            if (!data.browserData) {
+                return;
+            }
+            const meta = this.getMeta(data.browserData);
             const body = JSON.stringify({
                 captcha_response: '_',
                 meta,
@@ -106,12 +109,12 @@ export class Communicator {
             });
         });
     }
-    getCurrentUserProfile() {
+    getCurrentUserProfile(data) {
         return __awaiter(this, void 0, void 0, function* () {
             return yield this.send({
                 method: 'GET',
                 url: `${this.props.clientFAPIBaseUrl}${"user"}`,
-                headers: CommunicatorDefaultRequestData.FETCH_HEADERS_INIT,
+                headers: Object.assign({ 'Authorization': `Bearer ${data.accessToken}` }, CommunicatorDefaultRequestData.FETCH_HEADERS_INIT),
             });
         });
     }

package/dist/types/TCommunicator.d.ts

@@ -31,8 +31,15 @@ declare type TAccountMeta = {
     language: string;
     user_agent: string;
 };
+declare type TAccountBrowserData = {
+    innerWidth: number;
+    innerHeight: number;
+    isCookieEnabled: boolean;
+    userAgent: NavigatorID['userAgent'];
+};
 declare type TSignInByMobileRequestData = {
     phoneNumber: string;
+    browserData: TAccountBrowserData;
 };
 declare type TSignInByMobileResponse = {
     auth_token: string;
@@ -99,6 +106,9 @@ declare type TRegistrationRequestBody = {
     name: string;
     source: TRegistrationRequestBodySource;
 };
+declare type TGetCurrentUserProfileRequestData = {
+    accessToken: string;
+};
 declare type TRegistrationRequestData = {
     accessToken: string;
     name: TRegistrationRequestBody['name'];
@@ -107,4 +117,4 @@ declare type TRegistrationRequestData = {
     gaId: TRegistrationRequestBodySource['ga_id'];
     origin: TRegistrationRequestBodySource['origin'];
 };
-export { TChallenge, TAuditSource, TRequestProps, TRequestQueryParams, TResponse, TSignInStartRequestBody, TAccountMeta, TSignInByMobileRequestData, TSignInByMobileResponse, TSignUpStartRequestBody, TSignUpByMobileRequestData, TSetupChallengeRequestData, TSetupChallengeResponse, TVerifyChallengeRequestBody, TVerifyChallengeRequestData, TVerifyChallengeResponse, TEmailUpdateRequestData, TCreateSessionRequestData, TCreateSessionResponse, TGetCurrentUserProfileResponseUser, TRegistrationRequestData };
+export { TChallenge, TAuditSource, TRequestProps, TRequestQueryParams, TResponse, TSignInStartRequestBody, TAccountMeta, TAccountBrowserData, TSignInByMobileRequestData, TSignInByMobileResponse, TSignUpStartRequestBody, TSignUpByMobileRequestData, TSetupChallengeRequestData, TSetupChallengeResponse, TVerifyChallengeRequestBody, TVerifyChallengeRequestData, TVerifyChallengeResponse, TEmailUpdateRequestData, TCreateSessionRequestData, TCreateSessionResponse, TGetCurrentUserProfileResponseUser, TGetCurrentUserProfileRequestData, TRegistrationRequestData };

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.0.5",
+  "version": "1.0.7",
   "name": "@maxzima/wa-communicator",
   "description": "",
   "author": "Noname",

package/src/engine/Communicator/Public/Communicator.ts

@@ -1,7 +1,9 @@
 import {
+  TAccountBrowserData,
   TAccountMeta,
   TCreateSessionRequestData,
   TEmailUpdateRequestData,
+  TGetCurrentUserProfileRequestData,
   TRegistrationRequestData,
   TRequestProps,
   TRequestQueryParams,
@@ -24,7 +26,11 @@ export class Communicator {
   }
 
   public async signIn(data: TSignInByMobileRequestData) {
-    const meta = this.getMeta();
+    if (!data.browserData) {
+      return;
+    }
+
+    const meta = this.getMeta(data.browserData);
     const body = JSON.stringify({
       captcha_response: '_',
       meta,
@@ -112,11 +118,14 @@ export class Communicator {
     });
   }
 
-  public async getCurrentUserProfile() {
+  public async getCurrentUserProfile(data: TGetCurrentUserProfileRequestData) {
     return await this.send({
       method: 'GET',
       url: `${this.props.clientFAPIBaseUrl}${CommunicatorFAPIEndpointEnum.USER}`,
-      headers: CommunicatorDefaultRequestData.FETCH_HEADERS_INIT,
+      headers: {
+        'Authorization': `Bearer ${data.accessToken}`,
+        ...CommunicatorDefaultRequestData.FETCH_HEADERS_INIT,
+      },
     });
   }
 
@@ -164,15 +173,15 @@ export class Communicator {
       });
   }
 
-  private getMeta = (): TAccountMeta => {
+  private getMeta = (browserData: TAccountBrowserData): TAccountMeta => {
     return {
       audit_source_type: CommunicatorDefaultRequestData.AUDIT_SOURCE_TYPE,
-      browser_page_resolution: `${window.innerWidth}x${window.innerHeight}`,
-      cookies_enabled: window.navigator.cookieEnabled,
+      browser_page_resolution: `${browserData.innerWidth}x${browserData.innerHeight}`,
+      cookies_enabled: browserData.isCookieEnabled,
       ip: CommunicatorDefaultRequestData.IP,
       js_enabled: true,
       language: CommunicatorDefaultRequestData.LANG,
-      user_agent: window.navigator.userAgent,
+      user_agent: browserData.userAgent,
     };
   };
 

package/src/types/TCommunicator.ts

@@ -38,8 +38,16 @@ type TAccountMeta = {
   user_agent: string
 }
 
+type TAccountBrowserData = {
+  innerWidth: number,
+  innerHeight: number,
+  isCookieEnabled: boolean,
+  userAgent: NavigatorID['userAgent'],
+}
+
 type TSignInByMobileRequestData = {
   phoneNumber: string,
+  browserData: TAccountBrowserData,
 }
 
 type TSignInByMobileResponse = {
@@ -144,6 +152,10 @@ type TRegistrationRequestBody = {
   source: TRegistrationRequestBodySource,
 }
 
+type TGetCurrentUserProfileRequestData = {
+  accessToken: string,
+}
+
 type TRegistrationRequestData = {
   accessToken: string,
   name: TRegistrationRequestBody['name'],
@@ -162,6 +174,7 @@ export {
   TResponse,
   TSignInStartRequestBody,
   TAccountMeta,
+  TAccountBrowserData,
   TSignInByMobileRequestData,
   TSignInByMobileResponse,
   TSignUpStartRequestBody,
@@ -175,5 +188,6 @@ export {
   TCreateSessionRequestData,
   TCreateSessionResponse,
   TGetCurrentUserProfileResponseUser,
+  TGetCurrentUserProfileRequestData,
   TRegistrationRequestData
 };