Merge pull request #751 from inplayer-org/fix/wrong-data-types

Fix: Wrong data types

Author: Jasminna

CHANGELOG.md

@@ -2,6 +2,12 @@
 
 All notable changes to this project will be documented in this file.
 
+# [3.12.3] - 07-12-2021
+
+### Changes
+
+- Fixed wrong data types
+
 # [3.12.2] - 07-12-2021
 
 ### Changes

index.d.ts

@@ -23,10 +23,9 @@ export interface CredentialsConfig {
   expires: number;
 }
 
-export interface Credentials {
-  token: string;
-  refreshToken: string;
-  expires: number;
+export declare class Credentials {
+  constructor(data: CredentialsConfig);
+
   isExpired(): boolean;
   toObject(): CredentialsConfig;
 }
@@ -178,7 +177,7 @@ export declare class Account {
   constructor(config: Record<string, unknown>);
 
   isAuthenticated<R = boolean>(): R | boolean;
-  getToken<R = CredentialsConfig>(): R | CredentialsConfig;
+  getToken<R = Credentials>(): R | Credentials;
   setToken<R = void>(
     token: string,
     refreshToken: string,
@@ -567,8 +566,8 @@ export interface DefaultCreditCardData {
   cardNumber: string;
   cardName: string;
   cvc: number;
-  expMonth: string;
-  expYear: string;
+  expMonth: number;
+  expYear: number;
   currency: string;
 }
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@inplayer-org/inplayer.js",
-  "version": "3.12.1",
+  "version": "3.12.2",
   "author": "InPlayer",
   "license": "MIT",
   "description": "A Javascript SDK for Inplayer's RESTful API",
@@ -89,4 +89,4 @@
     "webpack-bundle-analyzer": "^4.1.0",
     "webpack-cli": "^3.3.12"
   }
-}
+}

src/endpoints/payment.ts

@@ -529,17 +529,17 @@ class Payment extends BaseExtend {
    * @param {string} cardNumber The card number.
    * @param {string} cardName The cardholder's name.
    * @param {number} cvc The card CVV number.
-   * @param {string} expMonth The card expiration month [1...12].
-   * @param {string} expYear The card expiration year.
+   * @param {number} expMonth The card expiration month [1...12].
+   * @param {number} expYear The card expiration year.
    * @param {string} currency The currency in which the subscription transactions are conducted.
    * @example
    *     InPlayer.Payment
    *     .setDefaultCreditCard({
    *          cardNumber: '4242424242424242',
    *          cardName: 'John Doe',
    *          cvc: 123,
-   *          expMonth: '1',
-   *          expYear: '2020',
+   *          expMonth: 1,
+   *          expYear: 2020,
    *          currency: 'EUR'
    *      })
    *     .then(data => console.log(data));
@@ -548,8 +548,8 @@ class Payment extends BaseExtend {
    * {
    *    number: number;
    *    card_name: string;
-   *    exp_month: string;
-   *    exp_year: string;
+   *    exp_month: number;
+   *    exp_year: number;
    * }
    * ```
    */
@@ -566,8 +566,8 @@ class Payment extends BaseExtend {
     cardNumber: string,
     cardName: string,
     cvc: number,
-    expMonth: string,
-    expYear: string,
+    expMonth: number,
+    expYear: number,
     currency: string,
   }): Promise<AxiosResponse<SetDefaultCard>> {
     const body = {

src/endpoints/subscription.ts

@@ -418,17 +418,17 @@ class Subscription extends BaseExtend {
    * @param {string} cardNumber The card number.
    * @param {string} cardName The cardholder's name.
    * @param {number} cvc The card CVV number.
-   * @param {string} expMonth The card expiration month [1...12].
-   * @param {string} expYear The card expiration year.
+   * @param {number} expMonth The card expiration month [1...12].
+   * @param {number} expYear The card expiration year.
    * @param {string} currency The currency in which the subscription transactions are conducted.
    * @example
    *     InPlayer.Payment
    *     .setDefaultCreditCard({
    *          cardNumber: '4242424242424242',
    *          cardName: 'John Doe',
    *          cvc: 123,
-   *          expMonth: '1',
-   *          expYear: '2020',
+   *          expMonth: 1,
+   *          expYear: 2020,
    *          currency: 'EUR'
    *      })
    *     .then(data => console.log(data));
@@ -437,8 +437,8 @@ class Subscription extends BaseExtend {
    * {
    *    number: number;
    *    card_name: string;
-   *    exp_month: string;
-   *    exp_year: string;
+   *    exp_month: number;
+   *    exp_year: number;
    * }
    * ```
    */
@@ -455,8 +455,8 @@ class Subscription extends BaseExtend {
     cardNumber: string,
     cardName: string,
     cvc: number,
-    expMonth: string,
-    expYear: string,
+    expMonth: number,
+    expYear: number,
     currency: string,
   }): Promise<AxiosResponse<SetDefaultCard>> {
     const body = {

src/factories/credentials.ts

@@ -1,5 +1,4 @@
 import { createTimestamp } from '../helpers';
-import { CredentialsConfig } from '../models/CommonInterfaces';
 
 class Credentials {
   token: string;
@@ -16,7 +15,7 @@ class Credentials {
     return createTimestamp() > this.expires;
   }
 
-  toObject(): CredentialsConfig {
+  toObject() {
     return {
       token: this.token,
       refreshToken: this.refreshToken,

src/models/IAccount&Authentication.ts

@@ -6,7 +6,7 @@ export interface SignUpData {
   email: string;
   password: string;
   passwordConfirmation: string;
-  type: 'consumer' | 'merchant';
+  type: 'consumer';
   grantType?: 'password' | 'client_credentials' | 'refresh_token';
   clientId: string;
   referrer: string;

src/models/IPayment.ts

@@ -151,8 +151,8 @@ export interface DefaultCreditCardData {
   cardNumber: string;
   cardName: string;
   cvc: number;
-  expMonth: string;
-  expYear: string;
+  expMonth: number;
+  expYear: number;
   currency: string;
 }