Merge pull request #675 from inplayer-org/ch12080/add-new-get-account-sdk-method

New account methods added

Author: Jasminna

CHANGELOG.md

@@ -2,6 +2,12 @@
 
 All notable changes to this project will be documented in this file.
 
+# [3.11.0] - 11-03-2021
+
+### Added
+
+- New account methods: Inplayer.Account.signInV2 and Inplayer.Account.signUpV2
+
 # [3.10.0] - 24-02-2021
 
 ### Changes

index.d.ts

@@ -34,6 +34,18 @@ export interface SignUpData {
   metadata?: { [key: string]: string };
 }
 
+export interface SignUpDataV2 {
+  fullName: string;
+  email: string;
+  password: string;
+  passwordConfirmation: string;
+  type: string;
+  clientId: string;
+  referrer: string;
+  metadata: { [key: string]: string };
+  brandingId: number;
+}
+
 export interface RequestPasswordData {
   email: string;
   merchantUuid: string;
@@ -74,6 +86,13 @@ export declare interface AuthenticateData {
   password?: string;
 }
 
+export interface AuthenticateDataV2 {
+  email: string;
+  clientId: string;
+  referrer: string;
+  password: string;
+}
+
 export declare interface AccountInformationReturn {
   id: number;
   email: string;
@@ -148,7 +167,9 @@ export declare class Account {
   removeToken<R = void>(): R | void;
 
   signIn(data: AuthenticateData): Promise<AxiosResponse<CreateAccount>>;
+  signInV2(data: AuthenticateDataV2): Promise<AxiosResponse<CreateAccount>>;
   signUp(data: SignUpData): Promise<AxiosResponse<CreateAccount>>;
+  signUpV2(data: SignUpDataV2): Promise<AxiosResponse<CreateAccount>>;
   signOut(): Promise<AxiosResponse<undefined>>;
   refreshToken(clientId: string): Promise<AxiosResponse<CreateAccount>>;
   reportSSOtoken(

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@inplayer-org/inplayer.js",
-  "version": "3.9.0",
+  "version": "3.11.0",
   "author": "InPlayer",
   "license": "MIT",
   "description": "A Javascript SDK for Inplayer's RESTful API",

src/constants/index.ts

@@ -1,8 +1,10 @@
 export const API = {
   // Account
   signIn: '/accounts/authenticate',
+  signInV2: '/v2/accounts/authenticate',
   signOut: '/accounts/logout',
   signUp: '/accounts',
+  signUpV2: 'v2/accounts',
   requestNewPassword: '/accounts/forgot-password',
   setNewPassword: (token: any) => `/accounts/forgot-password/${token}`,
   getAccountInfo: '/accounts',

src/endpoints/account.ts

@@ -1,7 +1,9 @@
 import qs from 'qs';
 import {
   AuthenticateData,
+  AuthenticateDataV2,
   SignUpData,
+  SignUpDataV2,
   RequestNewPasswordData,
   SetNewPasswordData,
   UpdateAccountData,
@@ -116,6 +118,51 @@ class Account extends BaseExtend {
     return respData;
   }
 
+  /**
+   * Signs in the user v2
+   * @method signInV2
+   * @async
+   * @typedef {Object} AxiosResponse<CreateAccount>
+   * @param {AuthenticateDataV2} data - Contains {
+   *  email: string,
+   *  password: string,
+   *  clientId: string,
+   *  referrer: string,
+   * }
+   * @example
+   *     InPlayer.Account.signInV2({
+   *      email: 'test@test.com',
+   *      password: 'test123',
+   *      clientId: '123-123-hf1hd1-12dhd1',
+   *      referrer: 'http://localhost:3000/',
+   *     })
+   *     .then(data => console.log(data));
+   * @returns  {AxiosResponse<CreateAccount>}
+   */
+  async signInV2(data: AuthenticateDataV2) {
+    const body = {
+      client_id: data.clientId,
+      grant_type: 'password',
+      referrer: data.referrer,
+      username: data.email,
+      password: data.password,
+    };
+
+    const respData = await this.request.post(API.signInV2, qs.stringify(body), {
+      headers: {
+        'Content-Type': 'application/x-www-form-urlencoded',
+      },
+    });
+
+    await this.request.setToken(
+      respData.data.access_token,
+      respData.data.refresh_token,
+      respData.data.expires,
+    );
+
+    return respData;
+  }
+
   /**
    * Signs up/Registers user
    * @method signUp
@@ -129,8 +176,7 @@ class Account extends BaseExtend {
    *  type: string,
    *  referrer: string,
    *  brandingId?: number,
-   *  metadata?: { [key: string]: string }\
-   *  dateOfBirth?: string,
+   *  metadata?: { [key: string]: string }
    * }
    * @example
    *     InPlayer.Account.signUp({
@@ -174,6 +220,63 @@ class Account extends BaseExtend {
     return resp;
   }
 
+  /**
+   * Signs up/Registers user v2
+   * @method signUpV2
+   * @async
+   * @param {SignUpDataV2} data - Contains {
+   *  fullName: string,
+   *  email: string
+   *  password: string,
+   *  passwordConfirmation: string,
+   *  clientId: string,
+   *  type: string,
+   *  referrer: string,
+   *  brandingId?: number,
+   *  metadata?: { [key: string]: string }
+   * }
+   * @example
+   *     InPlayer.Account.signUpV2({
+   *      fullName: "test",
+   *      email: "test32@test.com",
+   *      password: "12345678",
+   *      passwordConfirmation: "12345678",
+   *      clientId: "528b1b80-5868-4abc-a9b6-4d3455d719c8",
+   *      type: "consumer",
+   *      referrer: "http://localhost:3000/",
+   *      brandingId?: 12345,
+   *      metadata : { country: "Macedonia" },
+   *     })
+   *     .then(data => console.log(data));
+   * @returns  {AxiosResponse<CreateAccount>}
+   */
+  async signUpV2(data: SignUpDataV2) {
+    const body = {
+      full_name: data.fullName,
+      username: data.email,
+      password: data.password,
+      password_confirmation: data.passwordConfirmation,
+      client_id: data.clientId,
+      type: data.type,
+      referrer: data.referrer,
+      grant_type: 'password',
+      metadata: data.metadata,
+      branding_id: data.brandingId,
+    };
+
+    const resp = await this.request.post(API.signUpV2, qs.stringify(body), {
+      headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
+    });
+
+    await this.request.setToken(
+      resp.data.access_token,
+      resp.data.refresh_token,
+      resp.data.expires,
+    );
+
+    return resp;
+  }
+
   /**
    * Signs out the user and destroys cookies
    * @method signOut

src/models/Config.ts

@@ -11,8 +11,10 @@ export interface ApiConfig {
 
 export interface ApiEndpoints {
   signIn: string;
+  signInV2: string;
   signOut: string;
   signUp: string;
+  signUpV2: string;
   requestNewPassword: string;
   setNewPassword: (token: string) => string;
   getAccountInfo: string;

src/models/IAccount&Authentication.ts

@@ -115,6 +115,13 @@ export interface AuthenticateData {
   password?: string;
 }
 
+export interface AuthenticateDataV2 {
+  email: string;
+  clientId: string;
+  referrer: string;
+  password: string;
+}
+
 export interface SignUpData {
   fullName: string;
   email: string;
@@ -128,6 +135,18 @@ export interface SignUpData {
   brandingId: number;
 }
 
+export interface SignUpDataV2 {
+  fullName: string;
+  email: string;
+  password: string;
+  passwordConfirmation: string;
+  type: 'consumer';
+  clientId: string;
+  referrer: string;
+  metadata: Record<string, unknown>[];
+  brandingId: number;
+}
+
 export interface RequestNewPasswordData {
   merchantUuid: string;
   email: string;
@@ -168,7 +187,9 @@ export interface RestrictionSettingsData {
 
 export interface Account extends BaseExtend {
   signIn(data: AuthenticateData): Promise<AxiosResponse<CreateAccount>>;
+  signInV2(data: AuthenticateDataV2): Promise<AxiosResponse<CreateAccountV2>>
   signUp(data: SignUpData): Promise<AxiosResponse<CreateAccount>>;
+  signUpV2(data: SignUpDataV2): Promise<AxiosResponse<CreateAccount>>;
   signOut(): Promise<AxiosResponse<undefined>>;
   refreshToken(clientId: string): Promise<AxiosResponse<CreateAccount>>;
   reportSSOtoken(