matrix/authentication-service
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-authentication-service.git synced 2025-08-07 17:03:01 +03:00
Code Activity

Minor fixes

Browse Source
This commit is contained in:
Quentin Gliech
2022-10-27 17:26:43 +02:00
parent 2d2127dcdb
commit 577d5e4952
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
crates/storage/migrations/20221018142001_init.up.sql
View File

@@ -300,9 +300,10 @@ CREATE TABLE "oauth2_refresh_tokens" (
CONSTRAINT "oauth2_access_tokens_oauth2_session_id_fkey" CONSTRAINT "oauth2_access_tokens_oauth2_session_id_fkey"
REFERENCES "oauth2_sessions" ("oauth2_session_id"), REFERENCES "oauth2_sessions" ("oauth2_session_id"),
"oauth2_access_token_id" UUID NOT NULL "oauth2_access_token_id" UUID
CONSTRAINT "oauth2_refresh_tokens_oauth2_access_token_id_fkey" CONSTRAINT "oauth2_refresh_tokens_oauth2_access_token_id_fkey"
REFERENCES "oauth2_access_tokens" ("oauth2_access_token_id"), REFERENCES "oauth2_access_tokens" ("oauth2_access_token_id")
ON DELETE SET NULL,
"refresh_token" TEXT NOT NULL "refresh_token" TEXT NOT NULL
CONSTRAINT "oauth2_refresh_tokens_unique" CONSTRAINT "oauth2_refresh_tokens_unique"

5
crates/storage/src/oauth2/client.rs
View File

@@ -225,9 +225,10 @@ impl TryInto<Client<PostgresqlBackend>> for OAuth2ClientLookup {
_ => return Err(ClientFetchError::BothJwksAndJwksUri), _ => return Err(ClientFetchError::BothJwksAndJwksUri),
}; };
let id = Ulid::from(self.oauth2_client_id);
Ok(Client { Ok(Client {
data: self.oauth2_client_id.into(), data: id,
client_id: self.oauth2_client_id.to_string(), client_id: id.to_string(),
encrypted_client_secret: self.encrypted_client_secret, encrypted_client_secret: self.encrypted_client_secret,
redirect_uris, redirect_uris,
response_types, response_types,