Release 1.0.0

Release 1.0.0

fastlane/report.xml

@@ -5,7 +5,7 @@
 
 
 
-      <testcase classname="fastlane.lanes" name="0: default_platform" time="0.123619">
+      <testcase classname="fastlane.lanes" name="0: default_platform" time="0.070813">
 
       </testcase>
 

package.json

@@ -1,7 +1,7 @@
 {
   "name": "@qonversion/web-sdk",
   "title": "Qonversion Web SDK",
-  "version": "0.2.2",
+  "version": "1.0.0",
   "description": "Qonversion provides full in-app purchases infrastructure, so you do not need to build your own server for receipt validation. Implement in-app subscriptions, validate user receipts, check subscription status, and provide access to your app features and content using our Stripe wrapper, StoreKit wrapper and Google Play Billing wrapper.",
   "main": "sdk/build/index.js",
   "types": "sdk/build/index.d.ts",

sdk/src/UserPropertiesBuilder.ts

@@ -1,4 +1,4 @@
-import {UserProperty} from './dto/UserProperty';
+import {UserPropertyKey} from './dto/UserPropertyKey';
 
 /**
  * This builder class can be used to generate a map of user properties
@@ -17,18 +17,18 @@ export class UserPropertiesBuilder {
    * @return builder instance for chain calls
    */
   setName(name: string): UserPropertiesBuilder {
-    this.properties[UserProperty.Name] = name;
+    this.properties[UserPropertyKey.Name] = name;
     return this;
   }
-  
+
   /**
    * Set custom user id. It can be an identifier used on your backend
    * to link the current Qonversion user with your one.
    * @param customUserId unique user id
    * @return builder instance for chain calls
    */
   setCustomUserId(customUserId: string): UserPropertiesBuilder {
-    this.properties[UserProperty.CustomUserId] = customUserId;
+    this.properties[UserPropertyKey.CustomUserId] = customUserId;
     return this;
   }
 
@@ -38,7 +38,7 @@ export class UserPropertiesBuilder {
    * @return builder instance for chain calls
    */
   setEmail(email: string): UserPropertiesBuilder {
-    this.properties[UserProperty.Email] = email;
+    this.properties[UserPropertyKey.Email] = email;
     return this;
   }
 
@@ -48,7 +48,7 @@ export class UserPropertiesBuilder {
    * @return builder instance for chain calls
    */
   setKochavaDeviceId(deviceId: string): UserPropertiesBuilder {
-    this.properties[UserProperty.KochavaDeviceId] = deviceId;
+    this.properties[UserPropertyKey.KochavaDeviceId] = deviceId;
     return this;
   }
 
@@ -59,7 +59,7 @@ export class UserPropertiesBuilder {
    * @return builder instance for chain calls
    */
   setAppsFlyerUserId(userId: string): UserPropertiesBuilder {
-    this.properties[UserProperty.AppsFlyerUserId] = userId;
+    this.properties[UserPropertyKey.AppsFlyerUserId] = userId;
     return this;
   }
 
@@ -69,7 +69,7 @@ export class UserPropertiesBuilder {
    * @return builder instance for chain calls
    */
   setAdjustAdvertisingId(advertisingId: string): UserPropertiesBuilder {
-    this.properties[UserProperty.AdjustAdId] = advertisingId;
+    this.properties[UserPropertyKey.AdjustAdId] = advertisingId;
     return this;
   }
 
@@ -79,7 +79,7 @@ export class UserPropertiesBuilder {
    * @return builder instance for chain calls
    */
   setFacebookAttribution(facebookAttribution: string): UserPropertiesBuilder {
-    this.properties[UserProperty.FacebookAttribution] = facebookAttribution;
+    this.properties[UserPropertyKey.FacebookAttribution] = facebookAttribution;
     return this;
   }
 
@@ -89,7 +89,27 @@ export class UserPropertiesBuilder {
    * @return builder instance for chain calls
    */
   setFirebaseAppInstanceId(firebaseAppInstanceId: string): UserPropertiesBuilder {
-    this.properties[UserProperty.FirebaseAppInstanceId] = firebaseAppInstanceId;
+    this.properties[UserPropertyKey.FirebaseAppInstanceId] = firebaseAppInstanceId;
+    return this;
+  }
+
+  /**
+   * Set Android app set id.
+   * @param appSetId app set id
+   * @return builder instance for chain calls
+   */
+  setAppSetId(appSetId: string): UserPropertiesBuilder {
+    this.properties[UserPropertyKey.AppSetId] = appSetId;
+    return this;
+  }
+
+  /**
+   * Set iOS advertising id.
+   * @param advertisingId advertising id
+   * @return builder instance for chain calls
+   */
+  setAdvertisingId(advertisingId: string): UserPropertiesBuilder {
+    this.properties[UserPropertyKey.AdvertisingId] = advertisingId;
     return this;
   }
 

sdk/src/__tests__/internal/QonversionInternal.test.ts

@@ -7,14 +7,17 @@ import Qonversion, {
   LogLevel,
   PurchaseCoreData,
   StripeStoreData,
-  UserProperty,
+  UserPropertyKey,
   UserPurchase,
 } from '../../index';
 import {UserPropertiesController} from '../../internal/userProperties';
 import {UserController} from '../../internal/user';
 import {EntitlementsController, EntitlementsControllerImpl} from '../../internal/entitlements';
 import {PurchasesController, PurchasesControllerImpl} from '../../internal/purchases';
 import {Logger} from '../../internal/logger';
+import {API_URL} from '../../internal/network';
+import {UserProperties} from '../../dto/UserProperties';
+import {UserProperty} from '../../dto/UserProperty';
 
 jest.mock('../../internal/di/DependenciesAssembly', () => {
   const originalModule = jest.requireActual('../../internal/di/DependenciesAssembly');
@@ -41,6 +44,7 @@ beforeEach(() => {
   };
   networkConfig = {
     canSendRequests: true,
+    apiUrl: API_URL,
   };
   loggerConfig = {
     logTag: '',
@@ -190,7 +194,7 @@ describe('UserPropertiesController usage tests', () => {
 
   test('setUserProperty', () => {
     // given
-    const key = UserProperty.AppsFlyerUserId;
+    const key = UserPropertyKey.AppsFlyerUserId;
     const value = 'property_value';
     userPropertyController.setProperty = jest.fn();
 
@@ -218,21 +222,35 @@ describe('UserPropertiesController usage tests', () => {
     expect(userPropertyController.setProperties).toBeCalledWith(properties);
     expect(logger.verbose).toBeCalledWith('setUserProperties() call');
   });
+
+  test('userProperties', async () => {
+    // given
+    const response = new UserProperties([new UserProperty('testKey', 'testValue')]);
+    userPropertyController.getProperties = jest.fn(() => Promise.resolve(response));
+
+    // when
+    const res = await qonversionInternal.userProperties();
+
+    // then
+    expect(res).toEqual(response);
+    expect(userPropertyController.getProperties).toBeCalledWith();
+    expect(logger.verbose).toBeCalledWith('userProperties() call');
+  });
 });
 
 describe('EntitlementsController usage tests', () => {
-  test('getEntitlements', () => {
+  test('entitlements', () => {
     // given
     const promiseReturned = new Promise<Entitlement[]>(() => []);
     entitlementsController.getEntitlements = jest.fn(async () => promiseReturned);
 
     // when
-    const res = qonversionInternal.getEntitlements();
+    const res = qonversionInternal.entitlements();
 
     // then
     expect(res).toStrictEqual(promiseReturned);
     expect(entitlementsController.getEntitlements).toBeCalled();
-    expect(logger.verbose).toBeCalledWith('getEntitlements() call');
+    expect(logger.verbose).toBeCalledWith('entitlements() call');
   });
 });
 
@@ -248,6 +266,7 @@ describe('PurchasesController usage tests', () => {
           productId: 'test product id',
           subscriptionId: 'test subscription id',
         },
+        userId: 'Qon_test_user_id'
       };
       const requestData: PurchaseCoreData & StripeStoreData = {
         currency: 'USD',

sdk/src/__tests__/internal/entitlements/EntitlementsService.test.ts

@@ -2,8 +2,8 @@ import {
   ApiInteractor,
   RequestConfigurator,
   NetworkRequest,
-  NetworkResponseError,
-  NetworkResponseSuccess
+  ApiResponseError,
+  ApiResponseSuccess
 } from '../../../internal/network';
 import {
   Entitlement,
@@ -45,14 +45,14 @@ const apiPayload: EntitlementsResponse = {
   data: [apiEntitlement],
   object: 'list'
 };
-const testSuccessfulResponse: NetworkResponseSuccess<EntitlementsResponse> = {
+const testSuccessfulResponse: ApiResponseSuccess<EntitlementsResponse> = {
   code: 200,
   data: apiPayload,
   isSuccess: true
 };
 const testErrorCode = 500;
 const testErrorMessage = 'Test error message';
-const testErrorResponse: NetworkResponseError = {
+const testErrorResponse: ApiResponseError = {
   code: testErrorCode,
   apiCode: '',
   message: testErrorMessage,
@@ -119,7 +119,7 @@ describe('getEntitlements tests', function () {
 
   test('user does not exist', async () => {
     // given
-    const testUserNotFoundResponse: NetworkResponseError = {
+    const testUserNotFoundResponse: ApiResponseError = {
       code: HTTP_CODE_NOT_FOUND,
       apiCode: '',
       message: testErrorMessage,

sdk/src/__tests__/internal/network/ApiInteractor.test.ts

@@ -4,8 +4,8 @@ import {
   ExponentialDelayCalculator,
   NetworkClientImpl,
   NetworkRequest,
-  NetworkResponseError,
-  NetworkResponseSuccess,
+  ApiResponseError,
+  ApiResponseSuccess,
   NetworkRetryConfig,
   RawNetworkResponse,
   RequestType,
@@ -55,7 +55,7 @@ describe('execute tests', () => {
     code: testResponseCode,
     payload: testPayload,
   };
-  let errorResponse: NetworkResponseError = {
+  let errorResponse: ApiResponseError = {
     apiCode: '',
     code: 0,
     message: '',
@@ -92,7 +92,7 @@ describe('execute tests', () => {
 
   test('execute with successful response', async () => {
     // given
-    const expResponse: NetworkResponseSuccess<typeof testPayload> = {
+    const expResponse: ApiResponseSuccess<typeof testPayload> = {
       code: testResponseCode,
       data: testPayload,
       isSuccess: true,
@@ -360,7 +360,7 @@ describe('getErrorResponse tests', () => {
       code: testErrorCode,
       payload: {error: apiError},
     };
-    const expResult: NetworkResponseError = {
+    const expResult: ApiResponseError = {
       apiCode: testErrorApiCode,
       code: testErrorCode,
       message: testErrorMessage,

sdk/src/__tests__/internal/network/RequestConfigurator.test.ts

@@ -77,22 +77,34 @@ describe('RequestConfigurator tests', () => {
     expect(request).toStrictEqual(expResult);
   });
 
-  test('user properties request', () => {
+  test('user properties send request', () => {
     // given
-    const properties = {a: 'a', b: 'b'};
+    const properties = [{key: 'a', value: 'a'}, {key: 'b', value: 'b'}];
     const expResult: NetworkRequest = {
       headers: testHeaders,
       type: RequestType.POST,
-      url: testBaseUrl + '/' + ApiEndpoint.Properties,
-      body: {
-        access_token: testProjectKey,
-        q_uid: testUserId,
-        properties,
-      }
+      url: testBaseUrl + '/' + ApiEndpoint.Users + '/' + testUserId + '/' + ApiEndpoint.Properties,
+      body: properties,
+    };
+
+    // when
+    const request = requestConfigurator.configureUserPropertiesSendRequest(testUserId, properties);
+
+    // then
+    expect(request).toStrictEqual(expResult);
+  });
+
+  test('user properties get request', () => {
+    // given
+    const expResult: NetworkRequest = {
+      headers: testHeaders,
+      type: RequestType.GET,
+      url: testBaseUrl + '/' + ApiEndpoint.Users + '/' + testUserId + '/' + ApiEndpoint.Properties,
+      body: undefined,
     };
 
     // when
-    const request = requestConfigurator.configureUserPropertiesRequest(properties);
+    const request = requestConfigurator.configureUserPropertiesGetRequest(testUserId);
 
     // then
     expect(request).toStrictEqual(expResult);

sdk/src/__tests__/internal/purchases/PurchasesController.test.ts

@@ -17,6 +17,7 @@ const testUserPurchase: UserPurchase = {
     productId: 'test product id',
     subscriptionId: 'test subscription id'
   },
+  userId: testUserId,
 };
 
 const testStripePurchaseData: PurchaseCoreData & StripeStoreData = {

sdk/src/__tests__/internal/purchases/PurchasesService.test.ts

@@ -2,8 +2,8 @@ import {
   ApiInteractor,
   RequestConfigurator,
   NetworkRequest,
-  NetworkResponseError,
-  NetworkResponseSuccess
+  ApiResponseError,
+  ApiResponseSuccess
 } from '../../../internal/network';
 import {
   PurchaseCoreData,
@@ -23,20 +23,21 @@ const apiPurchase: UserPurchaseApi = {
   currency: 'USD',
   price: '10',
   purchased: 3243523432,
+  userId: testUserId,
   stripe_store_data: {
     product_id: 'test product id',
     subscription_id: 'test subscription id'
   },
 };
 
-const testSuccessfulResponse: NetworkResponseSuccess<UserPurchaseApi> = {
+const testSuccessfulResponse: ApiResponseSuccess<UserPurchaseApi> = {
   code: 200,
   data: apiPurchase,
   isSuccess: true
 };
 const testErrorCode = 500;
 const testErrorMessage = 'Test error message';
-const testErrorResponse: NetworkResponseError = {
+const testErrorResponse: ApiResponseError = {
   code: testErrorCode,
   apiCode: '',
   message: testErrorMessage,
@@ -47,6 +48,7 @@ const expRes: UserPurchase = {
   currency: 'USD',
   price: '10',
   purchased: 3243523432,
+  userId: testUserId,
   stripeStoreData: {
     productId: 'test product id',
     subscriptionId: 'test subscription id'