@voicenter-team/events-sdk 0.0.5 → 0.0.6

package/docs/src/.vuepress/components/Demo.vue

@@ -26,6 +26,7 @@ import EventsSdkClass from '@/index'
 import {eventsSdkDefaultOptions} from '@/classes/events-sdk/events-sdk-default-options'
 import {EventsEnum} from '@/enum/events.enum'
 import {EventTypeData} from '@/types/events'
+import {LoginTypeNewStackEnum, LoginTypeOldStackEnum} from "@/enum/auth.enum";
 
 /* Data */
 const token = ref('QMSVU9dwNYC9Le9VCBqx24AB9TYyWj9Xn5aCPV0GFHIWoShQqfPtnAPmnw24xpJIUSsDDtlac2OPpjx0t3MSkxH3AhiQGHCeGZ8e')
@@ -44,6 +45,8 @@ async function login() {
     const sdk = new EventsSdkClass({
         ...eventsSdkDefaultOptions,
         token: token.value,
+        loginType: LoginTypeNewStackEnum.USER,
+        newStack: true
     })
 
     await sdk.init()

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@voicenter-team/events-sdk",
-  "version": "0.0.5",
+  "version": "0.0.6",
   "description": "",
   "main": "dist/voicenter-events-sdk.cjs.js",
   "jsdelivr": "dist/voicenter-events-sdk.umd.js",

package/src/classes/auth/auth.class.ts

@@ -2,7 +2,16 @@ import md5 from 'js-md5'
 
 import EventsSdkClass from '@/classes/events-sdk/events-sdk.class'
 import { Environment, EventsSdkOptions, ServerParameter } from '@/classes/events-sdk/events-sdk.types'
-import { LoginSessionData, LoginSessionPayload } from '@/types/auth'
+import {
+    ExternalLoginResponse,
+    ExternalLoginResponseDataNewStack,
+    ExternalLoginResponseDataOldStack,
+    LoginSessionData,
+    LoginSessionPayload,
+    Settings
+} from '@/types/auth'
+import { LoginTypeNewStackEnum, LoginTypeOldStackEnum } from '@/enum/auth.enum'
+import { getSettingsUrl, newLoginUrl, oldLoginUrl } from '@/classes/auth/auth.urls'
 
 class AuthClass{
     constructor (private readonly eventsSdkClass: EventsSdkClass) {
@@ -29,10 +38,10 @@ class AuthClass{
 
         this.updateLastLoginTimestamp()
 
-        const isLoggedIn = await this.checkLoginStatus(options, key)
+        const isLoggedIn = await this.checkLoginStatus(options.environment, key)
 
         if (!isLoggedIn) {
-            await this.userLoginFunction(payload, key)
+            await this.userLoginFunction(payload, key, options.loginType, options.newStack)
         }
     }
 
@@ -40,9 +49,9 @@ class AuthClass{
         this.lastLoginTimestamp = new Date().getTime()
     }
 
-    private async checkLoginStatus (options: EventsSdkOptions, key: string): Promise<boolean> {
+    private async checkLoginStatus (environment: Environment, key: string): Promise<boolean> {
         let loginSessionData: LoginSessionData
-        if (options.environment === Environment.BROWSER && window) {
+        if (environment === Environment.BROWSER && window) {
             const loginSessionKey = window.sessionStorage.getItem(key)
 
             if (loginSessionKey) {
@@ -53,7 +62,7 @@ class AuthClass{
                 return true
             }
         }
-        if (options.environment === Environment.CHROME_EXTENSION && chrome) {
+        if (environment === Environment.CHROME_EXTENSION && chrome) {
             const loginSessionKey = await chrome.storage.session.get(key)
 
             if (loginSessionKey[key]) {
@@ -67,7 +76,7 @@ class AuthClass{
         return false
     }
 
-    private onLoginResponse (loginSessionData: LoginSessionData) {
+    private onLoginResponse (loginSessionData: Partial<LoginSessionData>) {
         if (loginSessionData.Client) {
             this.eventsSdkClass.socketIoClass.getSocketIoFunction(loginSessionData.Client)
         }
@@ -85,30 +94,96 @@ class AuthClass{
                 }
             })
         }
+        if (loginSessionData.MonitorList) {
+            this.eventsSdkClass.servers = [ ...loginSessionData.MonitorList ]
+        }
+        if (!loginSessionData.Url) {
+            this.eventsSdkClass.server = this.eventsSdkClass.servers[0]
+        }
+        if (!loginSessionData.Client) {
+            this.eventsSdkClass.socketIoClass.getSocketIoFunction(`v=${this.eventsSdkClass.server.Version}`)
+        }
         if (loginSessionData.Token) {
             // this.options.token = loginSessionData.Token
             this.token = loginSessionData.Token
             this.eventsSdkClass.connect(ServerParameter.DEFAULT, true)
         }
+        if (loginSessionData.IdentityCode) {
+            this.token = loginSessionData.IdentityCode
+            this.eventsSdkClass.connect(ServerParameter.DEFAULT, true)
+        }
         if (loginSessionData.RefreshToken && loginSessionData.TokenExpiry && this.eventsSdkClass.options.loginType === 'user') {
             this.eventsSdkClass.options.refreshToken = loginSessionData.RefreshToken
             this.eventsSdkClass.options.tokenExpiry = loginSessionData.TokenExpiry
             this.handleTokenExpiry()
         }
+        if (loginSessionData.RefreshToken && loginSessionData.IdentityCodeExpiry && this.eventsSdkClass.options.loginType === LoginTypeNewStackEnum.USER) {
+            this.eventsSdkClass.options.refreshToken = loginSessionData.RefreshToken
+            this.eventsSdkClass.options.tokenExpiry = loginSessionData.IdentityCodeExpiry
+            this.handleTokenExpiry()
+        }
     }
 
-    private async userLoginFunction (payload: LoginSessionPayload, key: string) {
-        const externalLoginUrl = this.getExternalLoginUrl(this.eventsSdkClass.options.loginUrl, this.eventsSdkClass.options.loginType)
+    private async userLoginFunction (
+        payload: LoginSessionPayload,
+        key: string,
+        loginType: LoginTypeNewStackEnum | LoginTypeOldStackEnum,
+        newStack: boolean
+    ) {
+        const externalLoginUrl = this.getExternalLoginUrl(
+            loginType,
+            newStack
+        )
+
+        if (!externalLoginUrl) {
+            throw new Error('External login url not found. Check provided options')
+        }
 
-        const externalLoginResponse = await this.externalLogin(externalLoginUrl, payload, this.eventsSdkClass.options.loginType)
+        if (newStack) {
+            const externalLoginResponse = await this.externalLogin<ExternalLoginResponseDataNewStack>(
+                externalLoginUrl,
+                payload,
+                loginType,
+                newStack
+            )
 
-        this.onLoginResponse(externalLoginResponse)
+            const settings = await this.getSettings(externalLoginResponse.Data.AccessToken)
 
-        if (this.eventsSdkClass.options.environment === Environment.BROWSER) {
-            window.sessionStorage.setItem(key, JSON.stringify(externalLoginResponse))
-        }
-        if (this.eventsSdkClass.options.environment === Environment.CHROME_EXTENSION) {
-            await chrome.storage.session.set({ [key]: JSON.stringify(externalLoginResponse) })
+            this.onLoginResponse({
+                ...externalLoginResponse.Data,
+                ...settings 
+            })
+
+            if (this.eventsSdkClass.options.environment === Environment.BROWSER) {
+                window.sessionStorage.setItem(key, JSON.stringify({
+                    ...externalLoginResponse.Data,
+                    ...settings
+                }))
+            }
+            if (this.eventsSdkClass.options.environment === Environment.CHROME_EXTENSION) {
+                await chrome.storage.session.set({
+                    [key]: JSON.stringify({
+                        ...externalLoginResponse.Data,
+                        ...settings
+                    }) 
+                })
+            }
+        } else {
+            const externalLoginResponse = await this.externalLogin<ExternalLoginResponseDataOldStack>(
+                externalLoginUrl,
+                payload,
+                loginType,
+                newStack
+            )
+
+            this.onLoginResponse(externalLoginResponse.Data.Socket)
+
+            if (this.eventsSdkClass.options.environment === Environment.BROWSER) {
+                window.sessionStorage.setItem(key, JSON.stringify(externalLoginResponse.Data.Socket))
+            }
+            if (this.eventsSdkClass.options.environment === Environment.CHROME_EXTENSION) {
+                await chrome.storage.session.set({ [key]: JSON.stringify(externalLoginResponse.Data.Socket) })
+            }
         }
     }
 
@@ -142,26 +217,54 @@ class AuthClass{
             maxAllowedTimeout)
     }
 
-    private getExternalLoginUrl (baseUrl: string, loginType: string) {
-        if (loginType === 'user') {
-            return `${baseUrl}/User`
-        }
-        if (loginType === 'token') {
-            return `${baseUrl}/Token`
+    private getExternalLoginUrl (
+        loginType: LoginTypeNewStackEnum | LoginTypeOldStackEnum,
+        newStack: boolean
+    ) {
+        if (newStack) {
+            return newLoginUrl
+        } else {
+            if (loginType === LoginTypeOldStackEnum.TOKEN) {
+                return `${oldLoginUrl}/Token`
+            }
+            if (loginType === LoginTypeOldStackEnum.USER) {
+                return `${oldLoginUrl}/User`
+            }
         }
-        return baseUrl
     }
 
-    private async externalLogin (url: string, { password, token, email }: LoginSessionPayload, loginType: string) {
+    private async externalLogin<T> (
+        url: string,
+        { password, token, email }: LoginSessionPayload,
+        loginType: LoginTypeNewStackEnum | LoginTypeOldStackEnum,
+        newStack: boolean
+    ): Promise<ExternalLoginResponse<T>> {
         let body: string
 
-        if (loginType === 'token') {
-            body = JSON.stringify({ token })
+        if (newStack) {
+            if (loginType === LoginTypeNewStackEnum.TOKEN) {
+                body = JSON.stringify({
+                    type: Number(LoginTypeNewStackEnum.TOKEN),
+                    token
+                })
+            } else {
+                body = JSON.stringify({
+                    type: Number(LoginTypeNewStackEnum.USER),
+                    username: email,
+                    password,
+                })
+            }
         } else {
-            body = JSON.stringify({
-                email,
-                pin: password
-            })
+            if (loginType === LoginTypeOldStackEnum.TOKEN) {
+                body = JSON.stringify({
+                    token
+                })
+            } else {
+                body = JSON.stringify({
+                    email,
+                    pin: password
+                })
+            }
         }
 
         const res = await fetch(url, {
@@ -177,7 +280,17 @@ class AuthClass{
         if (data.error) {
             throw new Error(data.error)
         }
-        return data.Data.Socket
+        return data
+    }
+
+    private async getSettings (token: string): Promise<Settings> {
+        const res = await fetch(getSettingsUrl, {
+            headers: {
+                Authorization: `Bearer ${token}`
+            }
+        })
+
+        return res.json()
     }
 
     private async refreshToken (refreshTokenUrl: string, oldRefreshToken: string) {

package/src/classes/auth/auth.urls.ts

@@ -0,0 +1,10 @@
+const oldLoginUrl = 'https://loginapi.voicenter.co.il/monitorAPI/Login'
+const newLoginUrl = 'http://loginapidev.voicenter.co.il/Auth/Login/Voicenter/Monitor'
+const getSettingsUrl = 'http://loginapidev.voicenter.co.il/Application/GetSettings'
+
+
+export {
+    oldLoginUrl,
+    newLoginUrl,
+    getSettingsUrl
+}

package/src/classes/events-sdk/events-sdk-default-options.ts

@@ -1,4 +1,5 @@
-import { EventsSdkOptions, Environment } from '@/classes/events-sdk/events-sdk.types'
+import { Environment, EventsSdkOptions } from '@/classes/events-sdk/events-sdk.types'
+import { LoginTypeOldStackEnum } from '@/enum/auth.enum'
 
 export const eventsSdkDefaultOptions: EventsSdkOptions = {
     url: 'https://monitorapi.voicenter.co.il/monitorAPI/getMonitorUrls',
@@ -7,11 +8,10 @@ export const eventsSdkDefaultOptions: EventsSdkOptions = {
         Domain: 'monitor5.voicenter.co.il',
         Priority: 0,
     },
-    loginUrl: 'https://loginapi.voicenter.co.il/monitorAPI/Login',
     refreshTokenUrl: 'https://loginapi.voicenter.co.il/monitorAPI/RefreshIdentityToken',
     // servers: defaultServers, // commented temporary
     token: '',
-    loginType: 'token',
+    loginType: LoginTypeOldStackEnum.TOKEN,
     forceNew: true,
     reconnectionDelay: 10000,
     reconnectionDelayMax: 10000,
@@ -47,6 +47,7 @@ export const eventsSdkDefaultOptions: EventsSdkOptions = {
         debug: false
     },
     username: 'username',
-    password: '53070875445',
-    email: 'FreshTest@Voicenter.com',
+    password: '78253050510',
+    email: 'test2@status.com',
+    newStack: false,
 }

package/src/classes/events-sdk/events-sdk.types.ts

@@ -1,14 +1,15 @@
+import { LoginTypeNewStackEnum, LoginTypeOldStackEnum } from 'enum/auth.enum'
+
 export interface EventsSdkOptions {
     url?: string,
-    environment?: string,
+    environment: Environment,
     fallbackServer: Server,
-    loginUrl: string,
     refreshTokenUrl?: string,
     refreshToken?: string,
     servers?: string,
     token: string,
     tokenExpiry?: Date,
-    loginType: string,
+    loginType: LoginTypeNewStackEnum | LoginTypeOldStackEnum,
     forceNew?: boolean,
     reconnectionDelay: number,
     reconnectionDelayMax?: number,
@@ -32,7 +33,8 @@ export interface EventsSdkOptions {
     loggerConnectOptions?: LoggerConnectOptions,
     email: string,
     password: string,
-    username: string
+    username: string,
+    newStack: boolean
 }
 
 export enum Environment {
@@ -42,7 +44,9 @@ export enum Environment {
 
 export interface Server {
     Priority: number,
-    Domain: string
+    Domain: string,
+    URLID?: number,
+    Version?: string,
 }
 
 export interface LoggerConfig {

package/src/enum/auth.enum.ts

@@ -0,0 +1,9 @@
+export enum LoginTypeNewStackEnum {
+    USER = '2',
+    TOKEN = '3'
+}
+
+export enum LoginTypeOldStackEnum {
+    USER = 'user',
+    TOKEN = 'token'
+}

package/src/types/auth.d.ts

@@ -1,3 +1,5 @@
+import { Server } from '@/classes/events-sdk/events-sdk.types'
+
 export interface LoginSessionPayload {
     token: string,
     email: string,
@@ -5,7 +7,7 @@ export interface LoginSessionPayload {
     password: string
 }
 
-export interface LoginSessionData {
+export interface Socket {
     Client: string,
     PersonId: number,
     RefreshToken: string,
@@ -15,4 +17,30 @@ export interface LoginSessionData {
     URLList: string[],
     Url: string,
     Version: string
-}
+}
+
+export interface ExternalLoginResponse<T> {
+    StatusCode: number,
+    Status: string,
+    Data: T
+}
+
+export interface ExternalLoginResponseDataOldStack {
+    Socket: Socket,
+}
+
+export interface ExternalLoginResponseDataNewStack {
+    AccessToken: string,
+    RefreshToken: string
+}
+
+export interface Settings {
+    IdentityCode: string,
+    IdentityCodeExpiry: Date,
+    PersonID: number,
+    PersonType: number,
+    ExtensionMonitorID: number,
+    MonitorList: Server[]
+}
+
+export interface LoginSessionData extends Settings, Socket, ExternalLoginResponseDataNewStack {}

package/src/types/events.common.d.ts

@@ -47,7 +47,7 @@ export interface Queue {
     AnsweredAgent?: string,
 }
 
-interface ExtensionCall {
+export interface ExtensionCall {
     callStarted: number,
     calldurationinterval: number,
     callAnswered: number,

package/src/classes/auth/auth.test.ts

@@ -1,14 +0,0 @@
-import AuthClass from '@/classes/auth/auth.class'
-import { eventsSdkDefaultOptions } from '@/classes/events-sdk/events-sdk-default-options'
-import EventsSdkClass from '@/classes/events-sdk/events-sdk.class'
-
-describe('AuthClass', () => {
-    const sdk = new EventsSdkClass(eventsSdkDefaultOptions)
-
-    const authClass = new AuthClass(sdk)
-
-    it('should be cypher', () => {
-        const key = authClass.login(eventsSdkDefaultOptions)
-        expect(typeof key).toBe('string')
-    })
-})