Update api

* Add oauth2 client

* Update LICENSE.txt

* Create .env.example

* Add dotenv to example

* Add oauth2 types

* Update lib.rs

* Update Cargo.toml

* Update lib.rs

* Add games routes

.cargo/config.toml

@@ -1,2 +0,0 @@
-[build]
-target-dir = "Intermediate/Target"

.editorconfig

@@ -10,3 +10,6 @@ insert_final_newline = true
 
 [*.md]
 trim_trailing_whitespace = false
+
+[*.env*]
+insert_final_newline = false

.env.example

@@ -0,0 +1,3 @@
+CLIENT_ID=
+CLIENT_SECRET=
+TRIBUFU_API_URL=https://api.tribufu.com

.gitignore

@@ -1,6 +1,40 @@
-[Bb]inaries/
-[Ii]ntermediate/
+__pycache__/
+.gradle/
+.idea/
+.metals/
+.next/
+.parcel-cache/
+.vs/
+.vscode/
+bin/
+binaries/
+build/
+node_modules/
+obj/
+saved/
+target/
 
 .DS_Store
+.env
+*.crt
+*.csproj
+*.filters
+*.fsproj
+*.key
+*.log
+*.make
+*.mwb.bak
+*.pem
+*.sln
+*.user
+*.vcxproj
+*.vpp.*
+*.wasm
+*.xcodeproj
+*.xcworkspace
 Cargo.lock
 desktop.ini
+keystore.jks
+local.properties
+Makefile
+next-env.d.ts

Cargo.toml

@@ -1,24 +1,34 @@
 [package]
 name = "tribufu"
-version = "0.0.3"
-description = "TribuFu SDK"
-repository = "https://github.com/TribuFu/SDK-RS"
-authors = ["TribuFu <contact@tribufu.com>"]
+version = "0.0.4"
+description = "Tribufu SDK"
+repository = "https://github.com/Tribufu/TribufuRust"
+authors = ["Tribufu <contact@tribufu.com>"]
 license = "Apache-2.0"
 readme = "README.md"
 edition = "2021"
 publish = true
 
-exclude = [
-    ".github/",
-    ".vscode/",
-    ".editorconfig",
-    ".gitattributes",
-]
+exclude = [".github/", ".vscode/", ".editorconfig", ".gitattributes"]
+
+[workspace]
+resolver = "2"
+members = ["src/*"]
 
 [lib]
-name = "TribuFu"
+name = "tribufu"
 crate-type = ["rlib"]
-path = "Source/lib.rs"
+path = "src/lib.rs"
+
+[features]
+actix = ["tribufu-actix"]
 
 [dependencies]
+tribufu-api = { path = "./src/api" }
+tribufu-constants = { path = "./src/constants" }
+tribufu-types = { path = "./src/types" }
+tribufu-actix = { path = "./src/actix", optional = true }
+
+[dev-dependencies]
+dotenv = "0.15.0"
+tokio = { version = "1", features = ["full"] }

LICENSE.txt

@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright (c) TribuFu. All Rights Reserved
+   Copyright (c) Tribufu. All Rights Reserved.
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

README.md

@@ -1 +1 @@
-# Rust SDK
+# Tribufu SDK

Source/lib.rs

@@ -1,5 +0,0 @@
-// Copyright (c) TribuFu. All Rights Reserved
-
-#![allow(non_snake_case)]
-
-pub const VERSION: &str = env!("CARGO_PKG_VERSION");

examples/api.rs

@@ -0,0 +1,10 @@
+// Copyright (c) Tribufu. All Rights Reserved
+
+use tribufu::*;
+
+#[tokio::main]
+async fn main() {
+    let api = TribufuApi::default();
+    let games = api.get_games(Some(1)).await.unwrap();
+    println!("{:?}", games);
+}

examples/token.rs

@@ -0,0 +1,10 @@
+// Copyright (c) Tribufu. All Rights Reserved
+
+use tribufu::*;
+
+#[tokio::main]
+async fn main() {
+    let api = TribufuApi::with_client_from_env().unwrap_or_default();
+    let games = api.get_games(Some(1)).await.unwrap();
+    println!("{:?}", games);
+}

src/actix/Cargo.toml

