Skip to content

Commit 1729f4c

Browse files
authored
Merge branch 'main' into main_2119_unassigned
2 parents 5269ea9 + 8531448 commit 1729f4c

31 files changed

Lines changed: 384 additions & 26 deletions

.github/pull_request_template.md

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
## Description
2+
<!-- Briefly describe the changes and link relevant issues -->
3+
4+
## Type of Change
5+
- [ ] Bug fix
6+
- [ ] New feature
7+
- [ ] Breaking change
8+
9+
## AI Usage Disclosure
10+
11+
**AI Tool(s) Used Including Version:**
12+
<!-- (e.g., ChatGPT 5.3, Claude Opus 4.6, etc.) -->
13+
14+
**Nature of Use:**
15+
- [ ] Code generation
16+
- [ ] Code suggestions/refactoring
17+
- [ ] Documentation
18+
- [ ] Tests
19+
- [ ] Other (please describe)
20+
21+
**Additional Description:**
22+
<!-- Briefly describe how AI was used -->
23+
24+
- [ ] No AI Used

.github/workflows/build.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,8 @@ jobs:
4242
jq 'reduce inputs as $i (.; .source_files += $i.source_files)' target/coveralls.json coverage/coveralls.json > coveralls.json
4343
4444
- name: "Send to Coveralls"
45+
if: github.event_name != 'pull_request'
46+
continue-on-error: true
4547
uses: MikeEdgar/github-action@raw_coverage_file
4648
with:
4749
github-token: ${{ secrets.github_token }}
File renamed without changes.
File renamed without changes.

build/appConfig.js.template

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,11 @@ var appConfig = {
3535

3636
/*
3737
Designate whether or not to use the local authentication.
38-
Set this to true or false booleans or set it to the the string 'alternate'.
38+
Set this to true or false booleans or set it to the literal strings (with quotes) 'alternate' or 'alternateAllowRegister'.
3939
When set to the boolean true, the login modal and registrations links are available.
4040
When set to the boolean false, a modal is not used and Shibboleth login is automatically attempted and no registration link is shown.
41-
When set to the string 'alternate' to hide the local login (and registration) as if localAuthentication is false and provide an alterate (hidden) login page for local authentication.
41+
When set to the string 'alternate' to hide the local login (and registration) as if localAuthentication is false and provide an alternate (hidden) login page for local authentication.
42+
When set to the string 'alternateAllowRegister' to hide the local login the same way as 'alternate', but allow for account registration at the /signup route.
4243
*/
4344
'localAuthentication': ${LOCAL_AUTHENTICATION},
4445

File renamed without changes.

docs/AI_POLICY.md

Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
1+
# AI Usage Policy
2+
3+
The Vireo ETD project allows the responsible and transparent use of Artificial Intelligence (AI) tools in development. This policy is designed to provide flexibility for contributors while ensuring accountability, transparency, and compatibility with institutional policies.
4+
5+
## Guiding Principles
6+
7+
* **Developer Discretion:** Use of AI tools is optional. Contributors may choose whether and how to use AI in their work.
8+
* **Responsibility and Accountability:** All contributors are responsible for the code and content they submit. Any AI-assisted work must be reviewed, tested, and validated to meet project standards.
9+
* **Institutional Compliance:** Contributors must ensure their use of AI tools complies with the policies of their home institutions and any applicable laws or regulations.
10+
* **Transparency:** AI usage must be disclosed in pull requests to support review and project oversight.
11+
12+
## Acceptable Uses
13+
14+
AI tools may be used for:
15+
* Code generation or suggestions
16+
* Refactoring assistance
17+
* Documentation drafting or editing
18+
* Test creation
19+
* Debugging support
20+
21+
## Restricted Uses
22+
23+
Contributors should not:
24+
* Submit AI-generated content without review and validation
25+
* Include sensitive or restricted data in AI prompts
26+
* Introduce code with unclear licensing or intellectual property risks
27+
28+
## AI Usage Disclosure Requirement
29+
30+
All pull requests using AI must include an **AI Usage Disclosure** section. This disclosure helps reviewers understand how AI tools were used and allows project maintainers to track usage trends. If no AI tools were used, no AI disclosure is necessary.
31+
32+
### Pull Request Template
33+
34+
When submitting a pull request, please include the following section in your PR description:
35+
36+
```markdown
37+
## Description
38+
<!-- Briefly describe the changes and link relevant issues -->
39+
40+
## Type of Change
41+
- [ ] Bug fix
42+
- [ ] New feature
43+
- [ ] Breaking change
44+
45+
## AI Usage Disclosure
46+
47+
**AI Tool(s) Used Including Version:**
48+
<!-- (e.g., ChatGPT 5.3, Claude Opus 4.6, etc.) -->
49+
50+
**Nature of Use:**
51+
- [ ] Code generation
52+
- [ ] Code suggestions/refactoring
53+
- [ ] Documentation
54+
- [ ] Tests
55+
- [ ] Other (please describe)
56+
57+
**Additional Description:**
58+
<!-- Briefly describe how AI was used -->
59+
60+
[ ] No AI Used
61+
```
62+
63+
## Reviewer Guidance
64+
65+
Reviewers may:
66+
* Request clarification about AI-assisted contributions
67+
* Apply additional scrutiny where appropriate
68+
* Evaluate contributions based on quality, correctness, and maintainability
69+
70+
*Note: The use of AI should not influence acceptance or rejection on its own.*
71+
72+
## Policy Evolution
73+
74+
This policy will evolve as AI tools and institutional requirements change. Contributors are encouraged to provide feedback to the Vireo User Group Steering Committee.
75+
76+
[Contact Us](https://texasdigitallibrary.atlassian.net/wiki/spaces/VUG/pages/2233303049/Contact+Us)
File renamed without changes.

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
<dependency>
4949
<groupId>org.apache.tomcat.embed</groupId>
5050
<artifactId>tomcat-embed-core</artifactId>
51-
<version>9.0.117</version>
51+
<version>9.0.118</version>
5252
</dependency>
5353

5454
<dependency>

src/main/java/org/tdl/vireo/auth/service/VireoUserCredentialsService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ public synchronized User updateUserByCredentials(Credentials credentials) {
9494
} else {
9595
boolean isUserUpdated = false;
9696

97-
if (StringUtils.isNotEmpty(shibNetid) && (user.getNetid() == null || !user.getNetid().equals(shibNetid))) {
97+
if (StringUtils.isNotEmpty(shibNetid) && (user.getNetid() == null || (user.getNetid().trim().length() < 1) || !user.getNetid().equals(shibNetid))) {
9898
user.setNetid(shibNetid);
9999
isUserUpdated = true;
100100
}

0 commit comments

Comments
 (0)