Skip to content
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

Update from original #1

Merged
merged 176 commits into from
Oct 16, 2014
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
176 commits
Select commit Hold shift + click to select a range
e5b5759
Removed name claim from default claims for all tokens
leastprivilege Aug 29, 2014
49987fb
Added ctor to ScopeClaim
leastprivilege Aug 29, 2014
71e3a90
Added default ctor to ScopeClaim
leastprivilege Aug 29, 2014
0a7708e
Introduced enum to distinguish between identity and resource claims
leastprivilege Aug 29, 2014
2c75f4a
Prototype of resource claims in default claims provider
leastprivilege Aug 29, 2014
16f6d41
Added roles, scopes and client config for idmgr and roles
leastprivilege Aug 29, 2014
6b75dc9
Filtered possible duplicate claims for access tokens.
leastprivilege Sep 2, 2014
ab80783
Merge pull request #330 from thinktecture/ClaimsUpdate
leastprivilege Sep 4, 2014
91e671c
Added google openid auth back - for now.
leastprivilege Sep 4, 2014
02fa4d9
Merge branch 'master' of https://github.com/thinktecture/Thinktecture…
leastprivilege Sep 10, 2014
081d7f9
Added FromSpaceSeparatedString helper and use it on authZ request val…
leastprivilege Sep 10, 2014
40ed3b0
Added support for acr_values parameter in authorize request and pass …
leastprivilege Sep 10, 2014
2944963
Fixes #319
leastprivilege Sep 10, 2014
80406d9
myget
brockallen Sep 10, 2014
6ad4e6e
Merge branch 'develop' of https://github.com/thinktecture/Thinktectur…
brockallen Sep 10, 2014
a28083d
added roles scope
leastprivilege Sep 10, 2014
71f4e60
Add description for roles scope
leastprivilege Sep 10, 2014
c78ccb8
Fixes #333
leastprivilege Sep 10, 2014
1b13ec7
Used constants for scope claims
leastprivilege Sep 10, 2014
8775e30
Switched access token validation endpoint to use the claims dictionar…
leastprivilege Sep 10, 2014
7fec63f
Allowed access to idmgr scope for code flow client
leastprivilege Sep 10, 2014
3538934
Renamed extension method
leastprivilege Sep 10, 2014
26a1ea4
Added support for custom grant types (replaces/extends support for mo…
leastprivilege Sep 11, 2014
453f11e
updated google to oidc
brockallen Sep 12, 2014
af2e39e
Merge pull request #359 from thinktecture/CustomGrants
leastprivilege Sep 16, 2014
b34857e
Removed VS2013 as minimum required version
Sep 16, 2014
bd03d61
Merge pull request #367 from slapointe/master
leastprivilege Sep 17, 2014
e83cfde
Removed filtering of name claim in InMemoryUserService (for review) @…
leastprivilege Sep 17, 2014
8051a5d
Merge branch 'master' into develop
leastprivilege Sep 17, 2014
e5647f5
Cleanup usings
leastprivilege Sep 17, 2014
8fcbff7
Added additional ctor to Scope and reworked standard scopes
leastprivilege Sep 17, 2014
3223d60
Added post logout redirect URI list to Client
leastprivilege Sep 17, 2014
5f39e07
Ignore unsupported response modes
leastprivilege Sep 18, 2014
ca2d054
Added more logging around response mode
leastprivilege Sep 20, 2014
34d0b2e
remove subject param to AuthenticateExternal
brockallen Sep 25, 2014
3a0f194
Added OAuth JS client redirect URIs
leastprivilege Sep 25, 2014
4d4c585
update for G+
brockallen Sep 25, 2014
fed70c5
Added RequireSsl middleware
leastprivilege Sep 25, 2014
6757cc8
Added default ctor to Scope
leastprivilege Sep 25, 2014
057810d
Added RequireSsl feature
leastprivilege Sep 25, 2014
58cfe3e
Changed BaseUrl behavior to use current scheme and host name
leastprivilege Sep 25, 2014
2943209
nuget push
brockallen Sep 25, 2014
b5b5d32
fix incorrect warning about InMemoryConsentStore
brockallen Sep 25, 2014
b254fb5
Merge branch 'master' into dev
brockallen Sep 25, 2014
12b8422
Added Enabled property to Scope
leastprivilege Sep 26, 2014
b26d740
Harmonized DataProtection (see #258)
leastprivilege Sep 26, 2014
3a9cd2b
Create contributing.md
leastprivilege Sep 26, 2014
cc0dd1b
remove unused file
leastprivilege Sep 26, 2014
4e3b69b
Merge branch 'dev' of https://github.com/thinktecture/Thinktecture.Id…
leastprivilege Sep 26, 2014
7cfb899
rename1
leastprivilege Sep 26, 2014
e698e18
rename2
leastprivilege Sep 26, 2014
6f34025
changed license to Apache2
leastprivilege Sep 26, 2014
6485eb3
changed default license header
leastprivilege Sep 26, 2014
094ebab
updated license headers for Core
leastprivilege Sep 26, 2014
3c1e869
Update CONTRIBUTING.md
leastprivilege Sep 26, 2014
79a3199
Update CONTRIBUTING.md
leastprivilege Sep 26, 2014
e722d80
Update CONTRIBUTING.md
leastprivilege Sep 26, 2014
5f71cd0
Changed subject from string to ClaimsPrincipal in IUserService
leastprivilege Sep 26, 2014
f2884f7
Merge branch 'dev' of https://github.com/thinktecture/Thinktecture.Id…
leastprivilege Sep 26, 2014
a3e4462
Added .User property to AuthenticateResult
leastprivilege Sep 27, 2014
791330d
Added new ctors for auth result
leastprivilege Sep 27, 2014
34de44d
cleanup
leastprivilege Sep 27, 2014
f5f057a
Added status code for protected resource errors
leastprivilege Sep 27, 2014
551cf27
Added status code support to protected resource error result (RFC6750…
leastprivilege Sep 27, 2014
bcfa904
Added support for id_tokens to token validator
leastprivilege Sep 27, 2014
0724b1d
Added id_token validation endpoint
leastprivilege Sep 27, 2014
3c0b0c2
Added support for ignoring audience when validating JWTs
leastprivilege Sep 27, 2014
e7f1938
rework AuthenticateExternal with the new AuthenticationResult changes
brockallen Sep 27, 2014
6192026
Merge branch 'UserServiceRework' into dev
brockallen Sep 27, 2014
ebf01d1
fix internalize
brockallen Sep 27, 2014
69a8d9b
add clientid and tenant to signin message; pass signin message to aut…
brockallen Sep 27, 2014
484be79
pass signin message to view service's login page
brockallen Sep 27, 2014
9c93853
cleanup
leastprivilege Sep 27, 2014
4473ae4
reworked PrincipalExtensions
leastprivilege Sep 27, 2014
5134031
Renamed IAssertionValidator to ICustomGrantValidator
leastprivilege Sep 27, 2014
822ea7b
add logout url to login view model
brockallen Sep 27, 2014
e1f1a9e
don't remove signing message cookie until full signin is performed
brockallen Sep 27, 2014
0545e15
Merge branch 'dev' of https://github.com/thinktecture/Thinktecture.Id…
brockallen Sep 27, 2014
62e8e8a
rename application scopes to resource scopes
brockallen Sep 27, 2014
9888a9b
Added SignInMessageExpiration to IdentityServerOptions
brockallen Sep 27, 2014
c4bbe7f
change expiration validation on SignInMessage
brockallen Sep 27, 2014
e1417a7
allow authenticate result redirect path to start with ~/
brockallen Sep 27, 2014
d3db36c
moved signin message expiration to authentication options class
brockallen Sep 27, 2014
f5d2ad8
allow login page links to start with ~/
brockallen Sep 28, 2014
29c81c8
add CspOptions
brockallen Sep 28, 2014
1923947
Added getting started index page
leastprivilege Sep 28, 2014
2a1003a
cleanup
leastprivilege Sep 28, 2014
83ff702
more cleanup
leastprivilege Sep 28, 2014
71f8a7f
move cookie options to authentication options class
brockallen Sep 28, 2014
458fa0b
Merge branch 'dev' of https://github.com/thinktecture/Thinktecture.Id…
brockallen Sep 28, 2014
67d7bc3
add flag to disable login logins
brockallen Sep 28, 2014
53ed331
added 'remember my login' feature
brockallen Sep 28, 2014
372f2d6
prevent // in emitted HTML when running on /
brockallen Sep 28, 2014
9303de1
return GetRedirectUrl
brockallen Sep 28, 2014
eaf0a2d
add comments for remember me logic
brockallen Sep 29, 2014
8131617
initial stab at sign in message rework
brockallen Sep 29, 2014
1a90974
add comments about issuing persistent cookie
brockallen Sep 29, 2014
836739e
reworked unit tests for new signin message design
brockallen Sep 29, 2014
aa86356
pass signin param to external login links
brockallen Sep 29, 2014
8502978
remove signin message expiration
brockallen Sep 29, 2014
c617ba6
can't assume we have subject or name in issie cookie helper
brockallen Sep 30, 2014
b6d5787
Update README.md
leastprivilege Sep 30, 2014
d4aa446
Merge branch 'master' into dev
leastprivilege Sep 30, 2014
2a35998
removed ilmerge.exclude
leastprivilege Sep 30, 2014
58037f6
add license headers
leastprivilege Sep 30, 2014
72d4ba1
re-org some tests
leastprivilege Sep 30, 2014
79c32ec
update nugets
brockallen Sep 30, 2014
e5fdc02
Added OWIN environment to validate request classes
leastprivilege Sep 30, 2014
a3b24b8
added license headers
leastprivilege Sep 30, 2014
d93990f
Added token validation test cases (not implemented)
leastprivilege Oct 2, 2014
19802e0
Re-org namespaces in tests
leastprivilege Oct 2, 2014
1a3bf91
Some tests for default refresh token service
leastprivilege Oct 2, 2014
bd986a4
First batch of token validation tests
leastprivilege Oct 2, 2014
781255b
More access token validation tests
leastprivilege Oct 2, 2014
55e42b6
added favicon
leastprivilege Oct 2, 2014
ff19207
rename IsActive to IsActiveAsync
brockallen Oct 2, 2014
2f778a2
update version file
leastprivilege Oct 3, 2014
4c479ed
Added active check to custom id token validator
leastprivilege Oct 3, 2014
e14c30c
Changed First to FirstOrDefault
leastprivilege Oct 3, 2014
13676e9
Made token validator more flexible (still a todo for symmetric signin…
leastprivilege Oct 3, 2014
4636ae9
Added identity token validation tests (more to come9
leastprivilege Oct 3, 2014
84b7e70
added more tests for token validation
leastprivilege Oct 3, 2014
7fa3477
Added symmetric signature validation support
leastprivilege Oct 3, 2014
1cd57c3
added license headers
leastprivilege Oct 3, 2014
09ebcc8
Added TraceSource logger
leastprivilege Oct 4, 2014
fc6ac7a
Updated gitignore for svclog files
leastprivilege Oct 4, 2014
7617cd9
Added sample for trace source logger
leastprivilege Oct 4, 2014
cc2f121
Updated enum and constants
leastprivilege Oct 5, 2014
0cd92df
Updated protocol parsing and added tests
leastprivilege Oct 5, 2014
248b296
Restructured response handling and result generation
leastprivilege Oct 5, 2014
cf4110b
cleanup
leastprivilege Oct 5, 2014
465740b
working with MS OWIN MW - still a lot of cleanup to do
leastprivilege Oct 5, 2014
2c1c0be
more refactoring
leastprivilege Oct 5, 2014
0dd5f7d
Changed token service to use TokenCreationOptions
leastprivilege Oct 5, 2014
f73e4d1
Changed claims provider
leastprivilege Oct 5, 2014
9a2ab23
cleanup
leastprivilege Oct 5, 2014
07c594e
Added validation to token creation request
leastprivilege Oct 5, 2014
562cff7
updated nuspec
leastprivilege Oct 5, 2014
193ef96
Updated to support hybrid flow
leastprivilege Oct 6, 2014
2b897a8
Allow hybrid clients on token endpoint
leastprivilege Oct 6, 2014
08a700b
Added license headers
leastprivilege Oct 6, 2014
049829b
updated hybrid redirect uri
leastprivilege Oct 6, 2014
991a3b6
Additional trailing slash check when constructing audience
leastprivilege Oct 6, 2014
1de63f4
Added katana client
leastprivilege Oct 6, 2014
9fdb6be
Update CONTRIBUTING.md
leastprivilege Oct 7, 2014
fe899b0
Update README.md
leastprivilege Oct 7, 2014
1b33386
Update CONTRIBUTING.md
leastprivilege Oct 7, 2014
6fcdabb
Update README.md
brockallen Oct 7, 2014
2f4ecd9
Fix format string for logging authorization code
Oct 9, 2014
ecc0c36
added allowed post_logout_redirect_uri to client reg
leastprivilege Oct 9, 2014
7469a2f
Merge pull request #430 from paumayr/dev
leastprivilege Oct 9, 2014
fc7d78f
Added kid to JWT header for asymmetric signing keys
leastprivilege Oct 9, 2014
a66365c
use PathBase for cookie paths
brockallen Oct 10, 2014
c98d0a1
added DisableSignOutPrompt setting added to AuthenticationOptions
brockallen Oct 10, 2014
f60458b
return null when no signin cookie
brockallen Oct 10, 2014
75a9f44
always pass some error message to error view
brockallen Oct 10, 2014
58b988d
Add call to exception logger
brockallen Oct 10, 2014
dfa2cf7
display strings from resx files
brockallen Oct 10, 2014
f050c87
Update README.md
leastprivilege Oct 11, 2014
8ce9eda
Initialize claims collection in InMemoryUser
leastprivilege Oct 12, 2014
d8f5541
removed pairwise subject type from disco doc
leastprivilege Oct 12, 2014
0b3ef42
add flags for filtering per-client login page options
brockallen Oct 13, 2014
19216f7
initial signin message rewrok
brockallen Oct 13, 2014
7539fee
forgot to pass signin message ID (fixes tests)
brockallen Oct 13, 2014
e44ae57
add client name and return URL to logout pages
brockallen Oct 13, 2014
adda9a6
provide LogoutResult; clear signout messages upon logout
brockallen Oct 13, 2014
2ec7d67
Start of end session validation work
leastprivilege Oct 14, 2014
a77de94
Merge branch 'dev' of https://github.com/thinktecture/Thinktecture.Id…
leastprivilege Oct 14, 2014
c205607
Merge branch 'master' into dev
leastprivilege Oct 14, 2014
da642d6
Added end session request validator and response generator
leastprivilege Oct 14, 2014
f3017cc
filter external IdPs on client's allowed IdP list
brockallen Oct 14, 2014
9085afc
Merge branch 'dev' of https://github.com/thinktecture/Thinktecture.Id…
brockallen Oct 14, 2014
24ce296
cleanup AuthorizeFormPostResult to better use assets
brockallen Oct 14, 2014
b6776ae
client ID now required in signin message
brockallen Oct 14, 2014
70223b0
ignore invalid signout params
brockallen Oct 14, 2014
78657c8
cleanup url params handling
brockallen Oct 14, 2014
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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ build/
.builds
*.pidb
*.log
*.svclog
*.scc

# Visual C++ cache files
Expand Down
60 changes: 60 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
# How to contribute

One of the easiest ways to contribute is to participate in discussions and discuss issues. You can also contribute by submitting pull requests with code changes.


## General feedback and discussions?
Please start a discussion on the [core repo issue tracker](https://github.com/thinktecture/Thinktecture.IdentityServer.v3/issues).


## Bugs and feature requests?
Please log a new issue in the appropriate GitHub repo:

* [Core](https://github.com/thinktecture/Thinktecture.IdentityServer.v3)
* [WS-Federation plugin](https://github.com/thinktecture/Thinktecture.IdentityServer.v3.WsFederation)
* [EntityFramework support](https://github.com/thinktecture/Thinktecture.IdentityServer.v3.EntityFramework)
* [ASP. NET Identity support](https://github.com/thinktecture/Thinktecture.IdentityServer.v3.AspNetIdentity)
* [MembershipReboot support](https://github.com/thinktecture/Thinktecture.IdentityServer.v3.MembershipReboot)
* [AccessToken validation](https://github.com/thinktecture/Thinktecture.IdentityServer.v3.AccessTokenValidation)
* [Samples](https://github.com/thinktecture/Thinktecture.IdentityServer.v3.Samples)

## Other discussions
https://gitter.im/thinktecture/Thinktecture.IdentityServer.v3

## Filing issues
The best way to get your bug fixed is to be as detailed as you can be about the problem.
Providing a minimal project with steps to reproduce the problem is ideal.
Here are questions you can answer before you file a bug to make sure you're not missing any important information.

1. Did you read the [documentation](https://github.com/thinktecture/Thinktecture.IdentityServer.v3/wiki)?
2. Did you include the snippet of broken code in the issue?
3. What are the *EXACT* steps to reproduce this problem?

GitHub supports [markdown](http://github.github.com/github-flavored-markdown/), so when filing bugs make sure you check the formatting before clicking submit.


## Contributing code and content
You will need to sign a contributor license agreement (CLA) - please contact us first.

Make sure you can build the code. Familiarize yourself with the project workflow and our coding conventions. If you don't know what a pull request is read this article: https://help.github.com/articles/using-pull-requests.

Before submitting a feature or substantial code contribution please discuss it with the team and ensure it follows the product roadmap. You might also read these two blogs posts on contributing code: [Open Source Contribution Etiquette](http://tirania.org/blog/archive/2010/Dec-31.html) by Miguel de Icaza and [Don't "Push" Your Pull Requests](http://www.igvita.com/2011/12/19/dont-push-your-pull-requests/) by Ilya Grigorik. Note that only contributions that meet a high bar for both quality and design/roadmap appropriateness will be merged into the source.

Here's a few things you should always do when making changes to the code base:

**Commit/Pull Request Format**

```
Summary of the changes (Less than 80 chars)
- Detail 1
- Detail 2

#bugnumber (in this specific format)
```

**Tests**

- Tests need to be provided for every bug/feature that is completed.
- Tests only need to be present for issues that need to be verified by QA (e.g. not tasks)
- If there is a scenario that is far too hard to test there does not need to be a test for it.
- "Too hard" is determined by the team as a whole.
78 changes: 51 additions & 27 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -1,27 +1,51 @@
Copyright (c) 2014, Dominick Baier & Brock Allen
All rights reserved.

Redistribution and use in source and binary forms, with or without modification,
are permitted provided that the following conditions are met:

* Redistributions of source code must retain the above copyright notice, this
list of conditions and the following disclaimer.

* Redistributions in binary form must reproduce the above copyright notice, this
list of conditions and the following disclaimer in the documentation and/or
other materials provided with the distribution.

* Neither the name of the {organization} nor the names of its
contributors may be used to endorse or promote products derived from
this software without specific prior written permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
Apache License

Version 2.0, January 2004

http://www.apache.org/licenses/

TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

1. Definitions.

"License" shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 through 9 of this document.

"Licensor" shall mean the copyright owner or entity authorized by the copyright owner that is granting the License.

"Legal Entity" shall mean the union of the acting entity and all other entities that control, are controlled by, or are under common control with that entity. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.

"You" (or "Your") shall mean an individual or Legal Entity exercising permissions granted by this License.

"Source" form shall mean the preferred form for making modifications, including but not limited to software source code, documentation source, and configuration files.

"Object" form shall mean any form resulting from mechanical transformation or translation of a Source form, including but not limited to compiled object code, generated documentation, and conversions to other media types.

"Work" shall mean the work of authorship, whether in Source or Object form, made available under the License, as indicated by a copyright notice that is included in or attached to the work (an example is provided in the Appendix below).

"Derivative Works" shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. For the purposes of this License, Derivative Works shall not include works that remain separable from, or merely link (or bind by name) to the interfaces of, the Work and Derivative Works thereof.

"Contribution" shall mean any work of authorship, including the original version of the Work and any modifications or additions to that Work or Derivative Works thereof, that is intentionally submitted to Licensor for inclusion in the Work by the copyright owner or by an individual or Legal Entity authorized to submit on behalf of the copyright owner. For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to the Licensor or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the Licensor for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by the copyright owner as "Not a Contribution."

"Contributor" shall mean Licensor and any individual or Legal Entity on behalf of whom a Contribution has been received by Licensor and subsequently incorporated within the Work.

2. Grant of Copyright License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or Object form.

3. Grant of Patent License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by such Contributor that are necessarily infringed by their Contribution(s) alone or by combination of their Contribution(s) with the Work to which such Contribution(s) was submitted. If You institute patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Work or a Contribution incorporated within the Work constitutes direct or contributory patent infringement, then any patent licenses granted to You under this License for that Work shall terminate as of the date such litigation is filed.

4. Redistribution. You may reproduce and distribute copies of the Work or Derivative Works thereof in any medium, with or without modifications, and in Source or Object form, provided that You meet the following conditions:

You must give any other recipients of the Work or Derivative Works a copy of this License; and
You must cause any modified files to carry prominent notices stating that You changed the files; and
You must retain, in the Source form of any Derivative Works that You distribute, all copyright, patent, trademark, and attribution notices from the Source form of the Work, excluding those notices that do not pertain to any part of the Derivative Works; and
If the Work includes a "NOTICE" text file as part of its distribution, then any Derivative Works that You distribute must include a readable copy of the attribution notices contained within such NOTICE file, excluding those notices that do not pertain to any part of the Derivative Works, in at least one of the following places: within a NOTICE text file distributed as part of the Derivative Works; within the Source form or documentation, if provided along with the Derivative Works; or, within a display generated by the Derivative Works, if and wherever such third-party notices normally appear. The contents of the NOTICE file are for informational purposes only and do not modify the License. You may add Your own attribution notices within Derivative Works that You distribute, alongside or as an addendum to the NOTICE text from the Work, provided that such additional attribution notices cannot be construed as modifying the License.

You may add Your own copyright statement to Your modifications and may provide additional or different license terms and conditions for use, reproduction, or distribution of Your modifications, or for any such Derivative Works as a whole, provided Your use, reproduction, and distribution of the Work otherwise complies with the conditions stated in this License.
5. Submission of Contributions. Unless You explicitly state otherwise, any Contribution intentionally submitted for inclusion in the Work by You to the Licensor shall be under the terms and conditions of this License, without any additional terms or conditions. Notwithstanding the above, nothing herein shall supersede or modify the terms of any separate license agreement you may have executed with Licensor regarding such Contributions.

6. Trademarks. This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licensor, except as required for reasonable and customary use in describing the origin of the Work and reproducing the content of the NOTICE file.

7. Disclaimer of Warranty. Unless required by applicable law or agreed to in writing, Licensor provides the Work (and each Contributor provides its Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining the appropriateness of using or redistributing the Work and assume any risks associated with Your exercise of permissions under this License.

8. Limitation of Liability. In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall any Contributor be liable to You for damages, including any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or out of the use or inability to use the Work (including but not limited to damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses), even if such Contributor has been advised of the possibility of such damages.

9. Accepting Warranty or Additional Liability. While redistributing the Work or Derivative Works thereof, You may choose to offer, and charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations and/or rights consistent with this License. However, in accepting such obligations, You may act only on Your own behalf and on Your sole responsibility, not on behalf of any other Contributor, and only if You agree to indemnify, defend, and hold each Contributor harmless for any liability incurred by, or claims asserted against, such Contributor by reason of your accepting any such warranty or additional liability.
16 changes: 8 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
# Thinktecture IdentityServer v3 #

**Current status: Beta 1**
**Current status: Beta 2**

[![Gitter](https://badges.gitter.im/Join Chat.svg)](https://gitter.im/thinktecture/Thinktecture.IdentityServer.v3?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)

## Overview ##

Expand Down Expand Up @@ -55,12 +57,10 @@ The host [samples](https://github.com/thinktecture/Thinktecture.IdentityServer.v
## Credits ##
IdentityServer is built using the following great open source projects:

- ASP.NET Web API
- Autofac
- Json.Net
- Thinktecture IdentityModel
- ILMerge
- DH.Logging
- Katana
- [ASP.NET Web API](https://aspnetwebstack.codeplex.com/)
- [Autofac](http://autofac.org/)
- [Json.Net](http://james.newtonking.com/json)
- [LibLog](https://github.com/damianh/LibLog)
- [Katana](https://katanaproject.codeplex.com/)

thanks to all [contributors](https://github.com/thinktecture/Thinktecture.IdentityServer.v3/graphs/contributors)!
2 changes: 1 addition & 1 deletion default.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ task ILMerge -depends Compile {
}

New-Item $dist_directory\lib\net45 -Type Directory
Invoke-Expression "$ilmerge_path /targetplatform:v4 /internalize:ilmerge.exclude /allowDup /target:library /out:$dist_directory\lib\net45\Thinktecture.IdentityServer.dll $input_dlls"
Invoke-Expression "$ilmerge_path /targetplatform:v4 /internalize /allowDup /target:library /out:$dist_directory\lib\net45\Thinktecture.IdentityServer.dll $input_dlls"
}

task CreateNuGetPackage -depends ILMerge {
Expand Down
1 change: 0 additions & 1 deletion ilmerge.exclude

This file was deleted.

1 change: 1 addition & 0 deletions mygetpush.cmd
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
nuget push distribution\*.nupkg -Source https://www.myget.org/F/thinktecture/
1 change: 1 addition & 0 deletions nugetpush.cmd
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
nuget push distribution\*.nupkg
Loading