@@ -0,0 +1,20 @@
+[package]
+name = "tribufu-actix"
+version = "0.0.4"
+description = "Tribufu Actix Extension"
+repository = "https://github.com/Tribufu/TribufuRust"
+authors = ["Tribufu <contact@tribufu.com>"]
+license = "Apache-2.0"
+readme = "README.md"
+edition = "2021"
+publish = true
+
+[lib]
+name = "tribufu_actix"
+crate-type = ["rlib"]
+path = "lib.rs"
+
+[dependencies]
+actix-web = { version = "4", features = ["rustls"] }
+mintaka-error = { version = "0.0.1" }
+tribufu-api = { path = "../api" }

src/actix/lib.rs

@@ -0,0 +1,24 @@
+// Copyright (c) Tribufu. All Rights Reserved.
+
+use actix_web::HttpRequest;
+use tribufu_api::TribufuApi;
+
+pub trait TribufuApiActixExtension {
+    fn from_actix(req: &HttpRequest) -> Self;
+}
+
+impl TribufuApiActixExtension for TribufuApi {
+    fn from_actix(req: &HttpRequest) -> Self {
+        let mut api = Self::with_client_from_env().unwrap_or_default();
+
+        if let Some(authorization) = req.headers().get("Authorization") {
+            let authorization = authorization.to_str().unwrap();
+
+            if authorization.starts_with("Bearer ") {
+                api = Self::with_user(authorization[7..].to_string());
+            }
+        }
+
+        return api;
+    }
+}

src/api/Cargo.toml

@@ -0,0 +1,29 @@
+[package]
+name = "tribufu-api"
+version = "0.0.4"
+description = "Tribufu API"
+repository = "https://github.com/Tribufu/TribufuRust"
+authors = ["Tribufu <contact@tribufu.com>"]
+license = "Apache-2.0"
+readme = "README.md"
+edition = "2021"
+publish = true
+
+[lib]
+name = "tribufu_api"
+crate-type = ["rlib"]
+path = "lib.rs"
+
+[dependencies]
+tribufu-constants = { path = "../constants" }
+tribufu-types = { path = "../types" }
+base64 = "0.21.5"
+mintaka-error = { version = "0.0.1" }
+alnilam-consts = { version = "0.0.4" }
+anyhow = "1.0.75"
+chrono = { version = "0.4.22", features = ["serde", "rustc-serialize"] }
+derive_more = "0.99.17"
+reqwest = { version = "0.11.18", features = ["json", "stream"] }
+serde = { version = "1.0", features = ["derive"] }
+serde_json = { version = "1.0", features = ["raw_value"] }
+serde_with = "3.4.0"

src/api/lib.rs

