From fdbef3e27d8afde5ab8fa77a324ec88260be1fec Mon Sep 17 00:00:00 2001
From: Rohit Sarpotdar <rohit@gobazzinga.io>
Date: Fri, 9 Feb 2024 13:57:20 +0530
Subject: [PATCH] store google sub id

---
 .gitignore                |    1 -
 cloudflare-api/Cargo.lock | 1266 +++++++++++++++++++++++++++++++++++++
 src/auth/cookie.rs        |   24 +
 src/auth/identity.rs      |  239 +++----
 src/auth/mod.rs           |    1 +
 src/main.rs               |    1 -
 src/page/login.rs         |    2 +-
 src/providers/google.rs   |  145 ++++-
 src/store/cloudflare.rs   |    4 +-
 9 files changed, 1531 insertions(+), 152 deletions(-)
 create mode 100644 cloudflare-api/Cargo.lock
 create mode 100644 src/auth/cookie.rs

diff --git a/.gitignore b/.gitignore
index 84bb892..2f7896d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
 target/
-cloudflare-api/Cargo.lock
diff --git a/cloudflare-api/Cargo.lock b/cloudflare-api/Cargo.lock
new file mode 100644
index 0000000..895be40
--- /dev/null
+++ b/cloudflare-api/Cargo.lock
@@ -0,0 +1,1266 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 3
+
+[[package]]
+name = "addr2line"
+version = "0.21.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb"
+dependencies = [
+ "gimli",
+]
+
+[[package]]
+name = "adler"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
+
+[[package]]
+name = "android-tzdata"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0"
+
+[[package]]
+name = "android_system_properties"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "autocfg"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+
+[[package]]
+name = "backtrace"
+version = "0.3.69"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837"
+dependencies = [
+ "addr2line",
+ "cc",
+ "cfg-if",
+ "libc",
+ "miniz_oxide",
+ "object",
+ "rustc-demangle",
+]
+
+[[package]]
+name = "base64"
+version = "0.21.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567"
+
+[[package]]
+name = "bitflags"
+version = "1.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+
+[[package]]
+name = "bumpalo"
+version = "3.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec"
+
+[[package]]
+name = "bytes"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223"
+
+[[package]]
+name = "cc"
+version = "1.0.83"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "cfg-if"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+
+[[package]]
+name = "chrono"
+version = "0.4.33"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9f13690e35a5e4ace198e7beea2895d29f3a9cc55015fcebe6336bd2010af9eb"
+dependencies = [
+ "android-tzdata",
+ "iana-time-zone",
+ "num-traits",
+ "serde",
+ "windows-targets 0.52.0",
+]
+
+[[package]]
+name = "cloudflare-api"
+version = "0.4.0"
+dependencies = [
+ "reqwest",
+ "serde",
+ "serde_json",
+ "serde_urlencoded",
+ "serde_with",
+ "thiserror",
+ "tracing",
+ "url",
+]
+
+[[package]]
+name = "core-foundation"
+version = "0.9.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f"
+dependencies = [
+ "core-foundation-sys",
+ "libc",
+]
+
+[[package]]
+name = "core-foundation-sys"
+version = "0.8.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f"
+
+[[package]]
+name = "darling"
+version = "0.20.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0209d94da627ab5605dcccf08bb18afa5009cfbef48d8a8b7d7bdbc79be25c5e"
+dependencies = [
+ "darling_core",
+ "darling_macro",
+]
+
+[[package]]
+name = "darling_core"
+version = "0.20.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "177e3443818124b357d8e76f53be906d60937f0d3a90773a664fa63fa253e621"
+dependencies = [
+ "fnv",
+ "ident_case",
+ "proc-macro2",
+ "quote",
+ "strsim",
+ "syn",
+]
+
+[[package]]
+name = "darling_macro"
+version = "0.20.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5"
+dependencies = [
+ "darling_core",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "deranged"
+version = "0.3.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4"
+dependencies = [
+ "powerfmt",
+ "serde",
+]
+
+[[package]]
+name = "encoding_rs"
+version = "0.8.33"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1"
+dependencies = [
+ "cfg-if",
+]
+
+[[package]]
+name = "equivalent"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
+
+[[package]]
+name = "fnv"
+version = "1.0.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
+
+[[package]]
+name = "form_urlencoded"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456"
+dependencies = [
+ "percent-encoding",
+]
+
+[[package]]
+name = "futures-channel"
+version = "0.3.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78"
+dependencies = [
+ "futures-core",
+]
+
+[[package]]
+name = "futures-core"
+version = "0.3.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d"
+
+[[package]]
+name = "futures-sink"
+version = "0.3.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5"
+
+[[package]]
+name = "futures-task"
+version = "0.3.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004"
+
+[[package]]
+name = "futures-util"
+version = "0.3.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48"
+dependencies = [
+ "futures-core",
+ "futures-task",
+ "pin-project-lite",
+ "pin-utils",
+]
+
+[[package]]
+name = "getrandom"
+version = "0.2.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "wasi",
+]
+
+[[package]]
+name = "gimli"
+version = "0.28.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253"
+
+[[package]]
+name = "h2"
+version = "0.3.22"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4d6250322ef6e60f93f9a2162799302cd6f68f79f6e5d85c8c16f14d1d958178"
+dependencies = [
+ "bytes",
+ "fnv",
+ "futures-core",
+ "futures-sink",
+ "futures-util",
+ "http",
+ "indexmap 2.2.1",
+ "slab",
+ "tokio",
+ "tokio-util",
+ "tracing",
+]
+
+[[package]]
+name = "hashbrown"
+version = "0.12.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
+
+[[package]]
+name = "hashbrown"
+version = "0.14.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
+
+[[package]]
+name = "hex"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
+
+[[package]]
+name = "http"
+version = "0.2.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8947b1a6fad4393052c7ba1f4cd97bed3e953a95c79c92ad9b051a04611d9fbb"
+dependencies = [
+ "bytes",
+ "fnv",
+ "itoa",
+]
+
+[[package]]
+name = "http-body"
+version = "0.4.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2"
+dependencies = [
+ "bytes",
+ "http",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "httparse"
+version = "1.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904"
+
+[[package]]
+name = "httpdate"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9"
+
+[[package]]
+name = "hyper"
+version = "0.14.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80"
+dependencies = [
+ "bytes",
+ "futures-channel",
+ "futures-core",
+ "futures-util",
+ "h2",
+ "http",
+ "http-body",
+ "httparse",
+ "httpdate",
+ "itoa",
+ "pin-project-lite",
+ "socket2",
+ "tokio",
+ "tower-service",
+ "tracing",
+ "want",
+]
+
+[[package]]
+name = "hyper-rustls"
+version = "0.24.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590"
+dependencies = [
+ "futures-util",
+ "http",
+ "hyper",
+ "rustls",
+ "tokio",
+ "tokio-rustls",
+]
+
+[[package]]
+name = "iana-time-zone"
+version = "0.1.59"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6a67363e2aa4443928ce15e57ebae94fd8949958fd1223c4cfc0cd473ad7539"
+dependencies = [
+ "android_system_properties",
+ "core-foundation-sys",
+ "iana-time-zone-haiku",
+ "js-sys",
+ "wasm-bindgen",
+ "windows-core",
+]
+
+[[package]]
+name = "iana-time-zone-haiku"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f"
+dependencies = [
+ "cc",
+]
+
+[[package]]
+name = "ident_case"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
+
+[[package]]
+name = "idna"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6"
+dependencies = [
+ "unicode-bidi",
+ "unicode-normalization",
+]
+
+[[package]]
+name = "indexmap"
+version = "1.9.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99"
+dependencies = [
+ "autocfg",
+ "hashbrown 0.12.3",
+ "serde",
+]
+
+[[package]]
+name = "indexmap"
+version = "2.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "433de089bd45971eecf4668ee0ee8f4cec17db4f8bd8f7bc3197a6ce37aa7d9b"
+dependencies = [
+ "equivalent",
+ "hashbrown 0.14.3",
+ "serde",
+]
+
+[[package]]
+name = "ipnet"
+version = "2.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3"
+
+[[package]]
+name = "itoa"
+version = "1.0.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c"
+
+[[package]]
+name = "js-sys"
+version = "0.3.67"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9a1d36f1235bc969acba30b7f5990b864423a6068a10f7c90ae8f0112e3a59d1"
+dependencies = [
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "libc"
+version = "0.2.152"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "13e3bf6590cbc649f4d1a3eefc9d5d6eb746f5200ffb04e5e142700b8faa56e7"
+
+[[package]]
+name = "log"
+version = "0.4.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f"
+
+[[package]]
+name = "memchr"
+version = "2.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149"
+
+[[package]]
+name = "mime"
+version = "0.3.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
+
+[[package]]
+name = "mime_guess"
+version = "2.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4192263c238a5f0d0c6bfd21f336a313a4ce1c450542449ca191bb657b4642ef"
+dependencies = [
+ "mime",
+ "unicase",
+]
+
+[[package]]
+name = "miniz_oxide"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7"
+dependencies = [
+ "adler",
+]
+
+[[package]]
+name = "mio"
+version = "0.8.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f3d0b296e374a4e6f3c7b0a1f5a51d748a0d34c85e7dc48fc3fa9a87657fe09"
+dependencies = [
+ "libc",
+ "wasi",
+ "windows-sys",
+]
+
+[[package]]
+name = "num-traits"
+version = "0.2.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "object"
+version = "0.32.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "once_cell"
+version = "1.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
+
+[[package]]
+name = "percent-encoding"
+version = "2.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
+
+[[package]]
+name = "pin-project-lite"
+version = "0.2.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58"
+
+[[package]]
+name = "pin-utils"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
+
+[[package]]
+name = "powerfmt"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.78"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.35"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
+dependencies = [
+ "proc-macro2",
+]
+
+[[package]]
+name = "reqwest"
+version = "0.11.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c6920094eb85afde5e4a138be3f2de8bbdf28000f0029e72c45025a56b042251"
+dependencies = [
+ "base64",
+ "bytes",
+ "encoding_rs",
+ "futures-core",
+ "futures-util",
+ "h2",
+ "http",
+ "http-body",
+ "hyper",
+ "hyper-rustls",
+ "ipnet",
+ "js-sys",
+ "log",
+ "mime",
+ "mime_guess",
+ "once_cell",
+ "percent-encoding",
+ "pin-project-lite",
+ "rustls",
+ "rustls-pemfile",
+ "serde",
+ "serde_json",
+ "serde_urlencoded",
+ "sync_wrapper",
+ "system-configuration",
+ "tokio",
+ "tokio-rustls",
+ "tower-service",
+ "url",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+ "web-sys",
+ "webpki-roots",
+ "winreg",
+]
+
+[[package]]
+name = "ring"
+version = "0.17.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "688c63d65483050968b2a8937f7995f443e27041a0f7700aa59b0822aedebb74"
+dependencies = [
+ "cc",
+ "getrandom",
+ "libc",
+ "spin",
+ "untrusted",
+ "windows-sys",
+]
+
+[[package]]
+name = "rustc-demangle"
+version = "0.1.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76"
+
+[[package]]
+name = "rustls"
+version = "0.21.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f9d5a6813c0759e4609cd494e8e725babae6a2ca7b62a5536a13daaec6fcb7ba"
+dependencies = [
+ "log",
+ "ring",
+ "rustls-webpki",
+ "sct",
+]
+
+[[package]]
+name = "rustls-pemfile"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c"
+dependencies = [
+ "base64",
+]
+
+[[package]]
+name = "rustls-webpki"
+version = "0.101.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765"
+dependencies = [
+ "ring",
+ "untrusted",
+]
+
+[[package]]
+name = "ryu"
+version = "1.0.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c"
+
+[[package]]
+name = "sct"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414"
+dependencies = [
+ "ring",
+ "untrusted",
+]
+
+[[package]]
+name = "serde"
+version = "1.0.196"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "870026e60fa08c69f064aa766c10f10b1d62db9ccd4d0abb206472bee0ce3b32"
+dependencies = [
+ "serde_derive",
+]
+
+[[package]]
+name = "serde_derive"
+version = "1.0.196"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "33c85360c95e7d137454dc81d9a4ed2b8efd8fbe19cee57357b32b9771fccb67"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "serde_json"
+version = "1.0.113"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "69801b70b1c3dac963ecb03a364ba0ceda9cf60c71cfe475e99864759c8b8a79"
+dependencies = [
+ "itoa",
+ "ryu",
+ "serde",
+]
+
+[[package]]
+name = "serde_urlencoded"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd"
+dependencies = [
+ "form_urlencoded",
+ "itoa",
+ "ryu",
+ "serde",
+]
+
+[[package]]
+name = "serde_with"
+version = "3.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1b0ed1662c5a68664f45b76d18deb0e234aff37207086803165c961eb695e981"
+dependencies = [
+ "base64",
+ "chrono",
+ "hex",
+ "indexmap 1.9.3",
+ "indexmap 2.2.1",
+ "serde",
+ "serde_json",
+ "serde_with_macros",
+ "time",
+]
+
+[[package]]
+name = "serde_with_macros"
+version = "3.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "568577ff0ef47b879f736cd66740e022f3672788cdf002a05a4e609ea5a6fb15"
+dependencies = [
+ "darling",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "slab"
+version = "0.4.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "socket2"
+version = "0.5.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9"
+dependencies = [
+ "libc",
+ "windows-sys",
+]
+
+[[package]]
+name = "spin"
+version = "0.9.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67"
+
+[[package]]
+name = "strsim"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
+
+[[package]]
+name = "syn"
+version = "2.0.48"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "sync_wrapper"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160"
+
+[[package]]
+name = "system-configuration"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7"
+dependencies = [
+ "bitflags",
+ "core-foundation",
+ "system-configuration-sys",
+]
+
+[[package]]
+name = "system-configuration-sys"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9"
+dependencies = [
+ "core-foundation-sys",
+ "libc",
+]
+
+[[package]]
+name = "thiserror"
+version = "1.0.56"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d54378c645627613241d077a3a79db965db602882668f9136ac42af9ecb730ad"
+dependencies = [
+ "thiserror-impl",
+]
+
+[[package]]
+name = "thiserror-impl"
+version = "1.0.56"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fa0faa943b50f3db30a20aa7e265dbc66076993efed8463e8de414e5d06d3471"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "time"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f657ba42c3f86e7680e53c8cd3af8abbe56b5491790b46e22e19c0d57463583e"
+dependencies = [
+ "deranged",
+ "itoa",
+ "powerfmt",
+ "serde",
+ "time-core",
+ "time-macros",
+]
+
+[[package]]
+name = "time-core"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
+
+[[package]]
+name = "time-macros"
+version = "0.2.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "26197e33420244aeb70c3e8c78376ca46571bc4e701e4791c2cd9f57dcb3a43f"
+dependencies = [
+ "time-core",
+]
+
+[[package]]
+name = "tinyvec"
+version = "1.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50"
+dependencies = [
+ "tinyvec_macros",
+]
+
+[[package]]
+name = "tinyvec_macros"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
+
+[[package]]
+name = "tokio"
+version = "1.35.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c89b4efa943be685f629b149f53829423f8f5531ea21249408e8e2f8671ec104"
+dependencies = [
+ "backtrace",
+ "bytes",
+ "libc",
+ "mio",
+ "pin-project-lite",
+ "socket2",
+ "windows-sys",
+]
+
+[[package]]
+name = "tokio-rustls"
+version = "0.24.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081"
+dependencies = [
+ "rustls",
+ "tokio",
+]
+
+[[package]]
+name = "tokio-util"
+version = "0.7.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15"
+dependencies = [
+ "bytes",
+ "futures-core",
+ "futures-sink",
+ "pin-project-lite",
+ "tokio",
+ "tracing",
+]
+
+[[package]]
+name = "tower-service"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52"
+
+[[package]]
+name = "tracing"
+version = "0.1.40"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef"
+dependencies = [
+ "pin-project-lite",
+ "tracing-attributes",
+ "tracing-core",
+]
+
+[[package]]
+name = "tracing-attributes"
+version = "0.1.27"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "tracing-core"
+version = "0.1.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54"
+dependencies = [
+ "once_cell",
+]
+
+[[package]]
+name = "try-lock"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
+
+[[package]]
+name = "unicase"
+version = "2.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89"
+dependencies = [
+ "version_check",
+]
+
+[[package]]
+name = "unicode-bidi"
+version = "0.3.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6f2528f27a9eb2b21e69c95319b30bd0efd85d09c379741b0f78ea1d86be2416"
+
+[[package]]
+name = "unicode-ident"
+version = "1.0.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+
+[[package]]
+name = "unicode-normalization"
+version = "0.1.22"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921"
+dependencies = [
+ "tinyvec",
+]
+
+[[package]]
+name = "untrusted"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
+
+[[package]]
+name = "url"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633"
+dependencies = [
+ "form_urlencoded",
+ "idna",
+ "percent-encoding",
+]
+
+[[package]]
+name = "version_check"
+version = "0.9.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
+
+[[package]]
+name = "want"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e"
+dependencies = [
+ "try-lock",
+]
+
+[[package]]
+name = "wasi"
+version = "0.11.0+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
+
+[[package]]
+name = "wasm-bindgen"
+version = "0.2.90"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b1223296a201415c7fad14792dbefaace9bd52b62d33453ade1c5b5f07555406"
+dependencies = [
+ "cfg-if",
+ "wasm-bindgen-macro",
+]
+
+[[package]]
+name = "wasm-bindgen-backend"
+version = "0.2.90"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fcdc935b63408d58a32f8cc9738a0bffd8f05cc7c002086c6ef20b7312ad9dcd"
+dependencies = [
+ "bumpalo",
+ "log",
+ "once_cell",
+ "proc-macro2",
+ "quote",
+ "syn",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-futures"
+version = "0.4.39"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac36a15a220124ac510204aec1c3e5db8a22ab06fd6706d881dc6149f8ed9a12"
+dependencies = [
+ "cfg-if",
+ "js-sys",
+ "wasm-bindgen",
+ "web-sys",
+]
+
+[[package]]
+name = "wasm-bindgen-macro"
+version = "0.2.90"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3e4c238561b2d428924c49815533a8b9121c664599558a5d9ec51f8a1740a999"
+dependencies = [
+ "quote",
+ "wasm-bindgen-macro-support",
+]
+
+[[package]]
+name = "wasm-bindgen-macro-support"
+version = "0.2.90"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bae1abb6806dc1ad9e560ed242107c0f6c84335f1749dd4e8ddb012ebd5e25a7"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+ "wasm-bindgen-backend",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-shared"
+version = "0.2.90"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4d91413b1c31d7539ba5ef2451af3f0b833a005eb27a631cec32bc0635a8602b"
+
+[[package]]
+name = "web-sys"
+version = "0.3.66"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "50c24a44ec86bb68fbecd1b3efed7e85ea5621b39b35ef2766b66cd984f8010f"
+dependencies = [
+ "js-sys",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "webpki-roots"
+version = "0.25.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1778a42e8b3b90bff8d0f5032bf22250792889a5cdc752aa0020c84abe3aaf10"
+
+[[package]]
+name = "windows-core"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
+dependencies = [
+ "windows-targets 0.52.0",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
+dependencies = [
+ "windows-targets 0.48.5",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c"
+dependencies = [
+ "windows_aarch64_gnullvm 0.48.5",
+ "windows_aarch64_msvc 0.48.5",
+ "windows_i686_gnu 0.48.5",
+ "windows_i686_msvc 0.48.5",
+ "windows_x86_64_gnu 0.48.5",
+ "windows_x86_64_gnullvm 0.48.5",
+ "windows_x86_64_msvc 0.48.5",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd"
+dependencies = [
+ "windows_aarch64_gnullvm 0.52.0",
+ "windows_aarch64_msvc 0.52.0",
+ "windows_i686_gnu 0.52.0",
+ "windows_i686_msvc 0.52.0",
+ "windows_x86_64_gnu 0.52.0",
+ "windows_x86_64_gnullvm 0.52.0",
+ "windows_x86_64_msvc 0.52.0",
+]
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04"
+
+[[package]]
+name = "winreg"
+version = "0.50.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1"
+dependencies = [
+ "cfg-if",
+ "windows-sys",
+]
diff --git a/src/auth/cookie.rs b/src/auth/cookie.rs
new file mode 100644
index 0000000..d7c139b
--- /dev/null
+++ b/src/auth/cookie.rs
@@ -0,0 +1,24 @@
+use axum_extra::extract::cookie::{Cookie, SameSite};
+
+#[cfg(feature = "ssr")]
+pub async fn create_cookie<'c>(
+    cookie_name: &'c str,
+    cookie_value: String,
+    cookie_domain: String,
+    same_site: SameSite,
+) -> Cookie<'c> {
+    let mut cookie = Cookie::new(cookie_name, cookie_value);
+    cookie.set_domain(cookie_domain.to_owned());
+    cookie.set_same_site(same_site);
+    set_cookie_expiry(&mut cookie);
+    cookie.set_http_only(true);
+    cookie.set_secure(true);
+    cookie
+}
+
+#[cfg(feature = "ssr")]
+fn set_cookie_expiry(cookie: &mut Cookie) {
+    let thirty_days = time::Duration::days(30);
+    cookie.set_max_age(thirty_days);
+    cookie.set_expires(time::OffsetDateTime::now_utc() + thirty_days);
+}
diff --git a/src/auth/identity.rs b/src/auth/identity.rs
index b10a253..94a8a0e 100644
--- a/src/auth/identity.rs
+++ b/src/auth/identity.rs
@@ -2,25 +2,28 @@ use leptos::*;
 
 cfg_if::cfg_if! {
 if #[cfg(feature="ssr")] {
-use axum::{extract::FromRef, http::header, response::IntoResponse};
-use axum_extra::extract::cookie::{Cookie, Key, SameSite, SignedCookieJar};
-use base64::{engine::general_purpose, Engine as _};
-use chrono::{Duration, Utc};
-use crate::store::cloudflare::{read_kv, read_metadata, write_kv};
-use ic_agent::{
-    identity::{DelegatedIdentity, Delegation, Secp256k1Identity, SignedDelegation},
-    Identity,
-};
-use leptos_axum::ResponseOptions;
-use leptos_router::RouteListing;
-use std::collections::HashMap;
-use super::{agent_js, generate};
-use tracing::log::{error, info, warn};
+    use super::{agent_js, cookie, generate};
+    use crate::store::cloudflare::{read_kv, read_metadata, write_kv};
+    use axum::{extract::FromRef, http::header, response::IntoResponse};
+    use axum_extra::extract::cookie::{Key, SameSite, SignedCookieJar};
+    use base64::{engine::general_purpose, Engine as _};
+    use chrono::{Duration, Utc};
+    use cloudflare_api::connect::ApiClientConfig;
+    use ic_agent::{
+        identity::{DelegatedIdentity, Delegation, Secp256k1Identity, SignedDelegation},
+        Identity,
+    };
+    use leptos_axum::ResponseOptions;
+    use leptos_router::RouteListing;
+    use std::collections::HashMap;
+    use tracing::log::{error, info, warn};
 }}
 
 #[server(endpoint = "generate_session")]
 pub async fn generate_session() -> Result<crate::auth::agent_js::SessionResponse, ServerFnError> {
     let app_state: AppState = use_context::<AppState>().unwrap();
+
+    // check if previously user has session
     let mut jar =
         leptos_axum::extract_with_state::<SignedCookieJar<Key>, AppState>(&app_state).await?;
 
@@ -29,64 +32,50 @@ pub async fn generate_session() -> Result<crate::auth::agent_js::SessionResponse
         None => None,
     };
 
+    let session_response = get_session_response(user_identity, &app_state.cloudflare_config).await;
+
+    info!("user_identity: {}", session_response.user_identity.len());
+
+    // store user refresh token in cookie
+
+    let user_cookie = cookie::create_cookie(
+        "user_identity",
+        session_response.user_identity.to_owned(),
+        app_state.auth_cookie_domain.to_owned(),
+        SameSite::None,
+    )
+    .await;
+    jar = jar.add(user_cookie);
+
+    // TODO: find better way to remove duplicate
+    let expiration = Utc::now() + Duration::days(30);
+    let exp_cookie = cookie::create_cookie(
+        "expiration",
+        expiration.to_string(),
+        app_state.auth_cookie_domain.to_owned(),
+        SameSite::None,
+    )
+    .await;
+    jar = jar.add(exp_cookie);
+
+    let jar_into_response = jar.into_response();
+    let response = expect_context::<ResponseOptions>();
+    for header_value in jar_into_response.headers().get_all(header::SET_COOKIE) {
+        response.append_header(header::SET_COOKIE, header_value.clone());
+    }
+
+    Ok(session_response)
+}
+
+#[cfg(feature = "ssr")]
+pub async fn get_session_response(
+    user_identity: Option<String>,
+    cloudflare_config: &ApiClientConfig,
+) -> agent_js::SessionResponse {
+    let mut user_identity = user_identity;
     // client identity
-    let user_key_pair: Option<generate::KeyPair> = match user_identity {
-        None => {
-            info!("User check: None");
-            None
-        }
-        Some(public_key) => {
-            info!("User check: {}", public_key.len());
-            match read_kv(&public_key, &app_state.cloudflare_config).await {
-                Some(private_key) => {
-                    let private_key = match general_purpose::STANDARD_NO_PAD.decode(private_key) {
-                        Ok(pk) => Some(pk),
-                        Err(error) => {
-                            error!("Could not decode pk: {}", error);
-                            None
-                        }
-                    };
-                    let metadata: Option<HashMap<String, String>> =
-                        read_metadata(&public_key, &app_state.cloudflare_config).await;
-                    if private_key.is_none() || metadata.is_none() {
-                        None
-                    } else {
-                        let metadata = metadata.unwrap();
-                        let private_pem = metadata.get("private_pem").unwrap();
-                        Some(generate::KeyPair {
-                            public_key,
-                            private_key: private_key.unwrap(),
-                            private_pem: private_pem.to_owned(),
-                        })
-                    }
-                }
-                None => {
-                    warn!("Found in cookie, not in KV");
-                    None
-                }
-            }
-        }
-    };
-    let user_key_pair = match user_key_pair {
-        Some(kp) => kp,
-        None => {
-            let new_key_pair = generate::key_pair().unwrap();
-            {
-                let private_key =
-                    general_purpose::STANDARD_NO_PAD.encode(&new_key_pair.private_key);
-                let mut metadata = HashMap::new();
-                metadata.insert("private_pem", new_key_pair.private_pem.as_str());
-                let _ = write_kv(
-                    &new_key_pair.public_key,
-                    &private_key,
-                    metadata,
-                    app_state.cloudflare_config,
-                )
-                .await;
-            }
-            new_key_pair
-        }
-    };
+    let user_key_pair = get_user_key_pair(&mut user_identity, cloudflare_config).await;
+
     let client_identity =
         Secp256k1Identity::from_pem(user_key_pair.private_pem.as_bytes()).unwrap();
 
@@ -106,14 +95,12 @@ pub async fn generate_session() -> Result<crate::auth::agent_js::SessionResponse
     };
 
     let signature = client_identity.sign_delegation(&delegation).unwrap();
-    // info!("signature: {:?}", signature);
     info!("expiration: {}", delegation.expiration);
 
     let signed_delegation = SignedDelegation {
         delegation,
         signature: signature.signature.unwrap(),
     };
-    // info!("signed_delegation: {:?}", signed_delegation);
 
     let signature_pubkey = signature.public_key.unwrap();
     let delegated_identity = DelegatedIdentity::new(
@@ -152,57 +139,85 @@ pub async fn generate_session() -> Result<crate::auth::agent_js::SessionResponse
         },
     };
     let session_response = agent_js::SessionResponse {
-        user_identity: user_key_pair.public_key.to_owned(),
+        user_identity: user_identity.unwrap(),
         delegation_identity: shareable_delegated_identity,
     };
-
-    info!("user_pubkey: {}", user_key_pair.public_key.len());
-
-    let mut user_cookie = Cookie::new("user_identity", user_key_pair.public_key.to_owned());
-    user_cookie.set_domain(app_state.auth_cookie_domain.to_owned());
-    user_cookie.set_same_site(SameSite::None);
-    set_cookie_expiry(&mut user_cookie);
-    user_cookie.set_http_only(true);
-    user_cookie.set_secure(true);
-    jar = jar.add(user_cookie);
-
-    let mut exp_cookie = Cookie::new("expiration", expiration.to_string());
-    exp_cookie.set_domain(app_state.auth_cookie_domain);
-    exp_cookie.set_same_site(SameSite::None);
-    set_cookie_expiry(&mut exp_cookie);
-    exp_cookie.set_http_only(true);
-    exp_cookie.set_secure(true);
-    jar = jar.add(exp_cookie);
-
-    let jar_into_response = jar.into_response();
-    let response = expect_context::<ResponseOptions>();
-    for header_value in jar_into_response.headers().get_all(header::SET_COOKIE) {
-        response.append_header(header::SET_COOKIE, header_value.clone());
-    }
-
-    Ok(session_response)
+    session_response
 }
 
 #[cfg(feature = "ssr")]
-fn set_cookie_expiry(cookie: &mut Cookie) {
-    let thirty_days = time::Duration::days(30);
-    cookie.set_max_age(thirty_days);
-    cookie.set_expires(time::OffsetDateTime::now_utc() + thirty_days);
+pub async fn get_user_key_pair(
+    user_identity: &mut Option<String>,
+    cloudflare_config: &ApiClientConfig,
+) -> generate::KeyPair {
+    let user_key_pair: Option<generate::KeyPair> = match user_identity {
+        None => {
+            info!("User check: None");
+            None
+        }
+        Some(public_key) => {
+            // check in kv for this user
+            info!("User check: {}", public_key.len());
+            match read_kv(&public_key, cloudflare_config).await {
+                Some(private_key) => {
+                    let private_key = match general_purpose::STANDARD_NO_PAD.decode(private_key) {
+                        Ok(pk) => Some(pk),
+                        Err(error) => {
+                            error!("Could not decode pk: {}", error);
+                            None
+                        }
+                    };
+                    let metadata: Option<HashMap<String, String>> =
+                        read_metadata(&public_key, cloudflare_config).await;
+                    if private_key.is_none() || metadata.is_none() {
+                        None
+                    } else {
+                        let metadata = metadata.unwrap();
+                        let private_pem = metadata.get("private_pem").unwrap();
+                        Some(generate::KeyPair {
+                            public_key: public_key.to_owned(),
+                            private_key: private_key.unwrap(),
+                            private_pem: private_pem.to_owned(),
+                        })
+                    }
+                }
+                None => {
+                    warn!("Found in cookie, not in KV");
+                    None
+                }
+            }
+        }
+    };
+    let user_key_pair = match user_key_pair {
+        Some(kp) => kp,
+        None => {
+            // generate new user identity
+            let new_key_pair = generate::key_pair().unwrap();
+            {
+                let private_key =
+                    general_purpose::STANDARD_NO_PAD.encode(&new_key_pair.private_key);
+                let mut metadata = HashMap::new();
+                metadata.insert("private_pem", new_key_pair.private_pem.as_str());
+                let _ = write_kv(
+                    &new_key_pair.public_key,
+                    &private_key,
+                    metadata,
+                    cloudflare_config,
+                )
+                .await;
+                user_identity.replace(new_key_pair.public_key.to_owned());
+            }
+            new_key_pair
+        }
+    };
+    user_key_pair
 }
 
-// pub fn authenticate(
-//     app_state: State<Arc<RwLock<AppState>>>,
-//     user_oauth_id: String,
-//     user_identity: String,
-// ) -> Json<SessionResponse> {
-// }
-
 #[derive(Clone)]
 #[cfg(feature = "ssr")]
 pub struct AppState {
     pub leptos_options: LeptosOptions,
     pub routes: Vec<RouteListing>,
-    // pub oauth_map: Arc<RwLock<HashMap<String, generate::KeyPair>>>,
     pub key: Key,
     pub oauth2_client: oauth2::basic::BasicClient,
     pub reqwest_client: reqwest::Client,
diff --git a/src/auth/mod.rs b/src/auth/mod.rs
index ff1f404..615013a 100644
--- a/src/auth/mod.rs
+++ b/src/auth/mod.rs
@@ -1,6 +1,7 @@
 cfg_if::cfg_if! {
 if #[cfg(feature = "ssr")] {
 pub mod generate;
+pub mod cookie;
 }}
 pub mod agent_js;
 pub mod identity;
diff --git a/src/main.rs b/src/main.rs
index e54a72c..2d9c327 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -74,7 +74,6 @@ async fn main() {
 
     let app_state = identity::AppState {
         leptos_options,
-        // oauth_map: Arc::new(RwLock::new(HashMap::new())),
         key: Key::from(auth_config.auth_sign_key.as_bytes()),
         routes: routes.clone(),
         oauth2_client,
diff --git a/src/page/login.rs b/src/page/login.rs
index 230cfa7..4fa24cd 100644
--- a/src/page/login.rs
+++ b/src/page/login.rs
@@ -32,7 +32,7 @@ pub fn LandingPage() -> impl IntoView {
                 </A>
                 <A class="flex items-center duration-200 transition-all rounded-full !select-none justify-center
         focus:outline-none px-4 py-3 font-semibold text-white border-white/40 focus:bg-white/20 border-2 bg-transparent
-        h-12 w-full space-x-2 py-3" href="/internetcomputer">
+        h-12 w-full space-x-2 py-3" href="#">
                     <svg class="w-8" id="dfinity-logo" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 197 97">
                         <path fill="#F15A24" d="M148.7.4c-10.9 0-22.8 5.8-35.4 17.3-6 5.4-11.2 11.2-15 15.9l12.8 14.3c3.6-4.5 8.9-10.6 14.9-16.1 11.2-10.2 18.5-12.3 22.7-12.3a28.9 28.9 0 1 1 0 57.8L146 77a35 35 0 0 0 14.2 3.6c28.8 0 34.4-19.5 34.8-20.9A48 48 0 0 0 148.7.4Z"/>
                         <path fill="#ED1E79" d="M48.1 96.3c10.9 0 22.8-5.8 35.4-17.3 6-5.4 11.2-11.2 15-15.9L85.7 48.8c-3.6 4.5-8.9 10.6-14.9 16.1-11.2 10.2-18.5 12.3-22.7 12.3a28.9 28.9 0 1 1 0-57.8l2.7.3a35 35 0 0 0-14.2-3.6C7.8 16.1 2.2 35.6 1.8 37a48 48 0 0 0 46.3 59.3Z"/>
diff --git a/src/providers/google.rs b/src/providers/google.rs
index be0f817..d1e2673 100644
--- a/src/providers/google.rs
+++ b/src/providers/google.rs
@@ -3,16 +3,27 @@ use cfg_if::cfg_if;
 use leptos::SignalGet;
 use leptos::*;
 use leptos_router::{use_query, Params};
-use oauth2::TokenResponse;
 
 cfg_if! {
 if #[cfg(feature="ssr")] {
-use axum::{http::header, response::IntoResponse};
-use axum_extra::extract::cookie::{SameSite, Cookie, Key, PrivateCookieJar, SignedCookieJar};
-use crate::auth::{identity::{AppState, generate_session}};
-use leptos_axum::ResponseOptions;
-use oauth2::{reqwest::{async_http_client}, AuthorizationCode, CsrfToken, PkceCodeVerifier, PkceCodeChallenge, Scope};
-use tracing::log::{info, error};
+    use crate::{
+        auth::{
+            cookie,
+            identity::{get_session_response, AppState},
+        },
+        store::cloudflare::{delete_kv, read_kv, write_kv},
+    };
+    use axum::{http::header, response::IntoResponse};
+    use axum_extra::extract::cookie::{Cookie, Key, PrivateCookieJar, SameSite, SignedCookieJar};
+    use chrono::{Duration, Utc};
+    use leptos_axum::ResponseOptions;
+    use oauth2::TokenResponse;
+    use oauth2::{
+        reqwest::async_http_client, AuthorizationCode, CsrfToken, PkceCodeChallenge,
+        PkceCodeVerifier, Scope,
+    };
+    use std::collections::HashMap;
+    use tracing::log::{error, info};
 }
 }
 
@@ -24,13 +35,11 @@ async fn google_auth_url() -> Result<String, ServerFnError> {
     // enable after integration
     let signed_jar: SignedCookieJar =
         leptos_axum::extract_with_state::<SignedCookieJar<Key>, AppState>(&app_state).await?;
-    /*
     let _user_identity = match signed_jar.get("user_identity") {
         Some(val) => Some(val.value().to_owned()),
         None => None,
     }
     .ok_or_else(|| ServerFnError::new("User Session not found."))?;
-    */
 
     let mut jar: PrivateCookieJar =
         leptos_axum::extract_with_state::<PrivateCookieJar<Key>, AppState>(&app_state).await?;
@@ -54,20 +63,24 @@ async fn google_auth_url() -> Result<String, ServerFnError> {
     info!("b4 pkce sec: {}", pkce_verifier.len());
     info!("b4 csrf sec: {}", csrf_token.len());
 
-    let mut pkce_verifier = Cookie::new("pkce_verifier", pkce_verifier.to_owned());
-    pkce_verifier.set_domain(app_state.auth_cookie_domain.clone());
-    pkce_verifier.set_same_site(SameSite::Strict);
-    pkce_verifier.set_http_only(true);
-    pkce_verifier.set_secure(true);
-    jar = jar.remove(Cookie::from("pkce_verifier"));
-    jar = jar.add(pkce_verifier.clone());
-    let mut csrf_token = Cookie::new("csrf_token", csrf_token.to_owned());
-    csrf_token.set_domain(app_state.auth_cookie_domain);
-    csrf_token.set_same_site(SameSite::Strict);
-    csrf_token.set_http_only(true);
-    csrf_token.set_secure(true);
-    jar = jar.remove(Cookie::from("csrf_token"));
-    jar = jar.add(csrf_token.clone());
+    let pkce_verifier = cookie::create_cookie(
+        "pkce_verifier",
+        pkce_verifier.to_owned(),
+        app_state.auth_cookie_domain.to_owned(),
+        SameSite::Strict,
+    )
+    .await;
+    // jar = jar.remove(Cookie::from("pkce_verifier"));
+    jar = jar.add(pkce_verifier);
+    let csrf_token = cookie::create_cookie(
+        "csrf_token",
+        csrf_token.to_owned(),
+        app_state.auth_cookie_domain.to_owned(),
+        SameSite::Strict,
+    )
+    .await;
+    // jar = jar.remove(Cookie::from("csrf_token"));
+    jar = jar.add(csrf_token);
 
     let jar_into_response = jar.into_response();
 
@@ -105,6 +118,14 @@ async fn google_verify_response(
         use_context::<AppState>().ok_or_else(|| ServerFnError::new("Context not found!"))?;
     let mut jar: PrivateCookieJar =
         leptos_axum::extract_with_state::<PrivateCookieJar<Key>, AppState>(&app_state).await?;
+    let mut signed_jar: SignedCookieJar =
+        leptos_axum::extract_with_state::<SignedCookieJar<Key>, AppState>(&app_state).await?;
+
+    let user_identity = match signed_jar.get("user_identity") {
+        Some(val) => Some(val.value().to_owned()),
+        None => None,
+    }
+    .ok_or_else(|| ServerFnError::new("User Session not found."))?;
 
     let client = app_state.oauth2_client;
     let csrf_token = jar
@@ -123,9 +144,9 @@ async fn google_verify_response(
     jar = jar.remove(Cookie::from("pkce_verifier"));
     let jar_into_response = jar.into_response();
 
-    let response = expect_context::<ResponseOptions>();
+    let response_options = expect_context::<ResponseOptions>();
     for header_value in jar_into_response.headers().get_all(header::SET_COOKIE) {
-        response.append_header(header::SET_COOKIE, header_value.clone());
+        response_options.append_header(header::SET_COOKIE, header_value.clone());
     }
     info!("aftr pkce: {}", pkce_verifier.len());
 
@@ -136,39 +157,93 @@ async fn google_verify_response(
         .request_async(async_http_client)
         .await?;
 
-    info!("token_result: {:?}", &token_result);
+    info!(
+        "token_result: f you need any inputs from my side.{:?}",
+        &token_result
+    );
     let access_token = token_result.access_token().secret();
+    // TODO: check against delegate session. set whichever is lower
     let expires_in = token_result.expires_in().unwrap().as_secs();
     match token_result.refresh_token() {
         Some(secret) => info!("secret: {:?}", secret),
         None => {}
     }
     let user_info_url = "https://www.googleapis.com/oauth2/v3/userinfo";
-    let response = app_state
+    let reqwest_response = app_state
         .reqwest_client
         .get(user_info_url)
         .bearer_auth(access_token)
         .send()
         .await?;
-    let sub_openid = if response.status().is_success() {
-        let response_json: serde_json::Value = response.json().await?;
+    let access_token = token_result.access_token().secret();
+    info!("aftr access_token: {:?}", access_token.len());
+
+    let sub_openid = if reqwest_response.status().is_success() {
+        let response_json: serde_json::Value = reqwest_response.json().await?;
         info!("response_json: {response_json:?}");
         response_json["sub"]
             .as_str()
             .expect("openid sub to parse to string")
             .to_string()
     } else {
-        error!("Response status failed: {:?}", response);
+        error!("Response status failed: {:?}", reqwest_response);
         return Err(ServerFnError::ServerError(format!(
             "Response from google has status of {}",
-            response.status()
+            reqwest_response.status()
         )));
     };
 
-    let access_token = token_result.access_token().secret();
-    info!("aftr access_token: {:?}", access_token.len());
-    // TODO: add to user map for reference
-    let session_response = generate_session().await?;
+    let oauth2_kv_key = format!("google_sub_id_{}", sub_openid);
+    let user_identity = match read_kv(&oauth2_kv_key, &app_state.cloudflare_config).await {
+        Some(user_public_key) => {
+            if !user_identity.eq(&user_public_key) {
+                // returning user with different temporary session
+                // delete current temp session
+                let _ignore = delete_kv(&user_identity, &app_state.cloudflare_config).await;
+                Some(user_public_key)
+            } else {
+                Some(user_identity)
+            }
+        }
+        None => {
+            let _ignore = write_kv(
+                &oauth2_kv_key,
+                &user_identity,
+                HashMap::with_capacity(0),
+                &app_state.cloudflare_config,
+            )
+            .await;
+            Some(user_identity)
+        }
+    };
+    let session_response = get_session_response(user_identity, &app_state.cloudflare_config).await;
+
+    let user_cookie = cookie::create_cookie(
+        "user_identity",
+        session_response.user_identity.to_owned(),
+        app_state.auth_cookie_domain.to_owned(),
+        SameSite::None,
+    )
+    .await;
+    signed_jar = signed_jar.add(user_cookie);
+
+    let expiration = Utc::now() + Duration::days(30);
+    let exp_cookie = cookie::create_cookie(
+        "expiration",
+        expiration.to_string(),
+        app_state.auth_cookie_domain.to_owned(),
+        SameSite::None,
+    )
+    .await;
+    signed_jar = signed_jar.add(exp_cookie);
+
+    let signed_jar_into_response = signed_jar.into_response();
+    for header_value in signed_jar_into_response
+        .headers()
+        .get_all(header::SET_COOKIE)
+    {
+        response_options.append_header(header::SET_COOKIE, header_value.clone());
+    }
 
     Ok(session_response)
 }
diff --git a/src/store/cloudflare.rs b/src/store/cloudflare.rs
index 3efe849..31625aa 100644
--- a/src/store/cloudflare.rs
+++ b/src/store/cloudflare.rs
@@ -51,7 +51,7 @@ pub async fn write_kv(
     key_name: &str,
     value: &str,
     metadata: HashMap<&str, &str>,
-    cloudflare_config: ApiClientConfig,
+    cloudflare_config: &ApiClientConfig,
 ) -> Option<String> {
     let end_point = WriteKVWithMetadata {
         account_identifier: &cloudflare_config.account_identifier,
@@ -79,7 +79,7 @@ pub async fn write_kv(
     }
 }
 
-pub async fn delete_kv(key_name: &str, cloudflare_config: ApiClientConfig) -> Option<String> {
+pub async fn delete_kv(key_name: &str, cloudflare_config: &ApiClientConfig) -> Option<String> {
     let end_point = DeleteKV {
         account_identifier: &cloudflare_config.account_identifier,
         namespace_identifier: &cloudflare_config.namespace_identifier,