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.

Sign up for GitHub

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

Oauth2 pure rest - Googe Summer of Code 2017 #4

Open
wants to merge 84 commits into
base: master
Choose a base branch
from
Open

Oauth2 pure rest - Googe Summer of Code 2017 #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
84 commits
Select commit Hold shift + click to select a range
27ad513
update openMRSVersion to 1.11.0
maany Jul 4, 2015
fea8d9f
openMRSVersion -> 1.11.1
maany Jul 5, 2015
41095da
adding spring-security-oauth dependency in api layer's pom.xml.
maany Jul 6, 2015
716cfcb
lib folder fixed. issue with aopalliance on installing module
maany Jul 6, 2015
ff19a4b
spring security oauth dependencies fixed. module installs and works c…
maany Jul 6, 2015
66252fb
added xml namespace for oauth2 and spring security tags in webModuleA…
maany Jul 6, 2015
cd756de
spring security version upgraded to 3.2.7 from 3.1.3
maany Jul 9, 2015
7667efb
authorization server
maany Jul 11, 2015
8f48941
dummy commit to remove Optimize Imports and Perform Code Analysis on …
maany Jul 11, 2015
79ecbb8
configured spring security to install and run correctly on OpenMRS.
maany Jul 11, 2015
208076a
URL Mapping succeeded. URL for OAuth module being intercepted success…
maany Jul 11, 2015
708efdf
Intercepting FHIR URI's
maany Jul 11, 2015
90c655c
wire frame for entire OAuth2 config setup
maany Jul 11, 2015
9df580a
Token Endpoint changed to /ws/oauth/token
maany Jul 19, 2015
e846984
Client Credentials Grant Type completely configured.
maany Jul 23, 2015
84de785
Restore Point: Resource Owner Password Credentials Grant Type
maany Aug 4, 2015
87d7f37
Authorization Code Grant Type
maany Aug 4, 2015
2bc8c39
oauth error page updated
maany Aug 9, 2015
5395fad
UserDetailsService
maany Aug 9, 2015
6965294
liquibase and hibernate changes
maany Aug 13, 2015
b420371
Client updated to support spring security oauth ClientDetails
maany Aug 16, 2015
e11f64a
Tests and Test Data updated to reflect changes in Client
maany Aug 16, 2015
7fdc360
updated liquibase.xml
maany Aug 16, 2015
503d491
updated liquibase.xml, fix UI related issues arising due to new Clien…
maany Aug 16, 2015
d508de3
remove redundant liquibase changelogs
maany Aug 18, 2015
83c10b2
OmodBypassController added to bypass and delay UI refactoring until A…
maany Aug 18, 2015
44dbedd
OmodBypassController tested. works successfully
maany Aug 18, 2015
782fe94
retire redirect_uri
maany Aug 19, 2015
27916ef
introduce a mediator to convert from CSV string to Collection<? exten…
maany Aug 20, 2015
5bcd620
database cleaned and set up.
maany Aug 20, 2015
e99088b
UserAuthenticationProvider added to read and verify credentials from …
maany Aug 20, 2015
76468fa
ClientAuthenticationProvider added. Token and Authorization endpoints…
maany Aug 20, 2015
c14348e
Token Persistence complete with spring-jdbc
maany Aug 23, 2015
1eba4f1
database refactor, remove duplicate fk constraint. add fk constraint …
maany Aug 23, 2015
03a582a
database refactor, remove duplicate fk constraint. add fk constraint …
maany Aug 29, 2015
be5505c
client modified to independently deal with spring security and data b…
maany Aug 30, 2015
d378165
sending checkbox data as a single parameter so that databinder is inv…
maany Aug 31, 2015
8f9f535
Features imported from https://github.com/maany/SpringPropertyEditorD…
maany Sep 26, 2015
ae6d616
Features imported from https://github.com/maany/SpringPropertyEditorD…
maany Sep 26, 2015
3b41585
fixed mappedBy in OneToMany annotated fields in Client
maany Sep 26, 2015
d72c243
update grantType checkboxes to have same name attribute
maany May 29, 2017
8c72295
update ClientRegistrationFormController to function without DataBinders
maany May 29, 2017
eaac4a3
update clientType ModelAttribute to return array of Client.ClientType
maany May 29, 2017
668a312
Introduce OAuth2Service to get access to all available/supported Gran…
maany May 29, 2017
5cdac9a
update registrationForm and ClientRegistrationController to use List<…
maany May 29, 2017
0cf81ae
Override Equals in AuthorizedGrantType and Scope. This will be used i…
maany May 29, 2017
f3c8fa2
minor fix in <c:forEach> to correctly load items
maany May 30, 2017
5410057
viewEditRegisteredClient.jsp updated to operate independently of spri…
maany May 30, 2017
1bbe0b6
fix errors in ClientRegistrationFormController
maany May 30, 2017
9fa69e7
remove DataBinding from view/edit registered client form and controller
maany May 30, 2017
3aafe67
deprecate CollectionPropertyEditor (remove Spring DataBinding)
maany May 30, 2017
61981d0
## Important Commit
maany Jun 3, 2017
9a096e9
Changes to 2.2.0-SNAPSHOT
mavrk Jun 22, 2017
0c1804c
Update to Spring 4.1.4 and OpenMRS 2.0.1
mavrk Jun 22, 2017
4097b3a
changed spring-security xsd and changed http@access-denied-page as in…
mavrk Jun 22, 2017
841a2b3
using spring security 4.0.4.RELEASE
mavrk Jun 23, 2017
1993a83
Added support for ${spring.version}
mavrk Jun 23, 2017
42f1847
Removing duplicate mappings from Client.java
mavrk Jun 29, 2017
433a987
Removing unused mappings and hibernate configurations AND changes to …
mavrk Jun 29, 2017
4703824
Fixed grant type and token validity issue
mavrk Jul 13, 2017
dfc29bc
Removed unused console outputs, changed grant types names, replaced C…
mavrk Jul 17, 2017
0499dfc
Added jackson support
mavrk Jul 18, 2017
6d8038b
Fixed all grant types :)
mavrk Jul 22, 2017
b632756
Fixed error in obtaining refresh_token
mavrk Jul 22, 2017
86d2158
Added gson support and fixed UI bugs
mavrk Aug 15, 2017
d6bc4a7
Removed gson dependency and fixed client registration controller
mavrk Aug 16, 2017
3c71a92
Add custom controller endpoint for REST OAuth client management contr…
mavrk Aug 21, 2017
dfc5e88
Remove unused dependencies
mavrk Aug 21, 2017
af93fc5
Remove dependancy on legacy-ui
mavrk Aug 21, 2017
3cef8a0
Fixed AUthorization Code issue
mavrk Aug 24, 2017
3ff3091
Fixed auth_code issue
mavrk Aug 24, 2017
84d2cc1
Changed controller to Support @RequestParam
mavrk Aug 24, 2017
264916c
Added CORS support
mavrk Aug 25, 2017
b80048e
Fix Client RedirectURI bug when requesting JSON Mappable OAuth Client
mavrk Aug 26, 2017
999ca8a
Cleaning up xml files and add support messages
mavrk Aug 26, 2017
557314a
Removed unused dependencies in pom.xml and updated comments
mavrk Aug 26, 2017
d873d91
Add support messages and removed unused code
mavrk Aug 26, 2017
875b44e
Added useful log messages and removed cosnole outputs
mavrk Aug 26, 2017
bbbc99b
Added /oauth/metadata url and made changes to rest controller
mavrk Aug 27, 2017
94a300b
Changed module version to 1.0
mavrk Aug 27, 2017
8fdf461
Changes Meta data facts
mavrk Oct 7, 2017
579fed8
Changed back to 0.8
mavrk Dec 22, 2017
6e7b5b8
Replace "Exception" with the specific exception that is raised in Cli…
Oscar-Belletti Dec 22, 2017
9637b72
Merge pull request #1 from Oscar-Belletti/oauth2-pure-rest
mavrk Dec 26, 2017
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
173 changes: 144 additions & 29 deletions api/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,78 +14,195 @@
<description>API project for Oauth2</description>

