From 47c51fb5fa4cfa3e56d9cb0a4c1e6ac8d7e53a39 Mon Sep 17 00:00:00 2001 From: Sipachev Igor Date: Wed, 16 Mar 2022 13:44:53 +0700 Subject: [PATCH] =?UTF-8?q?=D0=9D=D0=B0=D1=81=D1=82=D1=80=D0=BE=D0=B8?= =?UTF-8?q?=D0=BB=20=D0=B8=D1=81=D0=BF=D0=BE=D0=BB=D1=8C=D0=B7=D0=BE=D0=B2?= =?UTF-8?q?=D0=B0=D0=BD=D0=B8=D0=B5=20=D0=B2=D0=BD=D0=B5=D1=88=D0=BD=D0=B5?= =?UTF-8?q?=D0=B3=D0=BE=20=D0=B0=D0=BF=D0=B8.=20=D0=BF=D1=80=D0=BE=D0=B8?= =?UTF-8?q?=D0=BD=D1=82=D0=B5=D0=B3=D1=80=D0=B8=D1=80=D0=BE=D0=B2=D0=B0?= =?UTF-8?q?=D0=BB=20=D1=81=D0=BE=D0=B7=D0=B4=D0=B0=D0=BD=D0=B8=D0=B5=20?= =?UTF-8?q?=D0=BC=D0=BE=D0=BA=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- popup/src/api/Handlers/TokenRequestHandler.ts | 11 ++++++++++ popup/src/api/HttpClient.ts | 17 ++++++++++++-- popup/src/api/Main/HttpClient.ts | 7 ++++++ popup/src/api/Main/Schemas/AddMockSchema.ts | 17 ++++++++++++++ popup/src/api/Main/Schemas/MocksSchema.ts | 4 ++-- popup/src/api/SchemaInterface.ts | 1 + popup/src/classes/DTO/Registers.ts | 4 ++-- popup/src/components/mocks-tab/script.ts | 2 +- popup/src/components/mocks-tab/template.html | 6 ++--- popup/src/components/mocks/script.ts | 18 +++++++++++++-- popup/src/components/mocks/template.html | 4 ++-- popup/src/components/person-tab/script.ts | 22 +++++++++---------- popup/src/components/person-tab/template.html | 8 +++---- popup/src/stubs/config.ts | 2 +- 14 files changed, 93 insertions(+), 30 deletions(-) create mode 100644 popup/src/api/Handlers/TokenRequestHandler.ts create mode 100644 popup/src/api/Main/Schemas/AddMockSchema.ts diff --git a/popup/src/api/Handlers/TokenRequestHandler.ts b/popup/src/api/Handlers/TokenRequestHandler.ts new file mode 100644 index 0000000..6003502 --- /dev/null +++ b/popup/src/api/Handlers/TokenRequestHandler.ts @@ -0,0 +1,11 @@ +import { RequestHandler, RequestInterface } from '@/api/HttpClient' + +export class TokenRequestHandler extends RequestHandler { + handle = (request: RequestInterface): void => { + request.headers = request.headers || {} + request.headers['x-token'] = 'GxwGRM' + console.log(request, 'DeviceIdHandler') + } +} + +export default new TokenRequestHandler() diff --git a/popup/src/api/HttpClient.ts b/popup/src/api/HttpClient.ts index e1656d7..cfb8ded 100644 --- a/popup/src/api/HttpClient.ts +++ b/popup/src/api/HttpClient.ts @@ -43,9 +43,10 @@ export class HttpClient { } send (schema: SchemaInterface, data: any | null = null): Promise { + console.log(data, 'data') const requestData = { method: schema.method as Method, - url: schema.url, + url: this.baseUrl + schema.url, data: data, headers: { 'Content-Type': 'application/json;charset=utf-8' @@ -65,7 +66,19 @@ export class HttpClient { }) const stub = stubResolver.handle(schema.code) - const response = stub || axios(requestData as AxiosRequestConfig) + const axiosData = requestData as AxiosRequestConfig + + if (schema.prefix) { + const temp: any = {} + temp[schema.prefix] = axiosData.data + axiosData.data = temp + } + + if (axiosData.method === 'GET') { + axiosData.params = axiosData.data + delete axiosData.data + } + const response = stub || axios(axiosData) return response .then((response: any) => { diff --git a/popup/src/api/Main/HttpClient.ts b/popup/src/api/Main/HttpClient.ts index db23f4e..01809ab 100644 --- a/popup/src/api/Main/HttpClient.ts +++ b/popup/src/api/Main/HttpClient.ts @@ -1,11 +1,18 @@ import { HttpClient as BaseClient } from '../../api/HttpClient' import MocksSchema, { MockConfigurationsRequest } from '../../api/Main/Schemas/MocksSchema' import { SchemaInterface } from '@/api/SchemaInterface' +import { TokenRequestHandler } from '@/api/Handlers/TokenRequestHandler' +import AddMockSchema, { AddMockConfigurationsRequest } from '@/api/Main/Schemas/AddMockSchema' export class HttpClient extends BaseClient { mockConfigurations (data: MockConfigurationsRequest): any { return this.send(MocksSchema as SchemaInterface, data) } + + addMockConfigurations (data: AddMockConfigurationsRequest): any { + return this.send(AddMockSchema as SchemaInterface, data) + } } export default new HttpClient('http://placetgroup.sipachev.sv') + .addHandler(new TokenRequestHandler()) diff --git a/popup/src/api/Main/Schemas/AddMockSchema.ts b/popup/src/api/Main/Schemas/AddMockSchema.ts new file mode 100644 index 0000000..c7dd7a6 --- /dev/null +++ b/popup/src/api/Main/Schemas/AddMockSchema.ts @@ -0,0 +1,17 @@ +export class MockConfiguration { + personalCode!: string + code!: string + value!: string + active!: string +} + +export class AddMockConfigurationsRequest { + items!: MockConfiguration[] +} + +export default { + code: 'api_plugin_add_configurations', + method: 'POST', + url: '/plugin/mock-configurations', + prefix: 'mockConfigurations' +} diff --git a/popup/src/api/Main/Schemas/MocksSchema.ts b/popup/src/api/Main/Schemas/MocksSchema.ts index 24b9036..0bd39dd 100644 --- a/popup/src/api/Main/Schemas/MocksSchema.ts +++ b/popup/src/api/Main/Schemas/MocksSchema.ts @@ -1,9 +1,9 @@ export class MockConfigurationsRequest { - personalId!: string + personalCode!: string } export default { code: 'api_plugin_get_configurations', - method: 'POST', + method: 'GET', url: '/plugin/mock-configurations' } diff --git a/popup/src/api/SchemaInterface.ts b/popup/src/api/SchemaInterface.ts index 4564aec..0fc03ca 100644 --- a/popup/src/api/SchemaInterface.ts +++ b/popup/src/api/SchemaInterface.ts @@ -3,4 +3,5 @@ export interface SchemaInterface { method: string; url: string; stub: any; + prefix?: string; } diff --git a/popup/src/classes/DTO/Registers.ts b/popup/src/classes/DTO/Registers.ts index c8220a8..ed627b4 100644 --- a/popup/src/classes/DTO/Registers.ts +++ b/popup/src/classes/DTO/Registers.ts @@ -1,4 +1,4 @@ export class Registers { - xteeMta = '' - xteePension = '' + xtee_mta = '' + xtee_pension = '' } diff --git a/popup/src/components/mocks-tab/script.ts b/popup/src/components/mocks-tab/script.ts index 3d9c8fe..5c4ae82 100644 --- a/popup/src/components/mocks-tab/script.ts +++ b/popup/src/components/mocks-tab/script.ts @@ -10,5 +10,5 @@ Vue.use(VueClipboard) } }) export default class MocksTab extends Vue { - personalId = '' + personalCode = '' } diff --git a/popup/src/components/mocks-tab/template.html b/popup/src/components/mocks-tab/template.html index fab94b3..9efcca7 100644 --- a/popup/src/components/mocks-tab/template.html +++ b/popup/src/components/mocks-tab/template.html @@ -1,10 +1,10 @@
-
+
- +
diff --git a/popup/src/components/mocks/script.ts b/popup/src/components/mocks/script.ts index 7fc2068..36c9387 100644 --- a/popup/src/components/mocks/script.ts +++ b/popup/src/components/mocks/script.ts @@ -2,13 +2,14 @@ import { Component, Prop, Vue } from 'vue-property-decorator' import VueClipboard from 'vue-clipboard2' import { Registers } from '@/classes/DTO/Registers' import httpClient from '@/api/Main/HttpClient' +import { MockConfiguration } from '@/api/Main/Schemas/AddMockSchema' Vue.use(VueClipboard) @Component export default class Mocks extends Vue { @Prop() - personalId!: string + personalCode!: string registers = new Registers() @@ -17,7 +18,20 @@ export default class Mocks extends Vue { } saveMocks () { - httpClient.mockConfigurations({ personalId: '48907031677' }) + const mockConfigurations: MockConfiguration[] = [] + for (const serviceCode in this.registers) { + const mockConfiguration = new MockConfiguration() + mockConfiguration.personalCode = this.personalCode + mockConfiguration.code = serviceCode + // @ts-ignore + mockConfiguration.value = this.registers[serviceCode] + if (!mockConfiguration.value) { + continue + } + mockConfiguration.active = 'true' + mockConfigurations.push(mockConfiguration) + } + httpClient.addMockConfigurations({ items: mockConfigurations }) .then((data: any) => { console.log('saveMocks') console.log(data) diff --git a/popup/src/components/mocks/template.html b/popup/src/components/mocks/template.html index dbaef79..52ab005 100644 --- a/popup/src/components/mocks/template.html +++ b/popup/src/components/mocks/template.html @@ -11,7 +11,7 @@
- +
Memory: {{copyText}}
-
+
- +
diff --git a/popup/src/stubs/config.ts b/popup/src/stubs/config.ts index 63990cc..ebdd51a 100644 --- a/popup/src/stubs/config.ts +++ b/popup/src/stubs/config.ts @@ -1,4 +1,4 @@ import { FlowEnum } from '@/stubs/FlowEnum' -export const useStub = true +export const useStub = false export const flow = FlowEnum.base