conflict_resolution
stringlengths 27
16k
|
|---|
<<<<<<<
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: "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; |
<<<<<<<
contentType: "application/json; charset=utf-8",
parameterTransformations: [
{
sourcePath: [
"complexBody",
"defaultProgram"
],
targetPath: [
"defaultProgram"
]
}
]
=======
contentType: "application/json; charset=utf-8",
serializer: this.serializer
>>>>>>>
contentType: "application/json; charset=utf-8",
parameterTransformations: [
{
sourcePath: [
"complexBody",
"defaultProgram"
],
targetPath: [
"defaultProgram"
]
}
],
serializer: this.serializer
<<<<<<<
contentType: "application/json; charset=utf-8",
parameterTransformations: [
{
sourcePath: [
"complexBody",
"defaultProgram"
],
targetPath: [
"defaultProgram"
]
}
]
=======
contentType: "application/json; charset=utf-8",
serializer: this.serializer
>>>>>>>
contentType: "application/json; charset=utf-8",
parameterTransformations: [
{
sourcePath: [
"complexBody",
"defaultProgram"
],
targetPath: [
"defaultProgram"
]
}
],
serializer: this.serializer |
<<<<<<<
import { TokenProcessor } from "./TokenProcessor";
=======
import { StringDict } from "./MsalTypes";
>>>>>>>
import { TokenProcessor } from "./TokenProcessor";
import { StringDict } from "./MsalTypes";
<<<<<<<
this.decodedIdToken = TokenProcessor.extractIdToken(rawIdToken);
if (this.decodedIdToken) {
if (this.decodedIdToken.hasOwnProperty("iss")) {
this.issuer = this.decodedIdToken["iss"];
=======
this.claims = Utils.extractIdToken(rawIdToken);
if (this.claims) {
if (this.claims.hasOwnProperty("iss")) {
this.issuer = this.claims["iss"];
>>>>>>>
this.claims = TokenProcessor.extractIdToken(rawIdToken);
if (this.claims) {
if (this.claims.hasOwnProperty("iss")) {
this.issuer = this.claims["iss"]; |
<<<<<<<
contentType: "application/json; charset=utf-8",
parameterTransformations: [
{
sourcePath: [
"bodyParameter",
"productDictionaryOfArray"
],
targetPath: [
"productDictionaryOfArray"
]
}
]
=======
contentType: "application/json; charset=utf-8",
serializer: this.serializer
>>>>>>>
contentType: "application/json; charset=utf-8",
parameterTransformations: [
{
sourcePath: [
"bodyParameter",
"productDictionaryOfArray"
],
targetPath: [
"productDictionaryOfArray"
]
}
],
serializer: this.serializer
<<<<<<<
contentType: "application/json; charset=utf-8",
parameterTransformations: [
{
sourcePath: [
"bodyParameter",
"productArrayOfDictionary"
],
targetPath: [
"productArrayOfDictionary"
]
}
]
=======
contentType: "application/json; charset=utf-8",
serializer: this.serializer
>>>>>>>
contentType: "application/json; charset=utf-8",
parameterTransformations: [
{
sourcePath: [
"bodyParameter",
"productArrayOfDictionary"
],
targetPath: [
"productArrayOfDictionary"
]
}
],
serializer: this.serializer |
<<<<<<<
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: "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: "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: "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: "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: "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: "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: "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; |
<<<<<<<
it('navigates user to login and prompt parameter is passed in request', (done) => {
=======
it('navigates user to login and prompt=select_account parameter is passed as extraQueryParameter', (done) => {
msal.handleRedirectCallbacks(successCallback, errCallback);
>>>>>>>
it('navigates user to login and prompt=select_account parameter is passed in request', (done) => {
msal.handleRedirectCallbacks(successCallback, errCallback);
<<<<<<<
it('navigates user to login and prompt parameter is passed in request', (done) => {
=======
it('navigates user to login and prompt=none parameter is passed as extraQueryParameter', (done) => {
msal.handleRedirectCallbacks(successCallback, errCallback);
>>>>>>>
it('navigates user to login and prompt=none parameter is passed in request', (done) => {
msal.handleRedirectCallbacks(successCallback, errCallback); |
<<<<<<<
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: [
"bodyParameter",
"value"
],
targetPath: [
"value"
]
}
]
=======
contentType: "application/json; charset=utf-8",
serializer: this.serializer
>>>>>>>
contentType: "application/json; charset=utf-8",
parameterTransformations: [
{
sourcePath: [
"bodyParameter",
"value"
],
targetPath: [
"value"
]
}
],
serializer: this.serializer
<<<<<<<
contentType: "application/json; charset=utf-8",
parameterTransformations: [
{
sourcePath: [
"bodyParameter",
"value"
],
targetPath: [
"value"
]
}
]
=======
contentType: "application/json; charset=utf-8",
serializer: this.serializer
>>>>>>>
contentType: "application/json; charset=utf-8",
parameterTransformations: [
{
sourcePath: [
"bodyParameter",
"value"
],
targetPath: [
"value"
]
}
],
serializer: this.serializer
<<<<<<<
contentType: "application/json; charset=utf-8",
parameterTransformations: [
{
sourcePath: [
"bodyParameter",
"value"
],
targetPath: [
"value"
]
}
]
=======
contentType: "application/json; charset=utf-8",
serializer: this.serializer
>>>>>>>
contentType: "application/json; charset=utf-8",
parameterTransformations: [
{
sourcePath: [
"bodyParameter",
"value"
],
targetPath: [
"value"
]
}
],
serializer: this.serializer
<<<<<<<
contentType: "application/json; charset=utf-8",
parameterTransformations: [
{
sourcePath: [
"bodyParameter",
"value"
],
targetPath: [
"value"
]
}
]
=======
contentType: "application/json; charset=utf-8",
serializer: this.serializer
>>>>>>>
contentType: "application/json; charset=utf-8",
parameterTransformations: [
{
sourcePath: [
"bodyParameter",
"value"
],
targetPath: [
"value"
]
}
],
serializer: this.serializer
<<<<<<<
contentType: "application/json; charset=utf-8",
parameterTransformations: [
{
sourcePath: [
"bodyParameter",
"value"
],
targetPath: [
"value"
]
}
]
=======
contentType: "application/json; charset=utf-8",
serializer: this.serializer
>>>>>>>
contentType: "application/json; charset=utf-8",
parameterTransformations: [
{
sourcePath: [
"bodyParameter",
"value"
],
targetPath: [
"value"
]
}
],
serializer: this.serializer
<<<<<<<
contentType: "application/json; charset=utf-8",
parameterTransformations: [
{
sourcePath: [
"bodyParameter",
"value"
],
targetPath: [
"value"
]
}
]
=======
contentType: "application/json; charset=utf-8",
serializer: this.serializer
>>>>>>>
contentType: "application/json; charset=utf-8",
parameterTransformations: [
{
sourcePath: [
"bodyParameter",
"value"
],
targetPath: [
"value"
]
}
],
serializer: this.serializer
<<<<<<<
contentType: "application/json; charset=utf-8",
parameterTransformations: [
{
sourcePath: [
"bodyParameter",
"value"
],
targetPath: [
"value"
]
}
]
=======
contentType: "application/json; charset=utf-8",
serializer: this.serializer
>>>>>>>
contentType: "application/json; charset=utf-8",
parameterTransformations: [
{
sourcePath: [
"bodyParameter",
"value"
],
targetPath: [
"value"
]
}
],
serializer: this.serializer
<<<<<<<
contentType: "application/json; charset=utf-8",
parameterTransformations: [
{
sourcePath: [
"bodyParameter",
"value"
],
targetPath: [
"value"
]
}
]
=======
contentType: "application/json; charset=utf-8",
serializer: this.serializer
>>>>>>>
contentType: "application/json; charset=utf-8",
parameterTransformations: [
{
sourcePath: [
"bodyParameter",
"value"
],
targetPath: [
"value"
]
}
],
serializer: this.serializer |
<<<<<<<
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: "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: "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: "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: "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: "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: "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: "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: "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: "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: "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; |
<<<<<<<
import { ITenantDiscoveryResponse, OpenIdConfiguration } from './ITenantDiscoveryResponse';
import TelemetryManager from '../telemetry/TelemetryManager';
import { XhrClient, XhrResponse } from '../XHRClient';
import HttpEvent from '../telemetry/HttpEvent';
=======
import { ITenantDiscoveryResponse, OpenIdConfiguration } from "./ITenantDiscoveryResponse";
import TelemetryManager from "../telemetry/TelemetryManager";
>>>>>>>
import { ITenantDiscoveryResponse, OpenIdConfiguration } from './ITenantDiscoveryResponse';
import TelemetryManager from '../telemetry/TelemetryManager';
import { XhrClient, XhrResponse } from '../XHRClient';
import HttpEvent from '../telemetry/HttpEvent';
<<<<<<<
private static metadataMap = new Map<string, ITenantDiscoveryResponse>();
public static async resolveAuthorityAsync(authorityInstance: Authority, telemetryManager: TelemetryManager, correlationId: string): Promise<ITenantDiscoveryResponse> {
const metadata = await authorityInstance.resolveEndpointsAsync(telemetryManager, correlationId);
this.metadataMap.set(authorityInstance.CanonicalAuthority, metadata);
return metadata;
}
public static getAuthorityMetadata(authorityUrl: string) {
return this.metadataMap.get(authorityUrl);
}
public static parseAuthorityMetadata(authorityUrl: string, authorityMetadataJson: string) {
try {
if (authorityMetadataJson) {
const parsedMetadata = JSON.parse(authorityMetadataJson) as OpenIdConfiguration;
if (!parsedMetadata.authorization_endpoint || !parsedMetadata.end_session_endpoint || !parsedMetadata.issuer) {
throw ClientConfigurationError.createInvalidAuthorityMetadataError();
}
this.metadataMap.set(authorityUrl, {
AuthorizationEndpoint: parsedMetadata.authorization_endpoint,
EndSessionEndpoint: parsedMetadata.end_session_endpoint,
Issuer: parsedMetadata.issuer
});
}
} catch (e) {
throw ClientConfigurationError.createInvalidAuthorityMetadataError();
}
}
=======
private static metadataMap = new Map<string, ITenantDiscoveryResponse>();
>>>>>>>
private static metadataMap = new Map<string, ITenantDiscoveryResponse>();
public static async saveMetadataFromNetwork(authorityInstance: Authority, telemetryManager: TelemetryManager, correlationId: string): Promise<ITenantDiscoveryResponse> {
const metadata = await authorityInstance.resolveEndpointsAsync(telemetryManager, correlationId);
this.metadataMap.set(authorityInstance.CanonicalAuthority, metadata);
return metadata;
}
public static getMetadata(authorityUrl: string) {
return this.metadataMap.get(authorityUrl);
}
public static saveMetadataFromConfig(authorityUrl: string, authorityMetadataJson: string) {
try {
if (authorityMetadataJson) {
const parsedMetadata = JSON.parse(authorityMetadataJson) as OpenIdConfiguration;
if (!parsedMetadata.authorization_endpoint || !parsedMetadata.end_session_endpoint || !parsedMetadata.issuer) {
throw ClientConfigurationError.createInvalidAuthorityMetadataError();
}
this.metadataMap.set(authorityUrl, {
AuthorizationEndpoint: parsedMetadata.authorization_endpoint,
EndSessionEndpoint: parsedMetadata.end_session_endpoint,
Issuer: parsedMetadata.issuer
});
}
} catch (e) {
throw ClientConfigurationError.createInvalidAuthorityMetadataError();
}
}
<<<<<<<
private static async getAliases(telemetryManager: TelemetryManager, correlationId?: string): Promise<Array<any>> {
const client: XhrClient = new XhrClient();
=======
public static async saveMetadataFromNetwork(authorityInstance: Authority, telemetryManager: TelemetryManager, correlationId: string): Promise<ITenantDiscoveryResponse> {
const metadata = await authorityInstance.resolveEndpointsAsync(telemetryManager, correlationId);
this.metadataMap.set(authorityInstance.CanonicalAuthority, metadata);
return metadata;
}
public static getMetadata(authorityUrl: string) {
return this.metadataMap.get(authorityUrl);
}
public static saveMetadataFromConfig(authorityUrl: string, authorityMetadataJson: string) {
try {
if (authorityMetadataJson) {
const parsedMetadata = JSON.parse(authorityMetadataJson) as OpenIdConfiguration;
if (!parsedMetadata.authorization_endpoint || !parsedMetadata.end_session_endpoint || !parsedMetadata.issuer) {
throw ClientConfigurationError.createInvalidAuthorityMetadataError();
}
this.metadataMap.set(authorityUrl, {
AuthorizationEndpoint: parsedMetadata.authorization_endpoint,
EndSessionEndpoint: parsedMetadata.end_session_endpoint,
Issuer: parsedMetadata.issuer
});
}
} catch (e) {
throw ClientConfigurationError.createInvalidAuthorityMetadataError();
}
}
/**
* Parse the url and determine the type of authority
*/
private static detectAuthorityFromUrl(authorityUrl: string): AuthorityType {
authorityUrl = UrlUtils.CanonicalizeUri(authorityUrl);
const components = UrlUtils.GetUrlComponents(authorityUrl);
const pathSegments = components.PathSegments;
>>>>>>>
private static async getAliases(telemetryManager: TelemetryManager, correlationId?: string): Promise<Array<any>> {
const client: XhrClient = new XhrClient();
<<<<<<<
private static async setTrustedAuthoritiesFromNetwork(telemetryManager: TelemetryManager, correlationId?: string): Promise<void> {
const metadata = await this.getAliases(telemetryManager, correlationId);
metadata.forEach(function(entry: any){
const authorities: Array<string> = entry.aliases;
authorities.forEach(function(authority: string) {
Authority.TrustedHostList.push(authority);
});
});
}
=======
// Defaults to Aad
return AuthorityType.Aad;
}
>>>>>>>
private static async setTrustedAuthoritiesFromNetwork(telemetryManager: TelemetryManager, correlationId?: string): Promise<void> {
const metadata = await this.getAliases(telemetryManager, correlationId);
metadata.forEach(function(entry: any){
const authorities: Array<string> = entry.aliases;
authorities.forEach(function(authority: string) {
Authority.TrustedHostList.push(authority);
});
});
}
<<<<<<<
if (authorityMetadata) {
// todo: log statements
this.parseAuthorityMetadata(authorityUrl, authorityMetadata);
=======
if (authorityMetadata) {
// todo: log statements
this.saveMetadataFromConfig(authorityUrl, authorityMetadata);
}
const type = AuthorityFactory.detectAuthorityFromUrl(authorityUrl);
// Depending on above detection, create the right type.
switch (type) {
case AuthorityType.B2C:
return new B2cAuthority(authorityUrl, validateAuthority, this.getMetadata(authorityUrl));
case AuthorityType.Aad:
return new AadAuthority(authorityUrl, validateAuthority, this.getMetadata(authorityUrl));
default:
throw ClientConfigurationError.createInvalidAuthorityTypeError();
>>>>>>>
if (authorityMetadata) {
// todo: log statements
this.saveMetadataFromConfig(authorityUrl, authorityMetadata); |
<<<<<<<
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: "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; |
<<<<<<<
const TEST_NONCE = "123523";
const IDTOKEN_OBJECT = "00000000-0000-0000-66f3-3332eca7ea81";
const TEST_UNIQUE_ID = IDTOKEN_OBJECT;
=======
const TEST_NONCE = "test_nonce";
const TEST_UNIQUE_ID = "248289761001";
// Test Client Info Params
const TEST_UID = "123-test-uid";
const TEST_UTID = "456-test-utid";
const TEST_DECODED_CLIENT_INFO = `{"uid":"123-test-uid","utid":"456-test-utid"}`;
const TEST_INVALID_JSON_CLIENT_INFO = `{"uid":"${TEST_UID}""utid":"${TEST_UTID}"`;
const TEST_RAW_CLIENT_INFO = "eyJ1aWQiOiIxMjMtdGVzdC11aWQiLCJ1dGlkIjoiNDU2LXRlc3QtdXRpZCJ9";
const TEST_CLIENT_INFO_B64ENCODED = "eyJ1aWQiOiIxMjM0NSIsInV0aWQiOiI2Nzg5MCJ9";
// Test Account Params
const TEST_HOME_ACCOUNT_ID = "MTIzLXRlc3QtdWlk.NDU2LXRlc3QtdXRpZA==";
// Test Expiration Vals
const DEFAULT_EXPIRES_IN = 3599;
const BASELINE_DATE_CHECK = Utils.now();
const TEST_ID_TOKEN_ISSUED = 1561749650;
>>>>>>>
const TEST_NONCE = "123523";
const IDTOKEN_OID = "00000000-0000-0000-66f3-3332eca7ea81";
const TEST_UNIQUE_ID = IDTOKEN_OID;
<<<<<<<
=======
const TEST_ID_TOKEN = "eyJraWQiOiIxZTlnZGs3IiwiYWxnIjoiUlMyNTYifQ"
+ ".ewogImlzcyI6ICJodHRwOi8vc2VydmVyLmV4YW1wbGUuY29tIiwKICJzdWIiOiAiMjQ4Mjg5NzYxMDAxIiwKICJhdWQiOiAiczZCaGRSa3F0MyIsCiAibm9uY2UiOiAidGVzdF9ub25jZSIsCiAiZXhwIjogMTU2MTc0OTY1MCwKICJpYXQiOiAxNTYxNzQ5NjUwLAogIm5hbWUiOiAiSmFuZSBEb2UiLAogImdpdmVuX25hbWUiOiAiSmFuZSIsCiAiZmFtaWx5X25hbWUiOiAiRG9lIiwKICJnZW5kZXIiOiAiZmVtYWxlIiwKICJ0aWQiOiAiMTI0ZHMzMjQtNDNkZS1uODltLTc0NzctNDY2ZmVmczQ1YTg1IiwKICJiaXJ0aGRhdGUiOiAiMDAwMC0xMC0zMSIsCiAiZW1haWwiOiAiamFuZWRvZUBleGFtcGxlLmNvbSIsCiAicGljdHVyZSI6ICJodHRwOi8vZXhhbXBsZS5jb20vamFuZWRvZS9tZS5qcGciCn0="
+ ".rHQjEmBqn9Jre0OLykYNnspA10Qql2rvx4FsD00jwlB0Sym4NzpgvPKsDjn_wMkHxcp6CilPcoKrWHcipR2iAjzLvDNAReF97zoJqq880ZD1bwY82JDauCXELVR9O6_B0w3K-E7yM2macAAgNCUwtik6SjoSUZRcf-O5lygIyLENx882p6MtmwaL1hd6qn5RZOQ0TLrOYu0532g9Exxcm-ChymrB4xLykpDj3lUivJt63eEGGN6DH5K6o33TcxkIjNrCD4XB1CKKumZvCedgHHF3IAK4dVEDSUoGlH9z4pP_eWYNXvqQOjGs-rDaQzUHl6cQQWNiDpWOl_lxXjQEvQ";
const TEST_ACCESS_TOKEN = "eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiIsImtpZCI6IjFMVE16YWtpaGlSbGFfOHoyQkVKVlhlV01xbyJ9"
+ ".eyJ2ZXIiOiIyLjAiLCJpc3MiOiJodHRwOi8vc2VydmVyLmV4YW1wbGUuY29tIiwic3ViIjoiMjQ4Mjg5NzYxMDAxIiwiYXVkIjoiczZCaGRSa3F0MyIsImV4cCI6MTU2MTc0OTY1MCwiaWF0IjoxNTYxNzQ1NzUwLCJuYmYiOjE1NjE3NDU3NTAsIm5hbWUiOiJKYW5lIERvZSIsInByZWZlcnJlZF91c2VybmFtZSI6ImphbmVkb2VAZXhhbXBsZS5jb20iLCJvaWQiOiIwMDAwMDAwMC0wMDAwLTAwMDAtMTIzNC0xMjM0NWFlNjc4OSIsInRpZCI6Inh4eHh4eC14eHh4LXh4eHgteHh4eHgiLCJzY3AiOiJ0ZXN0In0="
+ ".Ztsxk8912PBaweKw0UFKcLsHL4yNnKj6MVd-ZCtKK8KxzAVCinaxepSJIlRB_p-9UBDCkFAOycbrSXYs7nA7fo9AtYxgAH5MHyuAT_K-Ev49LgD6oyLU3JLmRKthi9vVcMD2V9W93NPUxQG5JHhiruMAGDY4ISg0sD9MICZr0SMFlRxvhiEWkWuWwYhgctmOoB6dn17qrQEmTlQnZZlvQ2gLflBJmvvQ6OQxTFZi_5QxVBJkc6wyP4gArIfjUmeHK8Y9_WTTrCf7ZBNUyOvRVN4QTcl1JpYlIlU2GTg-QChpkiqQ8Weu4QaZFb_7UwLf7rnZeBKpEeBtVfsIqF39zw";
>>>>>>>
<<<<<<<
const TEST_ERROR_DESC = "msal error description";
// Test SSO params
const TEST_LOGIN_HINT = "[email protected]";
const TEST_SID = "1234-5678";
=======
const TEST_ERROR_DESC = "msal error description";
// Test Hashes
const TEST_SUCCESS_ID_TOKEN_HASH = `#id_token=${TEST_ID_TOKEN}&client_info=${TEST_RAW_CLIENT_INFO}&state=RANDOM-GUID-HERE|`;
const TEST_SUCCESS_ACCESS_TOKEN_HASH = `#access_token=${TEST_ACCESS_TOKEN}&id_token=${TEST_ID_TOKEN}&scope=test&expiresIn=${DEFAULT_EXPIRES_IN}&client_info=${TEST_RAW_CLIENT_INFO}&state=RANDOM-GUID-HERE|`;
const TEST_ERROR_HASH = "#error=error_code&error_description=msal+error+description&state=RANDOM-GUID-HERE|";
const TEST_INTERACTION_REQ_ERROR_HASH1 = "#error=interaction_required&error_description=msal+error+description&state=RANDOM-GUID-HERE|";
const TEST_INTERACTION_REQ_ERROR_HASH2 = "#error=interaction_required&error_description=msal+error+description+interaction_required&state=RANDOM-GUID-HERE|";
const TEST_LOGIN_REQ_ERROR_HASH1 = "#error=login_required&error_description=msal+error+description&state=RANDOM-GUID-HERE|";
const TEST_LOGIN_REQ_ERROR_HASH2 = "#error=login_required&error_description=msal+error+description+login_required&state=RANDOM-GUID-HERE|";
const TEST_CONSENT_REQ_ERROR_HASH1 = "#error=consent_required&error_description=msal+error+description&state=RANDOM-GUID-HERE|";
const TEST_CONSENT_REQ_ERROR_HASH2 = "#error=consent_required&error_description=msal+error+description+consent_required&state=RANDOM-GUID-HERE|";
>>>>>>>
const TEST_ERROR_DESC = "msal error description";
// Test SSO params
const TEST_LOGIN_HINT = "[email protected]";
const TEST_SID = "1234-5678";
// Test Account Params
const TEST_HOME_ACCOUNT_ID = "MTIzLXRlc3QtdWlk.NDU2LXRlc3QtdXRpZA==";
<<<<<<<
homeAccountIdentifier: "1234",
idToken: new IdToken(TEST_TOKENS.IDTOKEN_V2).claims,
idTokenClaims: new IdToken(TEST_TOKENS.IDTOKEN_V2).claims,
name: "Abe Lincoln",
=======
homeAccountIdentifier: TEST_HOME_ACCOUNT_ID,
idToken: "idToken",
name: "Test Account",
>>>>>>>
homeAccountIdentifier: TEST_HOME_ACCOUNT_ID,
idToken: new IdToken(TEST_TOKENS.IDTOKEN_V2).claims,
idTokenClaims: new IdToken(TEST_TOKENS.IDTOKEN_V2).claims,
name: "Abe Lincoln",
<<<<<<<
cacheStorage.setItem(Constants.urlHash, TEST_HASHES.TEST_SUCCESS_HASH + TEST_USER_STATE_NUM);
=======
cacheStorage.setItem(Constants.urlHash, TEST_SUCCESS_ID_TOKEN_HASH + TEST_USER_STATE_NUM);
>>>>>>>
cacheStorage.setItem(Constants.urlHash, TEST_HASHES.TEST_SUCCESS_ID_TOKEN_HASH + TEST_USER_STATE_NUM);
<<<<<<<
cacheStorage.setItem(Constants.urlHash, TEST_HASHES.TEST_SUCCESS_HASH + TEST_USER_STATE_NUM);
=======
cacheStorage.setItem(Constants.urlHash, TEST_SUCCESS_ID_TOKEN_HASH + TEST_USER_STATE_NUM);
>>>>>>>
cacheStorage.setItem(Constants.urlHash, TEST_HASHES.TEST_SUCCESS_ID_TOKEN_HASH + TEST_USER_STATE_NUM);
<<<<<<<
let successHash = TEST_HASHES.TEST_SUCCESS_HASH + TEST_USER_STATE_NUM;
=======
let successHash = TEST_SUCCESS_ID_TOKEN_HASH + TEST_USER_STATE_NUM;
>>>>>>>
let successHash = TEST_HASHES.TEST_SUCCESS_ID_TOKEN_HASH + TEST_USER_STATE_NUM; |
<<<<<<<
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: "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: "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: "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: "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: "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: "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: "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: "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: "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; |
<<<<<<<
// Initialize default authority instance
this.authority = AuthorityFactory.createInstance(this.clientConfig.auth.authority || Constants.DEFAULT_AUTHORITY, this.networkClient);
=======
B2cAuthority.setKnownAuthorities(this.config.authOptions.knownAuthorities);
>>>>>>>
// Initialize default authority instance
B2cAuthority.setKnownAuthorities(this.config.authOptions.knownAuthorities); |
<<<<<<<
=======
import { FetchClient } from "../network/FetchClient";
>>>>>>>
<<<<<<<
networkClient: null,
=======
networkClient: BrowserUtils.getBrowserNetworkClient(),
>>>>>>>
networkClient: BrowserUtils.getBrowserNetworkClient(), |
<<<<<<<
import { ConnectionProfileComponent } from './connectionprofile/connectionprofile.component.ts';
=======
import { WelcomeComponent } from './welcome';
>>>>>>>
import { ConnectionProfileComponent } from './connectionprofile/connectionprofile.component.ts';
import { WelcomeComponent } from './welcome';
<<<<<<<
AddFileComponent
=======
AddFileComponent,
WelcomeComponent
>>>>>>>
AddFileComponent,
WelcomeComponent |
<<<<<<<
import { ConfirmComponent } from '../confirm/confirm.component';
=======
import { TransactionRegistry } from 'composer-client';
>>>>>>>
import { ConfirmComponent } from '../confirm/confirm.component';
import { TransactionRegistry } from 'composer-client'; |
<<<<<<<
import {ResponsiveImageUploadDialog} from '../components/responsive-image-upload-dialog/responsive-image-upload-dialog.component';
=======
import {UploadFormComponent} from '../components/upload-form/upload-form.component';
import {FilesizePipe} from '../pipes/filesize/filesize.pipe';
import {UploadFormDialog} from '../components/upload-form-dialog/upload-form-dialog.component';
>>>>>>>
import {ResponsiveImageUploadDialog} from '../components/responsive-image-upload-dialog/responsive-image-upload-dialog.component';
import {UploadFormComponent} from '../components/upload-form/upload-form.component';
import {FilesizePipe} from '../pipes/filesize/filesize.pipe';
import {UploadFormDialog} from '../components/upload-form-dialog/upload-form-dialog.component'; |
<<<<<<<
import {SettingsComponent} from './settings/settings.component';
=======
import {StartComponent} from './start/start.component';
>>>>>>>
import {StartComponent} from './start/start.component';
import {SettingsComponent} from './settings/settings.component';
<<<<<<<
path: 'dashboard',
component: DashboardComponent,
canActivate: [AuthGuardService],
data: {roles: ['student', 'teacher', 'admin']}
},
{
path: 'settings',
component: SettingsComponent,
=======
path: 'admin/users',
component: UserRolesComponent,
>>>>>>>
path: 'settings',
component: SettingsComponent, |
<<<<<<<
transform: function (doc: IUnitModel, ret: any) {
ret._id = doc._id.toString();
=======
transform: function (doc: any, ret: any) {
ret._id = ret._id.toString();
ret._course = ret._course.toString();
>>>>>>>
transform: function (doc: IUnitModel, ret: any) {
ret._id = doc._id.toString();
ret._course = ret._course.toString(); |
<<<<<<<
return new Authority(authorityUrl, validateAuthority);
=======
if (authorityMetadata) {
// todo: log statements
this.parseAuthorityMetadata(authorityUrl, authorityMetadata);
}
const type = AuthorityFactory.detectAuthorityFromUrl(authorityUrl);
// Depending on above detection, create the right type.
switch (type) {
case AuthorityType.B2C:
return new B2cAuthority(authorityUrl, validateAuthority, this.metadataMap.get(authorityUrl));
case AuthorityType.Aad:
return new AadAuthority(authorityUrl, validateAuthority, this.metadataMap.get(authorityUrl));
default:
throw ClientConfigurationError.createInvalidAuthorityTypeError();
}
>>>>>>>
return new Authority(authorityUrl, validateAuthority, authorityMetadata); |
<<<<<<<
constructor(public dialogRef: MatDialogRef<AccessKeyDialog>) {}
=======
constructor(public dialogRef: MdDialogRef<AccessKeyDialog>) {
}
>>>>>>>
constructor(public dialogRef: MatDialogRef<AccessKeyDialog>) {
} |
<<<<<<<
import {SnackBarService} from './shared/services/snack-bar.service';
=======
import {NotfoundComponent} from './shared/components/notfound/notfound.component';
>>>>>>>
import {NotfoundComponent} from './shared/components/notfound/notfound.component';
import {SnackBarService} from './shared/services/snack-bar.service'; |
<<<<<<<
WriteMailDialog,
=======
FilepickerDialog,
>>>>>>>
FilepickerDialog,
WriteMailDialog,
<<<<<<<
WriteMailDialog,
=======
FilepickerDialog,
>>>>>>>
FilepickerDialog,
WriteMailDialog,
<<<<<<<
UploadDialog,
WriteMailDialog,
=======
UploadDialog,
FilepickerDialog,
>>>>>>>
UploadDialog,
FilepickerDialog,
WriteMailDialog, |
<<<<<<<
import {UserDataService, WhitelistUserService} from '../../../shared/services/data.service';
import {ICourse} from '../../../../../../../shared/models/ICourse';
import {IWhitelistUser} from '../../../../../../../shared/models/IWhitelistUser';
=======
import {CourseService} from '../../../shared/services/data.service';
import {MatSnackBar} from '@angular/material';
>>>>>>>
import {UserDataService, WhitelistUserService} from '../../../shared/services/data.service';
import {ICourse} from '../../../../../../../shared/models/ICourse';
import {IWhitelistUser} from '../../../../../../../shared/models/IWhitelistUser';
import {MatSnackBar} from '@angular/material';
<<<<<<<
@Output() onDragendRemove = new EventEmitter<IUser>();
@Output() onDragendPush = new EventEmitter<IUser>();
@Output() onUpdate = new EventEmitter<String>();
@Output() onSearch = new EventEmitter<String>();
search = '';
=======
selectedMembers: IUser[] = [];
fuzzySearch: String = '';
>>>>>>>
search = '';
<<<<<<<
finishRestCall = true;
=======
toggleBlocked = false;
>>>>>>>
finishRestCall = true;
@Output() onDragendRemove = new EventEmitter<IUser>();
@Output() onDragendPush = new EventEmitter<IUser>();
@Output() onUpdate = new EventEmitter<String>();
@Output() onSearch = new EventEmitter<String>();
<<<<<<<
get searchString(): string {
return this.search;
}
searchForUsers(search: string) {
this.onSearch.emit(search);
if (search !== '' && this.finishRestCall) {
this.finishRestCall = false;
this.userService.searchUsers(this.role, search).then((found: User[]) => {
if (found) {
const idList: string[] = this.course.students.map((u) => u._id);
this.dragableUsersInCourse = found.filter(user => (idList.indexOf(user._id) >= 0
&& this.course.courseAdmin._id !== user._id));
this.dragableUsers = found.filter(user => (idList.indexOf(user._id) < 0
&& this.course.courseAdmin._id !== user._id));
} else {
this.dragableUsers = [];
this.dragableUsersInCourse = [];
}
this.finishRestCall = true;
});
} else {
this.finishRestCall = true;
}
=======
constructor(private dragula: DragulaService,
public dialogService: DialogService,
private courseService: CourseService,
private snackBar: MatSnackBar) {
this.userCtrl = new FormControl();
this.filteredStates = this.userCtrl.valueChanges
.startWith(null)
.map(name => this.filterStates(name));
>>>>>>>
get searchString(): string {
return this.search;
}
searchForUsers(search: string) {
this.onSearch.emit(search);
if (search !== '' && this.finishRestCall) {
this.finishRestCall = false;
this.userService.searchUsers(this.role, search).then((found: User[]) => {
if (found) {
const idList: string[] = this.course.students.map((u) => u._id);
this.dragableUsersInCourse = found.filter(user => (idList.indexOf(user._id) >= 0
&& this.course.courseAdmin._id !== user._id));
this.dragableUsers = found.filter(user => (idList.indexOf(user._id) < 0
&& this.course.courseAdmin._id !== user._id));
} else {
this.dragableUsers = [];
this.dragableUsersInCourse = [];
}
this.finishRestCall = true;
});
} else {
this.finishRestCall = true;
}
<<<<<<<
updateUser(id: string) {
this.onUpdate.emit(id);
=======
// TODO: do levenshtein in backend
fuzzysearch(toSearch: string, user: IUser): boolean {
const lowerToSearch: string = toSearch.toLowerCase();
const elementsToFind = lowerToSearch.split(' ');
if (user.uid === undefined) {
user.uid = '';
}
const resArray = elementsToFind.filter(e => user.profile.firstName.toLowerCase().includes(e) ||
user.profile.lastName.toLowerCase().includes(e) ||
user.email.toLowerCase().includes(e)
);
return resArray.length > 0;
}
async removeSelectedUsers() {
this.toggleBlocked = true;
const res = await this.dialogService
.confirmRemove('selected members', '', 'course')
.toPromise();
this.toggleBlocked = false;
if (res) {
this.selectedMembers.forEach(user => this.onRemove.emit(user._id));
this.selectedMembers = [];
}
}
async openWriteMailDialog() {
this.toggleBlocked = true;
const mailData = await this.dialogService.writeMail(
this.selectedMembers
.map((user: IUser) => `${user.profile.firstName} ${user.profile.lastName}<${user.email}>`)
.join(', ')
).toPromise();
this.toggleBlocked = false;
if (!mailData) {
return;
}
this.selectedMembers = [];
try {
await this.courseService.sendMailToSelectedUsers(mailData);
this.snackBar.open('Sending mail succeeded.', '', {duration: 2000});
} catch (err) {
this.snackBar.open('Sending mail failed.', '', {duration: 3000});
}
>>>>>>>
updateUser(id: string) {
this.onUpdate.emit(id); |
<<<<<<<
option?: RequiredRuntimeOptions;
canvas?: HTMLCanvasElement;
webgl?: WebGLRenderingContext;
=======
isEditor?: boolean;
isPlaying?: boolean;
systems?: any[];
>>>>>>>
option?: RequiredRuntimeOptions;
canvas?: HTMLCanvasElement;
webgl?: WebGLRenderingContext;
isEditor?: boolean;
isPlaying?: boolean;
systems?: any[]; |
<<<<<<<
import {IWhitelistUser} from '../../shared/models/IWhitelistUser';
=======
import {ITaskUnit} from '../../shared/models/units/ITaskUnit';
import {ITaskUnitModel} from '../src/models/units/TaskUnit';
>>>>>>>
import {IWhitelistUser} from '../../shared/models/IWhitelistUser';
import {ITaskUnit} from '../../shared/models/units/ITaskUnit';
import {ITaskUnitModel} from '../src/models/units/TaskUnit'; |
<<<<<<<
import {IStudentConfig} from '../../../../../../shared/models/IStudentConfig';
=======
import {IDownload} from '../../../../../../shared/models/IDownload';
>>>>>>>
import {IDownload} from '../../../../../../shared/models/IDownload';
import {IStudentConfig} from '../../../../../../shared/models/IStudentConfig';
<<<<<<<
export class StudentConfigService extends DataService {
constructor(public backendService: BackendService) {
super('studentConfig/', backendService);
}
getConfig(Id: string): Promise<any[]> {
return new Promise((resolve, reject) => {
this.backendService.get(this.apiPath + Id)
.subscribe(
(responseItem: any) => {
resolve(responseItem);
},
error => reject(error)
);
});
}
postConfig(config: IStudentConfig): Promise<any[]> {
return new Promise((resolve, reject) => {
this.backendService.post(this.apiPath, config)
.subscribe(
(responseItem: any) => {
resolve(responseItem);
},
error => reject(error)
);
});
}
updateStudentConfig(id: string, config: IStudentConfig): Promise<any[]> {
return new Promise((resolve, reject) => {
this.backendService.post(this.apiPath + '/' + id, config)
.subscribe(
(responseItem: any) => {
resolve(responseItem);
},
error => reject(error)
);
});
}
}
@Injectable()
export class TaskService extends DataService {
constructor(public backendService: BackendService) {
super('tasks/', backendService);
}
getTasksForCourse(id: string): Promise<any[]> {
return new Promise((resolve, reject) => {
this.backendService.get(this.apiPath + 'course/' + id)
.subscribe(
(responseItems: any) => {
if (this.changeProps2Date) {
responseItems.forEach(item => {
this.changeProps2Date.forEach(prop => {
DataService.changeStringProp2DateProp(item, prop);
});
});
}
resolve(responseItems);
},
error => reject(error)
);
});
}
}
@Injectable()
=======
>>>>>>>
export class TaskService extends DataService {
constructor(public backendService: BackendService) {
super('tasks/', backendService);
}
getTasksForCourse(id: string): Promise<any[]> {
return new Promise((resolve, reject) => {
this.backendService.get(this.apiPath + 'course/' + id)
.subscribe(
(responseItems: any) => {
if (this.changeProps2Date) {
responseItems.forEach(item => {
this.changeProps2Date.forEach(prop => {
DataService.changeStringProp2DateProp(item, prop);
});
});
}
resolve(responseItems);
},
error => reject(error)
);
});
}
}
@Injectable() |
<<<<<<<
import {SaveFileService} from '../../shared/services/save-file.service';
import {ICourse} from '../../../../../../shared/models/ICourse';
=======
import {TitleService} from '../../shared/services/title.service';
>>>>>>>
import {TitleService} from '../../shared/services/title.service';
import {SaveFileService} from '../../shared/services/save-file.service';
import {ICourse} from '../../../../../../shared/models/ICourse';
<<<<<<<
private router: Router,
private exportService: ExportService,
private saveFileService: SaveFileService,
private duplicationService: DuplicationService,
private userService: UserService) {
=======
private router: Router,
private titleService: TitleService) {
>>>>>>>
private router: Router,
private exportService: ExportService,
private saveFileService: SaveFileService,
private duplicationService: DuplicationService,
private userService: UserService,
private titleService: TitleService) { |
<<<<<<<
import {RouterOutlet} from '@angular/router';
import {CourseDetailModule} from './course-detail/course-detail.module';
=======
>>>>>>>
import {RouterOutlet} from '@angular/router';
import {CourseDetailModule} from './course-detail/course-detail.module'; |
<<<<<<<
import {UserDataService} from '../../shared/services/data.service';
import {User} from '../../models/user';
import {UserService} from '../../shared/services/user.service';
import {ActivatedRoute, Router} from '@angular/router';
import {ShowProgressService} from '../../shared/services/show-progress.service';
=======
import {UserDataService} from '../../shared/data.service';
import {UserService} from '../../shared/user.service';
import {Router} from '@angular/router';
import {ShowProgressService} from '../../shared/show-progress.service';
import {IUser} from '../../../../../../shared/models/IUser';
>>>>>>>
import {UserDataService} from '../../shared/services/data.service';
import {IUser} from '../../../../../../shared/models/IUser';
import {UserService} from '../../shared/services/user.service';
import {ShowProgressService} from '../../shared/services/show-progress.service'; |
<<<<<<<
import {GravatarDirective} from './shared/directives/gravatar.directive';
import {CodeKataProgressService, ProgressService} from './shared/services/data/progress.service';
=======
import {TeachersComponent} from './course/course-edit/teachers/teachers.component';
import {CourseUserListComponent} from './course/course-edit/course-user-list/course-user-list.component';
import {GravatarDirective} from './shared/directives/gravatar.directive';
import {ProgressService} from './shared/services/data/progress.service';
>>>>>>>
import {TeachersComponent} from './course/course-edit/teachers/teachers.component';
import {CourseUserListComponent} from './course/course-edit/course-user-list/course-user-list.component';
import {GravatarDirective} from './shared/directives/gravatar.directive';
import {CodeKataProgressService, ProgressService} from './shared/services/data/progress.service';
<<<<<<<
import { CourseManageContentComponent } from './course/course-edit/course-manage-content/course-manage-content.component';
import { MdFabMenuComponent } from './shared/components/md-fab-menu/md-fab-menu.component';
import {CodeKataComponent} from './course/course-edit/unit/code-kata-unit/code-kata-unit.component';
import {CodeKataUnitFormComponent} from './course/course-edit/unit/unit-edit/code-kata-unit-form/code-kata-unit-form.component';
import {AceEditorModule} from 'ng2-ace-editor';
import { UnitGeneralInfoFormComponent } from './course/course-edit/unit/unit-edit/unit-general-info-form/unit-general-info-form.component';
=======
import {CourseManageContentComponent} from './course/course-edit/course-manage-content/course-manage-content.component';
import {MdFabMenuComponent} from './shared/components/md-fab-menu/md-fab-menu.component';
import {UnitGeneralInfoFormComponent} from './course/course-edit/unit/unit-edit/unit-general-info-form/unit-general-info-form.component';
>>>>>>>
import {CodeKataComponent} from './course/course-edit/unit/code-kata-unit/code-kata-unit.component';
import {CodeKataUnitFormComponent} from './course/course-edit/unit/unit-edit/code-kata-unit-form/code-kata-unit-form.component';
import {AceEditorModule} from 'ng2-ace-editor';
import {CourseManageContentComponent} from './course/course-edit/course-manage-content/course-manage-content.component';
import {MdFabMenuComponent} from './shared/components/md-fab-menu/md-fab-menu.component';
import {UnitGeneralInfoFormComponent} from './course/course-edit/unit/unit-edit/unit-general-info-form/unit-general-info-form.component'; |
<<<<<<<
import {MatSnackBar} from '@angular/material';
import {TranslateService} from '@ngx-translate/core';
=======
import {SnackBarService} from '../../services/snack-bar.service';
>>>>>>>
import {MatSnackBar} from '@angular/material';
import {TranslateService} from '@ngx-translate/core';
import {SnackBarService} from '../../services/snack-bar.service';
<<<<<<<
constructor(private snackBar: MatSnackBar,
private translate: TranslateService) {
=======
constructor(private snackBar: SnackBarService) {
>>>>>>>
constructor(private snackBar: SnackBarService,
private translate: TranslateService) { |
<<<<<<<
import {MessagingModule} from './messaging/messaging.module';
import { PrivacyComponent } from './privacy/privacy.component';
=======
import {PrivacyModule} from './privacy/privacy.module';
>>>>>>>
import {MessagingModule} from './messaging/messaging.module';
import {PrivacyModule} from './privacy/privacy.module';
<<<<<<<
LegalnoticeModule,
MessagingModule,
=======
PrivacyModule,
>>>>>>>
MessagingModule,
PrivacyModule, |
<<<<<<<
import { ActivationComponent } from './user/activation/activation.component';
=======
import { UserRolesComponent } from './admin/user-roles/user-roles.component';
import { UserEditComponent } from './user/user-edit/user-edit.component';
>>>>>>>
import { UserRolesComponent } from './admin/user-roles/user-roles.component';
import { UserEditComponent } from './user/user-edit/user-edit.component';
import { ActivationComponent } from './user/activation/activation.component';
<<<<<<<
ManageContentComponent,
ActivationComponent
=======
LectureComponent,
LectureNewComponent,
LectureEditComponent,
ManageContentComponent,
UserRolesComponent,
UserEditComponent,
UploadComponent,
FileSelectDirective
>>>>>>>
LectureComponent,
LectureNewComponent,
LectureEditComponent,
ManageContentComponent,
UserRolesComponent,
UserEditComponent,
UploadComponent,
FileSelectDirective
ManageContentComponent,
ActivationComponent |
<<<<<<<
import {LectureModule} from '../../lecture/lecture.module';
import {UnitFormModule} from '../../unit/unit-form/unit-form.module';
import { CourseMediamanagerComponent } from './course-mediamanager/course-mediamanager.component';
import { CourseMediamanagerDetailDialog } from './course-mediamanager/course-mediamanager-detail-dialog/course-mediamanager-detail.dialog';
=======
import {GeneralTabComponent} from './general-tab/general-tab.component';
import {CourseManageContentModule} from './course-manage-content/course-manage-content.module';
>>>>>>>
import {GeneralTabComponent} from './general-tab/general-tab.component';
import {CourseManageContentModule} from './course-manage-content/course-manage-content.module';
import { CourseMediamanagerComponent } from './course-mediamanager/course-mediamanager.component';
import { CourseMediamanagerDetailDialog } from './course-mediamanager/course-mediamanager-detail-dialog/course-mediamanager-detail.dialog';
<<<<<<<
CourseMediamanagerComponent,
CourseMediamanagerDetailDialog,
=======
GeneralTabComponent,
>>>>>>>
GeneralTabComponent,
CourseMediamanagerComponent,
CourseMediamanagerDetailDialog, |
<<<<<<<
import { ShowCommentsDirective } from './directives/show-comments.directive';
=======
import {ResponsiveImageComponent} from './components/responsive-image/responsive-image.component';
>>>>>>>
import { ShowCommentsDirective } from './directives/show-comments.directive';
import {ResponsiveImageComponent} from './components/responsive-image/responsive-image.component';
<<<<<<<
ShowCommentsDirective,
=======
ResponsiveImageComponent
>>>>>>>
ShowCommentsDirective,
ResponsiveImageComponent
<<<<<<<
ShowCommentsDirective,
=======
ResponsiveImageComponent
>>>>>>>
ShowCommentsDirective,
ResponsiveImageComponent |
<<<<<<<
import construct = Reflect.construct;
=======
import {ILecture} from '../../../../../../shared/models/ILecture';
import {IUnit} from '../../../../../../shared/models/units/IUnit';
import {IUser} from '../../../../../../shared/models/IUser';
import {ICourse} from '../../../../../../shared/models/ICourse';
>>>>>>>
import construct = Reflect.construct;
import {ILecture} from '../../../../../../shared/models/ILecture';
import {IUnit} from '../../../../../../shared/models/units/IUnit';
import {IUser} from '../../../../../../shared/models/IUser';
import {ICourse} from '../../../../../../shared/models/ICourse'; |
<<<<<<<
import {MarkdownEditorComponent} from './components/markdown-editor/markdown-editor.component';
import {AceEditorModule} from 'ng2-ace-editor';
=======
import {UploadFormComponent} from './components/upload-form/upload-form.component';
import {FileUploadModule} from 'ng2-file-upload';
import {FilesizePipe} from './pipes/filesize/filesize.pipe';
>>>>>>>
import {UploadFormComponent} from './components/upload-form/upload-form.component';
import {FileUploadModule} from 'ng2-file-upload';
import {FilesizePipe} from './pipes/filesize/filesize.pipe';
import {MarkdownEditorComponent} from './components/markdown-editor/markdown-editor.component';
import {AceEditorModule} from 'ng2-ace-editor';
<<<<<<<
AceEditorModule,
=======
FileUploadModule
>>>>>>>
AceEditorModule,
FileUploadModule
<<<<<<<
MarkdownEditorComponent,
=======
UploadFormComponent,
FilesizePipe,
>>>>>>>
UploadFormComponent,
FilesizePipe,
MarkdownEditorComponent,
<<<<<<<
MarkdownEditorComponent,
=======
UploadFormComponent,
FilesizePipe,
>>>>>>>
MarkdownEditorComponent,
UploadFormComponent,
FilesizePipe, |
<<<<<<<
import {UploadFormComponent} from '../components/upload-form/upload-form.component';
import {FilesizePipe} from '../pipes/filesize/filesize.pipe';
import {UploadFormDialog} from '../components/upload-form-dialog/upload-form-dialog.component';
=======
import {TranslateModule} from '@ngx-translate/core';
import {HttpClientModule} from '@angular/common/http';
>>>>>>>
import {UploadFormComponent} from '../components/upload-form/upload-form.component';
import {FilesizePipe} from '../pipes/filesize/filesize.pipe';
import {UploadFormDialog} from '../components/upload-form-dialog/upload-form-dialog.component';
import {TranslateModule} from '@ngx-translate/core';
import {HttpClientModule} from '@angular/common/http';
<<<<<<<
UploadFormComponent,
FilesizePipe,
UploadFormDialog,
=======
MaterialImportModule
>>>>>>>
UploadFormComponent,
FilesizePipe,
UploadFormDialog,
MaterialImportModule |
<<<<<<<
import {FreeTextUnitFormComponent} from './course/course-edit/unit/unit-edit/free-text-unit-form/free-text-unit-form.component';
import {FreeTextUnitComponent} from './course/course-edit/unit/free-text-unit/free-text-unit.component';
import {MarkdownService} from './shared/services/markdown.service';
=======
import { CourseManageContentComponent } from './course/course-edit/course-manage-content/course-manage-content.component';
import { MdFabMenuComponent } from './shared/components/md-fab-menu/md-fab-menu.component';
>>>>>>>
import {FreeTextUnitFormComponent} from './course/course-edit/unit/unit-edit/free-text-unit-form/free-text-unit-form.component';
import {FreeTextUnitComponent} from './course/course-edit/unit/free-text-unit/free-text-unit.component';
import {MarkdownService} from './shared/services/markdown.service';
import { CourseManageContentComponent } from './course/course-edit/course-manage-content/course-manage-content.component';
import { MdFabMenuComponent } from './shared/components/md-fab-menu/md-fab-menu.component';
<<<<<<<
GravatarDirective,
FreeTextUnitFormComponent,
FreeTextUnitComponent
=======
GravatarDirective,
CourseManageContentComponent,
MdFabMenuComponent,
>>>>>>>
GravatarDirective,
FreeTextUnitFormComponent,
FreeTextUnitComponent
CourseManageContentComponent,
MdFabMenuComponent, |
<<<<<<<
TaskService,
StudentConfigService,
=======
>>>>>>>
TaskService,
<<<<<<<
import {studentConfigSchema} from '../../../../api/src/models/StudentConfig';
=======
import {DataSharingService} from './shared/services/data-sharing.service';
>>>>>>> |
<<<<<<<
import {BadgeComponent} from './components/badge/badge.component';
import {MatFabMenuComponent} from './components/mat-fab-menu/mat-fab-menu.component';
=======
import { BadgeComponent } from './components/badge/badge.component';
import {ExpandableDivComponent} from './components/expandable-div/expandable-div.component';
>>>>>>>
import {BadgeComponent} from './components/badge/badge.component';
import {MatFabMenuComponent} from './components/mat-fab-menu/mat-fab-menu.component';
import { BadgeComponent } from './components/badge/badge.component';
import {ExpandableDivComponent} from './components/expandable-div/expandable-div.component';
<<<<<<<
BadgeComponent,
MatFabMenuComponent,
=======
BadgeComponent,
ExpandableDivComponent,
>>>>>>>
BadgeComponent,
MatFabMenuComponent,
BadgeComponent,
ExpandableDivComponent,
<<<<<<<
BadgeComponent,
MatFabMenuComponent,
=======
BadgeComponent,
ExpandableDivComponent,
>>>>>>>
BadgeComponent,
MatFabMenuComponent,
BadgeComponent,
ExpandableDivComponent, |
<<<<<<<
import {UserSettingsComponent} from './user-settings/user-settings.component';
import {MatHeaderCell, MatTableModule} from '@angular/material';
=======
import {UserReportComponent} from './user-report/user-report.component';
import {NgxChartsModule} from '@swimlane/ngx-charts';
>>>>>>>
import {UserSettingsComponent} from './user-settings/user-settings.component';
import {MatHeaderCell, MatTableModule} from '@angular/material';
import {UserReportComponent} from './user-report/user-report.component';
import {NgxChartsModule} from '@swimlane/ngx-charts';
<<<<<<<
UserProfileComponent,
UserSettingsComponent
=======
UserProfileComponent,
UserReportComponent,
>>>>>>>
UserProfileComponent,
UserSettingsComponent,
UserReportComponent, |
<<<<<<<
TaskService,
StudentConfigService,
=======
>>>>>>>
TaskService,
<<<<<<<
import {studentConfigSchema} from '../../../../api/src/models/StudentConfig';
=======
import {DataSharingService} from './shared/services/data-sharing.service';
>>>>>>> |
<<<<<<<
import {MaterialModule, MatDatepickerModule} from '@angular/material';
=======
>>>>>>>
import {MatDatepickerModule} from '@angular/material';
<<<<<<<
MaterialModule,
MatDatepickerModule,
=======
>>>>>>>
MatDatepickerModule, |
<<<<<<<
import {Lecture} from '../../src/models/Lecture';
=======
>>>>>>>
import {Lecture} from '../../src/models/Lecture';
<<<<<<<
=======
import {IUser} from '../../../shared/models/IUser';
>>>>>>>
<<<<<<<
const should = chai.should();
const expect = chai.expect;
=======
>>>>>>>
const should = chai.should();
const expect = chai.expect;
<<<<<<<
describe(`POST ${BASE_URL + '/pdf/individual'}`, () => {
it('should fail, no auth', async () => {
const res = await chai.request(app)
.post(BASE_URL + '/pdf/individual')
.set('Authorization', 'JWT asdf')
.catch(err => err.response);
res.status.should.be.equal(401);
});
it('should fail, course does not exists', async () => {
const course = await FixtureUtils.getRandomCourse();
const teacher = await User.findById(course.courseAdmin);
const testData: IDownload = {
courseName: '000000000000000000000000',
'lectures': [{
'lectureId': '000000000000000000000000',
'units': [{'unitId': '000000000000000000000000'}]
}]
};
const res = await chai.request(app)
.post(BASE_URL + '/pdf/individual')
.set('Authorization', `JWT ${JwtUtils.generateToken(teacher)}`)
.send(testData)
.catch(err => err.response);
res.status.should.be.equal(404);
});
it('should fail, because user is not in course', async () => {
const course = await FixtureUtils.getRandomCourse();
const teacher = await User.findById(course.courseAdmin);
const user = await User.findOne().where('_id').ne(teacher._id);
const testData: IDownload = {
courseName: course._id,
'lectures': [{
'lectureId': '000000000000000000000000',
'units': [{'unitId': '000000000000000000000000'}]
}]
};
const res = await chai.request(app)
.post(BASE_URL + '/pdf/individual')
.set('Authorization', `JWT ${JwtUtils.generateToken(user)}`)
.send(testData)
.catch(err => err.response);
res.status.should.be.equal(404);
});
it('should fail, because the lectures is empty and the IDownloadObject cant be created', async () => {
const course = await FixtureUtils.getRandomCourse();
const teacher = await User.findById(course.courseAdmin);
const testData = {
courseName: course._id,
'lectures': Array
};
const res = await chai.request(app)
.post(BASE_URL + '/pdf/individual')
.set('Authorization', `JWT ${JwtUtils.generateToken(teacher)}`)
.send(testData)
.catch(err => err.response);
res.status.should.be.equal(500);
});
it('should pass', async () => {
const course = await FixtureUtils.getRandomCourseWithAllUnitTypes();
const teacher = await User.findById(course.courseAdmin);
const lectures: any[] = [];
for (const lec of course.lectures) {
const lecture = await Lecture.findById(lec);
const units: any[] = [];
for ( const unitId of lecture.units) {
const temp: any = {};
temp['unitId'] = unitId;
units.push(temp);
}
const tempLec: any = {};
tempLec['lectureId'] = lec;
tempLec['units'] = units;
lectures.push(tempLec);
}
const testData = {
'courseName': course._id,
'lectures': lectures
};
const res = await chai.request(app)
.post(BASE_URL + '/pdf/individual')
.set('Authorization', `JWT ${JwtUtils.generateToken(teacher)}`)
.send(testData)
.catch(err => err.response);
expect(res).to.have.status(200);
expect(res).to.be.json;
}).timeout(30000);
});
describe(`POST ${BASE_URL + '/pdf/single'}`, () => {
=======
describe(`POST ${BASE_URL}`, () => {
it('should succeed for some valid input', async () => {
await postValidRequest();
});
>>>>>>>
describe(`POST ${BASE_URL + '/pdf/individual'}`, () => {
it('should fail, no auth', async () => {
const res = await chai.request(app)
.post(BASE_URL + '/pdf/individual')
.set('Authorization', 'JWT asdf')
.catch(err => err.response);
res.status.should.be.equal(401);
});
it('should fail, course does not exists', async () => {
const course = await FixtureUtils.getRandomCourse();
const teacher = await User.findById(course.courseAdmin);
const testData: IDownload = {
courseName: '000000000000000000000000',
'lectures': [{
'lectureId': '000000000000000000000000',
'units': [{'unitId': '000000000000000000000000'}]
}]
};
const res = await chai.request(app)
.post(BASE_URL + '/pdf/individual')
.set('Authorization', `JWT ${JwtUtils.generateToken(teacher)}`)
.send(testData)
.catch(err => err.response);
res.status.should.be.equal(404);
});
it('should fail, because user is not in course', async () => {
const course = await FixtureUtils.getRandomCourse();
const teacher = await User.findById(course.courseAdmin);
const user = await User.findOne().where('_id').ne(teacher._id);
const testData: IDownload = {
courseName: course._id,
'lectures': [{
'lectureId': '000000000000000000000000',
'units': [{'unitId': '000000000000000000000000'}]
}]
};
const res = await chai.request(app)
.post(BASE_URL + '/pdf/individual')
.set('Authorization', `JWT ${JwtUtils.generateToken(user)}`)
.send(testData)
.catch(err => err.response);
res.status.should.be.equal(404);
});
it('should fail, because the lectures is empty and the IDownloadObject cant be created', async () => {
const course = await FixtureUtils.getRandomCourse();
const teacher = await User.findById(course.courseAdmin);
const testData = {
courseName: course._id,
'lectures': Array
};
const res = await chai.request(app)
.post(BASE_URL + '/pdf/individual')
.set('Authorization', `JWT ${JwtUtils.generateToken(teacher)}`)
.send(testData)
.catch(err => err.response);
res.status.should.be.equal(500);
});
it('should pass', async () => {
const course = await FixtureUtils.getRandomCourseWithAllUnitTypes();
const teacher = await User.findById(course.courseAdmin);
const lectures: any[] = [];
for (const lec of course.lectures) {
const lecture = await Lecture.findById(lec);
const units: any[] = [];
for ( const unitId of lecture.units) {
const temp: any = {};
temp['unitId'] = unitId;
units.push(temp);
}
const tempLec: any = {};
tempLec['lectureId'] = lec;
tempLec['units'] = units;
lectures.push(tempLec);
}
const testData = {
'courseName': course._id,
'lectures': lectures
};
const res = await chai.request(app)
.post(BASE_URL + '/pdf/individual')
.set('Authorization', `JWT ${JwtUtils.generateToken(teacher)}`)
.send(testData)
.catch(err => err.response);
expect(res).to.have.status(200);
expect(res).to.be.json;
}).timeout(30000);
});
describe(`POST ${BASE_URL}`, () => {
it('should succeed for some valid input', async () => {
await postValidRequest();
});
describe(`POST ${BASE_URL + '/pdf/single'}`, () => { |
<<<<<<<
import {TeachersComponent} from './course/course-edit/teachers/teachers.component';
import {GravatarDirective} from './shared/directives/gravatar.directive';
import { CourseUserListComponent } from './course/course-edit/course-user-list/course-user-list.component';
=======
import {GravatarDirective} from './course/course-edit/members/gravatar.directive';
import { CourseManageContentComponent } from './course/course-edit/course-manage-content/course-manage-content.component';
import { MdFabMenuComponent } from './shared/components/md-fab-menu/md-fab-menu.component';
>>>>>>>
import {TeachersComponent} from './course/course-edit/teachers/teachers.component';
import {GravatarDirective} from './shared/directives/gravatar.directive';
import { CourseUserListComponent } from './course/course-edit/course-user-list/course-user-list.component';
import { CourseManageContentComponent } from './course/course-edit/course-manage-content/course-manage-content.component';
import { MdFabMenuComponent } from './shared/components/md-fab-menu/md-fab-menu.component';
<<<<<<<
TeachersComponent,
GravatarDirective,
CourseUserListComponent,
=======
GravatarDirective,
CourseManageContentComponent,
MdFabMenuComponent,
>>>>>>>
TeachersComponent,
GravatarDirective,
CourseUserListComponent,
CourseManageContentComponent,
MdFabMenuComponent, |
<<<<<<<
import {FilesizePipe} from './pipes/filesize/filesize.pipe';
import {JwtPipe} from './pipes/jwt/jwt.pipe';
import {UploadFormDialog} from './components/upload-form-dialog/upload-form-dialog.component';
=======
>>>>>>>
import {JwtPipe} from './pipes/jwt/jwt.pipe';
<<<<<<<
UploadFormComponent,
FilesizePipe,
JwtPipe,
UploadFormDialog,
=======
>>>>>>>
JwtPipe,
<<<<<<<
UploadFormComponent,
FilesizePipe,
JwtPipe,
UploadFormDialog,
=======
>>>>>>>
JwtPipe, |
<<<<<<<
import { CookieBannerComponent } from './cookie-banner/cookie-banner.component';
=======
import { PrivacyComponent } from './privacy/privacy.component';
>>>>>>>
import { CookieBannerComponent } from './cookie-banner/cookie-banner.component';
import { PrivacyComponent } from './privacy/privacy.component';
<<<<<<<
CookieBannerComponent
=======
PrivacyComponent,
>>>>>>>
PrivacyComponent,
CookieBannerComponen t |
<<<<<<<
import {HttpClientModule} from '@angular/common/http';
=======
import {HttpModule} from '@angular/http';
import {TranslateLoader, TranslateModule} from '@ngx-translate/core';
>>>>>>>
import {HttpClientModule} from '@angular/common/http';
import {TranslateLoader, TranslateModule} from '@ngx-translate/core'; |
<<<<<<<
import { CourseService, LectureService } from './shared/data.service';
=======
import { CourseService, UserDataService } from './shared/data.service';
>>>>>>>
import { CourseService, UserDataService, LectureService } from './shared/data.service';
<<<<<<<
LectureComponent,
LectureNewComponent,
LectureEditComponent,
ManageContentComponent
=======
ManageContentComponent,
UserRolesComponent,
UserEditComponent
>>>>>>>
LectureComponent,
LectureNewComponent,
LectureEditComponent,
ManageContentComponent,
UserRolesComponent,
UserEditComponent
<<<<<<<
LectureService,
=======
UserDataService,
>>>>>>>
UserDataService,
LectureService, |
<<<<<<<
// Cascade delete
taskUnitSchema.pre('remove', function(next: () => void) {
Task.find({'_id': {$in: this.tasks}}).exec()
.then((tasks) => Promise.all(tasks.map(task => task.remove())))
.then(next)
.catch(next);
});
taskUnitSchema.methods.exportJSON = async function() {
const obj = this.toObject();
// remove unwanted informations
// mongo properties
delete obj._id;
delete obj.createdAt;
delete obj.__v;
delete obj.updatedAt;
// custom properties
delete obj._course;
// "populate" tasks
const tasks: Array<mongoose.Types.ObjectId> = obj.tasks;
obj.tasks = [];
for (const taskId of tasks) {
const task: ITaskModel = await Task.findById(taskId);
if (task) {
const taskExport = await task.exportJSON();
obj.tasks.push(taskExport);
} else {
winston.log('warn', 'task(' + taskId + ') was referenced by unit(' + this._id + ') but does not exist anymore');
}
}
return obj;
};
taskUnitSchema.statics.importJSON = async function(taskUnit: ITaskUnit, courseId: string, lectureId: string) {
taskUnit._course = courseId;
const tasks: Array<ITask> = taskUnit.tasks;
taskUnit.tasks = [];
try {
const savedTaskUnit = await new TaskUnit(taskUnit).save();
for (const task of tasks) {
const newTask: ITask = await Task.schema.statics.importJSON(task, savedTaskUnit._id);
taskUnit.tasks.push(newTask);
}
const lecture = await Lecture.findById(lectureId);
lecture.units.push(<ITaskUnitModel>savedTaskUnit);
await lecture.save();
return savedTaskUnit.toObject();
} catch (err) {
const newError = new InternalServerError('Failed to import tasks');
newError.stack += '\nCaused by: ' + err.message + '\n' + err.stack;
throw newError;
}
};
taskUnitSchema.statics.toFile = async function(unit: ITaskUnit) {
let fileStream = unit.description;
for (const task of unit.tasks) {
const newTask = await Task.findOne(task._id);
fileStream = fileStream + newTask.name + '\n';
for (const answer of newTask.answers) {
fileStream = fileStream + answer.text + ': [ ]\n';
}
fileStream = fileStream + '-------------------------------------\n';
return new Promise((resolve) => {
return resolve(fileStream);
});
}
};
const TaskUnit = Unit.discriminator('task', taskUnitSchema);
=======
// const TaskUnit = Unit.discriminator('task', taskUnitSchema);
>>>>>>>
// Cascade delete
taskUnitSchema.pre('remove', function(next: () => void) {
Task.find({'_id': {$in: this.tasks}}).exec()
.then((tasks) => Promise.all(tasks.map(task => task.remove())))
.then(next)
.catch(next);
});
taskUnitSchema.methods.exportJSON = async function() {
const obj = this.toObject();
// remove unwanted informations
// mongo properties
delete obj._id;
delete obj.createdAt;
delete obj.__v;
delete obj.updatedAt;
// custom properties
delete obj._course;
// "populate" tasks
const tasks: Array<mongoose.Types.ObjectId> = obj.tasks;
obj.tasks = [];
for (const taskId of tasks) {
const task: ITaskModel = await Task.findById(taskId);
if (task) {
const taskExport = await task.exportJSON();
obj.tasks.push(taskExport);
} else {
winston.log('warn', 'task(' + taskId + ') was referenced by unit(' + this._id + ') but does not exist anymore');
}
}
return obj;
};
taskUnitSchema.statics.importJSON = async function(taskUnit: ITaskUnit, courseId: string, lectureId: string) {
taskUnit._course = courseId;
const tasks: Array<ITask> = taskUnit.tasks;
taskUnit.tasks = [];
try {
const savedTaskUnit = await new TaskUnit(taskUnit).save();
for (const task of tasks) {
const newTask: ITask = await Task.schema.statics.importJSON(task, savedTaskUnit._id);
taskUnit.tasks.push(newTask);
}
const lecture = await Lecture.findById(lectureId);
lecture.units.push(<ITaskUnitModel>savedTaskUnit);
await lecture.save();
return savedTaskUnit.toObject();
} catch (err) {
const newError = new InternalServerError('Failed to import tasks');
newError.stack += '\nCaused by: ' + err.message + '\n' + err.stack;
throw newError;
}
};
taskUnitSchema.statics.toFile = async function(unit: ITaskUnit) {
let fileStream = unit.description;
for (const task of unit.tasks) {
const newTask = await Task.findOne(task._id);
fileStream = fileStream + newTask.name + '\n';
for (const answer of newTask.answers) {
fileStream = fileStream + answer.text + ': [ ]\n';
}
fileStream = fileStream + '-------------------------------------\n';
return new Promise((resolve) => {
return resolve(fileStream);
});
}
};
// const TaskUnit = Unit.discriminator('task', taskUnitSchema); |
<<<<<<<
import {ICourse} from '../../../../../shared/models/ICourse';
=======
import {MessageService} from '../shared/services/message.service';
>>>>>>>
import {MessageService} from '../shared/services/message.service';
import {ICourse} from '../../../../../shared/models/ICourse'; |
<<<<<<<
import {IChatRoom} from '../../../../../shared/models/IChatRoom';
=======
import {IFile} from '../../../../../shared/models/mediaManager/IFile';
import {IPicture} from '../../../../../shared/models/mediaManager/IPicture';
>>>>>>>
import {IChatRoom} from '../../../../../shared/models/IChatRoom';
import {IFile} from '../../../../../shared/models/mediaManager/IFile';
import {IPicture} from '../../../../../shared/models/mediaManager/IPicture'; |
<<<<<<<
import {WhitelistDialog} from '../../course/course-edit/general-tab/whitelist-dialog/whitelist-dialog.component';
import {ICourse} from '../../../../../../shared/models/ICourse';
=======
import {ResponsiveImageUploadDialog} from '../components/responsive-image-upload-dialog/responsive-image-upload-dialog.component';
import {IResponsiveImageData} from '../../../../../../shared/models/IResponsiveImageData';
>>>>>>>
import {ResponsiveImageUploadDialog} from '../components/responsive-image-upload-dialog/responsive-image-upload-dialog.component';
import {IResponsiveImageData} from '../../../../../../shared/models/IResponsiveImageData';
import {WhitelistDialog} from '../../course/course-edit/general-tab/whitelist-dialog/whitelist-dialog.component';
import {ICourse} from '../../../../../../shared/models/ICourse'; |
<<<<<<<
import {InfoDialog} from '../components/info-dialog/info-dialog.component';
=======
import {FilepickerDialog} from '../components/filepicker-dialog/filepicker-dialog.component';
>>>>>>>
import {InfoDialog} from '../components/info-dialog/info-dialog.component';
import {FilepickerDialog} from '../components/filepicker-dialog/filepicker-dialog.component'; |
<<<<<<<
import {Dependency} from '../../about/licenses/dependency.model';
=======
import {ITask} from '../../../../../../shared/models/task/ITask';
import {ITaskUnit} from '../../../../../../shared/models/units/ITaskUnit';
>>>>>>>
import {Dependency} from '../../about/licenses/dependency.model';
import {ITask} from '../../../../../../shared/models/task/ITask';
import {ITaskUnit} from '../../../../../../shared/models/units/ITaskUnit'; |
<<<<<<<
import {IStudentConfig} from '../../../../../../shared/models/IStudentConfig';
=======
import {IDownload} from '../../../../../../shared/models/IDownload';
>>>>>>>
import {IDownload} from '../../../../../../shared/models/IDownload';
import {IStudentConfig} from '../../../../../../shared/models/IStudentConfig';
<<<<<<<
export class StudentConfigService extends DataService {
constructor(public backendService: BackendService) {
super('studentConfig/', backendService);
}
getConfig(Id: string): Promise<any[]> {
return new Promise((resolve, reject) => {
this.backendService.get(this.apiPath + Id)
.subscribe(
(responseItem: any) => {
resolve(responseItem);
},
error => reject(error)
);
});
}
postConfig(config: IStudentConfig): Promise<any[]> {
return new Promise((resolve, reject) => {
this.backendService.post(this.apiPath, config)
.subscribe(
(responseItem: any) => {
resolve(responseItem);
},
error => reject(error)
);
});
}
updateStudentConfig(id: string, config: IStudentConfig): Promise<any[]> {
return new Promise((resolve, reject) => {
this.backendService.post(this.apiPath + '/' + id, config)
.subscribe(
(responseItem: any) => {
resolve(responseItem);
},
error => reject(error)
);
});
}
}
@Injectable()
export class TaskService extends DataService {
constructor(public backendService: BackendService) {
super('tasks/', backendService);
}
getTasksForCourse(id: string): Promise<any[]> {
return new Promise((resolve, reject) => {
this.backendService.get(this.apiPath + 'course/' + id)
.subscribe(
(responseItems: any) => {
if (this.changeProps2Date) {
responseItems.forEach(item => {
this.changeProps2Date.forEach(prop => {
DataService.changeStringProp2DateProp(item, prop);
});
});
}
resolve(responseItems);
},
error => reject(error)
);
});
}
}
@Injectable()
=======
>>>>>>>
export class TaskService extends DataService {
constructor(public backendService: BackendService) {
super('tasks/', backendService);
}
getTasksForCourse(id: string): Promise<any[]> {
return new Promise((resolve, reject) => {
this.backendService.get(this.apiPath + 'course/' + id)
.subscribe(
(responseItems: any) => {
if (this.changeProps2Date) {
responseItems.forEach(item => {
this.changeProps2Date.forEach(prop => {
DataService.changeStringProp2DateProp(item, prop);
});
});
}
resolve(responseItems);
},
error => reject(error)
);
});
}
}
@Injectable() |
<<<<<<<
import {WriteMailDialog} from '../components/write-mail-dialog/write-mail-dialog.component';
=======
import {FilepickerDialog} from '../components/filepicker-dialog/filepicker-dialog.component';
>>>>>>>
import {FilepickerDialog} from '../components/filepicker-dialog/filepicker-dialog.component';
import {WriteMailDialog} from '../components/write-mail-dialog/write-mail-dialog.component'; |
<<<<<<<
public snackBar: MatSnackBar,
public dialogService: DialogService) {}
=======
public snackBar: MdSnackBar,
public dialogService: DialogService) {
}
>>>>>>>
public snackBar: MatSnackBar,
public dialogService: DialogService) {
} |
<<<<<<<
import {ActivationResendComponent} from './auth/activation-resend/activation-resend.component';
=======
import {NotfoundComponent} from './shared/components/notfound/notfound.component';
>>>>>>>
import {ActivationResendComponent} from './auth/activation-resend/activation-resend.component';
import {NotfoundComponent} from './shared/components/notfound/notfound.component'; |
<<<<<<<
import {UploadFormComponent} from "../../../shared/components/upload-form/upload-form.component";
import {IFileUnit} from "../../../../../../../shared/models/units/IFileUnit";
import {PickMediaDialog} from "../../../shared/components/pick-media-dialog/pick-media-dialog.component";
=======
import {FileIconService} from '../../../shared/services/file-icon.service';
>>>>>>>
import {FileIconService} from '../../../shared/services/file-icon.service';
<<<<<<<
private snackBar: SnackBarService,
@Inject(MAT_DIALOG_DATA || null) public dialogData: any) {
=======
private snackBar: SnackBarService,
private fileIcon: FileIconService) {
>>>>>>>
private snackBar: SnackBarService,
private fileIcon: FileIconService) {
<<<<<<<
getSimpleMimeType(file: IFile): string {
if (file.mimeType === undefined) {
return 'unknown';
}
const mimeType = file.mimeType.toLowerCase();
const archives = [
'application/x-bzip',
'application/x-bzip2',
'application/x-rar-compressed',
'application/x-tar',
'application/x-zip-compressed',
'application/zip',
'application/x-7z-compressed',
];
if (mimeType.startsWith('video')) {
return 'video';
} else if (mimeType.startsWith('image')) {
return 'image';
} else if (mimeType === 'application/pdf') {
return 'pdf';
} else if (archives.indexOf(mimeType) >= 0) {
return 'archive';
} else if (mimeType.startsWith('text')) {
return 'text';
} else {
return 'unknown';
}
}
cancelFileUpload():void{
this.uploadForm.fileUploader.clearQueue();
this.showUpload = false;
}
getUploadUrl(): string {
return this.uploadPathTmp + this.currentFolder._id;
}
uploadAllFiles() {
this.uploadForm.fileUploader.uploadAll();
this.uploadForm.onAllUploaded.subscribe(
result => this.onAllUploaded(),
error => this.snackBar.open('Could not upload files')
);
}
onAllUploaded() {
this.showUpload = false;
this.reloadDirectory();
this.snackBar.open('All items uploaded!');
}
onFileUploaded(event: IFileUnit) {
}
uploadHasQueueItems(): boolean {
if(this.uploadForm){
return this.uploadForm.fileUploader.queue.length !== 0;
}
return false;
}
=======
>>>>>>>
getSimpleMimeType(file: IFile): string {
if (file.mimeType === undefined) {
return 'unknown';
}
const mimeType = file.mimeType.toLowerCase();
const archives = [
'application/x-bzip',
'application/x-bzip2',
'application/x-rar-compressed',
'application/x-tar',
'application/x-zip-compressed',
'application/zip',
'application/x-7z-compressed',
];
if (mimeType.startsWith('video')) {
return 'video';
} else if (mimeType.startsWith('image')) {
return 'image';
} else if (mimeType === 'application/pdf') {
return 'pdf';
} else if (archives.indexOf(mimeType) >= 0) {
return 'archive';
} else if (mimeType.startsWith('text')) {
return 'text';
} else {
return 'unknown';
}
}
cancelFileUpload():void{
this.uploadForm.fileUploader.clearQueue();
this.showUpload = false;
}
getUploadUrl(): string {
return this.uploadPathTmp + this.currentFolder._id;
}
uploadAllFiles() {
this.uploadForm.fileUploader.uploadAll();
this.uploadForm.onAllUploaded.subscribe(
result => this.onAllUploaded(),
error => this.snackBar.open('Could not upload files')
);
}
onAllUploaded() {
this.showUpload = false;
this.reloadDirectory();
this.snackBar.open('All items uploaded!');
}
onFileUploaded(event: IFileUnit) {
}
uploadHasQueueItems(): boolean {
if(this.uploadForm){
return this.uploadForm.fileUploader.queue.length !== 0;
}
return false;
} |
<<<<<<<
chatRooms: chatRooms.map(extractSingleMongoId),
freeTextStyle
=======
chatRooms: chatRooms.map(extractMongoId),
freeTextStyle,
userCanEditCourse
>>>>>>>
chatRooms: chatRooms.map(extractSingleMongoId),
freeTextStyle,
userCanEditCourse |
<<<<<<<
FileUploadModule
=======
HttpClientModule,
>>>>>>>
HttpClientModule,
FileUploadModule |
<<<<<<<
import {FileComponent} from './file/file.component';
import {ImprintComponent} from './imprint/imprint.component';
=======
import {LegalnoticeComponent} from './privacy/legalnotice/legalnotice.component';
import {PrivacyComponent} from './privacy/privacynotice/privacy.component';
>>>>>>>
import {FileComponent} from './file/file.component';
import {LegalnoticeComponent} from './privacy/legalnotice/legalnotice.component';
import {PrivacyComponent} from './privacy/privacynotice/privacy.component';
<<<<<<<
path: 'file/:path',
component: FileComponent
},
{
path: 'imprint',
component: ImprintComponent
=======
path: 'legalnotice',
component: LegalnoticeComponent
},
{
path: 'privacy',
component: PrivacyComponent
>>>>>>>
path: 'file/:path',
component: FileComponent
},
{
path: 'legalnotice',
component: LegalnoticeComponent
},
{
path: 'privacy',
component: PrivacyComponent |
<<<<<<<
import {IUser} from '../../../shared/models/IUser';
import chaiHttp = require('chai-http');
=======
>>>>>>>
import {FixtureUtils} from '../../fixtures/FixtureUtils';
import {IUser} from '../../../shared/models/IUser';
import chaiHttp = require('chai-http');
<<<<<<<
it('should return the user [email protected]', (done) => {
User.findOne({email: '[email protected]'})
.then((user: IUser) => {
chai.request(app)
.get(`${BASE_URL}/${user._id}`)
.set('Authorization', `JWT ${JwtUtils.generateToken(user)}`)
.end((err, res) => {
res.status.should.be.equal(200);
done();
});
})
.catch(done);
=======
describe(`GET ${BASE_URL}`, () => {
it('should return the a user object', async () => {
const admin = await FixtureUtils.getRandomAdmin();
const res = await chai.request(app)
.get(`${BASE_URL}/${admin._id}`)
.set('Authorization', `JWT ${JwtUtils.generateToken(admin)}`);
res.status.should.be.equal(200);
res.body._id.should.be.equal(admin._id.toString());
res.body.email.should.be.equal(admin.email);
>>>>>>>
it('should return the a user object', async () => {
const admin = await FixtureUtils.getRandomAdmin();
const res = await chai.request(app)
.get(`${BASE_URL}/${admin._id}`)
.set('Authorization', `JWT ${JwtUtils.generateToken(admin)}`);
res.status.should.be.equal(200);
res.body._id.should.be.equal(admin._id.toString());
res.body.email.should.be.equal(admin.email);
<<<<<<<
it('should fail with wrong authorization (uid)', (done) => {
User.findOne({email: '[email protected]'})
.then((user) => {
const updatedUser = user;
updatedUser.uid = '987456';
chai.request(app)
.put(`${BASE_URL}/${user._id}`)
.set('Authorization', `JWT ${JwtUtils.generateToken(user)}`)
.send(updatedUser)
.end((err, res) => {
res.status.should.be.equal(403);
res.body.name.should.be.equal('ForbiddenError');
res.body.message.should.be.equal('Only users with admin privileges can change uids');
done();
});
})
.catch(done);
=======
it('should fail with bad request (email already in use)', async () => {
const users = await FixtureUtils.getRandomUsers(2, 2);
const updatedUser = users[0];
updatedUser.email = users[1].email;
const res = await chai.request(app)
.put(`${BASE_URL}/${users[0]._id}`)
.set('Authorization', `JWT ${JwtUtils.generateToken(users[0])}`)
.send(updatedUser)
.catch(err => err.response);
res.status.should.be.equal(400);
res.body.name.should.be.equal('BadRequestError');
res.body.message.should.be.equal('This mail address is already in use.');
>>>>>>>
it('should fail with wrong authorization (uid)', (done) => {
User.findOne({email: '[email protected]'})
.then((user) => {
const updatedUser = user;
updatedUser.uid = '987456';
chai.request(app)
.put(`${BASE_URL}/${user._id}`)
.set('Authorization', `JWT ${JwtUtils.generateToken(user)}`)
.send(updatedUser)
.end((err, res) => {
res.status.should.be.equal(403);
res.body.name.should.be.equal('ForbiddenError');
res.body.message.should.be.equal('Only users with admin privileges can change uids');
done();
});
})
.catch(done);
});
it('should fail with bad request (email already in use)', async () => {
const users = await FixtureUtils.getRandomUsers(2, 2);
const updatedUser = users[0];
updatedUser.email = users[1].email;
const res = await chai.request(app)
.put(`${BASE_URL}/${users[0]._id}`)
.set('Authorization', `JWT ${JwtUtils.generateToken(users[0])}`)
.send(updatedUser)
.catch(err => err.response);
res.status.should.be.equal(400);
res.body.name.should.be.equal('BadRequestError');
res.body.message.should.be.equal('This mail address is already in use.');
<<<<<<<
it('should upload a new user picture', (done) => {
User.findOne({email: '[email protected]'})
.then((user: IUser) => {
chai.request(app)
.post(`${BASE_URL}/picture/${user._id}`)
.set('Authorization', `JWT ${JwtUtils.generateToken(user)}`)
.attach('file', fs.readFileSync('test/resources/test.png'), 'test.png')
.end((err, res) => {
res.status.should.be.equal(200);
res.body.profile.picture.name.should.match(new RegExp(`${user._id}-[0-9]{4}.png`));
done();
});
})
.catch(done);
=======
it('should upload a new user picture', async () => {
const admin = await FixtureUtils.getRandomAdmin();
const res = await chai.request(app)
.post(`${BASE_URL}/picture/${admin._id}`)
.set('Authorization', `JWT ${JwtUtils.generateToken(admin)}`)
.attach('file', fs.readFileSync('test/resources/test.png'), 'test.png');
res.status.should.be.equal(200);
res.body.profile.picture.name.should.match(new RegExp(`${admin._id}-[0-9]{4}.png`));
>>>>>>>
it('should upload a new user picture', async () => {
const admin = await FixtureUtils.getRandomAdmin();
const res = await chai.request(app)
.post(`${BASE_URL}/picture/${admin._id}`)
.set('Authorization', `JWT ${JwtUtils.generateToken(admin)}`)
.attach('file', fs.readFileSync('test/resources/test.png'), 'test.png');
res.status.should.be.equal(200);
res.body.profile.picture.name.should.match(new RegExp(`${admin._id}-[0-9]{4}.png`)); |
<<<<<<<
import { UserSettingsComponent } from './user/user-settings/user-settings.component';
=======
import {DataSharingService} from './shared/services/data-sharing.service';
>>>>>>>
import {DataSharingService} from './shared/services/data-sharing.service';
<<<<<<<
NotificationSettingsService,
=======
DownloadFileService,
>>>>>>>
NotificationSettingsService,
DownloadFileService, |
<<<<<<<
import {BadgeComponent} from './components/badge/badge.component';
import {MatFabMenuComponent} from './components/mat-fab-menu/mat-fab-menu.component';
=======
import {BadgeComponent} from './components/badge/badge.component';
import {PasswordInputComponent} from './components/password-input/password-input.component';
>>>>>>>
import {BadgeComponent} from './components/badge/badge.component';
import {MatFabMenuComponent} from './components/mat-fab-menu/mat-fab-menu.component';
import {PasswordInputComponent} from './components/password-input/password-input.component';
<<<<<<<
MatFabMenuComponent,
BadgeComponent,
=======
PasswordInputComponent,
>>>>>>>
PasswordInputComponent,
MatFabMenuComponent,
BadgeComponent,
<<<<<<<
MatFabMenuComponent,
BadgeComponent,
=======
PasswordInputComponent,
>>>>>>>
PasswordInputComponent,
MatFabMenuComponent,
BadgeComponent, |
<<<<<<<
import {CourseService, UserDataService} from '../../../shared/services/data.service';
import {ShowProgressService} from '../../../shared/services/show-progress.service';
import {User} from '../../../models/user';
=======
import {CourseService, UserDataService} from '../../../shared/data.service';
import {ShowProgressService} from '../../../shared/show-progress.service';
import {IUser} from '../../../../../../../shared/models/IUser';
>>>>>>>
import {CourseService, UserDataService} from '../../../shared/services/data.service';
import {ShowProgressService} from '../../../shared/services/show-progress.service';
import {IUser} from '../../../../../../../shared/models/IUser'; |
<<<<<<<
import {AdminMarkdownEditComponent} from './components/admin-markdown-edit/admin-markdown-edit.component';
import {ImprintAndInfoService} from './services/imprint-and-info.service';
=======
import {NotfoundComponent} from './components/notfound/notfound.component';
>>>>>>>
import {AdminMarkdownEditComponent} from './components/admin-markdown-edit/admin-markdown-edit.component';
import {ImprintAndInfoService} from './services/imprint-and-info.service';
import {UserProfileDialog} from 'app/shared/components/user-profile-dialog/user-profile-dialog.component';
import {NotfoundComponent} from './components/notfound/notfound.component';
<<<<<<<
imports: [
CommonModule,
FormsModule,
ReactiveFormsModule,
MaterialImportModule,
HttpClientModule,
FileUploadModule,
AceEditorModule,
FileUploadModule,
TranslateModule,
],
declarations: [
GravatarDirective,
UnitMenuComponent,
UserImageDirective,
BadgeComponent,
PasswordInputComponent,
MatFabMenuComponent,
BadgeComponent,
ExpandableDivComponent,
ButtonSaveCancelComponent,
UploadFormComponent,
FilesizePipe,
UploadFormDialog,
ChangePasswordDialogComponent,
MarkdownEditorComponent,
PickMediaDialog,
AdminMarkdownEditComponent,
UserProfileDialog,
],
exports: [
GravatarDirective,
DialogModule,
UnitMenuComponent,
UserImageDirective,
MaterialImportModule,
BadgeComponent,
PasswordInputComponent,
MatFabMenuComponent,
BadgeComponent,
ExpandableDivComponent,
ButtonSaveCancelComponent,
MarkdownEditorComponent,
UploadFormComponent,
FilesizePipe,
UploadFormDialog,
ChangePasswordDialogComponent,
PickMediaDialog,
TranslateModule,
AdminMarkdownEditComponent,
UserProfileDialog,
],
entryComponents: [
UploadFormDialog,
PickMediaDialog,
UserProfileDialog,
],
=======
imports: [
CommonModule,
FormsModule,
ReactiveFormsModule,
MaterialImportModule,
HttpClientModule,
FileUploadModule,
AceEditorModule,
FileUploadModule,
TranslateModule,
],
declarations: [
GravatarDirective,
UnitMenuComponent,
UserImageDirective,
BadgeComponent,
PasswordInputComponent,
MatFabMenuComponent,
BadgeComponent,
ExpandableDivComponent,
ButtonSaveCancelComponent,
UploadFormComponent,
FilesizePipe,
UploadFormDialog,
ChangePasswordDialogComponent,
MarkdownEditorComponent,
PickMediaDialog,
NotfoundComponent,
UserProfileDialog,
],
exports: [
GravatarDirective,
DialogModule,
UnitMenuComponent,
UserImageDirective,
MaterialImportModule,
BadgeComponent,
PasswordInputComponent,
MatFabMenuComponent,
BadgeComponent,
ExpandableDivComponent,
ButtonSaveCancelComponent,
MarkdownEditorComponent,
UploadFormComponent,
FilesizePipe,
UploadFormDialog,
ChangePasswordDialogComponent,
PickMediaDialog,
TranslateModule,
UserProfileDialog,
],
entryComponents: [
UploadFormDialog,
PickMediaDialog,
UserProfileDialog,
],
>>>>>>>
imports: [
CommonModule,
FormsModule,
ReactiveFormsModule,
MaterialImportModule,
HttpClientModule,
FileUploadModule,
AceEditorModule,
FileUploadModule,
TranslateModule,
],
declarations: [
GravatarDirective,
UnitMenuComponent,
UserImageDirective,
BadgeComponent,
PasswordInputComponent,
MatFabMenuComponent,
BadgeComponent,
ExpandableDivComponent,
ButtonSaveCancelComponent,
UploadFormComponent,
FilesizePipe,
UploadFormDialog,
ChangePasswordDialogComponent,
MarkdownEditorComponent,
PickMediaDialog,
AdminMarkdownEditComponent,
UserProfileDialog,
NotfoundComponent,
UserProfileDialog,
],
exports: [
GravatarDirective,
DialogModule,
UnitMenuComponent,
UserImageDirective,
MaterialImportModule,
BadgeComponent,
PasswordInputComponent,
MatFabMenuComponent,
BadgeComponent,
ExpandableDivComponent,
ButtonSaveCancelComponent,
MarkdownEditorComponent,
UploadFormComponent,
FilesizePipe,
UploadFormDialog,
ChangePasswordDialogComponent,
PickMediaDialog,
TranslateModule,
AdminMarkdownEditComponent,
UserProfileDialog,
],
entryComponents: [
UploadFormDialog,
PickMediaDialog,
UserProfileDialog,
], |
<<<<<<<
import {ChangePasswordDialogComponent} from './components/change-password-dialog/change-password-dialog.component';
=======
import {MarkdownEditorComponent} from './components/markdown-editor/markdown-editor.component';
import {AceEditorModule} from 'ng2-ace-editor';
>>>>>>>
import {ChangePasswordDialogComponent} from './components/change-password-dialog/change-password-dialog.component';
import {MarkdownEditorComponent} from './components/markdown-editor/markdown-editor.component';
import {AceEditorModule} from 'ng2-ace-editor';
<<<<<<<
FileUploadModule,
=======
AceEditorModule,
FileUploadModule
>>>>>>>
FileUploadModule,
AceEditorModule,
FileUploadModule
<<<<<<<
ChangePasswordDialogComponent,
=======
MarkdownEditorComponent,
>>>>>>>
ChangePasswordDialogComponent,
MarkdownEditorComponent, |
<<<<<<<
import { CourseService, UserDataService } from './shared/data.service';
=======
import { CourseService, UserDataService, LectureService } from './shared/data.service';
>>>>>>>
import { CourseService, UserDataService, LectureService } from './shared/data.service';
<<<<<<<
import {MembersComponent} from './course/course-edit/members/members.component';
=======
import { UserRolesComponent } from './admin/user-roles/user-roles.component';
import { UserEditComponent } from './user/user-edit/user-edit.component';
>>>>>>>
import {MembersComponent} from './course/course-edit/members/members.component';
import { UserRolesComponent } from './admin/user-roles/user-roles.component';
import { UserEditComponent } from './user/user-edit/user-edit.component';
<<<<<<<
ManageContentComponent,
MembersComponent
=======
LectureComponent,
LectureNewComponent,
LectureEditComponent,
ManageContentComponent,
UserRolesComponent,
UserEditComponent,
UploadComponent,
FileSelectDirective
>>>>>>>
ManageContentComponent,
MembersComponent,
LectureComponent,
LectureNewComponent,
LectureEditComponent,
ManageContentComponent,
UserRolesComponent,
UserEditComponent,
UploadComponent,
FileSelectDirective
<<<<<<<
UserDataService,
ShowProgressService],
=======
ShowProgressService,
JwtHelper],
>>>>>>>
UserDataService,
ShowProgressService,
JwtHelper], |
<<<<<<<
import {isNullOrUndefined} from 'util';
=======
import {SortUtil} from '../../../shared/utils/SortUtil';
import {User} from '../../../models/User';
import {ActivatedRoute} from '@angular/router';
>>>>>>>
import {isNullOrUndefined} from 'util';
import {SortUtil} from '../../../shared/utils/SortUtil';
import {User} from '../../../models/User';
import {ActivatedRoute} from '@angular/router'; |
<<<<<<<
import {PickMediaDialog} from './components/pick-media-dialog/pick-media-dialog.component';
=======
import {TranslateModule} from '@ngx-translate/core';
>>>>>>>
import {PickMediaDialog} from './components/pick-media-dialog/pick-media-dialog.component';
import {TranslateModule} from '@ngx-translate/core';
<<<<<<<
PickMediaDialog,
],
entryComponents: [
UploadFormDialog,
PickMediaDialog,
],
=======
TranslateModule,
]
>>>>>>>
PickMediaDialog,
TranslateModule,
],
entryComponents: [
UploadFormDialog,
PickMediaDialog,
], |
<<<<<<<
import {UserDataService} from '../../shared/services/data.service';
import {User} from '../../models/user';
=======
import {UserDataService} from '../../shared/data.service';
>>>>>>>
import {UserDataService} from '../../shared/services/data.service';
<<<<<<<
import {DialogService} from '../../shared/services/dialog.service';
=======
import {IUser} from '../../../../../../shared/models/IUser';
>>>>>>>
import {IUser} from '../../../../../../shared/models/IUser';
import {DialogService} from '../../shared/services/dialog.service'; |
<<<<<<<
import { Constants, PersistentCacheKeys, StringUtils, AuthorizationCodeRequest, ICrypto, CacheSchemaType, AccountEntity, AppMetadataEntity, CacheManager, CredentialEntity, ThrottlingEntity, ServerTelemetryEntity, ProtocolUtils} from "@azure/msal-common";
=======
import { Constants, PersistentCacheKeys, StringUtils, AuthorizationCodeRequest, ICrypto, CacheSchemaType, AccountEntity, IdTokenEntity, CredentialType, AccessTokenEntity, RefreshTokenEntity, AppMetadataEntity, CacheManager, CredentialEntity, ServerTelemetryEntity, ThrottlingEntity, ProtocolUtils } from "@azure/msal-common";
>>>>>>>
import { Constants, PersistentCacheKeys, StringUtils, AuthorizationCodeRequest, ICrypto, AccountEntity, AppMetadataEntity, CacheManager, CredentialEntity, ThrottlingEntity, ServerTelemetryEntity, ProtocolUtils} from "@azure/msal-common";
<<<<<<<
return value;
}
/**
* Sets the cache item with the key and value given.
* Stores in cookie if storeAuthStateInCookie is set to true.
* This can cause cookie overflow if used incorrectly.
* @param key
* @param value
*/
setTemporaryCache(key: string, value: string): void {
const stringVal = value as string;
this.setItem(key, stringVal);
if (this.cacheConfig.storeAuthStateInCookie) {
this.setItemCookie(key, stringVal);
=======
switch (type) {
case CacheSchemaType.ACCOUNT: {
const account = new AccountEntity();
return (CacheManager.toObject(account, JSON.parse(value)) as AccountEntity);
}
case CacheSchemaType.CREDENTIAL: {
const credentialType = CredentialEntity.getCredentialType(key);
switch (credentialType) {
case CredentialType.ID_TOKEN: {
const idTokenEntity: IdTokenEntity = new IdTokenEntity();
return (CacheManager.toObject(idTokenEntity, JSON.parse(value)) as IdTokenEntity);
}
case CredentialType.ACCESS_TOKEN: {
const accessTokenEntity: AccessTokenEntity = new AccessTokenEntity();
return (CacheManager.toObject(accessTokenEntity, JSON.parse(value)) as AccessTokenEntity);
}
case CredentialType.REFRESH_TOKEN: {
const refreshTokenEntity: RefreshTokenEntity = new RefreshTokenEntity();
return (CacheManager.toObject(refreshTokenEntity, JSON.parse(value)) as RefreshTokenEntity);
}
}
}
case CacheSchemaType.APP_METADATA: {
return (JSON.parse(value) as AppMetadataEntity);
}
case CacheSchemaType.THROTTLING: {
return (JSON.parse(value) as ThrottlingEntity);
}
case CacheSchemaType.TEMPORARY: {
const itemCookie = this.getItemCookie(key);
if (this.cacheConfig.storeAuthStateInCookie) {
return itemCookie;
}
return value;
}
case CacheSchemaType.TELEMETRY: {
const serverTelemetryEntity: ServerTelemetryEntity = new ServerTelemetryEntity();
return (CacheManager.toObject(serverTelemetryEntity, JSON.parse(value)) as ServerTelemetryEntity);
}
default: {
throw BrowserAuthError.createInvalidCacheTypeError();
}
>>>>>>>
return value;
}
/**
* Sets the cache item with the key and value given.
* Stores in cookie if storeAuthStateInCookie is set to true.
* This can cause cookie overflow if used incorrectly.
* @param key
* @param value
*/
setTemporaryCache(key: string, value: string): void {
const stringVal = value as string;
this.setItem(key, stringVal);
if (this.cacheConfig.storeAuthStateInCookie) {
this.setItemCookie(key, stringVal); |
<<<<<<<
import * as moment from 'jalali-moment';
import {Moment} from 'jalali-moment';
=======
import * as momentNs from 'moment';
import {Moment} from 'moment';
>>>>>>>
import * as momentNs from 'jalali-moment';
import {Moment} from 'jalali-moment';
<<<<<<<
locale: 'fa'
};
private gregorianExtensionConfig: IDatePickerConfig = {
format: 'DD-MM-YYYY',
locale: 'en'
=======
locale: moment.locale(),
hideOnOutsideClick: true
>>>>>>>
locale: 'fa',
hideOnOutsideClick: true
};
private gregorianExtensionConfig: IDatePickerConfig = {
format: 'DD-MM-YYYY',
locale: 'en' |
<<<<<<<
=======
let config: ClientConfiguration;
beforeEach(() => {
config = ClientTestUtils.createTestClientConfiguration();
});
>>>>>>> |
<<<<<<<
import * as moment from 'jalali-moment';
import {Moment, unitOfTime} from 'jalali-moment';
=======
import {Moment} from 'moment';
import * as moment from 'moment';
>>>>>>>
import * as moment from 'jalali-moment';
import {Moment, unitOfTime} from 'jalali-moment';
<<<<<<<
import {IDate} from '../common/models/date.model';
import {ECalendarSystem} from '../common/types/calendar-type-enum';
=======
import {TimeSelectService} from '../time-select/time-select.service';
import {DayTimeCalendarService} from '../day-time-calendar/day-time-calendar.service';
import {ITimeSelectConfig} from '../time-select/time-select-config.model';
import {CalendarMode} from '../common/types/calendar-mode';
>>>>>>>
import {ECalendarSystem} from '../common/types/calendar-type-enum';
import {TimeSelectService} from '../time-select/time-select.service';
import {DayTimeCalendarService} from '../day-time-calendar/day-time-calendar.service';
import {ITimeSelectConfig} from '../time-select/time-select-config.model';
import {CalendarMode} from '../common/types/calendar-mode';
<<<<<<<
getConfig(config: IDatePickerConfig): IDatePickerConfig {
this.defaultConfig.format = (!config || (config.calendarSystem !== ECalendarSystem.gregorian)) ? 'jDD-jMM-jYYYY' : 'DD-MM-YYYY';
const _config: IDatePickerConfig = {...this.defaultConfig, ...this.utilsService.clearUndefined(config)};
=======
getConfig(config: IDatePickerConfig, mode: CalendarMode = 'daytime'): IDatePickerConfig {
const _config: IDatePickerConfig = {
...this.defaultConfig,
format: this.getDefaultFormatByMode(mode),
...this.utilsService.clearUndefined(config)
};
>>>>>>>
getConfig(config: IDatePickerConfig, mode: CalendarMode = 'daytime'): IDatePickerConfig {
this.defaultConfig.format = (!config || (config.calendarSystem !== ECalendarSystem.gregorian)) ? 'jDD-jMM-jYYYY' : 'DD-MM-YYYY';
const _config: IDatePickerConfig = {
...this.defaultConfig,
format: this.getDefaultFormatByMode(mode),
...this.utilsService.clearUndefined(config)
}; |
<<<<<<<
import {Moment, MomentInput} from 'jalali-moment';
import * as moment from 'jalali-moment';
=======
import * as moment from 'moment';
import {Moment} from 'moment';
>>>>>>>
import {Moment} from 'jalali-moment';
import * as moment from 'jalali-moment';
<<<<<<<
import {ITimeSelectConfig} from './time-select-config.model';
import {ECalendarSystem} from '../common/types/calendar-type-enum';
=======
import {ITimeSelectConfig, ITimeSelectConfigInternal} from './time-select-config.model';
>>>>>>>
import {ITimeSelectConfig, ITimeSelectConfigInternal} from './time-select-config.model';
<<<<<<<
if (!config || (config.calendarSystem !== ECalendarSystem.gregorian)) {
this.DEFAULT_CONFIG.locale = 'fa';
}
const _config = {
=======
const _config = <ITimeSelectConfigInternal>{
>>>>>>>
const _config = <ITimeSelectConfigInternal>{
<<<<<<<
getMeridiem(config: ITimeSelectConfig, time: Moment): string {
if (config.locale) {
time.locale(config.locale);
}
=======
getMeridiem(config: ITimeSelectConfigInternal, time: Moment): string {
>>>>>>>
getMeridiem(config: ITimeSelectConfigInternal, time: Moment): string {
if (config.locale) {
time.locale(config.locale);
} |
<<<<<<<
getConfig(config: IDayCalendarConfig): IDayCalendarConfig {
if (!config || (config.calendarSystem !== ECalendarSystem.gregorian)) {
this.DEFAULT_CONFIG = {...this.GREGORIAN_DEFAULT_CONFIG, ...this.JALALI_CONFIG_EXTENTION};
} else {
this.DEFAULT_CONFIG = this.GREGORIAN_DEFAULT_CONFIG;
}
moment.locale(this.DEFAULT_CONFIG.locale);
return {...this.DEFAULT_CONFIG, ...this.utilsService.clearUndefined(config)};
=======
getConfig(config: IDayCalendarConfig): IDayCalendarConfigInternal {
const _config = <IDayCalendarConfigInternal>{
...this.DEFAULT_CONFIG,
...this.utilsService.clearUndefined(config)
};
this.utilsService.convertPropsToMoment(_config, _config.format, ['min', 'max']);
moment.locale(_config.locale);
return _config;
>>>>>>>
getConfig(config: IDayCalendarConfig): IDayCalendarConfigInternal {
const _config = <IDayCalendarConfigInternal>{
...this.DEFAULT_CONFIG,
...((config && config.locale === 'en') ? {} : this.GREGORIAN_CONFIG_EXTENTION),
...this.utilsService.clearUndefined(config)
};
this.utilsService.convertPropsToMoment(_config, _config.format, ['min', 'max']);
moment.locale(_config.locale);
return _config;
<<<<<<<
const firstDayOfMonth = month.clone().startOf(this.getMonthFormat(config));
=======
>>>>>>>
<<<<<<<
const actionMonthFormat = this.getMonthFormat(config);
const daysOfCalendar: IDay[] = this.utilsService.createArray(42).reduce((array: IDay[]) => {
array.push({
date: current.clone(),
selected: !!selected.find(selectedDay => current.isSame(selectedDay, 'day')),
currentMonth: current.isSame(month, actionMonthFormat),
prevMonth: current.isSame(month.clone().subtract(1, actionMonthFormat), actionMonthFormat),
nextMonth: current.isSame(month.clone().add(1, actionMonthFormat), actionMonthFormat),
currentDay: current.isSame(moment(), 'day')
});
current.add(1, 'd');
return array;
}, []);
=======
const prevMonth = month.clone().subtract(1, 'month');
const nextMonth = month.clone().add(1, 'month');
const today = moment();
const daysOfCalendar: IDay[] = this.utilsService.createArray(42)
.reduce((array: IDay[]) => {
array.push({
date: current.clone(),
selected: !!selected.find(selectedDay => current.isSame(selectedDay, 'day')),
currentMonth: current.isSame(month, 'month'),
prevMonth: current.isSame(prevMonth, 'month'),
nextMonth: current.isSame(nextMonth, 'month'),
currentDay: current.isSame(today, 'day'),
disabled: this.isDateDisabled(current, config)
});
current.add(1, 'day');
if (current.format('HH') !== '00') {
current.startOf('day').add(1, 'day');
}
return array;
}, []);
>>>>>>>
const prevMonth = month.clone().subtract(1, 'month');
const nextMonth = month.clone().add(1, 'month');
const today = moment();
const daysOfCalendar: IDay[] = this.utilsService.createArray(42)
.reduce((array: IDay[]) => {
array.push({
date: current.clone(),
selected: !!selected.find(selectedDay => current.isSame(selectedDay, 'day')),
currentMonth: current.isSame(month, 'month'),
prevMonth: current.isSame(prevMonth, 'month'),
nextMonth: current.isSame(nextMonth, 'month'),
currentDay: current.isSame(today, 'day'),
disabled: this.isDateDisabled(current, config)
});
current.add(1, 'day');
if (current.format('HH') !== '00') {
current.startOf('day').add(1, 'day');
}
return array;
}, []); |
<<<<<<<
import * as moment from 'jalali-moment';
import {Moment, unitOfTime} from 'jalali-moment';
=======
import {Moment, unitOfTime} from 'moment';
>>>>>>>
import {Moment, unitOfTime} from 'jalali-moment';
<<<<<<<
.convertFromMomentArray(this.componentConfig.format, selected, ECalendarValue.StringArr, this.componentConfig.locale))
.join(', ');
=======
.convertFromMomentArray(this.componentConfig.format, selected, ECalendarValue.StringArr))
.join(' | ');
>>>>>>>
.convertFromMomentArray(this.componentConfig.format, selected, ECalendarValue.StringArr, this.componentConfig.locale))
.join(' | ');
<<<<<<<
}, this.componentConfig.format, this.mode, this.componentConfig.locale);
this.onChangeCallback(this.processOnChangeCallback(this.selected));
=======
}, this.componentConfig.format, this.mode);
this.onChangeCallback(this.processOnChangeCallback(this.selected), false);
>>>>>>>
}, this.componentConfig.format, this.mode, this.componentConfig.locale);
this.onChangeCallback(this.processOnChangeCallback(this.selected), false);
<<<<<<<
onViewDateChange(value: string) {
if (this.dayPickerService.isValidInputDateValue(value, this.componentConfig)) {
if (value && this.config.locale === 'fa') {
const l = moment.locale();
moment.locale('fa');
value = moment(value, this.componentConfig.format).locale('en').format(this.componentConfig.format);
moment.locale(l);
}
this.selected = this.dayPickerService.convertInputValueToMomentArray(value, this.componentConfig);
=======
onViewDateChange(value: CalendarValue) {
const strVal = value ? this.utilsService.convertToString(value, this.componentConfig.format) : '';
if (this.dayPickerService.isValidInputDateValue(strVal, this.componentConfig)) {
this.selected = this.dayPickerService.convertInputValueToMomentArray(strVal, this.componentConfig);
>>>>>>>
onViewDateChange(value: CalendarValue) {
const strVal = value ? this.utilsService.convertToString(value, this.componentConfig.format) : '';
if (this.dayPickerService.isValidInputDateValue(strVal, this.componentConfig)) {
this.selected = this.dayPickerService.convertInputValueToMomentArray(strVal, this.componentConfig);
// if (value && this.config.locale === 'fa') {
// const l = moment.locale();
// moment.locale('fa');
// value = moment(value, this.componentConfig.format).locale('en').format(this.componentConfig.format);
// moment.locale(l);
// }
this.selected = this.dayPickerService.convertInputValueToMomentArray(value, this.componentConfig);
<<<<<<<
.getValidMomentArray(value, this.componentConfig.format, this.componentConfig.locale);
this.onChangeCallback(this.processOnChangeCallback(value));
=======
.getValidMomentArray(strVal, this.componentConfig.format);
this.onChangeCallback(this.processOnChangeCallback(strVal), true);
>>>>>>>
.getValidMomentArray(strVal, this.componentConfig.format, this.componentConfig.locale);
this.onChangeCallback(this.processOnChangeCallback(strVal), true); |
<<<<<<<
import {Moment} from 'jalali-moment';
import {ECalendarSystem} from '../common/types/calendar-type-enum';
=======
import {Moment} from 'moment';
import {ECalendarValue} from '../common/types/calendar-value-enum';
>>>>>>>
import {Moment} from 'jalali-moment';
import {ECalendarSystem} from '../common/types/calendar-type-enum';
import {ECalendarValue} from '../common/types/calendar-value-enum'; |
<<<<<<<
import * as moment from 'jalali-moment';
import {Moment,unitOfTime} from 'jalali-moment';
import {DatePickerService} from './date-picker.service';
import {IDatePickerConfig} from './date-picker-config.model';
=======
>>>>>>> |
<<<<<<<
import * as moment from 'jalali-moment';
=======
import * as momentNs from 'moment';
>>>>>>>
import * as momentNs from 'jalali-moment'; |
Subsets and Splits
No saved queries yet
Save your SQL queries to embed, download, and access them later. Queries will appear here once saved.