<dependencies>

<!--
Add other dependencies from parent's pom:
<dependency>
<groupId>org.other.library</groupId>
<artifactId>library-name</artifactId>
</dependency>
-->


<!-- Begin OpenMRS core -->

<dependency>
<groupId>org.openmrs.api</groupId>
<artifactId>openmrs-api</artifactId>
<type>jar</type>
</dependency>

<dependency>
<groupId>org.openmrs.web</groupId>
<artifactId>openmrs-web</artifactId>
<type>jar</type>
</dependency>

<dependency>
<groupId>org.openmrs.api</groupId>
<artifactId>openmrs-api</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.openmrs.web</groupId>
<artifactId>openmrs-web</artifactId>
<type>test-jar</type>
<scope>test</scope>
<classifier>tests</classifier>
</dependency>

<dependency>
<groupId>org.openmrs.test</groupId>
<artifactId>openmrs-test</artifactId>
<type>pom</type>
<scope>test</scope>
</dependency>

<!-- End OpenMRS core -->

<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-crypto</artifactId>
<version>${spring.security.version}</version>
<exclusions>
<exclusion>
<groupId>org.springframework</groupId>
<groupId>org.springframework</groupId>
<artifactId>spring-aop</artifactId>
</exclusion>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
</exclusion>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
</exclusion>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
</exclusion>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring-asm</artifactId>
<artifactId>spring-tx</artifactId>
</exclusion>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
</exclusion>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
</exclusion>
<exclusion>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-core-asl</artifactId>
</exclusion>
<exclusion>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-mapper-asl</artifactId>
</exclusion>
</exclusions>
</dependency>

