-
Notifications
You must be signed in to change notification settings - Fork 35
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
QueryParam Backcompat #1587
Merged
Merged
QueryParam Backcompat #1587
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
103 changes: 103 additions & 0 deletions
103
common/src/test/java/com/microsoft/identity/common/internal/util/QueryParamsAdapterTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,103 @@ | ||
// Copyright (c) Microsoft Corporation. | ||
// All rights reserved. | ||
// | ||
// This code is licensed under the MIT License. | ||
// | ||
// Permission is hereby granted, free of charge, to any person obtaining a copy | ||
// of this software and associated documentation files(the "Software"), to deal | ||
// in the Software without restriction, including without limitation the rights | ||
// to use, copy, modify, merge, publish, distribute, sublicense, and / or sell | ||
// copies of the Software, and to permit persons to whom the Software is | ||
// furnished to do so, subject to the following conditions : | ||
// | ||
// The above copyright notice and this permission notice shall be included in | ||
// all copies or substantial portions of the Software. | ||
// | ||
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN | ||
// THE SOFTWARE. | ||
|
||
package com.microsoft.identity.common.internal.util; | ||
|
||
import com.microsoft.identity.common.java.exception.ClientException; | ||
|
||
import org.junit.Assert; | ||
import org.junit.Test; | ||
import org.junit.runner.RunWith; | ||
import org.robolectric.RobolectricTestRunner; | ||
|
||
import java.util.AbstractMap; | ||
import java.util.ArrayList; | ||
import java.util.List; | ||
import java.util.Map; | ||
|
||
@RunWith(RobolectricTestRunner.class) | ||
public class QueryParamsAdapterTest { | ||
|
||
@Test | ||
public void testConvertFromNullJsonString() throws Exception { | ||
final List<Map.Entry<String, String>> result = QueryParamsAdapter._fromJson(null); | ||
Assert.assertEquals(0, result.size()); | ||
} | ||
|
||
@Test | ||
public void testConvertFromEmptyJsonString() throws Exception { | ||
final List<Map.Entry<String, String>> result = QueryParamsAdapter._fromJson(""); | ||
Assert.assertEquals(0, result.size()); | ||
} | ||
|
||
@Test | ||
public void testConvertToJson() throws Exception { | ||
final List<Map.Entry<String, String>> input = new ArrayList<>(); | ||
input.add(new AbstractMap.SimpleEntry<String, String>("eqp1", "1")); | ||
input.add(new AbstractMap.SimpleEntry<String, String>("eqp2", "2")); | ||
|
||
final String expected = "[{\"first\":\"eqp1\",\"second\":\"1\"},{\"first\":\"eqp2\",\"second\":\"2\"}]"; | ||
rpdome marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
||
Assert.assertEquals(expected, QueryParamsAdapter._toJson(input)); | ||
} | ||
|
||
@Test | ||
public void testConvertFromJson() throws Exception { | ||
final String input = "[{\"first\":\"eqp1\",\"second\":\"1\"},{\"first\":\"eqp2\",\"second\":\"2\"}]"; | ||
|
||
final List<Map.Entry<String, String>> expected = new ArrayList<>(); | ||
expected.add(new AbstractMap.SimpleEntry<String, String>("eqp1", "1")); | ||
expected.add(new AbstractMap.SimpleEntry<String, String>("eqp2", "2")); | ||
|
||
Assert.assertEquals(expected, QueryParamsAdapter._fromJson(input)); | ||
} | ||
|
||
@Test | ||
public void testConvertFromIncorrectJson() throws Exception { | ||
// This is what we get if we serialized List<Map.Entry> directly. | ||
final String input = "[{\"key\":\"eqp1\",\"value\":\"1\"},{\"key\":\"eqp2\",\"value\":\"2\"}]"; | ||
Assert.assertEquals(0, QueryParamsAdapter._fromJson(input).size()); | ||
} | ||
|
||
@Test | ||
public void testConvertFromMalformedJson(){ | ||
final String input = "[{\"eqp1\", \"1\"}, {\"eqp2\", \"2\"}]"; | ||
try { | ||
QueryParamsAdapter._fromJson(input); | ||
Assert.fail(); | ||
} catch (final ClientException e){ | ||
Assert.assertEquals(ClientException.JSON_PARSE_FAILURE, e.getErrorCode()); | ||
} | ||
} | ||
|
||
@Test | ||
public void testConvertFromTruncatedJson(){ | ||
final String input = "[{\"key1\""; | ||
try { | ||
QueryParamsAdapter._fromJson(input); | ||
Assert.fail(); | ||
} catch (final ClientException e){ | ||
Assert.assertEquals(ClientException.JSON_PARSE_FAILURE, e.getErrorCode()); | ||
} | ||
} | ||
} | ||
rpdome marked this conversation as resolved.
Show resolved
Hide resolved
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
How does this now work with new MSAL? I suppose that's going to send Map.Entry?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
the new MSAL (not in prod) sends Map.Entry, the old one sends Pair.
Please also read the finding i just added below - this TypeAdapter is never properly used.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We should document this in the release notes for MSAL/ADAL.. As part of how to upgrade to new major version.
right?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think with this change now even new one sends Pair..so I don't expect there to be any changes needed for upgrade. @rpdome can confirm.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
yes. no change.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
the new one will serialize Map.Entry into the very same format as Pair.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I had to make this change in Authenticator code, with the first RC build, that's why I thought..
Maybe I will need to revert that with the new RC build :)