conflict_resolution
stringlengths
27
16k
<<<<<<< replaceTypeInfo(response.result.typeMetadata); updater.updateViewModelAndControls(response.result, true); ======= updater.updateViewModelAndControls(response.result); >>>>>>> replaceTypeInfo(response.result.typeMetadata); updater.updateViewModelAndControls(response.result);
<<<<<<< import { ClientConfigurationError } from "./error/ClientConfigurationError"; import { AuthError } from "./error/AuthError"; import { ClientAuthError } from "./error/ClientAuthError"; ======= import { ClientConfigurationError } from "./error/ClientConfigurationError"; >>>>>>> import { ClientConfigurationError } from "./error/ClientConfigurationError"; import { AuthError } from "./error/AuthError"; import { ClientAuthError } from "./error/ClientAuthError"; <<<<<<< // Validate and filter scopes (the validate function will throw if validation fails) try { this.validateInputScope(scopes, false); } catch (e) { // Rethrow for better error tracking throw e; } scopes = this.filterScopes(scopes); ======= // Validate and filter scopes (the validate function will throw if validation fails) this.validateInputScope(scopes, false); >>>>>>> // Validate and filter scopes (the validate function will throw if validation fails) try { this.validateInputScope(scopes, false); } catch (e) { // Rethrow for better error tracking throw e; } scopes = this.filterScopes(scopes); <<<<<<< // Validate and filter scopes (the validate function will throw if validation fails) try { this.validateInputScope(scopes, true); } catch (e) { // Rethrow for better error tracking throw e; } scopes = this.filterScopes(scopes); ======= // Validate and filter scopes (the validate function will throw if validation fails) this.validateInputScope(scopes, true); >>>>>>> // Validate and filter scopes (the validate function will throw if validation fails) try { this.validateInputScope(scopes, true); } catch (e) { // Rethrow for better error tracking throw e; } scopes = this.filterScopes(scopes); <<<<<<< // Validate and filter scopes (the validate function will throw if validation fails) try { this.validateInputScope(scopes, true); } catch (e) { // Rethrow for better error tracking throw e; } scopes = this.filterScopes(scopes); ======= // Validate and filter scopes (the validate function will throw if validation fails) this.validateInputScope(scopes, true); >>>>>>> // Validate and filter scopes (the validate function will throw if validation fails) try { this.validateInputScope(scopes, true); } catch (e) { // Rethrow for better error tracking throw e; } scopes = this.filterScopes(scopes); <<<<<<< throw ClientAuthError.createAcquireTokenInProgressError(); ======= // TODO: Should reject with custom error reject(ErrorCodes.acquireTokenProgressError + Constants.resourceDelimiter + ErrorDescription.acquireTokenProgressError); return; >>>>>>> throw ClientAuthError.createAcquireTokenInProgressError(); <<<<<<< throw ClientAuthError.createUserLoginRequiredError(); ======= reject(ErrorCodes.userLoginError + Constants.resourceDelimiter + ErrorDescription.userLoginError); return; >>>>>>> throw ClientAuthError.createUserLoginRequiredError(); <<<<<<< reject(ClientAuthError.createEndpointResolutionError()); ======= reject(ErrorCodes.endpointResolutionError + Constants.resourceDelimiter + ErrorDescription.endpointResolutionError); >>>>>>> reject(ClientAuthError.createEndpointResolutionError()); <<<<<<< // TODO: We should throw here instead of passing to reject reject(ClientAuthError.createPopupWindowError()); ======= // TODO: Throw custom error here // TODO: Figure out some way to pass tokenType reject(ErrorCodes.popUpWindowError + Constants.resourceDelimiter + ErrorDescription.popUpWindowError); >>>>>>> // TODO: We should throw here instead of passing to reject reject(ClientAuthError.createPopupWindowError()); <<<<<<< // TODO: We should throw here instead of passing to reject reject(ClientAuthError.createUserCancelledError()); ======= // TODO: Reject with custom error here // TODO: Figure out some way to pass tokenType reject(ErrorCodes.userCancelledError + Constants.resourceDelimiter + ErrorDescription.userCancelledError); >>>>>>> // TODO: We should throw here instead of passing to reject reject(ClientAuthError.createUserCancelledError()); <<<<<<< else if (cacheResult.errorDesc || cacheResult.error) { this._logger.infoPii(cacheResult.errorDesc + ":" + cacheResult.error); reject(cacheResult.errorDesc + Constants.resourceDelimeter + cacheResult.error); return null; ======= else if (cacheResult.errorDesc || cacheResult.error) { this._logger.infoPii(cacheResult.errorDesc + ":" + cacheResult.error); reject(cacheResult.errorDesc + Constants.resourceDelimiter + cacheResult.error); return null; >>>>>>> else if (cacheResult.errorDesc || cacheResult.error) { this._logger.infoPii(cacheResult.errorDesc + ":" + cacheResult.error); reject(cacheResult.errorDesc + Constants.resourceDelimiter + cacheResult.error); return null; <<<<<<< // TODO: Check if this can be combined with filterScopes() private validateInputScope(scopes: Array<string>, scopesRequired: boolean): void { if (!scopes) { if (scopesRequired) { throw ClientConfigurationError.createScopesRequiredError(scopes); } else { return; } ======= private validateInputScope(scopes: Array<string>, scopesRequired: boolean): void { if (!scopes) { if (scopesRequired) { throw ClientConfigurationError.createScopesRequiredError(scopes); } else { return; } >>>>>>> private validateInputScope(scopes: Array<string>, scopesRequired: boolean): void { if (!scopes) { if (scopesRequired) { throw ClientConfigurationError.createScopesRequiredError(scopes); } else { return; } <<<<<<< } /** * Used to remove openid and profile from the list of scopes passed by the developer.These scopes are added by default * @hidden */ // TODO: Check if this can be combined with validateInputScope() private filterScopes(scopes: Array<string>): Array<string> { if (scopes) { scopes = scopes.filter(function (element) { return element !== Constants.openidScope; }); scopes = scopes.filter(function (element) { return element !== Constants.profileScope; }); } return scopes; ======= >>>>>>> } /** * Used to remove openid and profile from the list of scopes passed by the developer.These scopes are added by default * @hidden */ private filterScopes(scopes: Array<string>): Array<string> { if (scopes) { scopes = scopes.filter(function (element) { return element !== Constants.openidScope; }); scopes = scopes.filter(function (element) { return element !== Constants.profileScope; }); } return scopes;
<<<<<<< file(): goog.async.Deferred<File>; } ======= file(): goog.async.Deferred<_File>; } } >>>>>>> file(): goog.async.Deferred<_File>; }
<<<<<<< import { CacheLocation } from "./Configuration"; ======= import { CacheKeys } from "./Constants"; >>>>>>> import { CacheLocation } from "./Configuration"; import { CacheKeys } from "./Constants"; <<<<<<< /** * Create acquireTokenUserKey to cache user object * acquireTokenUserKey = Constants.acquireTokenUser + Constants.resourceDelimeter + userId + Constants.resourceDelimeter + authenticationRequest.state; */ static generateATUserKey(userId: any, state: string) { return `msal.acquireTokenUser|${userId}|${state}`; } /** * Create authorityKey to cache authority * const authorityKey = Constants.authority + Constants.resourceDelimeter + authenticationRequest.state; */ static generateAuthKey(state: string) { return `msal.authority|${state}`; } ======= /** * Create acquireTokenUserKey to cache user object */ static generateAcquireTokenUserKey(userId: any, state: string): string { return CacheKeys.ACQUIRE_TOKEN_USER + Constants.resourceDelimiter + `${userId}` + Constants.resourceDelimiter + `${state}`; } /** * Create authorityKey to cache authority */ static generateAuthorityKey(state: string): string { return CacheKeys.AUTHORITY + Constants.resourceDelimiter + `${state}`; } >>>>>>> /** * Create acquireTokenUserKey to cache user object */ static generateAcquireTokenUserKey(userId: any, state: string): string { return CacheKeys.ACQUIRE_TOKEN_USER + Constants.resourceDelimiter + `${userId}` + Constants.resourceDelimiter + `${state}`; } /** * Create authorityKey to cache authority */ static generateAuthorityKey(state: string): string { return CacheKeys.AUTHORITY + Constants.resourceDelimiter + `${state}`; }
<<<<<<< class Error extends Error__Class { } /** Fake class which should be extended to avoid inheriting static properties */ class Error__Class extends Error__Class { ======= class Error extends Error.__Class { } module Error { /** Fake class which should be extended to avoid inheriting static properties */ class __Class extends _Error { >>>>>>> class Error extends Error__Class { } /** Fake class which should be extended to avoid inheriting static properties */ class Error__Class extends _Error {
<<<<<<< then<RESULT,THIS>(opt_onFulfilled?: (_0: TYPE) => Thenable, opt_onRejected?: (_0: any) => any, opt_context?: THIS): goog.Promise<RESULT>; } ======= then<RESULT,THIS>(opt_onFulfilled?: (_0: VALUE) => Thenable<RESULT>, opt_onRejected?: (_0: any) => any, opt_context?: THIS): goog.Promise<RESULT>; } } >>>>>>> then<RESULT,THIS>(opt_onFulfilled?: (_0: VALUE) => Thenable<RESULT>, opt_onRejected?: (_0: any) => any, opt_context?: THIS): goog.Promise<RESULT>; }
<<<<<<< declarations: [ AppComponent, HomeComponent ], imports: [ BrowserModule, AppRoutingModule, IgxButtonModule, NavigationDrawerModule, IgxNavbarModule ], providers: [], bootstrap: [AppComponent] ======= declarations: [ AppComponent, HomeComponent ], imports: [ BrowserModule, FormsModule, BrowserModule, BrowserAnimationsModule, AppRoutingModule, IgxButtonModule ], providers: [], bootstrap: [AppComponent] >>>>>>> declarations: [ AppComponent, HomeComponent ], imports: [ FormsModule, BrowserModule, BrowserAnimationsModule, AppRoutingModule, IgxButtonModule, NavigationDrawerModule, IgxNavbarModule ], providers: [], bootstrap: [AppComponent]
<<<<<<< async addTemplate(fileName: string, template: Template, modulePath?: string): Promise<boolean> { const parts = path.parse(fileName); // trim the fileName to avoid awkward paths or mismatches: fileName = fileName.trim(); fileName = parts.ext ? path.join(parts.dir, parts.name) : fileName; fileName = fileName.replace(/\\/g, "/"); let name = parts.dir ? parts.name : fileName; // trim name itself to avoid creating awkward component names ======= async addTemplate(name: string, template: Template, options?: AddTemplateArgs): Promise<boolean> { // trim name to avoid creating awkward paths or mismatches: >>>>>>> async addTemplate(fileName: string, template: Template, options?: AddTemplateArgs): Promise<boolean> { const parts = path.parse(fileName); // trim the fileName to avoid awkward paths or mismatches: fileName = fileName.trim(); fileName = parts.ext ? path.join(parts.dir, parts.name) : fileName; fileName = fileName.replace(/\\/g, "/"); let name = parts.dir ? parts.name : fileName; // trim name itself to avoid creating awkward component names <<<<<<< if (await template.generateFiles(process.cwd(), fileName, { modulePath })) { ======= if (await template.generateFiles(process.cwd(), name, options || {})) { >>>>>>> if (await template.generateFiles(process.cwd(), fileName, options || {})) { <<<<<<< template.registerInProject(process.cwd(), fileName, { modulePath }); ======= template.registerInProject(process.cwd(), name, options || {}); >>>>>>> template.registerInProject(process.cwd(), fileName, options || {});
<<<<<<< import { FormsModule } from '@angular/forms'; ======= import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; >>>>>>> import { FormsModule } from '@angular/forms'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
<<<<<<< var asciidoctor = spawn(asciidoctor_binary_path, ['-q', '-o-', '-', '-B', path.dirname(doc.fileName)], options ); ======= var asciidoctor = spawn(asciidoctor_command, ['-q', '-o-', '-', '-B', documentPath], options ); asciidoctor.stdin.write(text); asciidoctor.stdin.end(); >>>>>>> var asciidoctor = spawn(asciidoctor_command, ['-q', '-o-', '-', '-B', documentPath], options );
<<<<<<< CLOSE_DROPDOWNS: 'leonardo:close:dropdowns', ======= SCENARIO_CLICKED: 'leonardo:scenario:clicked', FILTER_STATES: 'leonardo:filter:states', >>>>>>> SCENARIO_CLICKED: 'leonardo:scenario:clicked', FILTER_STATES: 'leonardo:filter:states', CLOSE_DROPDOWNS: 'leonardo:close:dropdowns',
<<<<<<< constructor(private $scope, private $timeout) { ======= constructor(private $scope, private leoConfiguration, private $timeout) { this.activateBtnText = 'Activate All'; this.isAllActivated = false; >>>>>>> constructor(private $scope, private $timeout) { this.activateBtnText = 'Activate All'; this.isAllActivated = false; <<<<<<< this.states = Leonardo.getStates(); this.scenarios = Leonardo.getScenarios(); this.requests = Leonardo.getRequestsLog(); ======= this.states = this.leoConfiguration.getStates(); this.scenarios = this.leoConfiguration.getScenarios; this.requests = this.leoConfiguration.getRequestsLog(); >>>>>>> this.states = Leonardo.getStates(); this.scenarios = Leonardo.getScenarios(); this.requests = Leonardo.getRequestsLog(); <<<<<<< Leonardo.deactivateAllStates(); ======= this.leoConfiguration.toggleActivateAll(false); >>>>>>> Leonardo.toggleActivateAll(false); <<<<<<< this.exportStates = Leonardo.getStates(); ======= this.exportStates = this.leoConfiguration.getStates() .map((state) => { let {name, url, verb, options} = state; return {name, url, verb, options}; }); >>>>>>> this.exportStates = Leonardo.getStates().map((state) => { let {name, url, verb, options} = state; return {name, url, verb, options}; });
<<<<<<< interface Global { Olm: Olm; } interface MediaDevices { // This is experimental and types don't know about it yet // https://github.com/microsoft/TypeScript/issues/33232 getDisplayMedia(constraints: MediaStreamConstraints): Promise<MediaStream>; } interface HTMLAudioElement { // sinkId & setSinkId are experimental and typescript doesn't know about them sinkId: string; setSinkId(outputId: string); } interface DummyInterfaceWeShouldntBeUsingThis {} interface Navigator { // We check for the webkit-prefixed getUserMedia to detect if we're // on webkit: we should check if we still need to do this webkitGetUserMedia: DummyInterfaceWeShouldntBeUsingThis; } ======= >>>>>>> interface MediaDevices { // This is experimental and types don't know about it yet // https://github.com/microsoft/TypeScript/issues/33232 getDisplayMedia(constraints: MediaStreamConstraints): Promise<MediaStream>; } interface HTMLAudioElement { // sinkId & setSinkId are experimental and typescript doesn't know about them sinkId: string; setSinkId(outputId: string); } interface DummyInterfaceWeShouldntBeUsingThis {} interface Navigator { // We check for the webkit-prefixed getUserMedia to detect if we're // on webkit: we should check if we still need to do this webkitGetUserMedia: DummyInterfaceWeShouldntBeUsingThis; }
<<<<<<< import * as unhomoglyph from 'unhomoglyph'; ======= import unhomoglyph from 'unhomoglyph'; import {ConnectionError} from "./http-api"; >>>>>>> import * as unhomoglyph from 'unhomoglyph'; import {ConnectionError} from "./http-api";
<<<<<<< /** * Builds the absolute url for the destination page * @param url Relative path of requested page * @returns Full destination url */ getDestinationUrl(url: string): string { // Absolute base url for the application const baseUrl = this.location.normalize(document.getElementsByTagName("base")[0].href); // Path of page (including hash, if using hash routing) const pathUrl = this.location.prepareExternalUrl(url); // Hash location strategy if (pathUrl.startsWith("#")) { return `${baseUrl}/${pathUrl}`; } // If using path location strategy, pathUrl will include the relative portion of the base path (e.g. /base/page). // Since baseUrl also includes /base, can just concatentate baseUrl + path return `${baseUrl}${url}`; } /** * Interactively prompt the user to login * @param url Path of the requested page */ async loginInteractively(url: string) { if (this.msalAngularConfig.popUp) { return this.authService.loginPopup({ scopes: this.msalAngularConfig.consentScopes, extraQueryParameters: this.msalAngularConfig.extraQueryParameters }) .then(() => true) .catch(() => false); } const redirectStartPage = this.getDestinationUrl(url); this.authService.loginRedirect({ redirectStartPage, scopes: this.msalAngularConfig.consentScopes, extraQueryParameters: this.msalAngularConfig.extraQueryParameters }); } ======= /** * Builds the absolute url for the destination page * @param path Relative path of requested page * @returns Full destination url */ getDestinationUrl(path: string): string { // Absolute base url for the application (default to origin if base element not present) const baseElements = document.getElementsByTagName("base"); const baseUrl = this.location.normalize(baseElements.length ? baseElements[0].href : window.location.origin); // Path of page (including hash, if using hash routing) const pathUrl = this.location.prepareExternalUrl(path); // Hash location strategy if (pathUrl.startsWith("#")) { return `${baseUrl}/${pathUrl}`; } // If using path location strategy, pathUrl will include the relative portion of the base path (e.g. /base/page). // Since baseUrl also includes /base, can just concatentate baseUrl + path return `${baseUrl}${path}`; } >>>>>>> /** * Builds the absolute url for the destination page * @param path Relative path of requested page * @returns Full destination url */ getDestinationUrl(path: string): string { // Absolute base url for the application (default to origin if base element not present) const baseElements = document.getElementsByTagName("base"); const baseUrl = this.location.normalize(baseElements.length ? baseElements[0].href : window.location.origin); // Path of page (including hash, if using hash routing) const pathUrl = this.location.prepareExternalUrl(path); // Hash location strategy if (pathUrl.startsWith("#")) { return `${baseUrl}/${pathUrl}`; } // If using path location strategy, pathUrl will include the relative portion of the base path (e.g. /base/page). // Since baseUrl also includes /base, can just concatentate baseUrl + path return `${baseUrl}${path}`; } /** * Interactively prompt the user to login * @param url Path of the requested page */ async loginInteractively(url: string) { if (this.msalAngularConfig.popUp) { return this.authService.loginPopup({ scopes: this.msalAngularConfig.consentScopes, extraQueryParameters: this.msalAngularConfig.extraQueryParameters }) .then(() => true) .catch(() => false); } const redirectStartPage = this.getDestinationUrl(url); this.authService.loginRedirect({ redirectStartPage, scopes: this.msalAngularConfig.consentScopes, extraQueryParameters: this.msalAngularConfig.extraQueryParameters }); } <<<<<<< return this.loginInteractively(state.url); ======= if (this.msalAngularConfig.popUp) { return this.authService.loginPopup({ scopes: this.msalAngularConfig.consentScopes, extraQueryParameters: this.msalAngularConfig.extraQueryParameters }) .then(() => true) .catch(() => false); } const redirectStartPage = this.getDestinationUrl(state.url); this.authService.loginRedirect({ redirectStartPage, scopes: this.msalAngularConfig.consentScopes, extraQueryParameters: this.msalAngularConfig.extraQueryParameters }); } else { return this.authService.acquireTokenSilent({ scopes: [this.msalConfig.auth.clientId] }) .then(() => true) .catch(() => false); >>>>>>> return this.loginInteractively(state.url);
<<<<<<< import { AuthorizationCodePayload } from "./AuthorizationCodePayload"; ======= import { AuthenticationScheme, THE_FAMILY_ID } from "../utils/Constants"; import { PopTokenGenerator } from "../crypto/PopTokenGenerator"; import { AppMetadataEntity } from "../cache/entities/AppMetadataEntity"; import { ICachePlugin } from "../cache/interface/ICachePlugin"; import { TokenCacheContext } from "../cache/persistence/TokenCacheContext"; import { ISerializableTokenCache } from "../cache/interface/ISerializableTokenCache"; >>>>>>> import { AuthorizationCodePayload } from "./AuthorizationCodePayload"; import { AuthenticationScheme, THE_FAMILY_ID } from "../utils/Constants"; import { PopTokenGenerator } from "../crypto/PopTokenGenerator"; import { AppMetadataEntity } from "../cache/entities/AppMetadataEntity"; import { ICachePlugin } from "../cache/interface/ICachePlugin"; import { TokenCacheContext } from "../cache/persistence/TokenCacheContext"; import { ISerializableTokenCache } from "../cache/interface/ISerializableTokenCache"; <<<<<<< generateAuthenticationResult(serverTokenResponse: ServerAuthorizationTokenResponse, authority: Authority, authCodePayload?: AuthorizationCodePayload): AuthenticationResult { const cachedNonce = authCodePayload ? authCodePayload.nonce : ""; const cachedState = authCodePayload ? authCodePayload.state : ""; // create an idToken object (not entity) const idTokenObj = new IdToken(serverTokenResponse.id_token, this.cryptoObj); // token nonce check (TODO: Add a warning if no nonce is given?) if (!StringUtils.isEmpty(cachedNonce)) { if (idTokenObj.claims.nonce !== cachedNonce) { throw ClientAuthError.createNonceMismatchError(); ======= async handleServerTokenResponse( serverTokenResponse: ServerAuthorizationTokenResponse, authority: Authority, resourceRequestMethod?: string, resourceRequestUri?: string, cachedNonce?: string, cachedState?: string, requestScopes?: string[], oboAssertion?: string, handlingRefreshTokenResponse?: boolean): Promise<AuthenticationResult> { let idTokenObj: AuthToken = null; if (!StringUtils.isEmpty(serverTokenResponse.id_token)) { // create an idToken object (not entity) idTokenObj = new AuthToken(serverTokenResponse.id_token, this.cryptoObj); // token nonce check (TODO: Add a warning if no nonce is given?) if (!StringUtils.isEmpty(cachedNonce)) { if (idTokenObj.claims.nonce !== cachedNonce) { throw ClientAuthError.createNonceMismatchError(); } >>>>>>> async handleServerTokenResponse( serverTokenResponse: ServerAuthorizationTokenResponse, authority: Authority, resourceRequestMethod?: string, resourceRequestUri?: string, cachedNonce?: string, cachedState?: string, requestScopes?: string[], oboAssertion?: string, handlingRefreshTokenResponse?: boolean): Promise<AuthenticationResult> { let idTokenObj: AuthToken = null; if (!StringUtils.isEmpty(serverTokenResponse.id_token)) { // create an idToken object (not entity) idTokenObj = new AuthToken(serverTokenResponse.id_token, this.cryptoObj); // token nonce check (TODO: Add a warning if no nonce is given?) if (!StringUtils.isEmpty(cachedNonce)) { if (idTokenObj.claims.nonce !== cachedNonce) { throw ClientAuthError.createNonceMismatchError(); } <<<<<<< requestStateObj = ProtocolUtils.parseRequestState(cachedState, this.cryptoObj); } const cacheRecord = this.generateCacheRecord(serverTokenResponse, idTokenObj, authority, requestStateObj && requestStateObj.libraryState); const responseScopes = ScopeSet.fromString(serverTokenResponse.scope); this.cacheStorage.saveCacheRecord(cacheRecord, responseScopes); const authenticationResult: AuthenticationResult = { authority: authority.canonicalAuthority, uniqueId: idTokenObj.claims.oid || idTokenObj.claims.sub, tenantId: idTokenObj.claims.tid, scopes: responseScopes.asArray(), account: cacheRecord.account.getAccountInfo(), idToken: idTokenObj.rawIdToken, idTokenClaims: idTokenObj.claims, accessToken: serverTokenResponse.access_token, fromCache: true, expiresOn: new Date(cacheRecord.accessToken.expiresOn), extExpiresOn: new Date(cacheRecord.accessToken.extendedExpiresOn), familyId: serverTokenResponse.foci || null, state: requestStateObj ? requestStateObj.userRequestState : "", cloudGraphHostName: authCodePayload.cloud_graph_host_name, msGraphHost: authCodePayload.msgraph_host }; ======= requestStateObj = ProtocolUtils.parseRequestState(this.cryptoObj, cachedState); } >>>>>>> requestStateObj = ProtocolUtils.parseRequestState(this.cryptoObj, cachedState); }
<<<<<<< universe: Universe, event: any, ======= >>>>>>>
<<<<<<< initStore.createDispatch = createRootDispatch; const Provider = createProvider(store); ======= const Provider = createProvider(store, plugins); >>>>>>> initStore.createDispatch = createRootDispatch; const Provider = createProvider(store, plugins);
<<<<<<< ======= id: string; inputFiles: string[]; >>>>>>> id: string;
<<<<<<< if(handCard?.value === Value.PLUS_FOUR) { // Es importante el orden en que se aplica los efectos. Primero se aplica +4 y luego saltea turno. state.giveCards(4); state.skipNextTurn(); } if (handCard?.value === Value.WILDCARD || handCard?.value === Value.PLUS_FOUR) { ======= if ( handCard?.value === Value.WILDCARD || handCard?.value === Value.PLUS_FOUR ) { >>>>>>> if(handCard?.value === Value.PLUS_FOUR) { // Es importante el orden en que se aplica los efectos. Primero se aplica +4 y luego saltea turno. state.giveCards(4); state.skipNextTurn(); } if (handCard?.value === Value.WILDCARD || handCard?.value === Value.PLUS_FOUR) { <<<<<<< ======= if (handCard?.value === Value.PLUS_FOUR) { state.giveCards(4); } >>>>>>> if (handCard?.value === Value.PLUS_FOUR) { state.giveCards(4); }
<<<<<<< /** * Añadimos opción de reordenar las cartas. * Ahora mismo es un poco "inutil" ya que cuando pasa turno se mezclan de nuevo * pero cuando el jugador solo vea sus cartas deberían de permanecer ordenadas. **/ new Sortable(document.querySelectorAll('.player-cards'), { draggable: '.carta', }) } ======= playerDiv.appendChild(playerCards); _players?.appendChild(playerDiv); setPlayerClicks(player.id); }); /** * Añadimos opción de reordenar las cartas. * Ahora mismo es un poco "inutil" ya que cuando pasa turno se mezclan de nuevo * pero cuando el jugador solo vea sus cartas deberían de permanecer ordenadas. **/ new Sortable(document.querySelectorAll('.player-cards'), { draggable: '.carta', delay: 200 }) >>>>>>> /** * Añadimos opción de reordenar las cartas. * Ahora mismo es un poco "inutil" ya que cuando pasa turno se mezclan de nuevo * pero cuando el jugador solo vea sus cartas deberían de permanecer ordenadas. **/ new Sortable(document.querySelectorAll('.player-cards'), { draggable: '.carta', delay: 200 })
<<<<<<< import './styles/styles.css'; import RandomDeck from './utils/randomDeck/randomDeck'; import { fromEvent } from 'rxjs'; import { map } from 'rxjs/operators'; const cartas = [ 'cero', 'uno', 'dos', 'tres', 'cuatro', 'cinco', 'seis', 'siete', 'ocho', 'nueve', 'mas-dos', 'saltar', 'reversa', ]; const cartasEspeciales = ['mas-cuatro', 'comodin']; const colores = ['verde', 'amarillo', 'azul', 'rojo']; let deck = new RandomDeck(); deck.cards.push(...cartasEspeciales, ...cartasEspeciales); colores.forEach((color) => { cartas.forEach((carta) => { const currentCard = `${carta}--${color}`; deck.cards.push(currentCard, currentCard); }); ======= import "./styles/styles.css"; import { fromEvent } from "rxjs"; import { map, filter } from "rxjs/operators"; import { GameState } from "./models/game-state.model"; import { BuildDeckCommand } from "./commands/build-deck.command"; import { Player } from "./models/player.model"; import { FinalizeTurnCommand } from "./commands/finalize-turn.command"; import { StartGameCommand } from "./commands/start-game.command"; import { TakeDeckCardCommand } from "./commands/take-deck-card.command"; import { AddPlayersCommand } from "./commands/add-players.command"; import { DiscardHandCardCommand } from "./commands/discard-hand-card.command"; const gameState = new GameState(); const buildDeckCommand = new BuildDeckCommand(); buildDeckCommand.execute(gameState); const _players = document.getElementById("players"); const _stack = document.getElementById("stack"); const _turn = document.getElementById("turn"); // TODO: analizar donde debe ser agregado en el state let selectedCardId = ""; const addPlayersCommand = new AddPlayersCommand([ new Player( "jorge1234", "Jorge", "https://pbs.twimg.com/profile_images/1229508740510109697/Ww22knVc_400x400.jpg" ), new Player( "calel1234", "Calel", "https://pbs.twimg.com/profile_images/1229508740510109697/Ww22knVc_400x400.jpg" ), new Player( "Facu1234", "Facu", "https://pbs.twimg.com/profile_images/1196581886916747264/PaMavazA_400x400.jpg" ), new Player( "nikomendo", "Nicolas", "https://pbs.twimg.com/profile_images/1106827262907899904/S1BXkb04_400x400.jpg" ), ]); addPlayersCommand.execute(gameState); const startGameCommand = new StartGameCommand(); startGameCommand.execute(gameState); drawPlayersCards(); drawStack(); drawTurn(); /** * Finaliza el turno del currentPlayer */ const buttonNext = document.getElementById("button-next"); // @ts-ignore const _next = fromEvent(buttonNext, "click").subscribe((x: any) => { const finalizeTurnCommand = new FinalizeTurnCommand(); finalizeTurnCommand.execute(gameState); clearCardSelection(); drawTurn(); >>>>>>> import './styles/styles.css'; import { fromEvent } from 'rxjs'; import { map, filter } from 'rxjs/operators'; import { GameState } from './models/game-state.model'; import { BuildDeckCommand } from './commands/build-deck.command'; import { Player } from './models/player.model'; import { FinalizeTurnCommand } from './commands/finalize-turn.command'; import { StartGameCommand } from './commands/start-game.command'; import { TakeDeckCardCommand } from './commands/take-deck-card.command'; import { AddPlayersCommand } from './commands/add-players.command'; import { DiscardHandCardCommand } from './commands/discard-hand-card.command'; const gameState = new GameState(); const buildDeckCommand = new BuildDeckCommand(); buildDeckCommand.execute(gameState); const _players = document.getElementById('players'); const _stack = document.getElementById('stack'); const _turn = document.getElementById('turn'); // TODO: analizar donde debe ser agregado en el state let selectedCardId = ''; const addPlayersCommand = new AddPlayersCommand([ new Player( 'jorge1234', 'Jorge', 'https://pbs.twimg.com/profile_images/1229508740510109697/Ww22knVc_400x400.jpg', ), new Player( 'calel1234', 'Calel', 'https://pbs.twimg.com/profile_images/1229508740510109697/Ww22knVc_400x400.jpg', ), new Player( 'Facu1234', 'Facu', 'https://pbs.twimg.com/profile_images/1196581886916747264/PaMavazA_400x400.jpg', ), new Player( 'nikomendo', 'Nicolas', 'https://pbs.twimg.com/profile_images/1106827262907899904/S1BXkb04_400x400.jpg', ), ]); addPlayersCommand.execute(gameState); const startGameCommand = new StartGameCommand(); startGameCommand.execute(gameState); drawPlayersCards(); drawStack(); drawTurn(); /** * Finaliza el turno del currentPlayer */ const buttonNext = document.getElementById('button-next'); // @ts-ignore const _next = fromEvent(buttonNext, 'click').subscribe((x: any) => { const finalizeTurnCommand = new FinalizeTurnCommand(); finalizeTurnCommand.execute(gameState); clearCardSelection(); drawTurn(); <<<<<<< player.hand.forEach((carta) => { ======= div.setAttribute('class', 'player '); player.hand.forEach(carta => { >>>>>>> div.setAttribute('class', 'player '); player.hand.forEach(carta => { <<<<<<< return v.target.className.replace('carta ', ''); }), ======= return event.target.id; }) >>>>>>> return event.target.id; }), <<<<<<< console.log(card); const _index = players[currentPlayer].hand.indexOf(card); _player?.querySelector(`.${card}`)?.classList.add('carta-select'); ======= try { /* _player?.querySelectorAll('.carta-select').forEach((el) => { el.classList.remove('carta-select'); }) _player?.querySelector(`.${card}`)?.classList.add('carta-select'); } catch (e) { } */ _player?.querySelectorAll(".carta-select").forEach((el) => { el.classList.remove("carta-select"); }); document.getElementById(cardId)?.classList.add("carta-select"); selectedCardId = cardId; } catch (e) {} >>>>>>> try { /* _player?.querySelectorAll('.carta-select').forEach((el) => { el.classList.remove('carta-select'); }) _player?.querySelector(`.${card}`)?.classList.add('carta-select'); } catch (e) { } */ _player?.querySelectorAll('.carta-select').forEach((el) => { el.classList.remove('carta-select'); }); document.getElementById(cardId)?.classList.add('carta-select'); selectedCardId = cardId; } catch (e) {} <<<<<<< }; ======= >>>>>>> <<<<<<< }; ======= const turnDiv = document.createElement("div"); _players?.querySelectorAll(".player-select").forEach((el) => { el.classList.remove("player-select"); el.classList.remove("player-select-button"); }); document.getElementById(gameState.turn.player.id)?.classList.add("player-select"); document.getElementById(gameState.turn.player.id)?.classList.add("player-select-button"); turnDiv.append(`Es el turno de: ${gameState.turn.player.name}`); _turn?.appendChild(turnDiv); } /** Limpia la seleccion de cartas en la partida */ function clearCardSelection() { _players?.querySelectorAll(".carta-select").forEach((el) => { el.classList.remove("carta-select"); }); } /** Activa o desactiva el boton de tomar cartas */ function toggleTakeButton() { const takeButton = document.getElementById("button-take") as HTMLInputElement; takeButton.disabled = !takeButton.disabled; } >>>>>>> const turnDiv = document.createElement('div'); _players?.querySelectorAll('.player-select').forEach((el) => { el.classList.remove('player-select'); el.classList.remove('player-select-button'); }); document .getElementById(gameState.turn.player.id) ?.classList.add('player-select'); document .getElementById(gameState.turn.player.id) ?.classList.add('player-select-button'); turnDiv.append(`Es el turno de: ${gameState.turn.player.name}`); _turn?.appendChild(turnDiv); } /** Limpia la seleccion de cartas en la partida */ function clearCardSelection() { _players?.querySelectorAll('.carta-select').forEach((el) => { el.classList.remove('carta-select'); }); } /** Activa o desactiva el boton de tomar cartas */ function toggleTakeButton() { const takeButton = document.getElementById('button-take') as HTMLInputElement; takeButton.disabled = !takeButton.disabled; }
<<<<<<< 'pypi_cdktf': path.resolve(dist, 'python', `cdktf-${version.replace(/-/g, '_')}-py3-none-any.whl`), 'mvn_cdktf': path.resolve(dist, 'java', `com/hashicorp/cdktf/${version}/cdktf-${version}.jar`), 'nuget_cdktf': path.resolve(dist, 'dotnet', `Hashicorp.Cdktf.${version}.nupkg`) ======= 'pypi_cdktf': path.resolve(dist, 'python', `cdktf-${pythonVersion}-py3-none-any.whl`), 'mvn_cdktf': path.resolve(dist, 'java', `com/hashicorp/cdktf/${version}/cdktf-${version}.jar`) >>>>>>> 'pypi_cdktf': path.resolve(dist, 'python', `cdktf-${pythonVersion}-py3-none-any.whl`), 'mvn_cdktf': path.resolve(dist, 'java', `com/hashicorp/cdktf/${version}/cdktf-${version}.jar`), 'nuget_cdktf': path.resolve(dist, 'dotnet', `Hashicorp.Cdktf.${version}.nupkg`) <<<<<<< 'pypi_cdktf': `cdktf~=${version}`, // no support for pre-release 'mvn_cdktf': version, 'nuget_cdktf': version ======= 'pypi_cdktf': `cdktf~=${pythonVersion}`, 'mvn_cdktf': version >>>>>>> 'pypi_cdktf': `cdktf~=${pythonVersion}`, 'mvn_cdktf': version, 'nuget_cdktf': version
<<<<<<< import { getDialogData, setDialogData, sanitizeDialogData } from '../utils'; ======= import { StoreContext } from '../store'; import { getDialogData, setDialogData, sanitizeDialogData } from '../utils/dialogUtil'; >>>>>>> import { getDialogData, setDialogData, sanitizeDialogData } from '../utils/dialogUtil';
<<<<<<< import { isElectron } from '../../utils/electronUtil'; import storage from '../../utils/storage'; import OnboardingState from '../../utils/onboardingStorage'; ======= import { StateError } from '../../store/types'; >>>>>>> import OnboardingState from '../../utils/onboardingStorage'; import { StateError } from '../../store/types';
<<<<<<< // msg confirm private static confirm(message: string, callback?: (result: boolean) => void): any; private static confirm(message: string, title?: string, callback?: (result: boolean) => void, ): any; private static confirm( message: string, titleOrCallBack?: string | ((result: boolean) => void), callback?: (result: boolean) => void, ): any { if (typeof titleOrCallBack === 'string') { (<any>abp).nzModal.confirm({ nzTitle: titleOrCallBack, nzContent: message, nzOnOk() { if (callback) callback(true); }, nzOnCancel() { if (callback) callback(false); }, }); } else { (<any>abp).nzModal.confirm({ nzTitle: '确认操作', nzContent: message, nzOnOk() { if (titleOrCallBack) titleOrCallBack(true); }, nzOnCancel() { if (titleOrCallBack) titleOrCallBack(false); }, }); } ======= // msg confirm private static confirm( message: string, callback?: (result: boolean) => void, ): any; private static confirm( message: string, title?: string, callback?: (result: boolean) => void, ): any; private static confirm( message: string, titleOrCallBack?: string | ((result: boolean) => void), callback?: (result: boolean) => void, ): any { if (typeof titleOrCallBack === 'string') { (<any>abp).nzModal.confirm({ nzTitle: titleOrCallBack, nzContent: message, nzOnOk() { if (callback) callback(true); }, nzOnCancel() { if (callback) callback(false); }, }); } else { (<any>abp).nzModal.confirm({ nzTitle: '确认操作', nzContent: message, nzOnOk() { if (callback) callback(true); }, nzOnCancel() { if (callback) callback(false); }, }); >>>>>>> // msg confirm private static confirm(message: string, callback?: (result: boolean) => void): any; private static confirm(message: string, title?: string, callback?: (result: boolean) => void, ): any; private static confirm( message: string, titleOrCallBack?: string | ((result: boolean) => void), callback?: (result: boolean) => void, ): any { if (typeof titleOrCallBack === 'string') { (<any>abp).nzModal.confirm({ nzTitle: titleOrCallBack, nzContent: message, nzOnOk() { if (callback) callback(true); }, nzOnCancel() { if (callback) callback(false); }, }); } else { (<any>abp).nzModal.confirm({ nzTitle: '确认操作', nzContent: message, nzOnOk() { if (titleOrCallBack) titleOrCallBack(true); }, nzOnCancel() { if (titleOrCallBack) titleOrCallBack(false); }, });
<<<<<<< * Use to get the post logout redirect uri configured in MSAL or null. * @param requestPostLogoutRedirectUri * @returns Post logout redirect URL */ protected getPostLogoutRedirectUri(requestPostLogoutRedirectUri?: string): string { this.logger.verbose("getPostLogoutRedirectUri called"); const postLogoutRedirectUri = requestPostLogoutRedirectUri || this.config.auth.postLogoutRedirectUri || BrowserUtils.getCurrentUri(); return UrlString.getAbsoluteUrl(postLogoutRedirectUri, BrowserUtils.getCurrentUri()); } /** ======= >>>>>>>
<<<<<<< import { Runtype, Static, create, validationError } from '../runtype'; import { Unknown } from './unknown'; ======= import { Runtype, Static, create } from '../runtype'; import { Always } from './always'; >>>>>>> import { Runtype, Static, create } from '../runtype';
<<<<<<< getMyGrantedNodes() { return this.http.get<Array<Node>>('/api/perms/v1/user/nodes-assets/tree/?cache_policy=1'); ======= get_my_granted_nodes() { return this.http.get<Array<Node>>('/api/perms/v1/users/nodes-with-assets/tree/?cache_policy=1'); >>>>>>> getMyGrantedNodes() { return this.http.get<Array<Node>>('/api/perms/v1/users/nodes-with-assets/tree/?cache_policy=1'); <<<<<<< refreshMyGrantedNodes() { return this.http.get<Array<Node>>('/api/perms/v1/user/nodes-assets/tree/?cache_policy=2'); ======= refresh_my_granted_nodes() { return this.http.get<Array<Node>>('/api/perms/v1/users/nodes-with-assets/tree/?cache_policy=2'); >>>>>>> refreshMyGrantedNodes() { return this.http.get<Array<Node>>('/api/perms/v1/users/nodes-with-assets/tree/?cache_policy=2');
<<<<<<< locale: string; AudioPlayer?: keyStringObj; AutoComplete?: keyStringObj; Cascader?: keyStringObj; global?: keyStringObj; Table?: keyString; Modal?: keyStringObj; Form?: keyStringObj & { defaultValidateMessages: keyStringObj, }, Guide?: keyStringObj, List?: keyStringObj, Spin?: keyStringObj; ======= locale: string, AudioPlayer?: keyString, AutoComplete?: keyString, Cascader?: keyString, global?: keyString, Table?: keyString, Modal?: keyString, RichEditor?: keyString, Pagination?: keyString, VideoViewer?: keyString, Spin?: keyString; >>>>>>> locale: string; AudioPlayer?: keyString; AutoComplete?: keyString; Cascader?: keyString; global?: keyString; Table?: keyString; Modal?: keyString; Guide?: keyString, List?: keyString, Spin?: keyString; RichEditor?: keyString, Pagination?: keyString, VideoViewer?: keyString,
<<<<<<< defaultValidateMessages: keyStringObj, }, Transfer?: keyStringObj, TreeSelect?: keyStringObj, Upload?: keyStringObj, ======= defaultValidateMessages: keyStringObj; }; Spin?: keyStringObj; Select?: keyString; >>>>>>> defaultValidateMessages: keyStringObj; }; Spin?: keyStringObj; Select?: keyString; Transfer?: keyStringObj; TreeSelect?: keyStringObj; Upload?: keyStringObj;
<<<<<<< locale: string, AudioPlayer?: keyString, AutoComplete?: keyString, Cascader?: keyString, global?: keyString, Table?: keyString, Modal?: keyString, RichEditor?: keyString, Pagination?: keyString, VideoViewer?: keyString, ======= locale: string; AudioPlayer?: keyStringObj; AutoComplete?: keyStringObj; Cascader?: keyStringObj; global?: keyStringObj; Table?: keyString; Modal?: keyStringObj; Form?: keyStringObj & { defaultValidateMessages: keyStringObj; }; Spin?: keyStringObj; Select?: keyString; Transfer?: keyStringObj; TreeSelect?: keyStringObj; Upload?: keyStringObj; >>>>>>> locale: string, AudioPlayer?: keyString, AutoComplete?: keyString, Cascader?: keyString, global?: keyString, Table?: keyString, Modal?: keyString, RichEditor?: keyString, Pagination?: keyString, VideoViewer?: keyString, Spin?: keyString; Select?: keyString; Transfer?: keyString; TreeSelect?: keyString; Upload?: keyString;
<<<<<<< Transfer: { notFoundContent: '无匹配结果', sourceNotFoundContent: '暂无相关信息', targetNotFonudContent: '请从左侧选择添加', searchPlaceholder: '请输入关键字', }, TreeSelect: { placeholder: '请选择', searchPlaceholder: '请输入关键字', treeNodeResetTitle: '不选择任何分类', notFoundContent: '无匹配结果', okText: '确定', cancelText: '取消', }, Upload: { uploading: '上传中', removeFile: '移除文件', uploadError: '上传错误', previewFile: '预览文件', cancelText: '取消', deleteText: '全部删除', uploadedTip: '已上传 ${length} 项' }, ======= Spin: { loading: '加载中' }, Select: { errorMessage: '超过选项上限', multipleSelectAllText: '所有选项', notFoundContent: '无匹配结果', placeholder: '请选择', searchPlaceholder: '请输入关键字', selectAllText: '选择所有', confirmText: '确定', cancelText: '取消', loading: '加载中...' } >>>>>>> Spin: { loading: '加载中' }, Select: { errorMessage: '超过选项上限', multipleSelectAllText: '所有选项', notFoundContent: '无匹配结果', placeholder: '请选择', searchPlaceholder: '请输入关键字', selectAllText: '选择所有', confirmText: '确定', cancelText: '取消', loading: '加载中...' }, Transfer: { notFoundContent: '无匹配结果', sourceNotFoundContent: '暂无相关信息', targetNotFonudContent: '请从左侧选择添加', searchPlaceholder: '请输入关键字', }, TreeSelect: { placeholder: '请选择', searchPlaceholder: '请输入关键字', treeNodeResetTitle: '不选择任何分类', notFoundContent: '无匹配结果', okText: '确定', cancelText: '取消', }, Upload: { uploading: '上传中', removeFile: '移除文件', uploadError: '上传错误', previewFile: '预览文件', cancelText: '取消', deleteText: '全部删除', uploadedTip: '已上传 ${length} 项' },
<<<<<<< List: { emptyText: '暂无数据', }, Guide: { prevBtnText: '上一步', nextBtnText: '下一步', doneBtnText: '知道了', skipBtnText: '跳过', } ======= VideoViewer: { fullScreen: '全屏', cancelFullScreen: '取消全屏', download: '下载', retry: '重试' } >>>>>>> List: { emptyText: '暂无数据', }, Guide: { prevBtnText: '上一步', nextBtnText: '下一步', doneBtnText: '知道了', skipBtnText: '跳过', }, VideoViewer: { fullScreen: '全屏', cancelFullScreen: '取消全屏', download: '下载', retry: '重试' }
<<<<<<< handler.style.display = 'block'; const draggable = new Draggable(handler, this.getResizableOptions()); ======= const direction = this.getResizeDirection(handler); if (this.hasResizableHandle(direction)) { handler.style.display = 'block'; } const draggable = new Draggable(handler, { scroll: true }); >>>>>>> const direction = this.getResizeDirection(handler); if (this.hasResizableHandle(direction)) { handler.style.display = 'block'; } const draggable = new Draggable(handler, this.getResizableOptions()); <<<<<<< private getResizableOptions() { const resizableOptions: any = {}; if (this.gridster.draggableOptions.scroll) { resizableOptions.scroll = this.gridster.draggableOptions.scroll; resizableOptions.scrollEdge = this.gridster.draggableOptions.scrollEdge; } return resizableOptions; } ======= private hasResizableHandle(direction: string): boolean { const isItemResizable = this.gridster.options.resizable && this.item.resizable; const resizeHandles = this.gridster.options.resizeHandles; return isItemResizable && (!resizeHandles || (resizeHandles && !!resizeHandles[direction])); } >>>>>>> private getResizableOptions() { const resizableOptions: any = {}; if (this.gridster.draggableOptions.scroll || this.gridster.draggableOptions.scroll === false) { resizableOptions.scroll = this.gridster.draggableOptions.scroll; } if (this.gridster.draggableOptions.scrollEdge) { resizableOptions.scrollEdge = this.gridster.draggableOptions.scrollEdge; } return resizableOptions; } private hasResizableHandle(direction: string): boolean { const isItemResizable = this.gridster.options.resizable && this.item.resizable; const resizeHandles = this.gridster.options.resizeHandles; return isItemResizable && (!resizeHandles || (resizeHandles && !!resizeHandles[direction])); }
<<<<<<< }, isElementFitContainer: function (element: HTMLElement, containerEl: HTMLElement): boolean { const containerRect = containerEl.getBoundingClientRect(); const elRect = element.getBoundingClientRect(); return elRect.left > containerRect.left && elRect.right < containerRect.right && elRect.top > containerRect.top && elRect.bottom < containerRect.bottom; }, isElementIntersectContainer: function (element: HTMLElement, containerEl: HTMLElement): boolean { const containerRect = containerEl.getBoundingClientRect(); const elRect = element.getBoundingClientRect(); const elWidth = elRect.right - elRect.left; const elHeight = elRect.bottom - elRect.top; return (elRect.left + (elWidth / 2)) > containerRect.left && (elRect.right - (elWidth / 2)) < containerRect.right && (elRect.top + (elHeight / 2)) > containerRect.top && (elRect.bottom - (elHeight / 2)) < containerRect.bottom; }, isElementTouchContainer: function (element: HTMLElement, containerEl: HTMLElement): boolean { const containerRect = containerEl.getBoundingClientRect(); const elRect = element.getBoundingClientRect(); return elRect.right > containerRect.left && elRect.bottom > containerRect.top && elRect.left < containerRect.right && elRect.top < containerRect.bottom; }, isCursorAboveElement: function (event: DraggableEvent, element): boolean { const elRect = element.getBoundingClientRect(); return event.pageX > elRect.left && event.pageX < elRect.right && event.pageY > elRect.top && event.pageY < elRect.bottom; ======= }, getElementOuterHeight: function ($element: HTMLElement) { const styleObj = window.getComputedStyle($element); // NOTE: Manually calculating height because IE's `clientHeight` isn't always // reliable. return parseFloat(styleObj.getPropertyValue('height')) + parseFloat(styleObj.getPropertyValue('padding-top')) + parseFloat(styleObj.getPropertyValue('padding-bottom')); }, getRelativeCoordinates: (element, parentElement): {top: number, left: number} => { const parentElementRect = parentElement.getBoundingClientRect(); const elementRect = element.getBoundingClientRect(); return { top: elementRect.top - parentElementRect.top, left: elementRect.left - parentElementRect.left }; >>>>>>> }, isElementFitContainer: function (element: HTMLElement, containerEl: HTMLElement): boolean { const containerRect = containerEl.getBoundingClientRect(); const elRect = element.getBoundingClientRect(); return elRect.left > containerRect.left && elRect.right < containerRect.right && elRect.top > containerRect.top && elRect.bottom < containerRect.bottom; }, isElementIntersectContainer: function (element: HTMLElement, containerEl: HTMLElement): boolean { const containerRect = containerEl.getBoundingClientRect(); const elRect = element.getBoundingClientRect(); const elWidth = elRect.right - elRect.left; const elHeight = elRect.bottom - elRect.top; return (elRect.left + (elWidth / 2)) > containerRect.left && (elRect.right - (elWidth / 2)) < containerRect.right && (elRect.top + (elHeight / 2)) > containerRect.top && (elRect.bottom - (elHeight / 2)) < containerRect.bottom; }, isElementTouchContainer: function (element: HTMLElement, containerEl: HTMLElement): boolean { const containerRect = containerEl.getBoundingClientRect(); const elRect = element.getBoundingClientRect(); return elRect.right > containerRect.left && elRect.bottom > containerRect.top && elRect.left < containerRect.right && elRect.top < containerRect.bottom; }, isCursorAboveElement: function (event: DraggableEvent, element): boolean { const elRect = element.getBoundingClientRect(); return event.pageX > elRect.left && event.pageX < elRect.right && event.pageY > elRect.top && event.pageY < elRect.bottom; }, getElementOuterHeight: function ($element: HTMLElement) { const styleObj = window.getComputedStyle($element); // NOTE: Manually calculating height because IE's `clientHeight` isn't always // reliable. return parseFloat(styleObj.getPropertyValue('height')) + parseFloat(styleObj.getPropertyValue('padding-top')) + parseFloat(styleObj.getPropertyValue('padding-bottom')); }, getRelativeCoordinates: (element, parentElement): {top: number, left: number} => { const parentElementRect = parentElement.getBoundingClientRect(); const elementRect = element.getBoundingClientRect(); return { top: elementRect.top - parentElementRect.top, left: elementRect.left - parentElementRect.left };
<<<<<<< start () { ======= start() { >>>>>>> start() { <<<<<<< console.log('onStart', this.gridsterComponent.$element.getAttribute('id')); ======= this.refreshLines(); >>>>>>> this.refreshLines(); console.log('onStart', this.gridsterComponent.$element.getAttribute('id')); <<<<<<< cancel() { ======= onDragOut(item: GridListItem) { >>>>>>> cancel() { <<<<<<< } onDragOut (item: GridListItem) { this.cancel(); ======= this.gridsterComponent.isDragging = false; >>>>>>> this.gridsterComponent.isDragging = false; } onDragOut (item: GridListItem) { this.cancel(); <<<<<<< console.log('onStop', this.gridsterComponent.$element.getAttribute('id')); ======= this.refreshLines(); >>>>>>> this.refreshLines(); console.log('onStop', this.gridsterComponent.$element.getAttribute('id'));
<<<<<<< import {ArmObj, ArmArrayResult} from '../models/arm/arm-obj'; ======= import {ConfigService} from './config.service'; >>>>>>> import {ArmObj, ArmArrayResult} from '../models/arm/arm-obj'; import {ConfigService} from './config.service'; <<<<<<< public armApiVersion = '2014-04-01' public armLocksApiVersion = '2015-01-01'; public storageApiVersion = '2015-05-01-preview'; public websiteApiVersion = '2015-08-01'; ======= private armUrl = ''; private armApiVersion = '2014-04-01' private armLocksApiVersion = '2015-01-01'; private storageApiVersion = '2015-05-01-preview'; private websiteApiVersion = '2015-08-01'; >>>>>>> public armApiVersion = '2014-04-01' public armLocksApiVersion = '2015-01-01'; public storageApiVersion = '2015-05-01-preview'; public websiteApiVersion = '2015-08-01';
<<<<<<< import { Observable, Subscription as RxSubscription, Subject } from 'rxjs/Rx'; ======= import {Observable, Subscription as RxSubscription, BehaviorSubject} from 'rxjs/Rx'; >>>>>>> import {Observable, Subscription as RxSubscription, BehaviorSubject, Subject} from 'rxjs/Rx'; <<<<<<< public showTryView: boolean; public isRunningLocal: boolean = false; public showTopbar: boolean; public isAlwaysOn: boolean = true; public topBarNotificationsStream = new Subject<TopBarNotification[]>(); ======= >>>>>>> <<<<<<< // this._userService.getFunctionContainer() // .subscribe(fc => { // this._functionContainer = fc; // if (!this.showTryView && !this.GlobalDisabled) { // this._armService.getFunctionContainerAppSettings(this._functionContainer) // .subscribe(a => this._appSettings = a); // } // }); this._userService.getStartupInfo().subscribe(info => this._token = info.token); ======= this._userService.getFunctionContainer() .subscribe(fc => { this._functionContainer = fc; if (!this.showTryView && !this.GlobalDisabled) { this._armService.getFunctionContainerAppSettings(this._functionContainer) .subscribe(a => this._appSettings = a); } }); this._userService.getToken().subscribe(t => this._token = t); this.enabledApiProxy.next(false); >>>>>>> this._userService.getStartupInfo().subscribe(info => this._token = info.token); this.enabledApiProxy.next(false);
<<<<<<< public static deploymentCenterOAuthOrganization = 'deploymentCenterOAuthOrganization'; public static deploymentCenterOAuthOrganizationPlaceholder = 'deploymentCenterOAuthOrganizationPlaceholder'; public static deploymentCenterOAuthProject = 'deploymentCenterOAuthProject'; public static deploymentCenterOAuthProjectPlaceholder = 'deploymentCenterOAuthProjectPlaceholder'; public static deploymentCenterOAuthRepository = 'deploymentCenterOAuthRepository'; public static deploymentCenterOAuthRepositoryPlaceholder = 'deploymentCenterOAuthRepositoryPlaceholder'; public static deploymentCenterOAuthBranch = 'deploymentCenterOAuthBranch'; public static deploymentCenterOAuthBranchPlaceholder = 'deploymentCenterOAuthBranchPlaceholder'; public static deploymentCenterCodeSettingsSourcPlaceholder = 'deploymentCenterCodeSettingsSourcPlaceholder'; public static deploymentCenterCodeSettingsSourceContinuousDeploymentHeader = 'deploymentCenterCodeSettingsSourceContinuousDeploymentHeader'; public static deploymentCenterCodeSettingsSourceManualDeploymentHeader = 'deploymentCenterCodeSettingsSourceManualDeploymentHeader'; public static deploymentCenterCodeSettingsSourceGitHub = 'deploymentCenterCodeSettingsSourceGitHub'; public static deploymentCenterCodeSettingsSourceAzureRepos = 'deploymentCenterCodeSettingsSourceAzureRepos'; public static deploymentCenterCodeSettingsSourceBitbucket = 'deploymentCenterCodeSettingsSourceBitbucket'; public static deploymentCenterCodeSettingsSourceLocalGit = 'deploymentCenterCodeSettingsSourceLocalGit'; public static deploymentCenterCodeSettingsSourceOneDrive = 'deploymentCenterCodeSettingsSourceOneDrive'; public static deploymentCenterCodeSettingsSourceDropbox = 'deploymentCenterCodeSettingsSourceDropbox'; public static deploymentCenterCodeSettingsSourceExternal = 'deploymentCenterCodeSettingsSourceExternal'; public static deploymentCenterCodeSettingsBuildGitHubAction = 'deploymentCenterCodeSettingsBuildGitHubAction'; public static deploymentCenterCodeSettingsBuildKudu = 'deploymentCenterCodeSettingsBuildKudu'; ======= public static leaveFeedback = 'leaveFeedback'; public static functionLogsFeedbackCESQuestion = 'functionLogsFeedbackCESQuestion'; public static functionLogsFeedbackCVAQuestion = 'functionLogsFeedbackCVAQuestion'; >>>>>>> public static deploymentCenterOAuthOrganization = 'deploymentCenterOAuthOrganization'; public static deploymentCenterOAuthOrganizationPlaceholder = 'deploymentCenterOAuthOrganizationPlaceholder'; public static deploymentCenterOAuthProject = 'deploymentCenterOAuthProject'; public static deploymentCenterOAuthProjectPlaceholder = 'deploymentCenterOAuthProjectPlaceholder'; public static deploymentCenterOAuthRepository = 'deploymentCenterOAuthRepository'; public static deploymentCenterOAuthRepositoryPlaceholder = 'deploymentCenterOAuthRepositoryPlaceholder'; public static deploymentCenterOAuthBranch = 'deploymentCenterOAuthBranch'; public static deploymentCenterOAuthBranchPlaceholder = 'deploymentCenterOAuthBranchPlaceholder'; public static deploymentCenterCodeSettingsSourcPlaceholder = 'deploymentCenterCodeSettingsSourcPlaceholder'; public static deploymentCenterCodeSettingsSourceContinuousDeploymentHeader = 'deploymentCenterCodeSettingsSourceContinuousDeploymentHeader'; public static deploymentCenterCodeSettingsSourceManualDeploymentHeader = 'deploymentCenterCodeSettingsSourceManualDeploymentHeader'; public static deploymentCenterCodeSettingsSourceGitHub = 'deploymentCenterCodeSettingsSourceGitHub'; public static deploymentCenterCodeSettingsSourceAzureRepos = 'deploymentCenterCodeSettingsSourceAzureRepos'; public static deploymentCenterCodeSettingsSourceBitbucket = 'deploymentCenterCodeSettingsSourceBitbucket'; public static deploymentCenterCodeSettingsSourceLocalGit = 'deploymentCenterCodeSettingsSourceLocalGit'; public static deploymentCenterCodeSettingsSourceOneDrive = 'deploymentCenterCodeSettingsSourceOneDrive'; public static deploymentCenterCodeSettingsSourceDropbox = 'deploymentCenterCodeSettingsSourceDropbox'; public static deploymentCenterCodeSettingsSourceExternal = 'deploymentCenterCodeSettingsSourceExternal'; public static deploymentCenterCodeSettingsBuildGitHubAction = 'deploymentCenterCodeSettingsBuildGitHubAction'; public static deploymentCenterCodeSettingsBuildKudu = 'deploymentCenterCodeSettingsBuildKudu'; public static leaveFeedback = 'leaveFeedback'; public static functionLogsFeedbackCESQuestion = 'functionLogsFeedbackCESQuestion'; public static functionLogsFeedbackCVAQuestion = 'functionLogsFeedbackCVAQuestion';
<<<<<<< public static eventHubPicker_conncetion: string = "eventHubPicker_conncetion"; public static eventHubPicker_customConnectionString: string = "eventHubPicker_customConnectionString"; public static error_schemaValidationProxies: string = "error_schemaValidationProxies"; ======= public static eventHubPicker_connection: string = "eventHubPicker_connection"; public static eventHubPicker_custom: string = "eventHubPicker_custom"; public static eventHubPicker_IOTEvents: string = "eventHubPicker_IOTEvents"; public static eventHubPicker_IOTMonitoring: string = "eventHubPicker_IOTMonitoring"; >>>>>>> public static eventHubPicker_custom: string = "eventHubPicker_custom"; public static eventHubPicker_IOTEvents: string = "eventHubPicker_IOTEvents"; public static eventHubPicker_IOTMonitoring: string = "eventHubPicker_IOTMonitoring"; public static eventHubPicker_conncetion: string = "eventHubPicker_conncetion"; public static eventHubPicker_customConnectionString: string = "eventHubPicker_customConnectionString"; public static error_schemaValidationProxies: string = "error_schemaValidationProxies";
<<<<<<< import { Http } from '@angular/http'; import { CacheService } from './../shared/services/cache.service'; import { AuthzService } from './../shared/services/authz.service'; import { LanguageService } from './../shared/services/language.service'; import { ArmService } from './../shared/services/arm.service'; import { FunctionApp } from './../shared/function-app'; import { Site } from './../shared/models/arm/site'; import { ArmObj } from './../shared/models/arm/arm-obj'; ======= import { ErrorIds } from './../shared/models/error-ids'; >>>>>>> import { Http } from '@angular/http'; import { CacheService } from './../shared/services/cache.service'; import { AuthzService } from './../shared/services/authz.service'; import { LanguageService } from './../shared/services/language.service'; import { ArmService } from './../shared/services/arm.service'; import { FunctionApp } from './../shared/function-app'; import { Site } from './../shared/models/arm/site'; import { ArmObj } from './../shared/models/arm/arm-obj'; import { ErrorIds } from './../shared/models/error-ids';
<<<<<<< @Output() change = new Subject<boolean>(); @Input() disabled: boolean = false; @Input() on: boolean = false; @Input() isCommand: boolean = false; @Input() name: string; @Input() stateNames: { on: string; off: string }; // The inputs 'displayLabelFormat' and 'ariaLabelFormat' are used for indicating the way 'name' and 'stateNames' should be used to // construct 'displayLabel' and 'ariaLabel'. These settings may not be honored depending on the value of 'role' and whether 'name' // and/or 'stateNames' are defined. This is handeled in _updateLabelAndAriaAttributes(). // Format definitions: // name -> this.name [when applied to aria-label, ' toggle' is appended] // --------- if 'this.stateNames' defined --------- // stateName -> this.on ? this.stateNames.on : this.stateNames.off // nameAndStateName -> this.name + ": " (this.on ? this.stateNames.on : this.stateNames.off) // mergedStateNames -> this.stateNames.off + "/" + this.stateNames.on [when applied to aria-lable, ' toggle' is appended] // ------ if 'this.stateNames' not defined ------ // stateName -> this.on ? this.stateNames.on : this.stateNames.off // nameAndStateName -> this.name + ": " (this.on ? this.stateNames.on : this.stateNames.off) // mergedStateNames -> this.stateNames.off + "/" + this.stateNames.on [when applied to aria-lable, ' toggle' is appended] @Input() displayLabelFormat: LabelFormt; //If role is 'switch', 'aria-label' should stay constant, so only 'name' and 'mergedStateNames' will be honored @Input() ariaLabelFormat: LabelFormt; // We're restricting the 'role' attribute to 'switch' or 'button'. // If the control is being used to perform an action, the parent should pass a value of true to the 'isCommand' input, so the 'button' role is used. // Otherwise, the parent should pass a value of false to the 'isCommand' input or not beind to it, so the 'switch' role is used. // NOTE: Testing with NVDA screen reader revealed the following issues with the 'switch' role: // - Reader does not state the role. Only the 'aria-label' value and the 'aria-checked' status are read. // - Reader only states the 'aria-checked' status when the value is true ('checked'). When the value is false ('not checked'), the status is not read. // These issues don't occur when the 'checkbox' role is used, but using this role would technically be inorrect based on the usage of this control. public role: Role; public ariaLabel: string; // The 'aria-checked' attribute is REQUIRED for 'switch' role. public ariaChecked: boolean = null; // If 'aria-pressed' attribute does not apply to the 'switch' role and is optional for the 'button' role. // We should not use it if we are updating 'aria-label' whenever a toggle happens. // We should use it if we are using a constant value for 'aria-pressed'. public ariaPressed: boolean = null; public displayLabel: string; @Input() id: string; private _initialized: boolean = false; @ViewChild('toggleContainer') toggleContainer: ElementRef; constructor(private _translateService: TranslateService) { this.id = Guid.newGuid(); } ngOnChanges(changes: SimpleChanges) { // These properties will only be set once, in the first execution of ngOnChanges(). this.role = this.role || (this.isCommand ? 'button' : 'switch'); this.displayLabelFormat = this.displayLabelFormat || 'stateName'; this.ariaLabelFormat = this.ariaLabelFormat || 'name'; if (!this._initialized || !!changes['on']) { this._updateLabelAndAriaAttributes(); ======= @Output() change = new Subject<boolean>(); @Input() disabled: boolean = false; @Input() on: boolean = false; @Input() isCommand: boolean = false; @Input() name: string; @Input() stateNames: { on: string, off: string }; // The inputs 'displayLabelFormat' and 'ariaLabelFormat' are used for indicating the way 'name' and 'stateNames' should be used to // construct 'displayLabel' and 'ariaLabel'. These settings may not be honored depending on the value of 'role' and whether 'name' // and/or 'stateNames' are defined. This is handeled in _updateLabelAndAriaAttributes(). // Format definitions: // name -> this.name [when applied to aria-label, ' toggle' is appended] // --------- if 'this.stateNames' defined --------- // stateName -> this.on ? this.stateNames.on : this.stateNames.off // nameAndStateName -> this.name + ": " (this.on ? this.stateNames.on : this.stateNames.off) // mergedStateNames -> this.stateNames.off + "/" + this.stateNames.on [when applied to aria-label, ' toggle' is appended] // ------ if 'this.stateNames' not defined ------ // stateName -> this.on ? this.stateNames.on : this.stateNames.off // nameAndStateName -> this.name + ": " (this.on ? this.stateNames.on : this.stateNames.off) // mergedStateNames -> this.stateNames.off + "/" + this.stateNames.on [when applied to aria-label, ' toggle' is appended] @Input() displayLabelFormat: LabelFormt; //If role is 'switch', 'aria-label' should stay constant, so only 'name' and 'mergedStateNames' will be honored @Input() ariaLabelFormat: LabelFormt; // We're restricting the 'role' attribute to 'switch' or 'button'. // If the control is being used to perform an action, the parent should pass a value of true to the 'isCommand' input, so the 'button' role is used. // Otherwise, the parent should pass a value of false to the 'isCommand' input or not beind to it, so the 'switch' role is used. // NOTE: Testing with NVDA screen reader revealed the following issues with the 'switch' role: // - Reader does not state the role. Only the 'aria-label' value and the 'aria-checked' status are read. // - Reader only states the 'aria-checked' status when the value is true ('checked'). When the value is false ('not checked'), the status is not read. // These issues don't occur when the 'checkbox' role is used, but using this role would technically be inorrect based on the usage of this control. public role: Role; public ariaLabel: string; // The 'aria-checked' attribute is REQUIRED for 'switch' role. public ariaChecked: boolean = null; // If 'aria-pressed' attribute does not apply to the 'switch' role and is optional for the 'button' role. // We should not use it if we are updating 'aria-label' whenever a toggle happens. // We should use it if we are using a constant value for 'aria-pressed'. public ariaPressed: boolean = null; public displayLabel: string; @Input() id: string; private _initialized: boolean = false; @ViewChild('toggleContainer') toggleContainer: ElementRef; constructor(private _translateService: TranslateService) { this.id = Guid.newGuid(); } ngOnChanges(changes: SimpleChanges) { // These properties will only be set once, in the first execution of ngOnChanges(). this.role = this.role || (this.isCommand ? 'button' : 'switch'); this.displayLabelFormat = this.displayLabelFormat || 'stateName'; this.ariaLabelFormat = this.ariaLabelFormat || 'name'; if (!this._initialized || !!changes['on']) { this._updateLabelAndAriaAttributes(); } this._initialized = true; >>>>>>> @Output() change = new Subject<boolean>(); @Input() disabled: boolean = false; @Input() on: boolean = false; @Input() isCommand: boolean = false; @Input() name: string; @Input() stateNames: { on: string; off: string }; // The inputs 'displayLabelFormat' and 'ariaLabelFormat' are used for indicating the way 'name' and 'stateNames' should be used to // construct 'displayLabel' and 'ariaLabel'. These settings may not be honored depending on the value of 'role' and whether 'name' // and/or 'stateNames' are defined. This is handeled in _updateLabelAndAriaAttributes(). // Format definitions: // name -> this.name [when applied to aria-label, ' toggle' is appended] // --------- if 'this.stateNames' defined --------- // stateName -> this.on ? this.stateNames.on : this.stateNames.off // nameAndStateName -> this.name + ": " (this.on ? this.stateNames.on : this.stateNames.off) // mergedStateNames -> this.stateNames.off + "/" + this.stateNames.on [when applied to aria-label, ' toggle' is appended] // ------ if 'this.stateNames' not defined ------ // stateName -> this.on ? this.stateNames.on : this.stateNames.off // nameAndStateName -> this.name + ": " (this.on ? this.stateNames.on : this.stateNames.off) // mergedStateNames -> this.stateNames.off + "/" + this.stateNames.on [when applied to aria-label, ' toggle' is appended] @Input() displayLabelFormat: LabelFormt; //If role is 'switch', 'aria-label' should stay constant, so only 'name' and 'mergedStateNames' will be honored @Input() ariaLabelFormat: LabelFormt; // We're restricting the 'role' attribute to 'switch' or 'button'. // If the control is being used to perform an action, the parent should pass a value of true to the 'isCommand' input, so the 'button' role is used. // Otherwise, the parent should pass a value of false to the 'isCommand' input or not beind to it, so the 'switch' role is used. // NOTE: Testing with NVDA screen reader revealed the following issues with the 'switch' role: // - Reader does not state the role. Only the 'aria-label' value and the 'aria-checked' status are read. // - Reader only states the 'aria-checked' status when the value is true ('checked'). When the value is false ('not checked'), the status is not read. // These issues don't occur when the 'checkbox' role is used, but using this role would technically be inorrect based on the usage of this control. public role: Role; public ariaLabel: string; // The 'aria-checked' attribute is REQUIRED for 'switch' role. public ariaChecked: boolean = null; // If 'aria-pressed' attribute does not apply to the 'switch' role and is optional for the 'button' role. // We should not use it if we are updating 'aria-label' whenever a toggle happens. // We should use it if we are using a constant value for 'aria-pressed'. public ariaPressed: boolean = null; public displayLabel: string; @Input() id: string; private _initialized: boolean = false; @ViewChild('toggleContainer') toggleContainer: ElementRef; constructor(private _translateService: TranslateService) { this.id = Guid.newGuid(); } ngOnChanges(changes: SimpleChanges) { // These properties will only be set once, in the first execution of ngOnChanges(). this.role = this.role || (this.isCommand ? 'button' : 'switch'); this.displayLabelFormat = this.displayLabelFormat || 'stateName'; this.ariaLabelFormat = this.ariaLabelFormat || 'name'; if (!this._initialized || !!changes['on']) { this._updateLabelAndAriaAttributes();
<<<<<<< public static readonly tipSupported = 'tipSupported'; ======= public static readonly showFunctionsPreview = 'showFunctionsPreview'; >>>>>>> public static readonly tipSupported = 'tipSupported'; public static readonly showFunctionsPreview = 'showFunctionsPreview';
<<<<<<< import { BusyStateComponent } from './busy-state/busy-state.component'; import { environment } from './../environments/environment.prod'; import { StartupInfo } from './shared/models/portal'; import { BroadcastService } from './shared/services/broadcast.service'; import { FunctionContainer } from './shared/models/function-container'; import { GlobalStateService } from './shared/services/global-state.service'; import { LanguageService } from './shared/services/language.service'; import { BackgroundTasksService } from './shared/services/background-tasks.service'; import { Component, OnInit, ViewChild, AfterViewInit } from '@angular/core'; import {DashboardComponent} from './dashboard/dashboard.component'; ======= import { ErrorIds } from './shared/models/error-ids'; >>>>>>> import { BusyStateComponent } from './busy-state/busy-state.component'; import { environment } from './../environments/environment.prod'; import { StartupInfo } from './shared/models/portal'; import { BroadcastService } from './shared/services/broadcast.service'; import { FunctionContainer } from './shared/models/function-container'; import { GlobalStateService } from './shared/services/global-state.service'; import { LanguageService } from './shared/services/language.service'; import { BackgroundTasksService } from './shared/services/background-tasks.service'; import { Component, OnInit, ViewChild, AfterViewInit } from '@angular/core'; import {DashboardComponent} from './dashboard/dashboard.component'; <<<<<<< ======= import {FunctionsService} from './shared/services/functions.service'; import {BroadcastService} from './shared/services/broadcast.service'; import {BroadcastEvent} from './shared/models/broadcast-event'; import {BusyStateComponent} from './busy-state/busy-state.component'; >>>>>>> <<<<<<< import {ErrorListComponent} from './error-list/error-list.component'; import {MainComponent} from './main/main.component'; // import {MonitoringService} from './shared/services/app-monitoring.service'; // import {BackgroundTasksService} from './shared/services/background-tasks.service'; // import {GlobalStateService} from './shared/services/global-state.service'; // import {TranslateService} from 'ng2-translate/ng2-translate'; // import {LocalDevelopmentInstructionsComponent} from './local-development-instructions/local-development-instructions.component'; // Com // import {PortalResources} from './shared/models/portal-resources'; import {ConfigService} from './shared/services/config.service'; ======= import {MonitoringService} from './shared/services/app-monitoring.service'; import {BackgroundTasksService} from './shared/services/background-tasks.service'; import {GlobalStateService} from './shared/services/global-state.service'; import {TranslateService} from 'ng2-translate/ng2-translate'; import {PortalResources} from './shared/models/portal-resources'; import { ConfigService } from './shared/services/config.service'; import { ErrorEvent, ErrorType } from "./shared/models/error-event"; >>>>>>> import {ErrorListComponent} from './error-list/error-list.component'; import {MainComponent} from './main/main.component'; // import {MonitoringService} from './shared/services/app-monitoring.service'; // import {BackgroundTasksService} from './shared/services/background-tasks.service'; // import {GlobalStateService} from './shared/services/global-state.service'; // import {TranslateService} from 'ng2-translate/ng2-translate'; // import {LocalDevelopmentInstructionsComponent} from './local-development-instructions/local-development-instructions.component'; // Com // import {PortalResources} from './shared/models/portal-resources'; import {ConfigService} from './shared/services/config.service'; <<<<<<< this._globalStateService.GlobalBusyStateComponent = this.busyStateComponent; // this._globalStateService.LocalDevelopmentInstructionsComponent = this.localDevelopment; ======= this._globalStateService.GlobalBusyStateComponent = this.busyState; >>>>>>> this._globalStateService.GlobalBusyStateComponent = this.busyStateComponent;
<<<<<<< if (this.apiProxiesEnabled !== value) { this._busyManager.setBusy(); const appSettingValue: string = value ? this._configService.FunctionsVersionInfo.proxyDefault : Constants.disabled; ======= if (this.showProxyEnable) { this._busyState.setBusyState(); >>>>>>> if (this.showProxyEnable) { this._busyManager.setBusy(); <<<<<<< this.functionApp.fireSyncTrigger(); this.apiProxiesEnabled = value; this.needUpdateRoutingExtensionVersion = false; this.routingExtensionVersion = this._configService.FunctionsVersionInfo.proxyDefault; this._busyManager.clearBusy(); ======= this.showProxyEnable = false; this.showProxyEnabledWarning = true; this._busyState.clearBusyState(); >>>>>>> this.showProxyEnable = false; this.showProxyEnabledWarning = true; this._busyManager.clearBusy();
<<<<<<< import { AuthResponse, buildResponseStateOnly, setResponseIdToken } from "./AuthResponse"; // default authority ======= import { AuthResponse, buildResponseStateOnly } from "./AuthResponse"; import TelemetryManager from "./telemetry/TelemetryManager"; import { TelemetryPlatform, TelemetryConfig } from './telemetry/TelemetryTypes'; // default authority >>>>>>> import { AuthResponse, buildResponseStateOnly, setResponseIdToken } from "./AuthResponse"; import TelemetryManager from "./telemetry/TelemetryManager"; import { TelemetryPlatform, TelemetryConfig } from './telemetry/TelemetryTypes'; // default authority <<<<<<< // Construct urlNavigate let urlNavigate = UrlProcessor.createNavigateUrl(serverAuthenticationRequest) + Constants.response_mode_fragment; ======= // Construct url to navigate to let urlNavigate = serverAuthenticationRequest.createNavigateUrl(scopes) + Constants.response_mode_fragment; >>>>>>> // Construct urlNavigate let urlNavigate = UrlProcessor.createNavigateUrl(serverAuthenticationRequest) + Constants.response_mode_fragment; <<<<<<< ======= * * Adds login_hint to authorization URL which is used to pre-fill the username field of sign in page for the user if known ahead of time * domain_hint can be one of users/organizations which when added skips the email based discovery process of the user * domain_req utid received as part of the clientInfo * login_req uid received as part of clientInfo * Also does a sanity check for extraQueryParameters passed by the user to ensure no repeat queryParameters * * @param {@link Account} account - Account for which the token is requested * @param queryparams * @param {@link ServerRequestParameters} * @ignore */ private addHintParameters(accountObj: Account, qParams: StringDict, serverReqParams: ServerRequestParameters): StringDict { const account: Account = accountObj || this.getAccount(); // This is a final check for all queryParams added so far; preference order: sid > login_hint // sid cannot be passed along with login_hint or domain_hint, hence we check both are not populated yet in queryParameters if (account && !qParams[SSOTypes.SID]) { // sid - populate only if login_hint is not already populated and the account has sid const populateSID = !qParams[SSOTypes.LOGIN_HINT] && account.sid && serverReqParams.promptValue === PromptState.NONE; if (populateSID) { qParams = Utils.addSSOParameter(SSOTypes.SID, account.sid, qParams); } // login_hint - account.userName else { const populateLoginHint = !qParams[SSOTypes.LOGIN_HINT] && account.userName && !Utils.isEmpty(account.userName); if (populateLoginHint) { qParams = Utils.addSSOParameter(SSOTypes.LOGIN_HINT, account.userName, qParams); } } const populateReqParams = !qParams[SSOTypes.DOMAIN_REQ] && !qParams[SSOTypes.LOGIN_REQ]; if (populateReqParams) { qParams = Utils.addSSOParameter(SSOTypes.HOMEACCOUNT_ID, account.homeAccountIdentifier, qParams); } } return qParams; } /** * @hidden >>>>>>> <<<<<<< let hash = UrlProcessor.getHashFromUrl(urlFragment); ======= const hash = Utils.getHashFromUrl(urlFragment); >>>>>>> let hash = UrlProcessor.getHashFromUrl(urlFragment); <<<<<<< setResponseIdToken(response, idToken); ======= Utils.setResponseIdToken(response, idTokenObj); >>>>>>> setResponseIdToken(response, idTokenObj); <<<<<<< response = setResponseIdToken(response, new IdToken(this.cacheStorage.getItem(Constants.idTokenKey))); ======= idTokenObj = new IdToken(this.cacheStorage.getItem(Constants.idTokenKey)); response = Utils.setResponseIdToken(response, idTokenObj); >>>>>>> idTokenObj = new IdToken(this.cacheStorage.getItem(Constants.idTokenKey)); response = setResponseIdToken(response, idTokenObj); <<<<<<< response = setResponseIdToken(response, new IdToken(hashParams[Constants.idToken])); ======= // set the idToken idTokenObj = new IdToken(hashParams[Constants.idToken]); response = Utils.setResponseIdToken(response, idTokenObj); >>>>>>> // set the idToken idTokenObj = new IdToken(hashParams[Constants.idToken]); response = setResponseIdToken(response, idTokenObj); <<<<<<< authority = UrlProcessor.replaceTenantPath(authority, response.idToken.tenantId); ======= authority = Utils.replaceTenantPath(authority, idTokenObj.tenantId); >>>>>>> authority = UrlProcessor.replaceTenantPath(authority, idTokenObj.tenantId); <<<<<<< ======= /** * @hidden * @ignore * * Utility to populate QueryParameters and ExtraQueryParameters to ServerRequestParamerers * @param request * @param serverAuthenticationRequest */ private populateQueryParams(account: Account, request: AuthenticationParameters, serverAuthenticationRequest: ServerRequestParameters, adalIdTokenObject?: any): ServerRequestParameters { let queryParameters: StringDict = {}; if (request) { // add the prompt parameter to serverRequestParameters if passed if (request.prompt) { this.validatePromptParameter(request.prompt); serverAuthenticationRequest.promptValue = request.prompt; } // Add claims challenge to serverRequestParameters if passed if (request.claimsRequest) { validateClaimsRequest(request); serverAuthenticationRequest.claimsValue = request.claimsRequest; } // if the developer provides one of these, give preference to developer choice if (Utils.isSSOParam(request)) { queryParameters = Utils.constructUnifiedCacheQueryParameter(request, null); } } if (adalIdTokenObject) { queryParameters = Utils.constructUnifiedCacheQueryParameter(null, adalIdTokenObject); } // adds sid/login_hint if not populated; populates domain_req, login_req and domain_hint this.logger.verbose("Calling addHint parameters"); queryParameters = this.addHintParameters(account, queryParameters, serverAuthenticationRequest); // sanity check for developer passed extraQueryParameters let eQParams: StringDict; if (request) { eQParams = this.sanitizeEQParams(request); } // Populate the extraQueryParameters to be sent to the server serverAuthenticationRequest.queryParameters = Utils.generateQueryParametersString(queryParameters); serverAuthenticationRequest.extraQueryParameters = Utils.generateQueryParametersString(eQParams); return serverAuthenticationRequest; } /** * @hidden * @ignore * * Utility to test if valid prompt value is passed in the request * @param request */ private validatePromptParameter (prompt: string) { if (!([PromptState.LOGIN, PromptState.SELECT_ACCOUNT, PromptState.CONSENT, PromptState.NONE].indexOf(prompt) >= 0)) { throw ClientConfigurationError.createInvalidPromptError(prompt); } } /** * @hidden * @ignore * Removes unnecessary or duplicate query parameters from extraQueryParameters * @param request */ private sanitizeEQParams(request: AuthenticationParameters) : StringDict { let eQParams : StringDict = request.extraQueryParameters; if (!eQParams) { return null; } if (request.claimsRequest) { this.logger.warning("Removed duplicate claims from extraQueryParameters. Please use either the claimsRequest field OR pass as extraQueryParameter - not both."); delete eQParams[Constants.claims]; } BlacklistedEQParams.forEach(param => { if (eQParams[param]) { this.logger.warning("Removed duplicate " + param + " from extraQueryParameters. Please use the " + param + " field in request object."); delete eQParams[param]; } }); return eQParams; } >>>>>>>
<<<<<<< import {ErrorListComponent} from './error-list/error-list.component'; import {MainComponent} from './main/main.component'; ======= import {MonitoringService} from './shared/services/app-monitoring.service'; import {BackgroundTasksService} from './shared/services/background-tasks.service'; import {GlobalStateService} from './shared/services/global-state.service'; import {TranslateService} from 'ng2-translate/ng2-translate'; import {LocalDevelopmentInstructionsComponent} from './local-development-instructions/local-development-instructions.component'; // Com import {PortalResources} from './shared/models/portal-resources'; import {ConfigService} from './shared/services/config.service'; >>>>>>> import {ErrorListComponent} from './error-list/error-list.component'; import {MainComponent} from './main/main.component'; // import {MonitoringService} from './shared/services/app-monitoring.service'; // import {BackgroundTasksService} from './shared/services/background-tasks.service'; // import {GlobalStateService} from './shared/services/global-state.service'; // import {TranslateService} from 'ng2-translate/ng2-translate'; // import {LocalDevelopmentInstructionsComponent} from './local-development-instructions/local-development-instructions.component'; // Com // import {PortalResources} from './shared/models/portal-resources'; import {ConfigService} from './shared/services/config.service'; <<<<<<< public ready: boolean; private _startupInfo : StartupInfo; // public currentResourceId: string; ======= public ready: boolean = false; public showTryLandingPage: boolean; public functionContainer: FunctionContainer; public currentResourceId: string; private _readyFunction: boolean = false; private _readyResources: boolean = false; get readyFunction(): boolean { return this._readyFunction; } set readyFunction(value: boolean) { this._readyFunction = value; this.ready = this._readyFunction && this._readyResources; } >>>>>>> public ready: boolean; private _startupInfo : StartupInfo; <<<<<<< // if (typeof functionContainer !== 'string') // //TODO: investigate this // this.showTryView = functionContainer.tryScmCred === null; ======= >>>>>>>
<<<<<<< import { fileExit } from '../shared/file'; ======= import { setServerUrl } from '../shared/git'; >>>>>>> import { fileExit } from '../shared/file'; import { setServerUrl } from '../shared/git';
<<<<<<< // load plugin.yml delay commander.register(pluginCommand, () => { let plugin = loadPlugin(ctx, pkg, version); return plugin.desc || `${pkg} universal plugin description`; }, async () => { await execPlugin(ctx, pkg, version); }, [], pkg); ======= const universalPkg: UniversalPkg = ctx.universalPkg; const pluginDescriptions = plugin.desc || `${pkg} universal plugin description`; const usage = plugin.usage ? { type: "usage", content: plugin.usage } : { type: "path", content: plugin.path }; commander.register(pluginCommand, pluginDescriptions, async () => { await updateUniversalPlugin(ctx, pkg, version, plugin); const newVersion = universalPkg.getInstalled().get(pkg); if (!newVersion) { ctx.logger.error(`invalid universal plugin name: ${pluginCommand}`); return; } plugin = loadPlugin(ctx, pkg, newVersion); await execPlugin(ctx, pkg, newVersion, plugin); }, [usage], pkg); >>>>>>> // load plugin.yml delay commander.register(pluginCommand, () => { return loadPlugin(ctx, pkg, version).desc || `${pkg} universal plugin description`; }, async () => { await execPlugin(ctx, pkg, version); }, [() => { let plugin = loadPlugin(ctx, pkg, version); return plugin.usage ? { type: "usage", content: plugin.usage } : { type: "path", content: plugin.path } }], pkg); <<<<<<< ======= }).map(arg => { // only handle under non-windows if (!isWindows && !/^'.*'$/.test(arg)) { return `'${arg}'`; } return arg; >>>>>>>
<<<<<<< preUninstall: Command; postUninstall: Command; ======= usage: any; >>>>>>> preUninstall: Command; postUninstall: Command; usage: any; <<<<<<< this.preUninstall = new Command(this.ctx, this.path, config?.['pre-uninstall']); this.postUninstall = new Command(this.ctx, this.path, config?.['post-uninstall']); ======= this.usage = config?.['usage']; >>>>>>> this.preUninstall = new Command(this.ctx, this.path, config?.['pre-uninstall']); this.postUninstall = new Command(this.ctx, this.path, config?.['post-uninstall']); this.usage = config?.['usage'];
<<<<<<< import { NgZone, Directive, Optional, OnDestroy, DoCheck, OnChanges, AfterViewInit, SimpleChanges, KeyValueDiffers, Input, HostBinding, HostListener, ElementRef } from '@angular/core'; ======= import { SimpleChanges, KeyValueDiffers } from '@angular/core'; import { NgZone, Directive, Optional, ElementRef } from '@angular/core'; import { OnDestroy, DoCheck, OnChanges, AfterViewInit } from '@angular/core'; import { Input, Output, EventEmitter, HostBinding, HostListener } from '@angular/core'; >>>>>>> import { NgZone, Directive, Optional, OnDestroy, DoCheck, OnChanges, AfterViewInit, SimpleChanges, KeyValueDiffers, Input, HostBinding, HostListener, ElementRef } from '@angular/core'; <<<<<<< this.zone.runOutsideAngular(() => { Ps.destroy(this.elementRef.nativeElement); }); ======= if (this.runInsideAngular) { this.ps.destroy(); } else { this.zone.runOutsideAngular(() => { this.ps.destroy(); }); } this.ps = null; >>>>>>> if (this.ps) { this.zone.runOutsideAngular(() => { this.ps.destroy(); }); this.ps = null; } <<<<<<< this.zone.runOutsideAngular(() => { Ps.initialize(this.elementRef.nativeElement, config); }); ======= if (this.runInsideAngular) { this.ps = new PerfectScrollbar(this.elementRef.nativeElement, config); } else { this.zone.runOutsideAngular(() => { this.ps = new PerfectScrollbar(this.elementRef.nativeElement, config); }); } >>>>>>> this.zone.runOutsideAngular(() => { this.ps = new PerfectScrollbar(this.elementRef.nativeElement, config); }); <<<<<<< this.zone.runOutsideAngular(() => { Ps.update(this.elementRef.nativeElement); }); ======= if (this.runInsideAngular) { this.ps.update(); } else { this.zone.runOutsideAngular(() => { this.ps.update(); }); } >>>>>>> this.zone.runOutsideAngular(() => { this.ps.update(); });
<<<<<<< this.zone.runOutsideAngular(() => { ======= if (this.timeout) { window.clearTimeout(this.timeout); } if (this.runInsideAngular) { >>>>>>> if (this.timeout) { window.clearTimeout(this.timeout); } this.zone.runOutsideAngular(() => {
<<<<<<< protected _buildSlot(dataPackage: BuildArmaturePackage, slotData: SlotData, displays: Array<DisplayData | null> | null, armature: Armature): Slot { ======= /** * @inheritDoc */ protected _buildSlot(dataPackage: BuildArmaturePackage, slotData: SlotData, armature: Armature): Slot { >>>>>>> protected _buildSlot(dataPackage: BuildArmaturePackage, slotData: SlotData, armature: Armature): Slot {
<<<<<<< ifElse, findLastIndex, indexOf, ======= ifElse, throttle >>>>>>> findLastIndex, indexOf, ifElse, throttle
<<<<<<< import { ConfigurationManager, EnvironmentManager } from "../system" import { MultiStepInput, QuickPickParameters } from "../ui" ======= import { ConfigurationManager, EnvironmentManager } from "../manager" import { MultiStepInput, QuickPickParameters } from "../ui/MultiStepInput" >>>>>>> import { ConfigurationManager, EnvironmentManager } from "../system" import { MultiStepInput, QuickPickParameters } from "../ui/MultiStepInput"
<<<<<<< if (isEmpty(contracts) && isEmpty(changedLibraries)) { Loggy.noSpin(__filename, 'push', `after-push`, `All implementations are up to date`); ======= if (isEmpty(contractObjects) && isEmpty(changedLibraries)) { Loggy.noSpin(__filename, 'push', `after-push`, `All contracts are up to date`); >>>>>>> if (isEmpty(contractObjects) && isEmpty(changedLibraries)) { Loggy.noSpin(__filename, 'push', `after-push`, `All implementations are up to date`);
<<<<<<< ======= askForMethodParams: { type: 'confirm', message: 'Do you want to call a function on the instance after upgrade it?', when: () => initMethodsList.length !== 0 && methodName !== 'initialize', }, methodName: { type: 'list', message: 'Select which function', choices: initMethodsList, when: ({ askForMethodParams }) => askForMethodParams, normalize: input => { if (typeof input !== 'object') { return { name: input, selector: input }; } else return input; }, }, ...initMethodArgsList, >>>>>>>
<<<<<<< ======= import { getEntityOrThrow } from '../helpers/utils/get-entity-or-throw'; >>>>>>> <<<<<<< const fulfillment = await this.connection.getRepository(ctx, Fulfillment).save( new Fulfillment({ trackingCode: input.trackingCode, method: input.method, orderItems: items, }), ); ======= const fulfillment = await this.fulfillmentService.create({ trackingCode: input.trackingCode, method: input.method, orderItems: items, }); >>>>>>> const fulfillment = await this.fulfillmentService.create(ctx, { trackingCode: input.trackingCode, method: input.method, orderItems: items, }); <<<<<<< const orderWithFulfillments = await this.connection.findOneInChannel( ctx, Order, order.id, ctx.channelId, { relations: ['lines', 'lines.items', 'lines.items.fulfillment'], }, ); if (!orderWithFulfillments) { throw new InternalServerError('error.could-not-find-order'); } if (orderItemsAreFulfilled(orderWithFulfillments)) { await this.transitionToState(ctx, order.id, 'Fulfilled'); } else { await this.transitionToState(ctx, order.id, 'PartiallyFulfilled'); } ======= >>>>>>> <<<<<<< async getFulfillmentOrderItems(ctx: RequestContext, id: ID): Promise<OrderItem[]> { const fulfillment = await this.connection.getEntityOrThrow(ctx, Fulfillment, id, { relations: ['orderItems'], }); return fulfillment.orderItems; } ======= >>>>>>>
<<<<<<< import { CustomFieldRelationService } from '../helpers/custom-field-relation/custom-field-relation.service'; ======= import { ConfigArgService } from '../helpers/config-arg/config-arg.service'; >>>>>>> import { ConfigArgService } from '../helpers/config-arg/config-arg.service'; import { CustomFieldRelationService } from '../helpers/custom-field-relation/custom-field-relation.service'; <<<<<<< private customFieldRelationService: CustomFieldRelationService, ======= private configArgService: ConfigArgService, >>>>>>> private configArgService: ConfigArgService, private customFieldRelationService: CustomFieldRelationService,
<<<<<<< import { CustomPaymentProcess } from './payment/custom-payment-process'; import { PaymentMethodHandler } from './payment/payment-method-handler'; ======= import { PaymentMethodEligibilityChecker } from './payment-method/payment-method-eligibility-checker'; import { PaymentMethodHandler } from './payment-method/payment-method-handler'; >>>>>>> import { PaymentMethodEligibilityChecker } from './payment-method/payment-method-eligibility-checker'; import { PaymentMethodHandler } from './payment-method/payment-method-handler'; import { CustomPaymentProcess } from './payment/custom-payment-process'; <<<<<<< /** * @description * Allows the definition of custom states and transition logic for the payment process state machine. * Takes an array of objects implementing the {@link CustomPaymentProcess} interface. */ customPaymentProcess?: Array<CustomPaymentProcess<any>>; ======= /** * @description * Defines which {@link PaymentMethodEligibilityChecker}s are available when configuring * {@link PaymentMethod}s */ paymentMethodEligibilityCheckers?: PaymentMethodEligibilityChecker[]; >>>>>>> /** * @description * Defines which {@link PaymentMethodEligibilityChecker}s are available when configuring * {@link PaymentMethod}s */ paymentMethodEligibilityCheckers?: PaymentMethodEligibilityChecker[]; /** * @description * Allows the definition of custom states and transition logic for the payment process state machine. * Takes an array of objects implementing the {@link CustomPaymentProcess} interface. */ customPaymentProcess?: Array<CustomPaymentProcess<any>>;
<<<<<<< ======= import { findOneInChannel } from '../helpers/utils/channel-aware-orm-utils'; import { getEntityOrThrow } from '../helpers/utils/get-entity-or-throw'; >>>>>>> <<<<<<< .build(Customer, options, { where: { deletedAt: null }, ctx }) ======= .build(Customer, options, { relations: ['channels'], channelId: ctx.channelId, where: { deletedAt: null }, }) >>>>>>> .build(Customer, options, { relations: ['channels'], channelId: ctx.channelId, where: { deletedAt: null }, ctx, }) <<<<<<< async getCustomerGroups(ctx: RequestContext | undefined, customerId: ID): Promise<CustomerGroup[]> { const customerWithGroups = await this.connection .getRepository(ctx, Customer) .findOne(customerId, { relations: ['groups'] }); ======= async getCustomerGroups(ctx: RequestContext, customerId: ID): Promise<CustomerGroup[]> { const customerWithGroups = await findOneInChannel( this.connection, Customer, customerId, ctx.channelId, { relations: ['groups'], where: { deletedAt: null, }, }, ); >>>>>>> async getCustomerGroups(ctx: RequestContext, customerId: ID): Promise<CustomerGroup[]> { const customerWithGroups = await this.connection.findOneInChannel( ctx, Customer, customerId, ctx?.channelId, { relations: ['groups'], where: { deletedAt: null, }, }, ); <<<<<<< const existingCustomer = await this.connection.getRepository(ctx, Customer).findOne({ ======= const existingCustomerInChannel = await this.connection .getRepository(Customer) .createQueryBuilder('customer') .leftJoin('customer.channels', 'channel') .where('channel.id = :channelId', { channelId: ctx.channelId }) .andWhere('customer.emailAddress = :emailAddress', { emailAddress: input.emailAddress }) .andWhere('customer.deletedAt is null') .getOne(); if (existingCustomerInChannel) { throw new UserInputError(`error.email-address-must-be-unique`); } const existingCustomer = await this.connection.getRepository(Customer).findOne({ relations: ['channels'], >>>>>>> const existingCustomerInChannel = await this.connection .getRepository(ctx, Customer) .createQueryBuilder('customer') .leftJoin('customer.channels', 'channel') .where('channel.id = :channelId', { channelId: ctx.channelId }) .andWhere('customer.emailAddress = :emailAddress', { emailAddress: input.emailAddress }) .andWhere('customer.deletedAt is null') .getOne(); if (existingCustomerInChannel) { throw new UserInputError(`error.email-address-must-be-unique`); } const existingCustomer = await this.connection.getRepository(ctx, Customer).findOne({ relations: ['channels'], <<<<<<< const createdCustomer = await await this.connection.getRepository(ctx, Customer).save(customer); ======= this.channelService.assignToCurrentChannel(customer, ctx); const createdCustomer = await this.connection.getRepository(Customer).save(customer); >>>>>>> this.channelService.assignToCurrentChannel(customer, ctx); const createdCustomer = await this.connection.getRepository(ctx, Customer).save(customer); <<<<<<< const customer = await this.connection.getEntityOrThrow(ctx, Customer, input.id); ======= const customer = await getEntityOrThrow(this.connection, Customer, input.id, ctx.channelId); >>>>>>> const customer = await this.connection.getEntityOrThrow(ctx, Customer, input.id, { channelId: ctx.channelId, }); <<<<<<< await this.connection.getRepository(ctx, Customer).save(customer, { reload: false }); ======= await this.connection.getRepository(Customer).save(updatedCustomer, { reload: false }); >>>>>>> await this.connection.getRepository(ctx, Customer).save(updatedCustomer, { reload: false }); <<<<<<< const existing = await this.connection.getRepository(ctx, Customer).findOne({ ======= const existing = await this.connection.getRepository(Customer).findOne({ relations: ['channels'], >>>>>>> const existing = await this.connection.getRepository(ctx, Customer).findOne({ relations: ['channels'], <<<<<<< const customer = await this.connection.getRepository(ctx, Customer).findOne(customerId, { ======= const customer = await getEntityOrThrow(this.connection, Customer, customerId, ctx.channelId, { >>>>>>> const customer = await this.connection.getEntityOrThrow(ctx, Customer, customerId, { <<<<<<< async softDelete(ctx: RequestContext, customerId: ID): Promise<DeletionResponse> { const customer = await this.connection.getEntityOrThrow(ctx, Customer, customerId); await this.connection .getRepository(ctx, Customer) .update({ id: customerId }, { deletedAt: new Date() }); ======= async softDelete(ctx: RequestContext, customerId: ID): Promise<DeletionResponse> { const customer = await getEntityOrThrow(this.connection, Customer, customerId, ctx.channelId); await this.connection.getRepository(Customer).update({ id: customerId }, { deletedAt: new Date() }); >>>>>>> async softDelete(ctx: RequestContext, customerId: ID): Promise<DeletionResponse> { const customer = await this.connection.getEntityOrThrow(ctx, Customer, customerId, { channelId: ctx.channelId, }); await this.connection .getRepository(ctx, Customer) .update({ id: customerId }, { deletedAt: new Date() }); <<<<<<< const customer = await this.connection.getEntityOrThrow(ctx, Customer, input.id); ======= const customer = await getEntityOrThrow(this.connection, Customer, input.id, ctx.channelId); >>>>>>> const customer = await this.connection.getEntityOrThrow(ctx, Customer, input.id, { channelId: ctx.channelId, });
<<<<<<< import { OrderService } from '../../../service/services/order.service'; import { RequestContext } from '../../common/request-context'; import { Ctx } from '../../decorators/request-context.decorator'; ======= import { FulfillmentService } from '../../../service/services/fulfillment.service'; >>>>>>> import { FulfillmentService } from '../../../service/services/fulfillment.service'; import { RequestContext } from '../../common/request-context'; import { Ctx } from '../../decorators/request-context.decorator'; <<<<<<< async orderItems(@Ctx() ctx: RequestContext, @Parent() fulfillment: Fulfillment) { return this.orderService.getFulfillmentOrderItems(ctx, fulfillment.id); ======= async orderItems(@Parent() fulfillment: Fulfillment) { return this.fulfillmentService.getOrderItemsByFulfillmentId(fulfillment.id); } } @Resolver('Fulfillment') export class FulfillmentAdminEntityResolver { constructor(private fulfillmentService: FulfillmentService) {} @ResolveField() async nextStates(@Parent() fulfillment: Fulfillment) { return this.fulfillmentService.getNextStates(fulfillment); >>>>>>> async orderItems(@Ctx() ctx: RequestContext, @Parent() fulfillment: Fulfillment) { return this.fulfillmentService.getOrderItemsByFulfillmentId(ctx, fulfillment.id); } } @Resolver('Fulfillment') export class FulfillmentAdminEntityResolver { constructor(private fulfillmentService: FulfillmentService) {} @ResolveField() async nextStates(@Parent() fulfillment: Fulfillment) { return this.fulfillmentService.getNextStates(fulfillment);
<<<<<<< const CMD_TOGGLE = "spellchecker:toggle-check-spelling"; const CMD_APPLY_SUGGESTION = "spellchecker:apply-suggestion"; const TEXT_SUGGESTIONS_AVAILABLE = 'Adjust spelling to' const TEXT_NO_SUGGESTIONS = 'No spellcheck suggestions' interface IWord { line: number; start: number; end: number; text: string; } interface IContext { editor: CodeMirror.Editor; position: CodeMirror.Position; } ======= interface ILanguage { code: string; name: string; aff: string; dic: string; } // English dictionaries come from https://github.com/en-wl/wordlist import en_aff from 'file-loader!../dictionaries/en_US.aff'; import en_dic from 'file-loader!../dictionaries/en_US.dic'; import en_gb_aff from 'file-loader!../dictionaries/en_GB-ise.aff'; import en_gb_dic from 'file-loader!../dictionaries/en_GB-ise.dic'; import en_ca_aff from 'file-loader!../dictionaries/en_CA.aff'; import en_ca_dic from 'file-loader!../dictionaries/en_CA.dic'; import en_au_aff from 'file-loader!../dictionaries/en_AU.aff'; import en_au_dic from 'file-loader!../dictionaries/en_AU.dic'; import { Cell } from "@jupyterlab/cells"; const languages: ILanguage[] = [ {code: 'en-us', name: 'English (American)', aff: en_aff, dic: en_dic}, {code: 'en-gb', name: 'English (British)', aff: en_gb_aff, dic: en_gb_dic}, {code: 'en-ca', name: 'English (Canadian)', aff: en_ca_aff, dic: en_ca_dic}, {code: 'en-au', name: 'English (Australian)', aff: en_au_aff, dic: en_au_dic}, ] class StatusWidget extends ReactWidget { language_source: () => string; constructor(source: () => string) { super(); this.language_source = source } protected render() { return TextItem({source: this.language_source()}); } } >>>>>>> const CMD_TOGGLE = "spellchecker:toggle-check-spelling"; const CMD_APPLY_SUGGESTION = "spellchecker:apply-suggestion"; const TEXT_SUGGESTIONS_AVAILABLE = 'Adjust spelling to' const TEXT_NO_SUGGESTIONS = 'No spellcheck suggestions' interface IWord { line: number; start: number; end: number; text: string; } interface IContext { editor: CodeMirror.Editor; position: CodeMirror.Position; } interface ILanguage { code: string; name: string; aff: string; dic: string; } // English dictionaries come from https://github.com/en-wl/wordlist import en_aff from 'file-loader!../dictionaries/en_US.aff'; import en_dic from 'file-loader!../dictionaries/en_US.dic'; import en_gb_aff from 'file-loader!../dictionaries/en_GB-ise.aff'; import en_gb_dic from 'file-loader!../dictionaries/en_GB-ise.dic'; import en_ca_aff from 'file-loader!../dictionaries/en_CA.aff'; import en_ca_dic from 'file-loader!../dictionaries/en_CA.dic'; import en_au_aff from 'file-loader!../dictionaries/en_AU.aff'; import en_au_dic from 'file-loader!../dictionaries/en_AU.dic'; const languages: ILanguage[] = [ {code: 'en-us', name: 'English (American)', aff: en_aff, dic: en_dic}, {code: 'en-gb', name: 'English (British)', aff: en_gb_aff, dic: en_gb_dic}, {code: 'en-ca', name: 'English (Canadian)', aff: en_ca_aff, dic: en_ca_dic}, {code: 'en-au', name: 'English (Australian)', aff: en_au_aff, dic: en_au_dic}, ] class StatusWidget extends ReactWidget { language_source: () => string; constructor(source: () => string) { super(); this.language_source = source } protected render() { return TextItem({source: this.language_source()}); } } <<<<<<< suggestions_menu: Menu; ======= status_bar: IStatusBar; status_widget: StatusWidget; >>>>>>> suggestions_menu: Menu; status_bar: IStatusBar; status_widget: StatusWidget; <<<<<<< this.setup_suggestions(); this.load_dictionary(); this.tracker.activeCellChanged.connect(this.onActiveCellChanged, this); this.editor_tracker.widgetAdded.connect((sender, widget) => { let file_editor = widget.content; if (this.accepted_types.indexOf(file_editor.model.mimeType) !== -1) { let editor = this.extract_editor(file_editor); this.setup_overlay(editor); } }); ======= this.setup_language_picker(); this.load_dictionary().catch(console.warn); this.tracker.activeCellChanged.connect(() => this.setup_cell_editor(this.tracker.activeCell)); this.editor_tracker.widgetAdded.connect((sender, widget) => this.setup_file_editor(widget.content)); >>>>>>> this.setup_suggestions(); this.setup_language_picker(); this.load_dictionary().catch(console.warn); this.tracker.activeCellChanged.connect(() => this.setup_cell_editor(this.tracker.activeCell)); this.editor_tracker.widgetAdded.connect((sender, widget) => this.setup_file_editor(widget.content));
<<<<<<< import reactRemoveBracesFromJsxAttribute from "./refactorings/react/remove-braces-from-jsx-attribute"; ======= import reactAddBracesToJsxAttribute from "./refactorings/react/add-braces-to-jsx-attribute"; >>>>>>> import reactAddBracesToJsxAttribute from "./refactorings/react/add-braces-to-jsx-attribute"; import reactRemoveBracesFromJsxAttribute from "./refactorings/react/remove-braces-from-jsx-attribute"; <<<<<<< reactRemoveBracesFromJsxAttribute, ======= reactAddBracesToJsxAttribute, >>>>>>> reactAddBracesToJsxAttribute, reactRemoveBracesFromJsxAttribute, <<<<<<< reactRemoveBracesFromJsxAttribute, ======= reactAddBracesToJsxAttribute, >>>>>>> reactAddBracesToJsxAttribute, reactRemoveBracesFromJsxAttribute,
<<<<<<< t.traverseAST( ast, createVisitor(selection, (path: t.NodePath<t.IfStatement>) => { const { alternate } = path.node; if (alternate) { mergeAlternate = true; canMerge = true; } else { mergeAlternate = false; canMerge = true; } }) ); ======= t.traverseAST(ast, { IfStatement(path) { if (!selection.isInsidePath(path)) return; // Since we visit nodes from parent to children, first check // if a child would match the selection closer. if (hasChildWhichMatchesSelection(path, selection)) return; canMerge = true; mergeAlternate = !!path.node.alternate; } }); >>>>>>> t.traverseAST( ast, createVisitor(selection, (path: t.NodePath<t.IfStatement>) => { canMerge = true; mergeAlternate = !!path.node.alternate; }) );
<<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "PUT" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "PUT" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "POST" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "POST" }); let statusCode = operationRes.status;
<<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "PUT" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "PUT" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "PUT" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "PUT" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "PUT" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "PUT" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "PUT" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "PUT" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "PUT" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "PUT" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "PUT" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "PUT" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "PUT" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "PUT" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "PUT" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "PUT" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "PUT" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "PUT" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "PUT" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "PUT" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let statusCode = operationRes.status;
<<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let statusCode = operationRes.status;
<<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let statusCode = operationRes.status;
<<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let statusCode = operationRes.status;
<<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let statusCode = operationRes.status;
<<<<<<< contentType: "application/json; charset=utf-8", parameterTransformations: [ { sourcePath: [ "body" ], targetPath: [ "parameterGroupingPostRequiredParameters", "body" ] }, { sourcePath: [ "customHeader" ], targetPath: [ "parameterGroupingPostRequiredParameters", "customHeader" ] }, { sourcePath: [ "query" ], targetPath: [ "parameterGroupingPostRequiredParameters", "query" ] }, { sourcePath: [ "path" ], targetPath: [ "parameterGroupingPostRequiredParameters", "path" ] } ] ======= contentType: "application/json; charset=utf-8", serializer: this.serializer >>>>>>> contentType: "application/json; charset=utf-8", parameterTransformations: [ { sourcePath: [ "body" ], targetPath: [ "parameterGroupingPostRequiredParameters", "body" ] }, { sourcePath: [ "customHeader" ], targetPath: [ "parameterGroupingPostRequiredParameters", "customHeader" ] }, { sourcePath: [ "query" ], targetPath: [ "parameterGroupingPostRequiredParameters", "query" ] }, { sourcePath: [ "path" ], targetPath: [ "parameterGroupingPostRequiredParameters", "path" ] } ], serializer: this.serializer <<<<<<< ], parameterTransformations: [ { sourcePath: [ "customHeader" ], targetPath: [ "parameterGroupingPostOptionalParameters", "customHeader" ] }, { sourcePath: [ "query" ], targetPath: [ "parameterGroupingPostOptionalParameters", "query" ] } ] ======= ], serializer: this.serializer >>>>>>> ], parameterTransformations: [ { sourcePath: [ "customHeader" ], targetPath: [ "parameterGroupingPostOptionalParameters", "customHeader" ] }, { sourcePath: [ "query" ], targetPath: [ "parameterGroupingPostOptionalParameters", "query" ] } ], serializer: this.serializer <<<<<<< ], parameterTransformations: [ { sourcePath: [ "headerOne" ], targetPath: [ "firstParameterGroup", "headerOne" ] }, { sourcePath: [ "queryOne" ], targetPath: [ "firstParameterGroup", "queryOne" ] }, { sourcePath: [ "headerTwo" ], targetPath: [ "parameterGroupingPostMultiParamGroupsSecondParamGroup", "headerTwo" ] }, { sourcePath: [ "queryTwo" ], targetPath: [ "parameterGroupingPostMultiParamGroupsSecondParamGroup", "queryTwo" ] } ] ======= ], serializer: this.serializer >>>>>>> ], parameterTransformations: [ { sourcePath: [ "headerOne" ], targetPath: [ "firstParameterGroup", "headerOne" ] }, { sourcePath: [ "queryOne" ], targetPath: [ "firstParameterGroup", "queryOne" ] }, { sourcePath: [ "headerTwo" ], targetPath: [ "parameterGroupingPostMultiParamGroupsSecondParamGroup", "headerTwo" ] }, { sourcePath: [ "queryTwo" ], targetPath: [ "parameterGroupingPostMultiParamGroupsSecondParamGroup", "queryTwo" ] } ], serializer: this.serializer <<<<<<< ], parameterTransformations: [ { sourcePath: [ "headerOne" ], targetPath: [ "firstParameterGroup", "headerOne" ] }, { sourcePath: [ "queryOne" ], targetPath: [ "firstParameterGroup", "queryOne" ] } ] ======= ], serializer: this.serializer >>>>>>> ], parameterTransformations: [ { sourcePath: [ "headerOne" ], targetPath: [ "firstParameterGroup", "headerOne" ] }, { sourcePath: [ "queryOne" ], targetPath: [ "firstParameterGroup", "queryOne" ] } ], serializer: this.serializer
<<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "PUT" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "PUT" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let statusCode = operationRes.status;
<<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "PUT" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "PUT" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let statusCode = operationRes.status;
<<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "PUT" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "PUT" }); let statusCode = operationRes.status;
<<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "PUT" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "PUT" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "PUT" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "PUT" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let statusCode = operationRes.status;
<<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "POST" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "POST" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "POST" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "POST" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "POST" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "POST" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "POST" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "POST" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "POST" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "POST" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "POST" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "POST" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "POST" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "POST" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "POST" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "POST" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "POST" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "POST" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "POST" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "POST" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "POST" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "POST" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "POST" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "POST" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "POST" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "POST" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "POST" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "POST" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "POST" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "POST" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "POST" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "POST" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "POST" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "POST" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "POST" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "POST" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "POST" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "POST" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "POST" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "POST" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "POST" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "POST" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "POST" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "POST" }); let statusCode = operationRes.status;
<<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "POST" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "POST" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "POST" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "POST" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "HEAD" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "HEAD" }); let statusCode = operationRes.status;
<<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "PUT" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "PUT" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "PUT" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "PUT" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let statusCode = operationRes.status;
<<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "HEAD" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "HEAD" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "PUT" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "PUT" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "PATCH" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "PATCH" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "POST" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "POST" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "DELETE" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "DELETE" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "HEAD" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "HEAD" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "PUT" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "PUT" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "PATCH" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "PATCH" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "POST" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "POST" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "DELETE" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "DELETE" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "PUT" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "PUT" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "HEAD" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "HEAD" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "PUT" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "PUT" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "PATCH" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "PATCH" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "POST" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "POST" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "DELETE" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "DELETE" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "HEAD" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "HEAD" }); let statusCode = operationRes.status;
<<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "PUT" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "PUT" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "PUT" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "PUT" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let statusCode = operationRes.status;
<<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "PUT" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "PUT" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "PUT" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "PUT" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "PUT" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "PUT" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "PUT" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "PUT" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "PUT" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "PUT" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "POST" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "POST" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "PUT" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "PUT" }); let statusCode = operationRes.status;
<<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "POST" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "POST" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "POST" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "POST" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "POST" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "POST" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "POST" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "POST" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "POST" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "POST" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "POST" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "POST" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "POST" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "POST" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "POST" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "POST" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "POST" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "POST" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "POST" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "POST" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "POST" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "POST" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "POST" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "POST" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "POST" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "POST" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "POST" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "POST" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "POST" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "POST" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "POST" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "POST" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "POST" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "POST" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "POST" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "POST" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "POST" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "POST" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "POST" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "POST" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "POST" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "POST" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "POST" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "POST" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "POST" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "POST" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "POST" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "POST" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "POST" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "POST" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "POST" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "POST" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "POST" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "POST" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "POST" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "POST" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "POST" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "POST" }); let statusCode = operationRes.status;
<<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "PUT" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "PUT" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "PUT" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "PUT" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "PUT" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "PUT" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "PUT" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "PUT" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "PUT" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "PUT" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "PUT" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "PUT" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let statusCode = operationRes.status;
<<<<<<< contentType: "application/json; charset=utf-8", parameterTransformations: [ { sourcePath: [ "complexBody", "arrayProperty" ], targetPath: [ "arrayProperty" ] } ] ======= contentType: "application/json; charset=utf-8", serializer: this.serializer >>>>>>> contentType: "application/json; charset=utf-8", parameterTransformations: [ { sourcePath: [ "complexBody", "arrayProperty" ], targetPath: [ "arrayProperty" ] } ], serializer: this.serializer <<<<<<< contentType: "application/json; charset=utf-8", parameterTransformations: [ { sourcePath: [ "complexBody", "arrayProperty" ], targetPath: [ "arrayProperty" ] } ] ======= contentType: "application/json; charset=utf-8", serializer: this.serializer >>>>>>> contentType: "application/json; charset=utf-8", parameterTransformations: [ { sourcePath: [ "complexBody", "arrayProperty" ], targetPath: [ "arrayProperty" ] } ], serializer: this.serializer
<<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "PUT" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "PUT" }); let statusCode = operationRes.status;
<<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "PUT" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "PUT" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "PUT" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "PUT" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "PUT" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "PUT" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "PUT" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "PUT" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "PUT" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "PUT" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let statusCode = operationRes.status;
<<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "PUT" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "PUT" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "PUT" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "PUT" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "PUT" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "PUT" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "PUT" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "PUT" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "PUT" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "PUT" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "PUT" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "PUT" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "PUT" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "PUT" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "PUT" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "PUT" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "PUT" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "PUT" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "PUT" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "PUT" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "PUT" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "PUT" }); let statusCode = operationRes.status;
<<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let statusCode = operationRes.status;
<<<<<<< export const TEST_POP_VALUES = { KID: "NzbLsXh8uDCcd-6MNwXF4W_7noWXFZAfHkxZsRGC9Xs", ENCODED_REQ_CNF: "eyJraWQiOiJOemJMc1hoOHVEQ2NkLTZNTndYRjRXXzdub1dYRlpBZkhreFpzUkdDOVhzIiwieG1zX2tzbCI6InN3In0=", DECODED_REQ_CNF: `{"kid":"NzbLsXh8uDCcd-6MNwXF4W_7noWXFZAfHkxZsRGC9Xs","xms_ksl":"sw"}`, SAMPLE_POP_AT: "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiaWF0IjoxNTE2MjM5MDIyLCJjbmYiOnsia2lkIjoiTnpiTHNYaDh1RENjZC02TU53WEY0V183bm9XWEZaQWZIa3hac1JHQzlYcyJ9fQ.SflKxwRJSMeKKF2QT4fwpMeJf36POk6yJV_adQssw5c", SAMPLE_POP_AT_PAYLOAD_ENCODED: `eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiaWF0IjoxNTE2MjM5MDIyLCJjbmYiOnsia2lkIjoiTnpiTHNYaDh1RENjZC02TU53WEY0V183bm9XWEZaQWZIa3hac1JHQzlYcyJ9fQ`, SAMPLE_POP_AT_PAYLOAD_DECODED: `{"sub":"1234567890","name":"John Doe","iat":1516239022,"cnf":{"kid":"NzbLsXh8uDCcd-6MNwXF4W_7noWXFZAfHkxZsRGC9Xs"}}` }; ======= export const TEST_ACCOUNT_INFO: AccountInfo = { homeAccountId: `${TEST_DATA_CLIENT_INFO.TEST_UID}.${TEST_DATA_CLIENT_INFO.TEST_UTID}`, tenantId: ID_TOKEN_CLAIMS.tid, environment: "login.windows.net", username: ID_TOKEN_CLAIMS.preferred_username }; >>>>>>> export const TEST_POP_VALUES = { KID: "NzbLsXh8uDCcd-6MNwXF4W_7noWXFZAfHkxZsRGC9Xs", ENCODED_REQ_CNF: "eyJraWQiOiJOemJMc1hoOHVEQ2NkLTZNTndYRjRXXzdub1dYRlpBZkhreFpzUkdDOVhzIiwieG1zX2tzbCI6InN3In0=", DECODED_REQ_CNF: `{"kid":"NzbLsXh8uDCcd-6MNwXF4W_7noWXFZAfHkxZsRGC9Xs","xms_ksl":"sw"}`, SAMPLE_POP_AT: "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiaWF0IjoxNTE2MjM5MDIyLCJjbmYiOnsia2lkIjoiTnpiTHNYaDh1RENjZC02TU53WEY0V183bm9XWEZaQWZIa3hac1JHQzlYcyJ9fQ.SflKxwRJSMeKKF2QT4fwpMeJf36POk6yJV_adQssw5c", SAMPLE_POP_AT_PAYLOAD_ENCODED: `eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiaWF0IjoxNTE2MjM5MDIyLCJjbmYiOnsia2lkIjoiTnpiTHNYaDh1RENjZC02TU53WEY0V183bm9XWEZaQWZIa3hac1JHQzlYcyJ9fQ`, SAMPLE_POP_AT_PAYLOAD_DECODED: `{"sub":"1234567890","name":"John Doe","iat":1516239022,"cnf":{"kid":"NzbLsXh8uDCcd-6MNwXF4W_7noWXFZAfHkxZsRGC9Xs"}}` }; export const TEST_ACCOUNT_INFO: AccountInfo = { homeAccountId: `${TEST_DATA_CLIENT_INFO.TEST_UID}.${TEST_DATA_CLIENT_INFO.TEST_UTID}`, tenantId: ID_TOKEN_CLAIMS.tid, environment: "login.windows.net", username: ID_TOKEN_CLAIMS.preferred_username }; <<<<<<< export const POP_AUTHENTICATION_RESULT = { status: 200, body: { "token_type": "pop", "scope": "openid profile User.Read email", "expires_in": 3599, "ext_expires_in": 3599, "access_token": `${TEST_POP_VALUES.SAMPLE_POP_AT}`, "refresh_token": "thisIsARefreshT0ken", "id_token": "eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiIsImtpZCI6IjFMVE16YWtpaGlSbGFfOHoyQkVKVlhlV01xbyJ9.eyJ2ZXIiOiIyLjAiLCJpc3MiOiJodHRwczovL2xvZ2luLm1pY3Jvc29mdG9ubGluZS5jb20vOTE4ODA0MGQtNmM2Ny00YzViLWIxMTItMzZhMzA0YjY2ZGFkL3YyLjAiLCJzdWIiOiJBQUFBQUFBQUFBQUFBQUFBQUFBQUFJa3pxRlZyU2FTYUZIeTc4MmJidGFRIiwiYXVkIjoiNmNiMDQwMTgtYTNmNS00NmE3LWI5OTUtOTQwYzc4ZjVhZWYzIiwiZXhwIjoxNTM2MzYxNDExLCJpYXQiOjE1MzYyNzQ3MTEsIm5iZiI6MTUzNjI3NDcxMSwibmFtZSI6IkFiZSBMaW5jb2xuIiwicHJlZmVycmVkX3VzZXJuYW1lIjoiQWJlTGlAbWljcm9zb2Z0LmNvbSIsIm9pZCI6IjAwMDAwMDAwLTAwMDAtMDAwMC02NmYzLTMzMzJlY2E3ZWE4MSIsInRpZCI6IjMzMzgwNDBkLTZjNjctNGM1Yi1iMTEyLTM2YTMwNGI2NmRhZCIsIm5vbmNlIjoiMTIzNTIzIiwiYWlvIjoiRGYyVVZYTDFpeCFsTUNXTVNPSkJjRmF0emNHZnZGR2hqS3Y4cTVnMHg3MzJkUjVNQjVCaXN2R1FPN1lXQnlqZDhpUURMcSFlR2JJRGFreXA1bW5PcmNkcUhlWVNubHRlcFFtUnA2QUlaOGpZIn0=.1AFWW-Ck5nROwSlltm7GzZvDwUkqvhSQpm55TQsmVo9Y59cLhRXpvB8n-55HCr9Z6G_31_UbeUkoz612I2j_Sm9FFShSDDjoaLQr54CreGIJvjtmS3EkK9a7SJBbcpL1MpUtlfygow39tFjY7EVNW9plWUvRrTgVk7lYLprvfzw-CIqw3gHC-T7IK_m_xkr08INERBtaecwhTeN4chPC4W3jdmw_lIxzC48YoQ0dB1L9-ImX98Egypfrlbm0IBL5spFzL6JDZIRRJOu8vecJvj1mq-IUhGt0MacxX8jdxYLP-KUu2d9MbNKpCKJuZ7p8gwTL5B7NlUdh_dmSviPWrw", "client_info": `${TEST_DATA_CLIENT_INFO.TEST_RAW_CLIENT_INFO}` } }; ======= export const AUTHENTICATION_RESULT_DEFAULT_SCOPES = { status: 200, body: { "token_type": "Bearer", "scope": "openid profile offline_access User.Read", "expires_in": 3599, "ext_expires_in": 3599, "access_token": "thisIs.an.accessT0ken", "refresh_token": "thisIsARefreshT0ken", "id_token": "eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiIsImtpZCI6IjFMVE16YWtpaGlSbGFfOHoyQkVKVlhlV01xbyJ9.eyJ2ZXIiOiIyLjAiLCJpc3MiOiJodHRwczovL2xvZ2luLm1pY3Jvc29mdG9ubGluZS5jb20vOTE4ODA0MGQtNmM2Ny00YzViLWIxMTItMzZhMzA0YjY2ZGFkL3YyLjAiLCJzdWIiOiJBQUFBQUFBQUFBQUFBQUFBQUFBQUFJa3pxRlZyU2FTYUZIeTc4MmJidGFRIiwiYXVkIjoiNmNiMDQwMTgtYTNmNS00NmE3LWI5OTUtOTQwYzc4ZjVhZWYzIiwiZXhwIjoxNTM2MzYxNDExLCJpYXQiOjE1MzYyNzQ3MTEsIm5iZiI6MTUzNjI3NDcxMSwibmFtZSI6IkFiZSBMaW5jb2xuIiwicHJlZmVycmVkX3VzZXJuYW1lIjoiQWJlTGlAbWljcm9zb2Z0LmNvbSIsIm9pZCI6IjAwMDAwMDAwLTAwMDAtMDAwMC02NmYzLTMzMzJlY2E3ZWE4MSIsInRpZCI6IjMzMzgwNDBkLTZjNjctNGM1Yi1iMTEyLTM2YTMwNGI2NmRhZCIsIm5vbmNlIjoiMTIzNTIzIiwiYWlvIjoiRGYyVVZYTDFpeCFsTUNXTVNPSkJjRmF0emNHZnZGR2hqS3Y4cTVnMHg3MzJkUjVNQjVCaXN2R1FPN1lXQnlqZDhpUURMcSFlR2JJRGFreXA1bW5PcmNkcUhlWVNubHRlcFFtUnA2QUlaOGpZIn0=.1AFWW-Ck5nROwSlltm7GzZvDwUkqvhSQpm55TQsmVo9Y59cLhRXpvB8n-55HCr9Z6G_31_UbeUkoz612I2j_Sm9FFShSDDjoaLQr54CreGIJvjtmS3EkK9a7SJBbcpL1MpUtlfygow39tFjY7EVNW9plWUvRrTgVk7lYLprvfzw-CIqw3gHC-T7IK_m_xkr08INERBtaecwhTeN4chPC4W3jdmw_lIxzC48YoQ0dB1L9-ImX98Egypfrlbm0IBL5spFzL6JDZIRRJOu8vecJvj1mq-IUhGt0MacxX8jdxYLP-KUu2d9MbNKpCKJuZ7p8gwTL5B7NlUdh_dmSviPWrw", "client_info": `${TEST_DATA_CLIENT_INFO.TEST_RAW_CLIENT_INFO}` } }; export const CONFIDENTIAL_CLIENT_AUTHENTICATION_RESULT = { status: 200, body: { "token_type": "Bearer", "expires_in": 3599, "ext_expires_in": 3599, "access_token": "thisIs.an.accessT0ken", } }; >>>>>>> export const POP_AUTHENTICATION_RESULT = { status: 200, body: { "token_type": "pop", "scope": "openid profile User.Read email", "expires_in": 3599, "ext_expires_in": 3599, "access_token": `${TEST_POP_VALUES.SAMPLE_POP_AT}`, "refresh_token": "thisIsARefreshT0ken", "id_token": "eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiIsImtpZCI6IjFMVE16YWtpaGlSbGFfOHoyQkVKVlhlV01xbyJ9.eyJ2ZXIiOiIyLjAiLCJpc3MiOiJodHRwczovL2xvZ2luLm1pY3Jvc29mdG9ubGluZS5jb20vOTE4ODA0MGQtNmM2Ny00YzViLWIxMTItMzZhMzA0YjY2ZGFkL3YyLjAiLCJzdWIiOiJBQUFBQUFBQUFBQUFBQUFBQUFBQUFJa3pxRlZyU2FTYUZIeTc4MmJidGFRIiwiYXVkIjoiNmNiMDQwMTgtYTNmNS00NmE3LWI5OTUtOTQwYzc4ZjVhZWYzIiwiZXhwIjoxNTM2MzYxNDExLCJpYXQiOjE1MzYyNzQ3MTEsIm5iZiI6MTUzNjI3NDcxMSwibmFtZSI6IkFiZSBMaW5jb2xuIiwicHJlZmVycmVkX3VzZXJuYW1lIjoiQWJlTGlAbWljcm9zb2Z0LmNvbSIsIm9pZCI6IjAwMDAwMDAwLTAwMDAtMDAwMC02NmYzLTMzMzJlY2E3ZWE4MSIsInRpZCI6IjMzMzgwNDBkLTZjNjctNGM1Yi1iMTEyLTM2YTMwNGI2NmRhZCIsIm5vbmNlIjoiMTIzNTIzIiwiYWlvIjoiRGYyVVZYTDFpeCFsTUNXTVNPSkJjRmF0emNHZnZGR2hqS3Y4cTVnMHg3MzJkUjVNQjVCaXN2R1FPN1lXQnlqZDhpUURMcSFlR2JJRGFreXA1bW5PcmNkcUhlWVNubHRlcFFtUnA2QUlaOGpZIn0=.1AFWW-Ck5nROwSlltm7GzZvDwUkqvhSQpm55TQsmVo9Y59cLhRXpvB8n-55HCr9Z6G_31_UbeUkoz612I2j_Sm9FFShSDDjoaLQr54CreGIJvjtmS3EkK9a7SJBbcpL1MpUtlfygow39tFjY7EVNW9plWUvRrTgVk7lYLprvfzw-CIqw3gHC-T7IK_m_xkr08INERBtaecwhTeN4chPC4W3jdmw_lIxzC48YoQ0dB1L9-ImX98Egypfrlbm0IBL5spFzL6JDZIRRJOu8vecJvj1mq-IUhGt0MacxX8jdxYLP-KUu2d9MbNKpCKJuZ7p8gwTL5B7NlUdh_dmSviPWrw", "client_info": `${TEST_DATA_CLIENT_INFO.TEST_RAW_CLIENT_INFO}` } }; export const AUTHENTICATION_RESULT_DEFAULT_SCOPES = { status: 200, body: { "token_type": "Bearer", "scope": "openid profile offline_access User.Read", "expires_in": 3599, "ext_expires_in": 3599, "access_token": "thisIs.an.accessT0ken", "refresh_token": "thisIsARefreshT0ken", "id_token": "eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiIsImtpZCI6IjFMVE16YWtpaGlSbGFfOHoyQkVKVlhlV01xbyJ9.eyJ2ZXIiOiIyLjAiLCJpc3MiOiJodHRwczovL2xvZ2luLm1pY3Jvc29mdG9ubGluZS5jb20vOTE4ODA0MGQtNmM2Ny00YzViLWIxMTItMzZhMzA0YjY2ZGFkL3YyLjAiLCJzdWIiOiJBQUFBQUFBQUFBQUFBQUFBQUFBQUFJa3pxRlZyU2FTYUZIeTc4MmJidGFRIiwiYXVkIjoiNmNiMDQwMTgtYTNmNS00NmE3LWI5OTUtOTQwYzc4ZjVhZWYzIiwiZXhwIjoxNTM2MzYxNDExLCJpYXQiOjE1MzYyNzQ3MTEsIm5iZiI6MTUzNjI3NDcxMSwibmFtZSI6IkFiZSBMaW5jb2xuIiwicHJlZmVycmVkX3VzZXJuYW1lIjoiQWJlTGlAbWljcm9zb2Z0LmNvbSIsIm9pZCI6IjAwMDAwMDAwLTAwMDAtMDAwMC02NmYzLTMzMzJlY2E3ZWE4MSIsInRpZCI6IjMzMzgwNDBkLTZjNjctNGM1Yi1iMTEyLTM2YTMwNGI2NmRhZCIsIm5vbmNlIjoiMTIzNTIzIiwiYWlvIjoiRGYyVVZYTDFpeCFsTUNXTVNPSkJjRmF0emNHZnZGR2hqS3Y4cTVnMHg3MzJkUjVNQjVCaXN2R1FPN1lXQnlqZDhpUURMcSFlR2JJRGFreXA1bW5PcmNkcUhlWVNubHRlcFFtUnA2QUlaOGpZIn0=.1AFWW-Ck5nROwSlltm7GzZvDwUkqvhSQpm55TQsmVo9Y59cLhRXpvB8n-55HCr9Z6G_31_UbeUkoz612I2j_Sm9FFShSDDjoaLQr54CreGIJvjtmS3EkK9a7SJBbcpL1MpUtlfygow39tFjY7EVNW9plWUvRrTgVk7lYLprvfzw-CIqw3gHC-T7IK_m_xkr08INERBtaecwhTeN4chPC4W3jdmw_lIxzC48YoQ0dB1L9-ImX98Egypfrlbm0IBL5spFzL6JDZIRRJOu8vecJvj1mq-IUhGt0MacxX8jdxYLP-KUu2d9MbNKpCKJuZ7p8gwTL5B7NlUdh_dmSviPWrw", "client_info": `${TEST_DATA_CLIENT_INFO.TEST_RAW_CLIENT_INFO}` } }; export const CONFIDENTIAL_CLIENT_AUTHENTICATION_RESULT = { status: 200, body: { "token_type": "Bearer", "expires_in": 3599, "ext_expires_in": 3599, "access_token": "thisIs.an.accessT0ken", } };
<<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "POST" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "POST" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "POST" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "POST" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "POST" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "POST" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "POST" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "POST" }); let statusCode = operationRes.status;
<<<<<<< return popupWindow; } catch (e) { this.logger.error("error opening popup " + e.message); this.loginInProgress = false; this.acquireTokenInProgress = false; throw ClientAuthError.createPopupWindowError(e.toString()); } } //#endregion //#region Iframe Management /** * @hidden * Returns whether current window is in ifram for token renewal * @ignore */ public isInIframe() { return window.parent !== window; } /** * @hidden * Returns whether parent window exists and has msal */ private parentIsMsal() { return window.parent !== window && window.parent.msal; } /** * @hidden * Calling _loadFrame but with a timeout to signal failure in loadframeStatus. Callbacks are left. * registered when network errors occur and subsequent token requests for same resource are registered to the pending request. * @ignore */ private loadIframeTimeout(urlNavigate: string, frameName: string, scope: string): void { //set iframe session to pending const expectedState = window.activeRenewals[scope]; this.logger.verbose("Set loading state to pending for: " + scope + ":" + expectedState); this.cacheStorage.setItem(Constants.renewStatus + expectedState, Constants.tokenRenewStatusInProgress); this.loadFrame(urlNavigate, frameName); setTimeout(() => { if (this.cacheStorage.getItem(Constants.renewStatus + expectedState) === Constants.tokenRenewStatusInProgress) { // fail the iframe session if it's in pending state this.logger.verbose("Loading frame has timed out after: " + (this.config.system.loadFrameTimeout / 1000) + " seconds for scope " + scope + ":" + expectedState); // Error after timeout if (expectedState && window.callbackMappedToRenewStates[expectedState]) { window.callbackMappedToRenewStates[expectedState](null, ClientAuthError.createTokenRenewalTimeoutError()); } ======= const pollTimer = window.setInterval(() => { // If popup closed or login in progress, cancel login if (popupWindow && popupWindow.closed && (instance.loginInProgress || instance.acquireTokenInProgress)) { if (reject) { reject(ClientAuthError.createUserCancelledError()); } window.clearInterval(pollTimer); if (this.config.framework.isAngular) { this.broadcast("msal:popUpClosed", ClientAuthErrorMessage.userCancelledError.code + Constants.resourceDelimiter + ClientAuthErrorMessage.userCancelledError.desc); return; } instance.loginInProgress = false; instance.acquireTokenInProgress = false; } >>>>>>> const pollTimer = window.setInterval(() => { // If popup closed or login in progress, cancel login if (popupWindow && popupWindow.closed && (instance.loginInProgress || instance.acquireTokenInProgress)) { if (reject) { reject(ClientAuthError.createUserCancelledError()); } window.clearInterval(pollTimer); if (this.config.framework.isAngular) { this.broadcast("msal:popUpClosed", ClientAuthErrorMessage.userCancelledError.code + Constants.resourceDelimiter + ClientAuthErrorMessage.userCancelledError.desc); return; } instance.loginInProgress = false; instance.acquireTokenInProgress = false; } <<<<<<< if (window.frames && window.frames[iframeId]) { adalFrame = window.frames[iframeId]; } } return adalFrame; } //#endregion //#region General Helpers /** * @hidden * Used to redirect the browser to the STS authorization endpoint * @param {string} urlNavigate - URL of the authorization endpoint */ private navigateWindow(urlNavigate: string, popupWindow?: Window) { // Navigate if valid URL if (urlNavigate && !StringUtils.isEmpty(urlNavigate)) { const navigateWindow: Window = popupWindow ? popupWindow : window; const logMessage: string = popupWindow ? "Navigated Popup window to:" + urlNavigate : "Navigate to:" + urlNavigate; this.logger.infoPii(logMessage); navigateWindow.location.replace(urlNavigate); } else { this.logger.info("Navigate url is empty"); throw AuthError.createUnexpectedError("Navigate url is empty"); } } /** * @hidden * Used to add the developer requested callback to the array of callbacks for the specified scopes. The updated array is stored on the window object * @param {string} expectedState - Unique state identifier (guid). * @param {string} scope - Developer requested permissions. Not all scopes are guaranteed to be included in the access token returned. * @param {Function} resolve - The resolve function of the promise object. * @param {Function} reject - The reject function of the promise object. * @ignore */ private registerCallback(expectedState: string, scope: string, resolve: Function, reject: Function): void { // track active renewals window.activeRenewals[scope] = expectedState; // initialize callbacks mapped array if (!window.promiseMappedToRenewStates[expectedState]) { window.promiseMappedToRenewStates[expectedState] = []; } // indexing on the current state, push the callback params to callbacks mapped window.promiseMappedToRenewStates[expectedState].push({ resolve: resolve, reject: reject }); // Store the server response in the current window?? if (!window.callbackMappedToRenewStates[expectedState]) { window.callbackMappedToRenewStates[expectedState] = ======= if (window.frames && window.frames[iframeId]) { adalFrame = window.frames[iframeId]; } } return adalFrame; } // #endregion // #region General Helpers /** * @hidden * Used to redirect the browser to the STS authorization endpoint * @param {string} urlNavigate - URL of the authorization endpoint */ private navigateWindow(urlNavigate: string, popupWindow?: Window) { // Navigate if valid URL if (urlNavigate && !StringUtils.isEmpty(urlNavigate)) { const navigateWindow: Window = popupWindow ? popupWindow : window; const logMessage: string = popupWindow ? "Navigated Popup window to:" + urlNavigate : "Navigate to:" + urlNavigate; this.logger.infoPii(logMessage); navigateWindow.location.replace(urlNavigate); } else { this.logger.info("Navigate url is empty"); throw AuthError.createUnexpectedError("Navigate url is empty"); } } /** * @hidden * Used to add the developer requested callback to the array of callbacks for the specified scopes. The updated array is stored on the window object * @param {string} expectedState - Unique state identifier (guid). * @param {string} scope - Developer requested permissions. Not all scopes are guaranteed to be included in the access token returned. * @param {Function} resolve - The resolve function of the promise object. * @param {Function} reject - The reject function of the promise object. * @ignore */ private registerCallback(expectedState: string, scope: string, resolve: Function, reject: Function): void { // track active renewals window.activeRenewals[scope] = expectedState; // initialize callbacks mapped array if (!window.promiseMappedToRenewStates[expectedState]) { window.promiseMappedToRenewStates[expectedState] = []; } // indexing on the current state, push the callback params to callbacks mapped window.promiseMappedToRenewStates[expectedState].push({ resolve: resolve, reject: reject }); // Store the server esponse in the current window?? if (!window.callbackMappedToRenewStates[expectedState]) { window.callbackMappedToRenewStates[expectedState] = >>>>>>> if (window.frames && window.frames[iframeId]) { adalFrame = window.frames[iframeId]; } } return adalFrame; } // #endregion // #region General Helpers /** * @hidden * Used to redirect the browser to the STS authorization endpoint * @param {string} urlNavigate - URL of the authorization endpoint */ private navigateWindow(urlNavigate: string, popupWindow?: Window) { // Navigate if valid URL if (urlNavigate && !StringUtils.isEmpty(urlNavigate)) { const navigateWindow: Window = popupWindow ? popupWindow : window; const logMessage: string = popupWindow ? "Navigated Popup window to:" + urlNavigate : "Navigate to:" + urlNavigate; this.logger.infoPii(logMessage); navigateWindow.location.replace(urlNavigate); } else { this.logger.info("Navigate url is empty"); throw AuthError.createUnexpectedError("Navigate url is empty"); } } /** * @hidden * Used to add the developer requested callback to the array of callbacks for the specified scopes. The updated array is stored on the window object * @param {string} expectedState - Unique state identifier (guid). * @param {string} scope - Developer requested permissions. Not all scopes are guaranteed to be included in the access token returned. * @param {Function} resolve - The resolve function of the promise object. * @param {Function} reject - The reject function of the promise object. * @ignore */ private registerCallback(expectedState: string, scope: string, resolve: Function, reject: Function): void { // track active renewals window.activeRenewals[scope] = expectedState; // initialize callbacks mapped array if (!window.promiseMappedToRenewStates[expectedState]) { window.promiseMappedToRenewStates[expectedState] = []; } // indexing on the current state, push the callback params to callbacks mapped window.promiseMappedToRenewStates[expectedState].push({ resolve: resolve, reject: reject }); // Store the server response in the current window?? if (!window.callbackMappedToRenewStates[expectedState]) { window.callbackMappedToRenewStates[expectedState] =
<<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "PUT" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "PUT" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "PUT" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "PUT" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let statusCode = operationRes.status;
<<<<<<< contentType: "application/json; charset=utf-8", parameterTransformations: [ { sourcePath: [ "product", "provisioningState" ], targetPath: [ "provisioningState" ] } ] ======= contentType: "application/json; charset=utf-8", serializer: this.serializer >>>>>>> contentType: "application/json; charset=utf-8", parameterTransformations: [ { sourcePath: [ "product", "provisioningState" ], targetPath: [ "provisioningState" ] } ], serializer: this.serializer <<<<<<< contentType: "application/json; charset=utf-8", parameterTransformations: [ { sourcePath: [ "product", "provisioningState" ], targetPath: [ "provisioningState" ] } ] ======= contentType: "application/json; charset=utf-8", serializer: this.serializer >>>>>>> contentType: "application/json; charset=utf-8", parameterTransformations: [ { sourcePath: [ "product", "provisioningState" ], targetPath: [ "provisioningState" ] } ], serializer: this.serializer
<<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "PUT" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "PUT" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "PUT" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "PUT" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "PUT" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "PUT" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "PUT" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "PUT" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "PUT" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "PUT" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let statusCode = operationRes.status;
<<<<<<< contentType: "application/json; charset=utf-8", parameterTransformations: [ { sourcePath: [ "complexBody", "field" ], targetPath: [ "field" ] } ] ======= contentType: "application/json; charset=utf-8", serializer: this.serializer >>>>>>> contentType: "application/json; charset=utf-8", parameterTransformations: [ { sourcePath: [ "complexBody", "field" ], targetPath: [ "field" ] } ], serializer: this.serializer <<<<<<< contentType: "application/json; charset=utf-8", parameterTransformations: [ { sourcePath: [ "complexBody", "field" ], targetPath: [ "field" ] } ] ======= contentType: "application/json; charset=utf-8", serializer: this.serializer >>>>>>> contentType: "application/json; charset=utf-8", parameterTransformations: [ { sourcePath: [ "complexBody", "field" ], targetPath: [ "field" ] } ], serializer: this.serializer
<<<<<<< } catch (err) { this.logger.warning("could not resolve endpoints"); ======= }).catch((err) => { this.logger.error(err); >>>>>>> } catch (err) { this.logger.error(err); <<<<<<< } } catch (err) { this.logger.warning("could not resolve endpoints"); reject(ClientAuthError.createEndpointResolutionError(err.toString())); return null; } ======= }).catch((err) => { this.logger.error(err); reject(ClientAuthError.createEndpointResolutionError(err.toString())); return null; }); >>>>>>> } } catch (err) { this.logger.error(err); reject(ClientAuthError.createEndpointResolutionError(err.toString())); return null; }
<<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "HEAD" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "HEAD" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "PUT" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "PUT" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "PATCH" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "PATCH" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "GET" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "POST" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "POST" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "DELETE" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "DELETE" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "PUT" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "PUT" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "PATCH" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "PATCH" }); let statusCode = operationRes.status;
<<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "PUT" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "PUT" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "PUT" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "PUT" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "PUT" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "PUT" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "PUT" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "PUT" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "DELETE" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "DELETE" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "DELETE" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "DELETE" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "DELETE" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "DELETE" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "POST" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "POST" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "POST" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "POST" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "POST" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "POST" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "PUT" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "PUT" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "PUT" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "PUT" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "PUT" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "PUT" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "DELETE" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "DELETE" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "DELETE" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "DELETE" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "POST" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "POST" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "POST" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "POST" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "PUT" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "PUT" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "PUT" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "PUT" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "PUT" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "PUT" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "DELETE" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "DELETE" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "DELETE" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "DELETE" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "DELETE" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "DELETE" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "POST" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "POST" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "POST" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "POST" }); let statusCode = operationRes.status; <<<<<<< operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "POST" }); let response = operationRes.response; let statusCode = response.status; ======= operationRes = await client.sendRequest(httpRequest); let statusCode = operationRes.status; >>>>>>> operationRes = await client.sendOperationRequest(httpRequest, { httpMethod: "POST" }); let statusCode = operationRes.status;