refresh_tokens: add app inside each refresh token

crates/database/migrations/20230318135414_refresh_tokens.up.sql

@@ -4,6 +4,7 @@ create table if not exists refresh_tokens
     token      TEXT not null primary key,
     ip_address TEXT not null,
     user       TEXT not null references users (id),
+    app        TEXT not null references apps (id),
 
     -- timings
     created_at TEXT not null default CURRENT_TIMESTAMP,

crates/database/queries/refresh_tokens/get_one.sql

@@ -3,6 +3,7 @@ select
     token,
     ip_address,
     user,
+    app,
 
     -- timings
     created_at as "created_at: DateTime<Utc>",

crates/database/queries/refresh_tokens/insert.sql

@@ -1,2 +1,2 @@
-insert into refresh_tokens (token, ip_address, user, expires_at)
-values (?, ?, ?, datetime(?, 'unixepoch'))
+insert into refresh_tokens (token, ip_address, user, app, expires_at)
+values (?, ?, ?, ?, datetime(?, 'unixepoch'))

crates/database/sqlx-data.json

@@ -100,6 +100,66 @@
     },
     "query": "update apps\n\nset secret = ?\n\nwhere id is ?"
   },
+  "37681902a5f5d87492812a525a6488e75d20c1c436a3ba2c5aa3f54da62fe861": {
+    "describe": {
+      "columns": [
+        {
+          "name": "token",
+          "ordinal": 0,
+          "type_info": "Text"
+        },
+        {
+          "name": "ip_address",
+          "ordinal": 1,
+          "type_info": "Text"
+        },
+        {
+          "name": "user",
+          "ordinal": 2,
+          "type_info": "Text"
+        },
+        {
+          "name": "app",
+          "ordinal": 3,
+          "type_info": "Text"
+        },
+        {
+          "name": "created_at: DateTime<Utc>",
+          "ordinal": 4,
+          "type_info": "Text"
+        },
+        {
+          "name": "expires_at: DateTime<Utc>",
+          "ordinal": 5,
+          "type_info": "Text"
+        },
+        {
+          "name": "used_at: DateTime<Utc>",
+          "ordinal": 6,
+          "type_info": "Text"
+        },
+        {
+          "name": "revoked_at: DateTime<Utc>",
+          "ordinal": 7,
+          "type_info": "Text"
+        }
+      ],
+      "nullable": [
+        false,
+        false,
+        false,
+        false,
+        false,
+        false,
+        true,
+        true
+      ],
+      "parameters": {
+        "Right": 1
+      }
+    },
+    "query": "select\n    -- info\n    token,\n    ip_address,\n    user,\n    app,\n\n    -- timings\n    created_at as \"created_at: DateTime<Utc>\",\n    expires_at as \"expires_at: DateTime<Utc>\",\n    used_at    as \"used_at: DateTime<Utc>\",\n    revoked_at as \"revoked_at: DateTime<Utc>\"\nfrom refresh_tokens\n\nwhere token is (?)"
+  },
   "3c8e31ffa5cbfd4dded8a272777cb320fb51fd2e53ed25054d24e9801df0c358": {
     "describe": {
       "columns": [],
@@ -468,70 +528,6 @@
     },
     "query": "insert into authorization_codes (code, app, user, expires_at)\nvalues (?, ?, ?, datetime(?, 'unixepoch'))\n"
   },
-  "a7405a0479b551ce8e3ea7451fd781214e049a0f12551146ace1e9a2f2f0c06d": {
-    "describe": {
-      "columns": [
-        {
-          "name": "token",
-          "ordinal": 0,
-          "type_info": "Text"
-        },
-        {
-          "name": "ip_address",
-          "ordinal": 1,
-          "type_info": "Text"
-        },
-        {
-          "name": "user",
-          "ordinal": 2,
-          "type_info": "Text"
-        },
-        {
-          "name": "created_at: DateTime<Utc>",
-          "ordinal": 3,
-          "type_info": "Text"
-        },
-        {
-          "name": "expires_at: DateTime<Utc>",
-          "ordinal": 4,
-          "type_info": "Text"
-        },
-        {
-          "name": "used_at: DateTime<Utc>",
-          "ordinal": 5,
-          "type_info": "Text"
-        },
-        {
-          "name": "revoked_at: DateTime<Utc>",
-          "ordinal": 6,
-          "type_info": "Text"
-        }
-      ],
-      "nullable": [
-        false,
-        false,
-        false,
-        false,
-        false,
-        true,
-        true
-      ],
-      "parameters": {
-        "Right": 1
-      }
-    },
-    "query": "select\n    -- info\n    token,\n    ip_address,\n    user,\n\n    -- timings\n    created_at as \"created_at: DateTime<Utc>\",\n    expires_at as \"expires_at: DateTime<Utc>\",\n    used_at    as \"used_at: DateTime<Utc>\",\n    revoked_at as \"revoked_at: DateTime<Utc>\"\nfrom refresh_tokens\n\nwhere token is (?)"
-  },
-  "aa88eb27d38ba4cfb539e4b4d7a86770c24221109e8fcc188a7d38f41e674817": {
-    "describe": {
-      "columns": [],
-      "nullable": [],
-      "parameters": {
-        "Right": 4
-      }
-    },
-    "query": "insert into refresh_tokens (token, ip_address, user, expires_at)\nvalues (?, ?, ?, datetime(?, 'unixepoch'))\n"
-  },
   "aae93a39c5a9f46235b5ef871b45ba76d7efa1677bfe8291a62b8cbf9cd9e0d5": {
     "describe": {
       "columns": [],
@@ -542,6 +538,16 @@
     },
     "query": "update settings\n\nset first_admin = ?\n\nwhere id is 0\n"
   },
+  "b3936ae237f02cc048ca084372f7975921c79aef8fcd6d15a4d63c10f2377d24": {
+    "describe": {
+      "columns": [],
+      "nullable": [],
+      "parameters": {
+        "Right": 5
+      }
+    },
+    "query": "insert into refresh_tokens (token, ip_address, user, app, expires_at)\nvalues (?, ?, ?, ?, datetime(?, 'unixepoch'))\n"
+  },
   "b652e67e8e1cd0e2b55c830c5569eb1c6caf73857215b4298265cce5c5462902": {
     "describe": {
       "columns": [

crates/database/src/tables/refresh_tokens.rs

@@ -9,6 +9,7 @@ pub struct RefreshTokens {
     pub token: String,
     pub ip_address: String,
     pub user: String,
+    pub app: String,
 
     // Timings
     pub created_at: DateTime<Utc>,
@@ -23,6 +24,7 @@ impl RefreshTokens {
         token: &str,
         ip_address: &str,
         user: &str,
+        app: &str,
         expires_at: i64,
     ) -> Result<Option<()>, Error> {
         let query: SqliteQueryResult = sqlx::query_file!(
@@ -30,6 +32,7 @@ impl RefreshTokens {
             token,
             ip_address,
             user,
+            app,
             expires_at
         )
         .execute(conn)