-
Notifications
You must be signed in to change notification settings - Fork 46
Native auth: JIT feature implementation #2639
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
Merged
Merged
Changes from 9 commits
Commits
Show all changes
12 commits
Select commit
Hold shift + click to select a range
91e60ae
Native auth: network layer for JIT feature, Fixes AB#3188135 (#2626)
nilo-ms edcc82a
Merge branch 'dev' into feature/jit
nilo-ms 5eb8e05
Native auth: JIT business logic (#2637)
nilo-ms 99443cb
Merge branch 'dev' into feature/jit
nilo-ms bd48322
update changelog
nilo-ms 917c264
add authentication scheme to JIT parameters
nilo-ms 6d4f4f2
use correct challenge type in tests
nilo-ms baeb806
Merge branch 'dev' into feature/jit
nilo-ms 8569362
update mock email
nilo-ms e6593e7
Merge branch 'dev' into feature/jit
nilo-ms 283874d
update changelog
nilo-ms ff27692
Merge branch 'dev' into feature/jit
nilo-ms 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 hidden or 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
69 changes: 69 additions & 0 deletions
69
...m/microsoft/identity/common/nativeauth/internal/commands/JITChallengeAuthMethodCommand.kt
This file contains hidden or 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,69 @@ | ||
| // | ||
| // 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.nativeauth.internal.commands | ||
|
|
||
| import com.microsoft.identity.common.java.logging.LogSession | ||
| import com.microsoft.identity.common.java.logging.Logger | ||
| import com.microsoft.identity.common.java.nativeauth.commands.parameters.JITChallengeAuthMethodCommandParameters | ||
| import com.microsoft.identity.common.java.nativeauth.controllers.results.JITChallengeAuthMethodCommandResult | ||
| import com.microsoft.identity.common.nativeauth.internal.controllers.NativeAuthMsalController | ||
|
|
||
| /** | ||
| * Command class to call controllers to trigger register/challenge JIT endpoint. | ||
| * {@see com.microsoft.identity.common.java.controllers.CommandDispatcher}. | ||
| */ | ||
| class JITChallengeAuthMethodCommand( | ||
| private val parameters: JITChallengeAuthMethodCommandParameters, | ||
| private val controller: NativeAuthMsalController, | ||
| publicApiId: String | ||
| ) : BaseNativeAuthCommand<JITChallengeAuthMethodCommandResult>( | ||
| parameters, | ||
| controller, | ||
| publicApiId | ||
| ) { | ||
|
|
||
| companion object { | ||
| private val TAG = JITChallengeAuthMethodCommand::class.java.simpleName | ||
| } | ||
|
|
||
| /** | ||
| * The execution part of the command, to be run on the background thread. | ||
| * It calls the jitChallengeAuthMethod method of the native auth MSAL controller with the given parameters. | ||
| */ | ||
| override fun execute(): JITChallengeAuthMethodCommandResult { | ||
| LogSession.logMethodCall( | ||
| tag = TAG, | ||
| correlationId = parameters.getCorrelationId(), | ||
| methodName = "${TAG}.execute" | ||
| ) | ||
| val result = controller.jitChallengeAuthMethod( | ||
| parameters = parameters | ||
| ) | ||
|
|
||
| Logger.infoWithObject( | ||
| TAG, | ||
| parameters.getCorrelationId(), | ||
| "Returning result: ", | ||
| result | ||
| ) | ||
| return result | ||
| } | ||
| } |
70 changes: 70 additions & 0 deletions
70
...a/com/microsoft/identity/common/nativeauth/internal/commands/JITSubmitChallengeCommand.kt
This file contains hidden or 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,70 @@ | ||
| // | ||
| // 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.nativeauth.internal.commands | ||
|
|
||
| import com.microsoft.identity.common.java.logging.LogSession | ||
| import com.microsoft.identity.common.java.logging.Logger | ||
| import com.microsoft.identity.common.java.nativeauth.commands.parameters.JITContinueCommandParameters | ||
| import com.microsoft.identity.common.java.nativeauth.controllers.results.JITSubmitChallengeCommandResult | ||
| import com.microsoft.identity.common.nativeauth.internal.controllers.NativeAuthMsalController | ||
|
|
||
| /** | ||
| * Command class to call controllers to trigger register/continue JIT endpoint. | ||
| * {@see com.microsoft.identity.common.java.controllers.CommandDispatcher}. | ||
| */ | ||
| class JITSubmitChallengeCommand( | ||
| private val parameters: JITContinueCommandParameters, | ||
| private val controller: NativeAuthMsalController, | ||
| publicApiId: String | ||
| ) : BaseNativeAuthCommand<JITSubmitChallengeCommandResult>( | ||
| parameters, | ||
| controller, | ||
| publicApiId | ||
| ) { | ||
|
|
||
| companion object { | ||
| private val TAG = JITSubmitChallengeCommand::class.java.simpleName | ||
| } | ||
|
|
||
| /** | ||
| * The execution part of the command, to be run on the background thread. | ||
| * It calls the jitSubmitChallenge method of the native auth MSAL controller with the given parameters. | ||
| */ | ||
| override fun execute(): JITSubmitChallengeCommandResult { | ||
| LogSession.logMethodCall( | ||
| tag = TAG, | ||
| correlationId = parameters.getCorrelationId(), | ||
| methodName = "${TAG}.execute" | ||
| ) | ||
| val result = controller.jitSubmitChallenge( | ||
| parameters = parameters | ||
| ) | ||
|
|
||
| Logger.infoWithObject( | ||
| TAG, | ||
| parameters.getCorrelationId(), | ||
| "Returning result: ", | ||
| result | ||
| ) | ||
| return result | ||
| } | ||
|
|
||
| } |
Oops, something went wrong.
Oops, something went wrong.
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.
Can we include name of strong auth method in the changlog note?
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, sure. Thanks Fadi