@@ -0,0 +1,394 @@
+// Copyright (c) Tribufu. All Rights Reserved.
+
+use alnilam_consts::TARGET_TRIPLE;
+use base64::engine::general_purpose::STANDARD as BASE64;
+use base64::Engine as _;
+use mintaka_error::{Error, Result};
+use reqwest::header::{HeaderMap, HeaderValue, AUTHORIZATION};
+use reqwest::Client;
+use std::env;
+use tribufu_constants::VERSION;
+use tribufu_types::games::Game;
+use tribufu_types::oauth2::{OAuth2GrantType, OAuth2TokenRequest, OAuth2TokenResponse};
+use tribufu_types::users::*;
+
+pub enum Credentials {
+    Anonymous,
+    ApiKey {
+        api_key: String,
+    },
+    Client {
+        client_id: u64,
+        client_secret: String,
+    },
+}
+
+pub enum Token {
+    ApiKey {
+        api_key: String,
+    },
+    Basic {
+        basic_token: String,
+    },
+    Bearer {
+        access_token: String,
+        refresh_token: Option<String>,
+    },
+}
+
+pub struct TribufuApi {
+    base_url: String,
+    credentials: Credentials,
+    token: Option<Token>,
+    http: Client,
+}
+
+impl Default for TribufuApi {
+    fn default() -> Self {
+        Self::new(Credentials::Anonymous)
+    }
+}
+
+impl TribufuApi {
+    const TRIBUFU_API_URL: &'static str = "https://api.tribufu.com";
+
+    pub fn new(credentials: Credentials) -> Self {
+        let http = Client::builder()
+            .user_agent(Self::user_agent())
+            .default_headers(Self::default_headers())
+            .build()
+            .unwrap();
+
+        Self {
+            base_url: Self::get_base_url(),
+            credentials,
+            token: None,
+            http,
+        }
+    }
+
+    pub fn debug_enabled(&self) -> bool {
+        return cfg!(debug_assertions);
+    }
+
+    #[inline]
+    fn user_agent() -> String {
+        format!(
+            "Tribufu/{} (+https://api.tribufu.com; {})",
+            VERSION, TARGET_TRIPLE
+        )
+    }
+
+    #[inline]
+    fn default_headers() -> HeaderMap {
+        let mut headers = HeaderMap::new();
+        headers.insert("X-Tribufu-Language", HeaderValue::from_static("rust"));
+        headers.insert("X-Tribufu-Version", HeaderValue::from_static(VERSION));
+        headers
+    }
+
+    fn get_base_url() -> String {
+        if cfg!(debug_assertions) {
+            return env::var("TRIBUFU_API_URL")
+                .unwrap_or_else(|_| Self::TRIBUFU_API_URL.to_string());
+        }
+
+        Self::TRIBUFU_API_URL.to_string()
+    }
+
+    pub fn with_api_key(api_key: String) -> Self {
+        Self::new(Credentials::ApiKey { api_key })
+    }
+
+    pub fn with_client(client_id: u64, client_secret: String) -> Self {
+        Self::new(Credentials::Client {
+            client_id,
+            client_secret,
+        })
+    }
+
+    pub fn with_api_key_from_env() -> Option<Self> {
+        if let Ok(api_key) = env::var("TRIBUFU_API_KEY") {
+            Some(Self::with_api_key(api_key))
+        } else {
+            None
+        }
+    }
+
+    pub fn with_client_from_env() -> Option<Self> {
+        let client_id = env::var("TRIBUFU_CLIENT_ID");
+        let client_secret = env::var("TRIBUFU_CLIENT_SECRET");
+
+        if let (Ok(client_id), Ok(client_secret)) = (client_id, client_secret) {
+            Some(Self::with_client(client_id.parse().unwrap(), client_secret))
+        } else {
+            None
+        }
+    }
+
+    pub fn set_anonymous(&mut self) {
+        self.credentials = Credentials::Anonymous;
+    }
+
+    pub fn set_api_key(&mut self, api_key: String) {
+        self.credentials = Credentials::ApiKey { api_key };
+    }
+
+    pub fn set_clients(&mut self, client_id: u64, client_secret: String) {
+        self.credentials = Credentials::Client {
+            client_id,
+            client_secret,
+        };
+    }
+
+    pub fn set_basic_token(&mut self, basic_token: String) {
+        self.token = Some(Token::Basic { basic_token });
+    }
+
+    pub fn set_bearer_token(&mut self, access_token: String, refresh_token: Option<String>) {
+        self.token = Some(Token::Bearer {
+            access_token,
+            refresh_token,
+        });
+    }
+
+    #[inline]
+    fn headers(&self) -> HeaderMap {
+        let mut headers = Self::default_headers();
+
+        match &self.token {
+            Some(token) => match token {
+                Token::ApiKey { api_key } => {
+                    headers.insert(
+                        AUTHORIZATION,
+                        HeaderValue::from_str(&format!("ApiKey {}", api_key)).unwrap(),
+                    );
+                }
+                Token::Basic { basic_token } => {
+                    headers.insert(
+                        AUTHORIZATION,
+                        HeaderValue::from_str(&format!("Basic {}", basic_token)).unwrap(),
+                    );
+                }
+                Token::Bearer { access_token, .. } => {
+                    headers.insert(
+                        AUTHORIZATION,
+                        HeaderValue::from_str(&format!("Bearer {}", access_token)).unwrap(),
+                    );
+                }
+            },
+            None => {}
+        }
+
+        headers
+    }
+
+    pub async fn get_token_with_code(
+        &mut self,
+        code: String,
+        client_id: u64,
+        client_secret: String,
+    ) -> Result<OAuth2TokenResponse> {
+        self.get_oauth_token(
+            OAuth2GrantType::AuthorizationCode,
+            Some(code),
+            client_id,
+            client_secret,
+            None,
+            None,
+        )
+        .await
+    }
+
+    pub async fn get_token_from_password(
+        &mut self,
+        username: String,
+        password: String,
+        client_id: u64,
+        client_secret: String,
+    ) -> Result<OAuth2TokenResponse> {
+        self.get_oauth_token(
+            OAuth2GrantType::Password,
+            Some(password),
+            client_id,
+            client_secret,
+            None,
+            Some(username),
+        )
+        .await
+    }
+
+    pub async fn get_token_from_passkey(
+        &mut self,
+        username: String,
+        passkey: String,
+        client_id: u64,
+        client_secret: String,
+    ) -> Result<OAuth2TokenResponse> {
+        self.get_oauth_token(
+            OAuth2GrantType::Passkey,
+            Some(passkey),
+            client_id,
+            client_secret,
+            None,
+            Some(username),
+        )
+        .await
+    }
+
+    pub async fn refresh_token(
+        &mut self,
+        refresh_token: String,
+        client_id: u64,
+        client_secret: String,
+    ) -> Result<OAuth2TokenResponse> {
+        self.get_oauth_token(
+            OAuth2GrantType::RefreshToken,
+            Some(refresh_token),
+            client_id,
+            client_secret,
+            None,
+            None,
+        )
+        .await
+    }
+
+    pub async fn get_client_token(
+        &mut self,
+        client_id: u64,
+        client_secret: String,
+    ) -> Result<OAuth2TokenResponse> {
+        self.get_oauth_token(
+            OAuth2GrantType::ClientCredentials,
+            None,
+            client_id,
+            client_secret,
+            None,
+            None,
+        )
+        .await
+    }
+
+    pub async fn get_server_token(
+        &mut self,
+        server_id: u64,
+        client_id: u64,
+        client_secret: String,
+    ) -> Result<OAuth2TokenResponse> {
+        self.get_oauth_token(
+            OAuth2GrantType::ClientCredentials,
+            None,
+            client_id,
+            client_secret,
+            Some("server_id".to_string()),
+            Some(server_id.to_string()),
+        )
+        .await
+    }
+
+    async fn get_oauth_token(
+        &self,
+        grant_type: OAuth2GrantType,
+        grant_value: Option<String>,
+        client_id: u64,
+        client_secret: String,
+        subject_key: Option<String>,
+        subject_value: Option<String>,
+    ) -> Result<OAuth2TokenResponse> {
+        let code = if grant_type == OAuth2GrantType::AuthorizationCode {
+            grant_value.clone()
+        } else {
+            None
+        };
+
+        let refresh_token = if grant_type == OAuth2GrantType::RefreshToken {
+            grant_value.clone()
+        } else {
+            None
+        };
+
+        let mut require_username = false;
+
+        let password = if grant_type == OAuth2GrantType::Password {
+            require_username = true;
+            grant_value.clone()
+        } else {
+            None
+        };
+
+        let passkey = if grant_type == OAuth2GrantType::Passkey {
+            require_username = true;
+            grant_value.clone()
+        } else {
+            None
+        };
+
+        let username = if require_username && subject_value.is_some() {
+            subject_value.clone()
+        } else {
+            None
+        };
+
+        let request_body = OAuth2TokenRequest {
+            grant_type,
+            code,
+            refresh_token,
+            username,
+            password,
+            passkey,
+            client_id: Some(client_id.to_string()),
+            client_secret: Some(client_secret.clone()),
+            redirect_uri: None,
+        };
+
+        let params = if subject_key.is_some() && subject_value.is_some() {
+            format!("?{}={}", subject_key.unwrap(), subject_value.unwrap())
+        } else {
+            "".to_string()
+        };
+
+        let url = format!("{}/v1/oauth2/token{}", self.base_url, params);
+        let headers = self.headers();
+        let response = self
+            .http
+            .post(url)
+            .headers(headers)
+            .form(&request_body)
+            .send()
+            .await?;
+
+        if response.status() != 200 {
+            return Err(Error::msg(format!(
+                "Failed to get token: {}",
+                response.status()
+            )));
+        }
+
+        Ok(response.json().await?)
+    }
+
+    pub async fn get_user_info(&self) -> Result<User> {
+        let url = format!("{}/v1/oauth2/userinfo", self.base_url);
+        let headers = self.headers();
+        let response = self.http.get(url).headers(headers).send().await?;
+
+        Ok(response.json().await?)
+    }
+
+    pub async fn get_games(&self, page: Option<u32>) -> Result<Vec<Game>> {
+        let page = page.unwrap_or(1);
+        let url = format!("{}/v1/packages?page={}", self.base_url, page);
+        let headers = self.headers();
+        let response = self.http.get(url).headers(headers).send().await?;
+
+        Ok(response.json().await?)
+    }
+
+    pub async fn get_game(&self, id: u64) -> Result<Game> {
+        let url = format!("{}/v1/packages/{}", self.base_url, id);
+        let headers = self.headers();
+        let response = self.http.get(url).headers(headers).send().await?;
+
+        Ok(response.json().await?)
+    }
+}

