Skip to content

Commit 5146ba5

Browse files
cslzchencslzchen
committed
Merge branch 'feature/frontend-rework' into feature/newCAS-v21.0.0-alpha
2 parents eeef575 + 22c4835 commit 5146ba5

81 files changed

Lines changed: 1417 additions & 1067 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎etc/cas/config/cas.properties‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -76,16 +76,6 @@ cas.authn.osf-url.logout=https://{{ .Values.osfDomain }}/logout/
7676
cas.authn.osf-url.resend-confirmation=https://{{ .Values.osfDomain }}/resend/
7777
cas.authn.osf-url.forgot-password=https://{{ .Values.osfDomain }}/forgotpassword/
7878
cas.authn.osf-url.register=https://{{ .Values.osfDomain }}/register/
79-
cas.authn.osf-url.search=https://{{ .Values.osfDomain }}/search/
80-
cas.authn.osf-url.support=https://{{ .Values.osfDomain }}/support/
81-
cas.authn.osf-url.donate=https://www.cos.io/about/support-cos/
82-
#
83-
# OSF Products
84-
#
85-
cas.authn.osf-url.preprints-home=https://{{ .Values.osfDomain }}/preprints/
86-
cas.authn.osf-url.registries-home=https://{{ .Values.osfDomain }}/registries/
87-
cas.authn.osf-url.institutions-home=https://{{ .Values.osfDomain }}/institutions/
88-
cas.authn.osf-url.meetings-home=https://{{ .Values.osfDomain }}/meetings/
8979
########################################################################################################################
9080

9181
########################################################################################################################

‎etc/cas/config/local/cas-local.properties‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -77,16 +77,6 @@ cas.authn.osf-url.logout=http://localhost:5000/logout/
7777
cas.authn.osf-url.resend-confirmation=http://localhost:5000/resend/
7878
cas.authn.osf-url.forgot-password=http://localhost:5000/forgotpassword/
7979
cas.authn.osf-url.register=http://localhost:5000/register/
80-
cas.authn.osf-url.search=http://localhost:5000/search/
81-
cas.authn.osf-url.support=http://localhost:5000/support/
82-
cas.authn.osf-url.donate=https://www.cos.io/about/support-cos/
83-
#
84-
# OSF Products
85-
#
86-
cas.authn.osf-url.preprints-home=http://localhost:5000/preprints/
87-
cas.authn.osf-url.registries-home=http://localhost:5000/registries/
88-
cas.authn.osf-url.institutions-home=http://localhost:5000/institutions/
89-
cas.authn.osf-url.meetings-home=http://localhost:5000/meetings/
9080
########################################################################################################################
9181

9282
########################################################################################################################

‎etc/cas/services/local/cas-203948234207100.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
22
"@class": "org.apereo.cas.services.RegexRegisteredService",
33
"serviceId": "^https?://(localhost|127\\.0\\.0\\.1|192\\.168\\.168\\.167)(|:8080|:8443)/.*",
4-
"name": "OSF CAS",
5-
"description": "OSF CAS is the centralized authentication and authorization service for OSF",
4+
"name": "",
5+
"description": "",
66
"id": 203948234207100,
77
"evaluationOrder": 10,
88
"logo": "/images/osf-banner.png",