<!--Begin Spring-->
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
</dependency>

<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
</dependency>

<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-tx</artifactId>
</dependency>
<!--End Spring-->

<!--Begin Spring 3.1.1-->
<!--Begin spring-security-oauth2-->
<dependency>
<groupId>org.springframework.security.oauth</groupId>
<artifactId>spring-security-oauth2</artifactId>
<exclusions>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring-aop</artifactId>
</exclusion>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
</exclusion>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
</exclusion>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
</exclusion>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring-tx</artifactId>
</exclusion>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
</exclusion>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
</exclusion>
<exclusion>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-core-asl</artifactId>
</exclusion>
<exclusion>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-mapper-asl</artifactId>
</exclusion>
<exclusion>
<groupId>aopalliance</groupId>
<artifactId>aopalliance</artifactId>
</exclusion>
</exclusions>
</dependency>
<!--End spring-security-oauth2-->

<!--End Spring 3.1.1-->
<!--Begin spring security-->
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-core</artifactId>
<exclusions>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>/*</artifactId>
</exclusion>
<exclusion>
<groupId>aopalliance</groupId>
<artifactId>aopalliance</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-web</artifactId>
<exclusions>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>/*</artifactId>
</exclusion>
<exclusion>
<groupId>aopalliance</groupId>
<artifactId>aopalliance</artifactId>
</exclusion>
</exclusions>
</dependency>

</dependencies>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
</dependency>


<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-config</artifactId>
<exclusions>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>/*</artifactId>
</exclusion>
<exclusion>
<groupId>aopalliance</groupId>
<artifactId>aopalliance</artifactId>
</exclusion>
</exclusions>
</dependency>
<!--End spring security-->
</dependencies>
<build>
<resources>
<resource>
Expand All @@ -101,6 +218,4 @@
</testResource>
</testResources>
</build>


</project>
Loading