Skip to content
This repository has been archived by the owner on Apr 10, 2023. It is now read-only.

chore(deps): update oryd/hydra docker tag to v2 #254

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
23 changes: 13 additions & 10 deletions backend/src/main/java/io/papermc/hangarauth/config/WebConfig.java
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,19 @@ public ByteArrayHttpMessageConverter byteArrayHttpMessageConverter() {
return converter;
}

private List<MediaType> getSupportedMediaTypes() {
return List.of(
MediaType.IMAGE_JPEG,
MediaType.IMAGE_PNG,
MediaType.APPLICATION_OCTET_STREAM,
MediaType.IMAGE_GIF,
new MediaType("image", "svg+xml"),
new MediaType("image", "webp"),
new MediaType("image", "apng"),
new MediaType("image", "avif")
);
}

@Bean
public Filter identifyFilter() {
return new OncePerRequestFilter() {
Expand All @@ -71,16 +84,6 @@ public FilterRegistrationBean<ShallowEtagHeaderFilter> shallowEtagHeaderFilterFi
return bean;
}

private List<MediaType> getSupportedMediaTypes() {
return List.of(
MediaType.IMAGE_JPEG,
MediaType.IMAGE_PNG,
MediaType.APPLICATION_OCTET_STREAM,
new MediaType("image", "svg+xml"),
new MediaType("image", "webp")
);
}

@Override
public void addCorsMappings(final CorsRegistry registry) {
final String[] avatarCorsOrigins = new String[this.generalConfig.allowedOrigins().length + 1];
Expand Down
2 changes: 1 addition & 1 deletion chart/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ hydra:
image:
repository: oryd/hydra
pullPolicy: Always
tag: "v1.11.10"
tag: "v2.0.3"

imagePullSecrets: []
nameOverride: ""
Expand Down
2 changes: 1 addition & 1 deletion docker/hydra/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
FROM oryd/hydra:v1.11.10
FROM oryd/hydra:v2.0.3
CMD ["serve", "all", "-c", "/etc/config/hydra/hydra.yml", "--dangerous-force-http"]
COPY hydra.yml /etc/config/hydra/hydra.yml
12 changes: 12 additions & 0 deletions frontend/src/components/Footer.vue
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,18 @@ const { t } = useI18n();
<a href="https://github.com/HangarMC" class="flex items-center rounded-md px-6 py-2" hover="text-primary-400 bg-primary-0">
{{ t("footer.org") }}
</a>
<a
href="https://hangarstatus.papermc.io"
class="flex items-center rounded-md px-6 py-2"
hover="text-primary-400 bg-primary-0"
target="_blank"
rel="noreferrer noopener"
>
{{ t("footer.status") }}
</a>
<a href="https://hangar.papermc.io/terms" class="flex items-center rounded-md px-6 py-2" hover="text-primary-400 bg-primary-0">
{{ t("footer.terms") }}
</a>
<a href="https://hangar.papermc.io/privacy" class="flex items-center rounded-md px-6 py-2" hover="text-primary-400 bg-primary-0">
{{ t("footer.privacypolicy") }}
</a>
Expand Down
10 changes: 9 additions & 1 deletion frontend/src/components/form/FormInputText.vue
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
v-model="value"
:disabled="disabledField || node.attributes.disabled"
:name="node.attributes.name"
:label="node.meta.label ? node.meta.label.text : undefined"
:label="label"
:messages="messages"
:error-messages="errorMessages"
:rules="rules"
Expand Down Expand Up @@ -33,6 +33,14 @@ const autocomplete = computed(() => {
}
return undefined;
});

const label = computed(() => {
if (node.meta.label) {
// nobody understands what 'ID' means, lets override
return node.meta.label.id === 1070004 ? "Username or email address" : node.meta.label.text;
}
return undefined;
});
</script>

<style scoped></style>
6 changes: 4 additions & 2 deletions frontend/src/locales/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,10 @@
}
},
"footer": {
"org": "GitHub Organization",
"privacypolicy": "Privacy Policy"
"org": "GitHub",
"privacypolicy": "Privacy Policy",
"terms": "Terms and Conditions",
"status": "Status"
},
"index": {
"title": "Paper Authentication Portal",
Expand Down