src/constants/Cargo.toml

@@ -0,0 +1,17 @@
+[package]
+name = "tribufu-constants"
+version = "0.0.4"
+description = "Tribufu Constants"
+repository = "https://github.com/Tribufu/TribufuRust"
+authors = ["Tribufu <contact@tribufu.com>"]
+license = "Apache-2.0"
+readme = "README.md"
+edition = "2021"
+publish = true
+
+[lib]
+name = "tribufu_constants"
+crate-type = ["rlib"]
+path = "lib.rs"
+
+[dependencies]

src/constants/lib.rs

@@ -0,0 +1,3 @@
+// Copyright (c) Tribufu. All Rights Reserved.
+
+pub const VERSION: &str = env!("CARGO_PKG_VERSION");

src/lib.rs

@@ -0,0 +1,5 @@
+// Copyright (c) Tribufu. All Rights Reserved.
+
+pub use tribufu_api::*;
+pub use tribufu_constants::VERSION;
+pub use tribufu_types as types;

src/types/Cargo.toml

@@ -0,0 +1,23 @@
+[package]
+name = "tribufu-types"
+version = "0.0.4"
+description = "Tribufu Types"
+repository = "https://github.com/Tribufu/TribufuRust"
+authors = ["Tribufu <contact@tribufu.com>"]
+license = "Apache-2.0"
+readme = "README.md"
+edition = "2021"
+publish = true
+
+[lib]
+name = "tribufu_types"
+crate-type = ["rlib"]
+path = "lib.rs"
+
+[dependencies]
+chrono = { version = "0.4.22", features = ["serde", "rustc-serialize"] }
+derive_more = "0.99.17"
+mintaka-error = { version = "0.0.1" }
+serde = { version = "1.0", features = ["derive"] }
+serde_json = { version = "1.0", features = ["raw_value"] }
+serde_with = "3.4.0"

