Skip to content

Commit 442c646

Browse files
rpdomerpdome
authored
Merge branch 'dev' into rapong/powerOpt
2 parents 530ab3b + 8bdb7ba commit 442c646

File tree

13 files changed

+59
-157
lines changed

13 files changed

+59
-157
lines changed

‎LabApiUtilities/src/main/com/microsoft/identity/labapi/utilities/client/LabClient.java‎

Lines changed: 12 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -229,10 +229,7 @@ private ILabAccount createTempAccountInternal(@NonNull final TempUserType tempUs
229229
mLabApiAuthenticationClient.getAccessToken()
230230
);
231231

232-
final String createTempUserFunctionCode = getKeyVaultSecret(
233-
CreateTempUserApi.AZURE_FUNCTION_CODE_SECRET_NAME
234-
);
235-
final CreateTempUserApi createTempUserApi = new CreateTempUserApi(createTempUserFunctionCode);
232+
final CreateTempUserApi createTempUserApi = new CreateTempUserApi();
236233
createTempUserApi.getApiClient().setReadTimeout(TEMP_USER_API_READ_TIMEOUT);
237234
final TempUser tempUser;
238235

@@ -329,14 +326,10 @@ public boolean deleteDevice(@NonNull final String upn,
329326
Configuration.getDefaultApiClient().setAccessToken(
330327
mLabApiAuthenticationClient.getAccessToken()
331328
);
332-
333-
final String deleteDeviceFunctionCode = getKeyVaultSecret(
334-
DeleteDeviceApi.AZURE_FUNCTION_CODE_SECRET_NAME
335-
);
336-
final DeleteDeviceApi deleteDeviceApi = new DeleteDeviceApi(deleteDeviceFunctionCode);
329+
final DeleteDeviceApi deleteDeviceApi = new DeleteDeviceApi();
337330

338331
try {
339-
final CustomSuccessResponse successResponse = deleteDeviceApi.apiDeleteDeviceDelete(
332+
final String successResponse = deleteDeviceApi.apiDeleteDeviceDelete(
340333
upn, deviceId
341334
);
342335

@@ -346,12 +339,12 @@ public boolean deleteDevice(@NonNull final String upn,
346339

347340
// we probably need a more sophisticated logger integrated into LabApi
348341
// for now this is fine
349-
System.out.println(successResponse.getResult());
342+
System.out.println(successResponse);
350343

351344
final String expectedResult = String.format(
352345
"Device : %s, successfully deleted from AAD.", deviceId
353346
);
354-
return expectedResult.equalsIgnoreCase(successResponse.getResult());
347+
return expectedResult.equalsIgnoreCase(successResponse);
355348
} catch (final com.microsoft.identity.internal.test.labapi.ApiException ex) {
356349
throw new LabApiException(
357350
LabError.FAILED_TO_DELETE_DEVICE, ex,
@@ -435,10 +428,10 @@ private String getPassword(final String credentialVaultKeyName) throws LabApiExc
435428

436429
@Override
437430
public boolean resetPassword(@NonNull final String upn) throws LabApiException {
438-
final String resetApiFunctionCode = getKeyVaultSecret(
439-
ResetApi.AZURE_FUNCTION_CODE_SECRET_NAME
431+
Configuration.getDefaultApiClient().setAccessToken(
432+
mLabApiAuthenticationClient.getAccessToken()
440433
);
441-
final ResetApi resetApi = new ResetApi(resetApiFunctionCode);
434+
final ResetApi resetApi = new ResetApi();
442435
try {
443436
final CustomSuccessResponse resetResponse = resetApi.apiResetPut(upn, ResetOperation.PASSWORD.toString());
444437
if (resetResponse == null) {
@@ -512,10 +505,7 @@ public boolean enablePolicy(@NonNull final String upn, @NonNull final Protection
512505
Configuration.getDefaultApiClient().setAccessToken(
513506
mLabApiAuthenticationClient.getAccessToken()
514507
);
515-
final String enablePolicyFunctionCode = getKeyVaultSecret(
516-
EnablePolicyApi.AZURE_FUNCTION_CODE_SECRET_NAME
517-
);
518-
final EnablePolicyApi enablePolicyApi = new EnablePolicyApi(enablePolicyFunctionCode);
508+
final EnablePolicyApi enablePolicyApi = new EnablePolicyApi();
519509
try {
520510
final CustomSuccessResponse enablePolicyResult = enablePolicyApi.apiEnablePolicyPut(upn, policy.toString());
521511
final String expectedResult = (policy + " Enabled for user : " + upn).toLowerCase();
@@ -537,10 +527,10 @@ public boolean enablePolicy(@NonNull final String upn, @NonNull final Protection
537527
* @return boolean value indicating policy is disabled or not for the upn.
538528
*/
539529
public boolean disablePolicy(@NonNull final String upn, @NonNull final ProtectionPolicy policy) throws LabApiException {
540-
final String disablePolicyFunctionCode = getKeyVaultSecret(
541-
DisablePolicyApi.AZURE_FUNCTION_CODE_SECRET_NAME
530+
Configuration.getDefaultApiClient().setAccessToken(
531+
mLabApiAuthenticationClient.getAccessToken()
542532
);
543-
final DisablePolicyApi disablePolicyApi = new DisablePolicyApi(disablePolicyFunctionCode);
533+
final DisablePolicyApi disablePolicyApi = new DisablePolicyApi();
544534
try {
545535
final CustomSuccessResponse disablePolicyResponse = disablePolicyApi.apiDisablePolicyPut(upn, policy.toString());
546536
final String expectedResult = (policy + " Disabled for user : " + upn).toLowerCase();

‎LabApiUtilities/src/main/com/microsoft/identity/labapi/utilities/constants/LabConstants.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,8 +163,8 @@ static final class TempUserPolicy {
163163
}
164164

165165
static final class ResetOperation {
166-
public static final String MFA = "MFA";
167-
public static final String PASSWORD = "Password";
166+
public static final String MFA = "mfa";
167+
public static final String PASSWORD = "password";
168168
}
169169

170170
static final class HasAltId {

‎LabApiUtilities/src/test/com/microsoft/identity/labapi/utilities/client/LabClientTest.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,6 @@ public void canCreateMAMCATempUser() {
171171
}
172172

173173
@Test
174-
@Ignore
175174
public void canResetPassword() {
176175
try {
177176
final ILabAccount labAccount = mLabClient.createTempAccount(TempUserType.BASIC);
@@ -183,7 +182,6 @@ public void canResetPassword() {
183182
}
184183

185184
@Test
186-
@Ignore
187185
public void canEnablePolicy() {
188186
try {
189187
final ILabAccount labAccount = mLabClient.createTempAccount(TempUserType.BASIC);
@@ -195,7 +193,6 @@ public void canEnablePolicy() {
195193
}
196194

197195
@Test
198-
@Ignore
199196
public void canDisablePolicy() {
200197
try {
201198
final ILabAccount labAccount = mLabClient.createTempAccount(TempUserType.MAM_CA);

‎labapi/src/main/java/com/microsoft/identity/internal/test/labapi/api/CreateTempUserApi.java‎

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,9 @@
2020
import com.microsoft.identity.internal.test.labapi.Pair;
2121
import com.microsoft.identity.internal.test.labapi.ProgressRequestBody;
2222
import com.microsoft.identity.internal.test.labapi.ProgressResponseBody;
23-
2423
import com.google.gson.reflect.TypeToken;
25-
2624
import java.io.IOException;
27-
28-
29-
import com.microsoft.identity.internal.test.labapi.model.CustomErrorResponse;
3025
import com.microsoft.identity.internal.test.labapi.model.TempUser;
31-
3226
import java.lang.reflect.Type;
3327
import java.util.ArrayList;
3428
import java.util.HashMap;
@@ -37,16 +31,13 @@
3731

3832
public class CreateTempUserApi {
3933
private ApiClient apiClient;
40-
private final String mAzureFunctionCode;
41-
public static final String AZURE_FUNCTION_CODE_SECRET_NAME = "CreateTempUser";
4234

43-
public CreateTempUserApi(final String azureFunctionCode) {
44-
this(Configuration.getDefaultApiClient(), azureFunctionCode);
35+
public CreateTempUserApi() {
36+
this(Configuration.getDefaultApiClient());
4537
}
4638

47-
public CreateTempUserApi(final ApiClient apiClient, final String azureFunctionCode) {
39+
public CreateTempUserApi(final ApiClient apiClient) {
4840
this.apiClient = apiClient;
49-
mAzureFunctionCode = azureFunctionCode;
5041
}
5142

5243
public ApiClient getApiClient() {
@@ -76,8 +67,6 @@ public com.squareup.okhttp.Call apiCreateTempUserPostCall(String usertype, final
7667
if (usertype != null)
7768
localVarQueryParams.addAll(apiClient.parameterToPair("usertype", usertype));
7869

79-
localVarQueryParams.addAll(apiClient.parameterToPair("code", mAzureFunctionCode));
80-
8170
Map<String, String> localVarHeaderParams = new HashMap<String, String>();
8271

8372
Map<String, Object> localVarFormParams = new HashMap<String, Object>();

‎labapi/src/main/java/com/microsoft/identity/internal/test/labapi/api/DeleteDeviceApi.java‎

Lines changed: 9 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,9 @@
2020
import com.microsoft.identity.internal.test.labapi.Pair;
2121
import com.microsoft.identity.internal.test.labapi.ProgressRequestBody;
2222
import com.microsoft.identity.internal.test.labapi.ProgressResponseBody;
23-
2423
import com.google.gson.reflect.TypeToken;
25-
2624
import java.io.IOException;
27-
28-
29-
import com.microsoft.identity.internal.test.labapi.model.CustomErrorResponse;
3025
import com.microsoft.identity.internal.test.labapi.model.CustomSuccessResponse;
31-
3226
import java.lang.reflect.Type;
3327
import java.util.ArrayList;
3428
import java.util.HashMap;
@@ -37,16 +31,13 @@
3731

3832
public class DeleteDeviceApi {
3933
private ApiClient apiClient;
40-
private final String mAzureFunctionCode;
41-
public static final String AZURE_FUNCTION_CODE_SECRET_NAME = "DeleteDevice";
4234

43-
public DeleteDeviceApi(final String azureFunctionCode) {
44-
this(Configuration.getDefaultApiClient(), azureFunctionCode);
35+
public DeleteDeviceApi() {
36+
this(Configuration.getDefaultApiClient());
4537
}
4638

47-
public DeleteDeviceApi(ApiClient apiClient, final String azureFunctionCode) {
39+
public DeleteDeviceApi(ApiClient apiClient) {
4840
this.apiClient = apiClient;
49-
mAzureFunctionCode = azureFunctionCode;
5041
}
5142

5243
public ApiClient getApiClient() {
@@ -77,9 +68,7 @@ public com.squareup.okhttp.Call apiDeleteDeviceDeleteCall(String upn, String dev
7768
if (upn != null)
7869
localVarQueryParams.addAll(apiClient.parameterToPair("upn", upn));
7970
if (deviceid != null)
80-
localVarQueryParams.addAll(apiClient.parameterToPair("deviceid", deviceid));
81-
82-
localVarQueryParams.addAll(apiClient.parameterToPair("code", mAzureFunctionCode));
71+
localVarQueryParams.addAll(apiClient.parameterToPair("deviceId", deviceid));
8372

8473
Map<String, String> localVarHeaderParams = new HashMap<String, String>();
8574

@@ -110,7 +99,7 @@ public com.squareup.okhttp.Response intercept(com.squareup.okhttp.Interceptor.Ch
11099
}
111100

112101
String[] localVarAuthNames = new String[] { };
113-
return apiClient.buildCall(localVarPath, "DELETE", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
102+
return apiClient.buildCall(localVarPath, "POST", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
114103
}
115104

116105
@SuppressWarnings("rawtypes")
@@ -128,8 +117,8 @@ private com.squareup.okhttp.Call apiDeleteDeviceDeleteValidateBeforeCall(String
128117
* @return CustomSuccessResponse
129118
* @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
130119
*/
131-
public CustomSuccessResponse apiDeleteDeviceDelete(String upn, String deviceid) throws ApiException {
132-
ApiResponse<CustomSuccessResponse> resp = apiDeleteDeviceDeleteWithHttpInfo(upn, deviceid);
120+
public String apiDeleteDeviceDelete(String upn, String deviceid) throws ApiException {
121+
ApiResponse<String> resp = apiDeleteDeviceDeleteWithHttpInfo(upn, deviceid);
133122
return resp.getData();
134123
}
135124

@@ -141,9 +130,9 @@ public CustomSuccessResponse apiDeleteDeviceDelete(String upn, String deviceid)
141130
* @return ApiResponse&lt;CustomSuccessResponse&gt;
142131
* @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
143132
*/
144-
public ApiResponse<CustomSuccessResponse> apiDeleteDeviceDeleteWithHttpInfo(String upn, String deviceid) throws ApiException {
133+
public ApiResponse<String> apiDeleteDeviceDeleteWithHttpInfo(String upn, String deviceid) throws ApiException {
145134
com.squareup.okhttp.Call call = apiDeleteDeviceDeleteValidateBeforeCall(upn, deviceid, null, null);
146-
Type localVarReturnType = TypeToken.get(CustomSuccessResponse.class).getType();
135+
Type localVarReturnType = TypeToken.get(String.class).getType();
147136
return apiClient.execute(call, localVarReturnType);
148137
}
149138

‎labapi/src/main/java/com/microsoft/identity/internal/test/labapi/api/DisablePolicyApi.java‎

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -36,16 +36,13 @@
3636

3737
public class DisablePolicyApi {
3838
private ApiClient apiClient;
39-
private final String mAzureFunctionCode;
40-
public static final String AZURE_FUNCTION_CODE_SECRET_NAME = "DisablePolicy";
4139

42-
public DisablePolicyApi(final String azureFunctionCode) {
43-
this(Configuration.getDefaultApiClient(), azureFunctionCode);
40+
public DisablePolicyApi() {
41+
this(Configuration.getDefaultApiClient());
4442
}
4543

46-
public DisablePolicyApi(ApiClient apiClient, final String azureFunctionCode) {
44+
public DisablePolicyApi(ApiClient apiClient) {
4745
this.apiClient = apiClient;
48-
mAzureFunctionCode = azureFunctionCode;
4946
}
5047

5148
public ApiClient getApiClient() {
@@ -78,8 +75,6 @@ public com.squareup.okhttp.Call apiDisablePolicyPutCall(String upn, String polic
7875
if (policy != null)
7976
localVarQueryParams.addAll(apiClient.parameterToPair("policy", policy));
8077

81-
localVarQueryParams.addAll(apiClient.parameterToPair("code", mAzureFunctionCode));
82-
8378
Map<String, String> localVarHeaderParams = new HashMap<String, String>();
8479

8580
Map<String, Object> localVarFormParams = new HashMap<String, Object>();
@@ -109,7 +104,7 @@ public com.squareup.okhttp.Response intercept(com.squareup.okhttp.Interceptor.Ch
109104
}
110105

111106
String[] localVarAuthNames = new String[] { };
112-
return apiClient.buildCall(localVarPath, "PUT", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
107+
return apiClient.buildCall(localVarPath, "POST", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
113108
}
114109

115110
@SuppressWarnings("rawtypes")

‎labapi/src/main/java/com/microsoft/identity/internal/test/labapi/api/EnablePolicyApi.java‎

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -35,16 +35,13 @@
3535

3636
public class EnablePolicyApi {
3737
private ApiClient apiClient;
38-
private final String mAzureFunctionCode;
39-
public static final String AZURE_FUNCTION_CODE_SECRET_NAME = "EnablePolicy";
4038

41-
public EnablePolicyApi(final String azureFunctionCode) {
42-
this(Configuration.getDefaultApiClient(), azureFunctionCode);
39+
public EnablePolicyApi() {
40+
this(Configuration.getDefaultApiClient());
4341
}
4442

45-
public EnablePolicyApi(ApiClient apiClient, final String azureFunctionCode) {
43+
public EnablePolicyApi(ApiClient apiClient) {
4644
this.apiClient = apiClient;
47-
mAzureFunctionCode = azureFunctionCode;
4845
}
4946

5047
public ApiClient getApiClient() {
@@ -77,8 +74,6 @@ public com.squareup.okhttp.Call apiEnablePolicyPutCall(String upn, String policy
7774
if (policy != null)
7875
localVarQueryParams.addAll(apiClient.parameterToPair("policy", policy));
7976

80-
localVarQueryParams.addAll(apiClient.parameterToPair("code", mAzureFunctionCode));
81-
8277
Map<String, String> localVarHeaderParams = new HashMap<String, String>();
8378

8479
Map<String, Object> localVarFormParams = new HashMap<String, Object>();
@@ -108,7 +103,7 @@ public com.squareup.okhttp.Response intercept(com.squareup.okhttp.Interceptor.Ch
108103
}
109104

110105
String[] localVarAuthNames = new String[] { };
111-
return apiClient.buildCall(localVarPath, "PUT", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
106+
return apiClient.buildCall(localVarPath, "POST", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
112107
}
113108

114109
@SuppressWarnings("rawtypes")

‎labapi/src/main/java/com/microsoft/identity/internal/test/labapi/api/ResetApi.java‎

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,9 @@
2020
import com.microsoft.identity.internal.test.labapi.Pair;
2121
import com.microsoft.identity.internal.test.labapi.ProgressRequestBody;
2222
import com.microsoft.identity.internal.test.labapi.ProgressResponseBody;
23-
2423
import com.google.gson.reflect.TypeToken;
25-
2624
import java.io.IOException;
27-
28-
29-
import com.microsoft.identity.internal.test.labapi.model.CustomErrorResponse;
3025
import com.microsoft.identity.internal.test.labapi.model.CustomSuccessResponse;
31-
3226
import java.lang.reflect.Type;
3327
import java.util.ArrayList;
3428
import java.util.HashMap;
@@ -37,16 +31,13 @@
3731

3832
public class ResetApi {
3933
private ApiClient apiClient;
40-
private final String mAzureFunctionCode;
41-
public static final String AZURE_FUNCTION_CODE_SECRET_NAME = "ResetApi";
4234

43-
public ResetApi(final String azureFunctionCode) {
44-
this(Configuration.getDefaultApiClient(), azureFunctionCode);
35+
public ResetApi() {
36+
this(Configuration.getDefaultApiClient());
4537
}
4638

47-
public ResetApi(ApiClient apiClient, final String azureFunctionCode) {
39+
public ResetApi(ApiClient apiClient) {
4840
this.apiClient = apiClient;
49-
mAzureFunctionCode = azureFunctionCode;
5041
}
5142

5243
public ApiClient getApiClient() {
@@ -79,8 +70,6 @@ public com.squareup.okhttp.Call apiResetPutCall(String upn, String operation, fi
7970
if (operation != null)
8071
localVarQueryParams.addAll(apiClient.parameterToPair("operation", operation));
8172

82-
localVarQueryParams.addAll(apiClient.parameterToPair("code", mAzureFunctionCode));
83-
8473
Map<String, String> localVarHeaderParams = new HashMap<String, String>();
8574

8675
Map<String, Object> localVarFormParams = new HashMap<String, Object>();
@@ -110,7 +99,7 @@ public com.squareup.okhttp.Response intercept(com.squareup.okhttp.Interceptor.Ch
11099
}
111100

112101
String[] localVarAuthNames = new String[] { };
113-
return apiClient.buildCall(localVarPath, "PUT", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
102+
return apiClient.buildCall(localVarPath, "POST", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
114103
}
115104

116105
@SuppressWarnings("rawtypes")

0 commit comments

Comments
 (0)