diff --git a/storage/sql/crud.go b/storage/sql/crud.go index 26a42176..67cab973 100644 --- a/storage/sql/crud.go +++ b/storage/sql/crud.go @@ -330,7 +330,7 @@ func getRefresh(q querier, id string) (storage.RefreshToken, error) { claims_user_id, claims_username, claims_preferred_username, claims_email, claims_email_verified, claims_groups, - connector_id, connector_data, + connector_id, token, created_at, last_used from refresh_token where id = $1; `, id)) @@ -685,7 +685,7 @@ func (c *conn) UpdateOfflineSessions(userID string, connID string, updater func( _, err = tx.Exec(` update offline_session set - refresh = $1 + refresh = $1, connector_data = $2 where user_id = $3 AND conn_id = $4; `, diff --git a/storage/sql/migrate.go b/storage/sql/migrate.go index 0ef62609..bce8e5cf 100644 --- a/storage/sql/migrate.go +++ b/storage/sql/migrate.go @@ -90,18 +90,17 @@ var migrations = []migration{ nonce text not null, state text not null, force_approval_prompt boolean not null, - + logged_in boolean not null, - + claims_user_id text not null, claims_username text not null, claims_email text not null, claims_email_verified boolean not null, claims_groups bytea not null, -- JSON array of strings - + connector_id text not null, - connector_data bytea, - + expiry timestamptz not null );`, ` @@ -111,16 +110,15 @@ var migrations = []migration{ scopes bytea not null, -- JSON array of strings nonce text not null, redirect_uri text not null, - + claims_user_id text not null, claims_username text not null, claims_email text not null, claims_email_verified boolean not null, claims_groups bytea not null, -- JSON array of strings - + connector_id text not null, - connector_data bytea, - + expiry timestamptz not null );`, ` @@ -129,15 +127,14 @@ var migrations = []migration{ client_id text not null, scopes bytea not null, -- JSON array of strings nonce text not null, - + claims_user_id text not null, claims_username text not null, claims_email text not null, claims_email_verified boolean not null, claims_groups bytea not null, -- JSON array of strings - - connector_id text not null, - connector_data bytea + + connector_id text not null );`, ` create table password ( @@ -175,6 +172,7 @@ var migrations = []migration{ user_id text not null, conn_id text not null, refresh bytea not null, + connector_data bytea not null, PRIMARY KEY (user_id, conn_id) );`, },