src/types/games.rs

@@ -0,0 +1,29 @@
+// Copyright (c) Tribufu. All Rights Reserved.
+
+use chrono::NaiveDateTime;
+use serde::{Deserialize, Serialize};
+use serde_with::{serde_as, DisplayFromStr};
+
+#[serde_as]
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct Game {
+    #[serde_as(as = "DisplayFromStr")]
+    pub id: u64,
+    pub name: String,
+    pub description: Option<String>,
+    pub icon_url: Option<String>,
+    pub banner_url: Option<String>,
+    pub capsule_image_url: Option<String>,
+    pub library_image_url: Option<String>,
+    pub slug: Option<String>,
+    pub game_port: Option<u16>,
+    pub query_port: Option<u16>,
+    pub rcon_port: Option<u16>,
+    pub steam_app_id: Option<u32>,
+    pub steam_server_app_id: Option<u32>,
+    pub rust_gamedig_id: Option<String>,
+    pub node_gamedig_id: Option<String>,
+    pub server_connect_url: Option<String>,
+    pub created: NaiveDateTime,
+    pub updated: Option<NaiveDateTime>,
+}

src/types/lib.rs

@@ -0,0 +1,5 @@
+// Copyright (c) Tribufu. All Rights Reserved.
+
+pub mod games;
+pub mod oauth2;
+pub mod users;

src/types/oauth2.rs

