chore: remove two more db field tags

GitOrigin-RevId: 5416005a52f51dec01fb5c34b23d96c5c3544a29
forkmeplease · pull · Jul 23, 2025 · Jul 24, 2025 · Jul 24, 2025 · Jul 24, 2025
commit 1c6dc2ada2f7edeb56f51ba6a9edb66a464abcec
diff --git a/flow/flow.go b/flow/flow.go
@@ -175,7 +175,7 @@ type Flow struct {
 
 	// IdentityProviderSessionID is the session ID of the end-user that authenticated.
 	// If specified, we will use this value to propagate the logout.
-	IdentityProviderSessionID sqlxx.NullString `db:"identity_provider_session_id" json:"is,omitempty"`
+	IdentityProviderSessionID sqlxx.NullString `db:"-" json:"is,omitempty"`
 
 	LoginCSRF string `db:"-" json:"lc,omitempty"`
 
@@ -223,7 +223,7 @@ type Flow struct {
 	// other unique value).
 	//
 	// If you fail to compute the proper value, then authentication processes which have id_token_hint set might fail.
-	ForceSubjectIdentifier string `db:"forced_subject_identifier" json:"fs,omitempty"`
+	ForceSubjectIdentifier string `db:"-" json:"fs,omitempty"`
 
 	// Context is an optional object which can hold arbitrary data. The data will be made available when fetching the
 	// consent request under the "context" field. This is useful in scenarios where login and consent endpoints share

diff --git a/persistence/sql/migratest/fixtures/hydra_oauth2_flow/challenge-0002.json b/persistence/sql/migratest/fixtures/hydra_oauth2_flow/challenge-0002.json
@@ -12,7 +12,6 @@
   "r": "http://request/0002",
   "ia": "2022-02-15T22:20:21Z",
   "a": "acr-0002",
-  "fs": "force_subject_id-0002",
   "ct": {},
   "la": null,
   "dh": null,

diff --git a/persistence/sql/migratest/fixtures/hydra_oauth2_flow/challenge-0003.json b/persistence/sql/migratest/fixtures/hydra_oauth2_flow/challenge-0003.json
@@ -13,7 +13,6 @@
   "si": "auth_session-0003",
   "ia": "2022-02-15T22:20:21Z",
   "a": "acr-0003",
-  "fs": "force_subject_id-0003",
   "ct": {},
   "la": null,
   "dh": null,

diff --git a/persistence/sql/migratest/fixtures/hydra_oauth2_flow/challenge-0004.json b/persistence/sql/migratest/fixtures/hydra_oauth2_flow/challenge-0004.json
@@ -16,7 +16,6 @@
   "si": "auth_session-0004",
   "ia": "2022-02-15T22:20:21Z",
   "a": "acr-0004",
-  "fs": "force_subject_id-0004",
   "ct": {},
   "la": null,
   "dh": null,

diff --git a/persistence/sql/migratest/fixtures/hydra_oauth2_flow/challenge-0005.json b/persistence/sql/migratest/fixtures/hydra_oauth2_flow/challenge-0005.json
@@ -16,7 +16,6 @@
   "si": "auth_session-0005",
   "ia": "2022-02-15T22:20:21Z",
   "a": "acr-0005",
-  "fs": "force_subject_id-0005",
   "ct": {},
   "la": null,
   "dh": null,

diff --git a/persistence/sql/migratest/fixtures/hydra_oauth2_flow/challenge-0006.json b/persistence/sql/migratest/fixtures/hydra_oauth2_flow/challenge-0006.json
@@ -16,7 +16,6 @@
   "si": "auth_session-0006",
   "ia": "2022-02-15T22:20:21Z",
   "a": "acr-0006",
-  "fs": "force_subject_id-0006",
   "ct": {},
   "la": null,
   "dh": null,

diff --git a/persistence/sql/migratest/fixtures/hydra_oauth2_flow/challenge-0007.json b/persistence/sql/migratest/fixtures/hydra_oauth2_flow/challenge-0007.json
@@ -16,7 +16,6 @@
   "si": "auth_session-0007",
   "ia": "2022-02-15T22:20:21Z",
   "a": "acr-0007",
-  "fs": "force_subject_id-0007",
   "ct": {},
   "la": null,
   "dh": null,

diff --git a/persistence/sql/migratest/fixtures/hydra_oauth2_flow/challenge-0008.json b/persistence/sql/migratest/fixtures/hydra_oauth2_flow/challenge-0008.json
@@ -16,7 +16,6 @@
   "si": "auth_session-0008",
   "ia": "2022-02-15T22:20:21Z",
   "a": "acr-0008",
-  "fs": "force_subject_id-0008",
   "ct": {
     "context": "0008"
   },

diff --git a/persistence/sql/migratest/fixtures/hydra_oauth2_flow/challenge-0009.json b/persistence/sql/migratest/fixtures/hydra_oauth2_flow/challenge-0009.json
@@ -16,7 +16,6 @@
   "si": "auth_session-0009",
   "ia": "2022-02-15T22:20:21Z",
   "a": "acr-0009",
-  "fs": "force_subject_id-0009",
   "ct": {
     "context": "0009"
   },

diff --git a/persistence/sql/migratest/fixtures/hydra_oauth2_flow/challenge-0010.json b/persistence/sql/migratest/fixtures/hydra_oauth2_flow/challenge-0010.json
@@ -16,7 +16,6 @@
   "si": "auth_session-0010",
   "ia": "2022-02-15T22:20:21Z",
   "a": "acr-0010",
-  "fs": "force_subject_id-0010",
   "ct": {
     "context": "0010"
   },

diff --git a/persistence/sql/migratest/fixtures/hydra_oauth2_flow/challenge-0011.json b/persistence/sql/migratest/fixtures/hydra_oauth2_flow/challenge-0011.json
@@ -16,7 +16,6 @@
   "si": "auth_session-0011",
   "ia": "2022-02-15T22:20:21Z",
   "a": "acr-0011",
-  "fs": "force_subject_id-0011",
   "ct": {
     "context": "0011"
   },

diff --git a/persistence/sql/migratest/fixtures/hydra_oauth2_flow/challenge-0012.json b/persistence/sql/migratest/fixtures/hydra_oauth2_flow/challenge-0012.json
@@ -16,7 +16,6 @@
   "si": "auth_session-0012",
   "ia": "2022-02-15T22:20:21Z",
   "a": "acr-0012",
-  "fs": "force_subject_id-0012",
   "ct": {
     "context": "0012"
   },

diff --git a/persistence/sql/migratest/fixtures/hydra_oauth2_flow/challenge-0013.json b/persistence/sql/migratest/fixtures/hydra_oauth2_flow/challenge-0013.json
@@ -16,7 +16,6 @@
   "si": "auth_session-0013",
   "ia": "2022-02-15T22:20:21Z",
   "a": "acr-0013",
-  "fs": "force_subject_id-0013",
   "ct": {
     "context": "0013"
   },

diff --git a/persistence/sql/migratest/fixtures/hydra_oauth2_flow/challenge-0014.json b/persistence/sql/migratest/fixtures/hydra_oauth2_flow/challenge-0014.json
@@ -16,7 +16,6 @@
   "si": "auth_session-0014",
   "ia": "2022-02-15T22:20:21Z",
   "a": "acr-0014",
-  "fs": "force_subject_id-0014",
   "ct": {
     "context": "0014"
   },

diff --git a/persistence/sql/migratest/fixtures/hydra_oauth2_flow/challenge-0015.json b/persistence/sql/migratest/fixtures/hydra_oauth2_flow/challenge-0015.json
@@ -22,7 +22,6 @@
     "amr-0015-1",
     "amr-0015-2"
   ],
-  "fs": "force_subject_id-0015",
   "ct": {
     "context": "0015"
   },

diff --git a/persistence/sql/migratest/fixtures/hydra_oauth2_flow/challenge-0016.json b/persistence/sql/migratest/fixtures/hydra_oauth2_flow/challenge-0016.json
@@ -22,7 +22,6 @@
     "amr-0016-1",
     "amr-0016-2"
   ],
-  "fs": "force_subject_id-0016",
   "ct": {
     "context": "0016"
   },

diff --git a/persistence/sql/migratest/fixtures/hydra_oauth2_flow/challenge-0017.json b/persistence/sql/migratest/fixtures/hydra_oauth2_flow/challenge-0017.json
@@ -16,14 +16,12 @@
   "ci": "client-21",
   "r": "http://request/0017",
   "si": "auth_session-0017",
-  "is": "identity_provider_session_id-0017",
   "ia": "2022-02-15T22:20:21Z",
   "a": "acr-0017",
   "am": [
     "amr-0017-1",
     "amr-0017-2"
   ],
-  "fs": "force_subject_id-0017",
   "ct": {
     "context": "0017"
   },

diff --git a/persistence/sql/migratest/fixtures/hydra_oauth2_flow/challenge-0018.json b/persistence/sql/migratest/fixtures/hydra_oauth2_flow/challenge-0018.json
@@ -21,7 +21,6 @@
     "amr-0018-1",
     "amr-0018-2"
   ],
-  "fs": "force_subject_id-0018",
   "ct": {
     "context": "0018"
   },