Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
77 commits
Select commit Hold shift + click to select a range
b7283bd
init msal4j - parity with adal4j
SomkaPe Jan 8, 2019
198095f
switching api from app clients constructors to builders
SomkaPe Jan 17, 2019
7584224
making api more consistent and expressive
SomkaPe Jan 19, 2019
abfa3ad
Merge pull request #1 from AzureAD/somkape/apiConsistency
SomkaPe Jan 25, 2019
b72b038
Add build files (#2)
sangonzal Jan 26, 2019
42566a4
Integration with lap and keyvault API
Jan 31, 2019
8f8a4e8
Delete unecessary files from web sample
Jan 31, 2019
7a79f13
Merge pull request #3 from AzureAD/sagonzal/removePom
sangonzal Feb 7, 2019
35f0d20
Refactor labapi. Add selenium infra
Feb 7, 2019
b8a7b23
Merge branch 'dev' of https://github.com/AzureAD/microsoft-authentica…
Feb 7, 2019
894eb51
splitting scopes param to set of scopes
SomkaPe Feb 7, 2019
b5a17e2
Update tests and selenium infra
Feb 9, 2019
134effb
minor fix
SomkaPe Feb 11, 2019
dabd9c5
Merge pull request #4 from AzureAD/somkape/apiConsistency
SomkaPe Feb 12, 2019
47053d8
Add integratedAuthentionTests. Add AuthorizationCode tests
Feb 13, 2019
cb0acdf
Add infra for interactive tests
Feb 15, 2019
1b1ccaa
Add authCode tests. Fix bugs for device code.
Feb 16, 2019
7daad64
device code flow
SomkaPe Feb 19, 2019
d8a9f35
addressing pr comments
SomkaPe Feb 20, 2019
fac30df
refactor
Feb 21, 2019
4c7f260
Add ADFSv2019 tests
Feb 21, 2019
f4ee34e
Merge branch 'dev' of https://github.com/AzureAD/microsoft-authentica…
Feb 21, 2019
0e86396
Add national cloud
Feb 21, 2019
5d5ce5e
Add missing licenses
Feb 21, 2019
4d74054
Remove adal4j dependency
Feb 22, 2019
9d18101
addressing pr comments
SomkaPe Feb 22, 2019
6354ccf
pr comments
SomkaPe Feb 26, 2019
6370d5b
Merge pull request #7 from AzureAD/somkape/deviceCodePolling
SomkaPe Feb 27, 2019
26e1370
PR feedback
Feb 28, 2019
dcdc7c3
More PR feedback
Feb 28, 2019
9cba76d
Merge remote-tracking branch 'refs/remotes/origin/dev' into sagonzal/…
Feb 28, 2019
3461c7b
Update device code test
Feb 28, 2019
0dfdfab
Update dependencies
Feb 28, 2019
d2a32b0
Increase time out limits to run on Azure hosted agent
Mar 3, 2019
e0a8488
Add debugging utilities
Mar 4, 2019
7e43c84
Fix pom and disable MSA IT
Mar 5, 2019
9ba034a
Merge pull request #8 from AzureAD/sagonzal/labInfra
sangonzal Mar 5, 2019
9180702
Removing MSA test while selenium issue is solved
Mar 5, 2019
f9c36db
Merge pull request #9 from AzureAD/sagonzal/removeMsaTest
sangonzal Mar 5, 2019
03532ef
Update README.md
henrik-me Mar 7, 2019
e3465f2
Add preview statement in README
Mar 8, 2019
90541c4
Add contributing.md
Mar 8, 2019
a5d7483
Sagonzal/request context (#10)
sangonzal Mar 15, 2019
2ff1474
cache + auhtority migration
SomkaPe Mar 26, 2019
20b3d8f
minor change
SomkaPe Mar 27, 2019
de302b6
Merge remote-tracking branch 'origin/dev' into somkape/cache
SomkaPe Mar 28, 2019
e2a9d4f
Merge pull request #17 from AzureAD/somkape/cache
SomkaPe Mar 28, 2019
51ff7d1
Sagonzal/all telemetry (#15)
sangonzal Mar 30, 2019
227825c
Remove Sun API use
Apr 1, 2019
0870b15
Fix warning message
Apr 1, 2019
33bed08
Builder based api (#19)
SomkaPe Apr 3, 2019
cb77f7c
usind char[] for password (#20)
SomkaPe Apr 5, 2019
2384215
Merge pull request #18 from AzureAD/sagonzal/removeSunApi
sangonzal Apr 10, 2019
4b11f74
Add OBO integration test
Apr 12, 2019
69c134b
Update powermock and easymock
Apr 16, 2019
e95d5e9
Merge pull request #23 from AzureAD/fixPowermock
sangonzal Apr 16, 2019
96e64d3
Update oauth2-oidc-sdk to 6.5
Apr 17, 2019
7f9c0aa
Remove javax.servlet-api
Apr 17, 2019
5a0f2ea
Change verificationUrl to verificationURI. Update to use Lombok
Apr 17, 2019
4f4a5ac
Fix typo
Apr 18, 2019
2fd19f7
Merge pull request #22 from AzureAD/sagonzal/obo
sangonzal Apr 18, 2019
3ff649d
Merge pull request #24 from AzureAD/updateOauth2Sdk
sangonzal Apr 18, 2019
c07b555
Merge pull request #25 from AzureAD/removeJavaxServlet
sangonzal Apr 18, 2019
59c37e3
Update to use fluent API
Apr 18, 2019
1127a2c
Merge branch 'dev' into verificationUri
sangonzal Apr 18, 2019
c948e0f
Merge pull request #26 from AzureAD/verificationUri
sangonzal Apr 18, 2019
a8ee7f3
Clean up dev samples. Update scrub logic for telemetry Pii
Apr 19, 2019
5595037
PR feedback
Apr 19, 2019
3eac11d
Merge pull request #27 from AzureAD/cleanUp
sangonzal Apr 19, 2019
a87e890
Bumping version to 0.1.0
Apr 19, 2019
50457c8
Merge pull request #28 from AzureAD/sagonzal/release0.1.0
sangonzal Apr 20, 2019
9963c85
Update device code unit test to reflect service changes
Apr 22, 2019
eaab157
Update to version 0.1.0-preview
Apr 22, 2019
3860579
Update to be standards compliant
Apr 22, 2019
73ede24
Update x-client-SKU
Apr 23, 2019
70062c4
Merge pull request #30 from AzureAD/deviceCodeTest
sangonzal Apr 23, 2019
6f863c2
Merge pull request #31 from AzureAD/sagonzal/updateReleaseVersion
sangonzal Apr 23, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,8 @@
*.tar.gz
*.rar

# Intellij
.idea/

# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
hs_err_pid*
23 changes: 9 additions & 14 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,14 +1,9 @@

# Contributing

This project welcomes contributions and suggestions. Most contributions require you to agree to a
Contributor License Agreement (CLA) declaring that you have the right to, and actually do, grant us
the rights to use your contribution. For details, visit https://cla.microsoft.com.

When you submit a pull request, a CLA-bot will automatically determine whether you need to provide
a CLA and decorate the PR appropriately (e.g., label, comment). Simply follow the instructions
provided by the bot. You will only need to do this once across all repos using our CLA.

This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/).
For more information see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/) or
contact [opencode@microsoft.com](mailto:opencode@microsoft.com) with any additional questions or comments.
# Microsoft Authentication Library (MSAL) for Java

The MSAL library for Java gives your app the ability to begin using the Microsoft Cloud by supporting Microsoft Azure Active Directory and Microsoft Accounts in a converged experience using industry standard OAuth2 and OpenID Connect.

The library is currently in preview. During the preview we reserve the right to make changes to the API, cache format, and other mechanisms of this library without notice which you will be required to take along with bug fixes or feature improvements
## Contribution
This project welcomes contributions and suggestions. Most contributions require you to agree to a Contributor License Agreement (CLA) declaring that you have the right to, and actually do, grant us the rights to use your contribution. For details, visit https://cla.microsoft.com.
When you submit a pull request, a CLA-bot will automatically determine whether you need to provide a CLA and decorate the PR appropriately (e.g., label, comment). Simply follow the instructions provided by the bot. You will only need to do this once across all repos using our CLA.
This project has adopted the Microsoft Open Source Code of Conduct. For more information see the Code of Conduct FAQ or contact opencode@microsoft.com with any additional questions or comments.
Empty file added RELEASES.md
Empty file.
17 changes: 17 additions & 0 deletions build/credscan-exclude.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{
"tool": "Credential Scanner",
"suppressions": [
{
"file": "test-certificate.pfx",
"_justification": "test self signed certificate to test signing from the library. this certificate is not associated with any tenant"
},
{
"placeholder": "client_secret",
"_justification" : "credential used for testing. not associated with any tenant"
},
{
"placeholder": "ClientPassword",
"_justification" : "credential used for testing. not associated with any tenant"
}
]
}
28 changes: 28 additions & 0 deletions build/findbugs-exclude.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
<?xml version="1.0" encoding="UTF-8"?>
<FindBugsFilter>
<!-- Experimental and not fully vetted bug patterns -->
<Match>
<Bug pattern="CRLF_INJECTION_LOGS"/>
</Match>
<Match>
<Bug pattern="XXE_DOCUMENT"/>
</Match>
<Match>
<Bug pattern="XPATH_INJECTION"/>
</Match>
<Match>
<Bug pattern="FORMAT_STRING_MANIPULATION"/>
</Match>
<Match>
<Bug pattern="WEAK_MESSAGE_DIGEST_SHA1"/>
</Match>
<Match>
<Bug pattern="DM_DEFAULT_ENCODING"/>
</Match>
<Match>
<Bug pattern="DM_CONVERT_CASE"/>
</Match>
<Match>
<Bug pattern="REC_CATCH_EXCEPTION"/>
</Match>
</FindBugsFilter>
8 changes: 8 additions & 0 deletions changelog.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
Version 0.0.1-preview
=============
Public preview of Microsoft Authentication Library for Java
- Feature parity with ADAL Java
- Updated public API to use builder pattern
- Added telemetry callback
- Added support for caching tokens
- Added acquire token with silent parameters API
122 changes: 122 additions & 0 deletions contributing.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,122 @@
# CONTRIBUTING

Microsoft Authentication Library for Java welcomes new contributors. This document will guide you
through the process.

### CONTRIBUTOR LICENSE AGREEMENT

Please visit [https://cla.microsoft.com/](https://cla.microsoft.com/) and sign the Contributor License
Agreement. You only need to do that once. We can not look at your code until you've submitted this request.


### FORK

Fork the project [on GitHub](https://github.com/AzureAD/microsoft-authentication-library-for-java) and check out
your copy.

Example for MSAL Java:

```
$ git clone git@github.com:username/microsoft-authentication-library-for-java.git
$ cd microsoft-authentication-library-for-java
$ git remote add upstream git@github.com:AzureAD/microsoft-authentication-library-for-java.git
```

Now decide if you want your feature or bug fix to go into the dev branch
or the master branch. **All bug fixes and new features should go into the dev branch.**

The master branch is effectively frozen; patches that change the SDKs
protocols or API surface area or affect the run-time behavior of the SDK will be rejected.

Some of our SDKs have bundled dependencies that are not part of the project proper. Any changes to files in those directories or its subdirectories should be sent to their respective
projects. Do not send your patch to us, we cannot accept it.

In case of doubt, open an issue in the [issue tracker](https://github.com/AzureAD/microsoft-authentication-library-for-java/issues).

Especially do so if you plan to work on a major change in functionality. Nothing is more
frustrating than seeing your hard work go to waste because your vision
does not align with our goals for the SDK.


### BRANCH

Okay, so you have decided on the proper branch. Create a feature branch
and start hacking:

```
$ git checkout -b my-feature-branch
```

### COMMIT

Make sure git knows your name and email address:

```
$ git config --global user.name "J. Random User"
$ git config --global user.email "j.random.user@example.com"
```

Writing good commit logs is important. A commit log should describe what
changed and why. Follow these guidelines when writing one:

1. The first line should be 50 characters or less and contain a short
description of the change prefixed with the name of the changed
subsystem (e.g. "net: add localAddress and localPort to Socket").
2. Keep the second line blank.
3. Wrap all other lines at 72 columns.

A good commit log looks like this:

```
fix: explaining the commit in one line

Body of commit message is a few lines of text, explaining things
in more detail, possibly giving some background about the issue
being fixed, etc etc.

The body of the commit message can be several paragraphs, and
please do proper word-wrap and keep columns shorter than about
72 characters or so. That way `git log` will show things
nicely even when it is indented.
```

The header line should be meaningful; it is what other people see when they
run `git shortlog` or `git log --oneline`.

Check the output of `git log --oneline files_that_you_changed` to find out
what directories your changes touch.


### REBASE

Use `git rebase` (not `git merge`) to sync your work from time to time.

```
$ git fetch upstream
$ git rebase upstream/v0.1 # or upstream/master
```


### TEST

Bug fixes and features should come with tests. Add your tests in the
test directory. This varies by repository but often follows the same convention of /src/test. Look at other tests to see how they should be
structured (license boilerplate, common includes, etc.).


Make sure that all tests pass.


### PUSH

```
$ git push origin my-feature-branch
```

Go to https://github.com/username/microsoft-authentication-library-for-java.git and select your feature branch. Click
the 'Pull Request' button and fill out the form.

Pull requests are usually reviewed within a few days. If there are comments
to address, apply your changes in a separate commit and push that to your
feature branch. Post a comment in the pull request afterwards; GitHub does
not send out notifications when you add commits.
Loading