Skip to content

Commit

Permalink
Merge pull request #203 from sohosai/release/0.7.1
Browse files Browse the repository at this point in the history
Release/0.7.1
  • Loading branch information
momeemt committed May 1, 2023
2 parents 613994f + 14bde93 commit 93449e6
Show file tree
Hide file tree
Showing 16 changed files with 34 additions and 24 deletions.
7 changes: 6 additions & 1 deletion CHANGELOG.md
Expand Up @@ -13,6 +13,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
### Fixed
### Security

## [0.7.1] - 2023-05-01

### Changed
- Changed so that accounts can also be created from *.sohosai.com.

## [0.7.0] - 2023-04-23

### Added
Expand Down Expand Up @@ -189,4 +194,4 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
### Fixed

- Inflexibility of `sos21-database` ([#28](https://github.com/sohosai/sos21-backend/pull/28))
- Server error logs ([#36](https://github.com/sohosai/sos21-backend/pull/36))
- Server error logs ([#36](https://github.com/sohosai/sos21-backend/pull/36))
16 changes: 8 additions & 8 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion VERSION
@@ -1 +1 @@
0.7.0
0.7.1
4 changes: 2 additions & 2 deletions docker-compose.run.yml
Expand Up @@ -10,7 +10,7 @@ services:
depends_on:
- api-server
api-server:
image: ghcr.io/sohosai/sos21-backend:v0.7.0
image: ghcr.io/sohosai/sos21-backend:v0.7.1
command: sos21-api-server
environment:
SOS21_API_SERVER_JWT_AUDIENCE: ${SOS21_FIREBASE_PROJECT_ID:?}
Expand All @@ -33,7 +33,7 @@ services:
- run-migrations
- create-bucket
run-migrations:
image: ghcr.io/sohosai/sos21-backend:v0.7.0
image: ghcr.io/sohosai/sos21-backend:v0.7.1
command: sos21-run-migrations --wait
environment:
SOS21_RUN_MIGRATIONS_POSTGRES_URI: "postgres://sos21:sos21@db:5432/sos21"
Expand Down
4 changes: 3 additions & 1 deletion sos21-api-server/CHANGELOG.md
Expand Up @@ -15,6 +15,8 @@ with the HTTP API interface being the "public API".
### Fixed
### Security

## [0.7.1] - 2023-05-01

## [0.7.0] - 2023-04-23

## [0.6.2] - 2022-06-26
Expand Down Expand Up @@ -126,4 +128,4 @@ No changes in `sos21-api-server`.

### Removed

- Display ID of projects ([#20](https://github.com/sohosai/sos21-backend/pull/20), [#25](https://github.com/sohosai/sos21-backend/pull/25))
- Display ID of projects ([#20](https://github.com/sohosai/sos21-backend/pull/20), [#25](https://github.com/sohosai/sos21-backend/pull/25))
2 changes: 1 addition & 1 deletion sos21-api-server/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "sos21-api-server"
version = "0.7.0"
version = "0.7.1"
authors = ["coord_e <me@coord-e.com>", "azarashi2931 <az@rashi.email>", "yuseiito <me@yuseiito.com>", "momeemt <me@momee.mt>"]
edition = "2018"
readme = "README.md"
Expand Down
2 changes: 1 addition & 1 deletion sos21-api-server/schema/api.yml
@@ -1,7 +1,7 @@
openapi: 3.0.0
info:
title: sos21-api-server
version: 0.7.0
version: 0.7.1
contact:
name: coord_e
email: me@coord-e.com
Expand Down
2 changes: 1 addition & 1 deletion sos21-api-server/schema/package.json
@@ -1,6 +1,6 @@
{
"name": "sos21-api-server-schema",
"version": "0.7.0",
"version": "0.7.1",
"description": "OpenAPI schema for sos21-api-server",
"scripts": {
"lint:spectral": "spectral lint ./api.yml -F hint",
Expand Down
2 changes: 1 addition & 1 deletion sos21-database/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "sos21-database"
version = "0.7.0"
version = "0.7.1"
authors = ["coord_e <me@coord-e.com>", "azarashi2931 <az@rashi.email>", "yuseiito <me@yuseiito.com>", "momeemt <me@momee.mt>"]
edition = "2018"
readme = "README.md"
Expand Down
2 changes: 1 addition & 1 deletion sos21-domain/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "sos21-domain"
version = "0.7.0"
version = "0.7.1"
authors = ["coord_e <me@coord-e.com>", "azarashi2931 <az@rashi.email>", "yuseiito <me@yuseiito.com>", "momeemt <me@momee.mt>"]
edition = "2018"
readme = "README.md"
Expand Down
5 changes: 4 additions & 1 deletion sos21-domain/src/model/user/email.rs
Expand Up @@ -50,7 +50,7 @@ impl UserEmailAddress {
let email = EmailAddress::from_string(s.into()).map_err(|err| EmailAddressError {
inner: EmailAddressErrorInner::InvalidEmailAddress(err),
})?;
if email.ends_with("tsukuba.ac.jp") {
if email.ends_with("tsukuba.ac.jp") || email.ends_with("sohosai.com") {
Ok(UserEmailAddress(email))
} else {
Err(EmailAddressError {
Expand Down Expand Up @@ -78,6 +78,7 @@ mod tests {
assert!(UserEmailAddress::from_string("a.b.c@de.fg").is_err());
assert!(UserEmailAddress::from_string("ab.c@d-e.fg").is_err());
assert!(UserEmailAddress::from_string("a@s.tsukuba.ac.jp.com").is_err());
assert!(UserEmailAddress::from_string("b@sohosai.com.jp").is_err());
}

#[test]
Expand All @@ -87,5 +88,7 @@ mod tests {
assert!(UserEmailAddress::from_string("a-c@s.tsukuba.ac.jp").is_ok());
assert!(UserEmailAddress::from_string("abcde@su.tsukuba.ac.jp").is_ok());
assert!(UserEmailAddress::from_string("ab.c@coins.tsukuba.ac.jp").is_ok());
assert!(UserEmailAddress::from_string("a@external.sohosai.com").is_ok());
assert!(UserEmailAddress::from_string("a-b@sohosai.com").is_ok());
}
}
2 changes: 1 addition & 1 deletion sos21-gateway/database/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "sos21-gateway-database"
version = "0.7.0"
version = "0.7.1"
authors = ["coord_e <me@coord-e.com>", "azarashi2931 <az@rashi.email>"]
edition = "2018"
readme = "README.md"
Expand Down
2 changes: 1 addition & 1 deletion sos21-gateway/s3/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "sos21-gateway-s3"
version = "0.7.0"
version = "0.7.1"
authors = ["coord.e <me@coord-e.com>"]
edition = "2018"
readme = "README.md"
Expand Down
2 changes: 1 addition & 1 deletion sos21-gateway/slack/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "sos21-gateway-slack"
version = "0.7.0"
version = "0.7.1"
authors = ["yuseiito <me@yuseiito.com>"]
edition = "2018"

Expand Down
2 changes: 1 addition & 1 deletion sos21-run-migrations/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "sos21-run-migrations"
version = "0.7.0"
version = "0.7.1"
authors = ["coord.e <me@coord-e.com>", "yuseiito <me@yuseiito.com>", "momeemt <me@momee.mt>"]
edition = "2018"
readme = "README.md"
Expand Down
2 changes: 1 addition & 1 deletion sos21-use-case/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "sos21-use-case"
version = "0.7.0"
version = "0.7.1"
authors = ["coord_e <me@coord-e.com>", "azarashi2931 <az@rashi.email>", "yuseiito <me@yuseiito.com>", "momeemt <me@momee.mt>"]
edition = "2018"
readme = "README.md"
Expand Down

0 comments on commit 93449e6

Please sign in to comment.