etc/cas/services/local/fakeosf-203948234207210.json renamed to etc/cas/services/local/cas-203948234207101.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{
22
"@class": "org.apereo.cas.services.RegexRegisteredService",
3-
"serviceId": "^https?://(localhost|127\\.0\\.0\\.1|192\\.168\\.168\\.167):5000/fake/.*",
4-
"name": "One Special Fake OSF",
5-
"description": "This is the One Special Fake OSF for testing hard-to-reach corner cases and errors (local-dev only)",
6-
"id": 203948234207210,
7-
"evaluationOrder": 25,
8-
"logo": "/images/osf-logo.png",
3+
"serviceId": "^/(login|logout)\\?.*",
4+
"name": "",
5+
"description": "",
6+
"id": 203948234207101,
7+
"evaluationOrder": 10,
8+
"logo": "/images/osf-banner.png",
99
"attributeReleasePolicy": {
1010
"@class": "org.apereo.cas.services.ReturnAllowedAttributeReleasePolicy",
1111
"allowedAttributes": [

‎etc/cas/services/local/casarxiv-203948234207241.json‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
{
2+
"@class": "org.apereo.cas.services.RegexRegisteredService",
3+
"serviceId" : "^https?://(localhost|127\\.0\\.0\\.1):5000/(login|logout)/?\\?next=https?(%3A|:)(%2F|/)(%2F|/)((local\\.casarxiv\\.org(%3A|:)4200)|((localhost|127\\.0\\.0\\.1)(%3A|:)5000(%2F|/)preprints(%2F|/)casarxiv))($|%2F|/).*",
4+
"name" : "CasArxiv Preprints",
5+
"description" : "",
6+
"id" : 203948234207241,
7+
"evaluationOrder": 10,
8+
"logo" : "/images/branded/preprints-casarxiv-logo.png",
9+
"attributeReleasePolicy": {
10+
"@class": "org.apereo.cas.services.ReturnAllowedAttributeReleasePolicy",
11+
"allowedAttributes": [
12+
"java.util.ArrayList",
13+
[
14+
"givenName",
15+
"familyName",
16+
"username"
17+
]
18+
]
19+
},
20+
"accessStrategy": {
21+
"@class": "org.apereo.cas.services.DefaultRegisteredServiceAccessStrategy",
22+
"delegatedAuthenticationPolicy": {
23+
"@class": "org.apereo.cas.services.DefaultRegisteredServiceDelegatedAuthenticationPolicy",
24+
"allowedProviders": [
25+
"java.util.ArrayList",
26+
[
27+
"cord",
28+
"fakecas",
29+
"okstate",
30+
"orcid"
31+
]
32+
],
33+
"permitUndefined": false
34+
}
35+
}
36+
}

‎etc/cas/services/local/legacyosf-203948234207220.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
22
"@class": "org.apereo.cas.services.RegexRegisteredService",
33
"serviceId": "^https?://(localhost|127\\.0\\.0\\.1|192\\.168\\.168\\.167):5000/.*",
4-
"name": "OSF",
5-
"description": "Manage and share your research with OSF – an free, open, easy and integrated platform to support your research and enable collaboration.",
4+
"name": "",
5+
"description": "",
66
"id": 203948234207220,
77
"evaluationOrder": 25,
88
"logo": "/images/osf-logo.png",

‎etc/cas/services/local/osf-203948234207230.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"@class": "org.apereo.cas.services.RegexRegisteredService",
33
"serviceId": "^https?://(localhost|127\\.0\\.0\\.1|192\\.168\\.168\\.167):5000/(login|logout)/?\\?next=.*",
44
"name": "",
5-
"description": "There's a better way to manage your research! OSF is a free, open platform to support your research and enable collaboration.",
5+
"description": "",
66
"id": 203948234207230,
77
"evaluationOrder": 20,
88
"logo": "/images/osf-banner.png",

‎etc/cas/services/local/preprints-203948234207240.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"@class": "org.apereo.cas.services.RegexRegisteredService",
33
"serviceId": "^https?://(localhost|127\\.0\\.0\\.1):5000/(login|logout)/?\\?next=https?(%3A|:)(%2F|/)(%2F|/)(localhost|127\\.0\\.0\\.1)(%3A|:)5000(%2F|/)preprints($|%2F|/).*",
44
"name": "",
5-
"description": "Accelerating scholarly review, publishing, and discovery.",
5+
"description": "",
66
"id": 203948234207240,
77
"evaluationOrder": 15,
88
"logo": "/images/osf-preprints-banner.png",

‎etc/cas/services/local/registries-203948234207340.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"@class": "org.apereo.cas.services.RegexRegisteredService",
33
"serviceId": "^https?://(localhost|127\\.0\\.0\\.1):5000/(login|logout)/?\\?next=https?(%3A|:)(%2F|/)(%2F|/)(localhost|127\\.0\\.0\\.1)(%3A|:)5000(%2F|/)registries($|%2F|/).*",
44
"name": "",
5-
"description": "The open registries network",
5+
"description": "",
66
"id": 203948234207340,
77
"evaluationOrder": 15,
88
"logo": "/images/osf-registries-banner.png",

‎src/main/java/io/cos/cas/osf/configuration/model/OsfUrlProperties.java‎

Lines changed: 0 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -61,41 +61,6 @@ public class OsfUrlProperties implements Serializable {
6161
*/
6262
private String forgotPassword;
6363

64-
/**
65-
* OSF Preprints landing page URL.
66-
*/
67-
private String preprintsHome;
68-
69-
/**
70-
* OSF Registries landing page URL.
71-
*/
72-
private String registriesHome;
73-
74-
/**
75-
* OSF Institutions landing page URL.
76-
*/
77-
private String institutionsHome;
78-
79-
/**
80-
* OSF meetings landing page URL.
81-
*/
82-
private String meetingsHome;
83-
84-
/**
85-
* OSF search page URL.
86-
*/
87-
private String search;
88-
89-
/**
90-
* OSF support page URL.
91-
*/
92-
private String support;
93-
94-
/**
95-
* OSF / COS donation page URL.
96-
*/
97-
private String donate;
98-
9964
/**
10065
* Build the default service URL using OSF login endpoint with OSF home page as destination.
10166
*/

0 commit comments

Comments
 (0)