@@ -0,0 +1,167 @@
+// Copyright (c) Tribufu. All Rights Reserved.
+
+use serde::{Deserialize, Serialize};
+
+#[derive(Debug, Copy, Clone, Serialize, Deserialize, PartialEq, Eq)]
+#[serde(rename_all = "snake_case")]
+pub enum OAuth2ResponseType {
+    Code,
+    Token,
+}
+
+#[derive(Debug, Copy, Clone, Serialize, Deserialize, PartialEq, Eq)]
+#[serde(rename_all = "snake_case")]
+pub enum OAuth2ClientType {
+    Confidential,
+    Public,
+}
+
+#[derive(Debug, Copy, Clone, Serialize, Deserialize, PartialEq, Eq)]
+#[serde(rename_all = "snake_case")]
+pub enum OAuth2TokenHintType {
+    AccessToken,
+    RefreshToken,
+}
+
+#[derive(Debug, Copy, Clone, Serialize, Deserialize, PartialEq, Eq)]
+#[serde(rename_all = "snake_case")]
+pub enum OAuth2GrantType {
+    AuthorizationCode,
+    ClientCredentials,
+    DeviceCode,
+    Passkey,
+    Password,
+    RefreshToken,
+}
+
+#[derive(Debug, Copy, Clone, Serialize, Deserialize, PartialEq, Eq)]
+#[serde(rename_all = "snake_case")]
+pub enum OAuth2AuthorizeError {
+    AccessDenied,
+    InvalidRequest,
+    InvalidScope,
+    ServerError,
+    TemporarilyUnavailable,
+    UnauthorizedClient,
+    UnsupportedResponseType,
+}
+
+#[derive(Debug, Copy, Clone, Serialize, Deserialize, PartialEq, Eq)]
+#[serde(rename_all = "snake_case")]
+pub enum OAuth2TokenType {
+    Bearer,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct OAuth2AuthorizeRequest {
+    pub response_type: OAuth2ResponseType,
+    pub client_id: String,
+    pub client_secret: Option<String>,
+    pub redirect_uri: String,
+    pub scope: Option<String>,
+    pub state: Option<String>,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct OAuth2CodeResponse {
+    pub code: String,
+
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub state: Option<String>,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct OAuth2ErrorResponse {
+    pub error: OAuth2AuthorizeError,
+
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub error_description: Option<String>,
+
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub error_uri: Option<String>,
+
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub state: Option<String>,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct OAuth2TokenRequest {
+    pub grant_type: OAuth2GrantType,
+
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub code: Option<String>,
+
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub refresh_token: Option<String>,
+
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub username: Option<String>,
+
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub password: Option<String>,
+
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub passkey: Option<String>,
+
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub client_id: Option<String>,
+
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub client_secret: Option<String>,
+
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub redirect_uri: Option<String>,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct OAuth2TokenResponse {
+    pub token_type: OAuth2TokenType,
+
+    pub access_token: String,
+
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub refresh_token: Option<String>,
+
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub scope: Option<String>,
+
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub state: Option<String>,
+
+    pub expires_in: u64,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct OAuth2RevokeRequest {
+    pub token: String,
+    pub token_type_hint: OAuth2TokenHintType,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct OAuth2IntrospectionResponse {
+    pub active: bool,
+
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub client_id: Option<String>,
+
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub username: Option<String>,
+
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub scope: Option<String>,
+
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub exp: Option<i64>,
+}
+
+impl OAuth2IntrospectionResponse {
+    pub fn inative() -> Self {
+        Self {
+            active: false,
+            client_id: None,
+            username: None,
+            scope: None,
+            exp: None,
+        }
+    }
+}

src/types/users.rs

@@ -0,0 +1,41 @@
+// Copyright (c) Tribufu. All Rights Reserved.
+
+use chrono::{NaiveDate, NaiveDateTime};
+use serde::{Deserialize, Serialize};
+use serde_with::{serde_as, DisplayFromStr};
+
+#[repr(u8)]
+#[derive(Debug, Copy, Clone, PartialEq, Eq, Serialize, Deserialize)]
+#[serde(rename_all = "snake_case")]
+pub enum UserType {
+    User = 0,
+    Bot = 1,
+    Org = 2,
+}
+
+#[serde_as]
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct User {
+    #[serde_as(as = "DisplayFromStr")]
+    pub id: u64,
+    pub uuid: String,
+    pub name: String,
+    pub display_name: String,
+    #[serde(rename = "type")]
+    pub kind: UserType,
+    pub public_flags: u64,
+    pub verified: bool,
+    pub level: u32,
+    pub experience: f64,
+    pub public_birthday: bool,
+    pub birthday: Option<NaiveDate>,
+    pub points: f64,
+    pub location: Option<String>,
+    pub photo_url: Option<String>,
+    pub banner_url: Option<String>,
+    pub last_online: Option<NaiveDateTime>,
+    pub biography: Option<String>,
+    pub view_count: u32,
+    pub created: NaiveDateTime,
+    pub updated: Option<NaiveDateTime>,
+}