From 803abfc0151becc7aef2f516e08b12fda53faa36 Mon Sep 17 00:00:00 2001 From: "Z. Charles Dziura" Date: Wed, 9 Oct 2024 09:50:56 -0400 Subject: [PATCH] Rename expiration to expiresAt --- api/src/requests/auth/login/handler.rs | 4 ++-- api/src/requests/auth/login/models/response.rs | 2 +- .../java/ing/bikeshedengineer/debtpirate/http/ApiResponse.kt | 3 +++ .../ing/bikeshedengineer/debtpirate/http/HttpClientService.kt | 4 ++++ .../debtpirate/repositories/auth/AuthRemoteDataSource.kt | 2 ++ .../debtpirate/repositories/auth/AuthRepository.kt | 4 ++++ .../debtpirate/repositories/auth/models/AuthLoginRequest.kt | 3 +++ .../debtpirate/repositories/auth/models/AuthLoginResponse.kt | 3 +++ 8 files changed, 22 insertions(+), 3 deletions(-) create mode 100644 app/app/src/main/java/ing/bikeshedengineer/debtpirate/http/ApiResponse.kt create mode 100644 app/app/src/main/java/ing/bikeshedengineer/debtpirate/http/HttpClientService.kt create mode 100644 app/app/src/main/java/ing/bikeshedengineer/debtpirate/repositories/auth/AuthRemoteDataSource.kt create mode 100644 app/app/src/main/java/ing/bikeshedengineer/debtpirate/repositories/auth/AuthRepository.kt create mode 100644 app/app/src/main/java/ing/bikeshedengineer/debtpirate/repositories/auth/models/AuthLoginRequest.kt create mode 100644 app/app/src/main/java/ing/bikeshedengineer/debtpirate/repositories/auth/models/AuthLoginResponse.kt diff --git a/api/src/requests/auth/login/handler.rs b/api/src/requests/auth/login/handler.rs index 5b158f4..ac406dc 100644 --- a/api/src/requests/auth/login/handler.rs +++ b/api/src/requests/auth/login/handler.rs @@ -59,11 +59,11 @@ async fn auth_login_request( user_id, session: AuthLoginTokenData { token: session_token, - expiration: session_token_expiration, + expires_at: session_token_expiration, }, auth: AuthLoginTokenData { token: auth_token, - expiration: auth_token_expiration, + expires_at: auth_token_expiration, }, }; diff --git a/api/src/requests/auth/login/models/response.rs b/api/src/requests/auth/login/models/response.rs index 7a9e3f2..70a1aa3 100644 --- a/api/src/requests/auth/login/models/response.rs +++ b/api/src/requests/auth/login/models/response.rs @@ -15,5 +15,5 @@ pub struct AuthLoginTokenData { pub token: String, #[serde(serialize_with = "humantime_serde::serialize")] - pub expiration: SystemTime, + pub expires_at: SystemTime, } diff --git a/app/app/src/main/java/ing/bikeshedengineer/debtpirate/http/ApiResponse.kt b/app/app/src/main/java/ing/bikeshedengineer/debtpirate/http/ApiResponse.kt new file mode 100644 index 0000000..538cc83 --- /dev/null +++ b/app/app/src/main/java/ing/bikeshedengineer/debtpirate/http/ApiResponse.kt @@ -0,0 +1,3 @@ +package ing.bikeshedengineer.debtpirate.http + +data class ApiResponse() diff --git a/app/app/src/main/java/ing/bikeshedengineer/debtpirate/http/HttpClientService.kt b/app/app/src/main/java/ing/bikeshedengineer/debtpirate/http/HttpClientService.kt new file mode 100644 index 0000000..5c7ea0d --- /dev/null +++ b/app/app/src/main/java/ing/bikeshedengineer/debtpirate/http/HttpClientService.kt @@ -0,0 +1,4 @@ +package ing.bikeshedengineer.debtpirate.http + +class HttpClientService { +} \ No newline at end of file diff --git a/app/app/src/main/java/ing/bikeshedengineer/debtpirate/repositories/auth/AuthRemoteDataSource.kt b/app/app/src/main/java/ing/bikeshedengineer/debtpirate/repositories/auth/AuthRemoteDataSource.kt new file mode 100644 index 0000000..66dde02 --- /dev/null +++ b/app/app/src/main/java/ing/bikeshedengineer/debtpirate/repositories/auth/AuthRemoteDataSource.kt @@ -0,0 +1,2 @@ +package ing.bikeshedengineer.debtpirate.repositories.auth + diff --git a/app/app/src/main/java/ing/bikeshedengineer/debtpirate/repositories/auth/AuthRepository.kt b/app/app/src/main/java/ing/bikeshedengineer/debtpirate/repositories/auth/AuthRepository.kt new file mode 100644 index 0000000..afdabf1 --- /dev/null +++ b/app/app/src/main/java/ing/bikeshedengineer/debtpirate/repositories/auth/AuthRepository.kt @@ -0,0 +1,4 @@ +package ing.bikeshedengineer.debtpirate.repositories.auth + +class AuthRepository { +} \ No newline at end of file diff --git a/app/app/src/main/java/ing/bikeshedengineer/debtpirate/repositories/auth/models/AuthLoginRequest.kt b/app/app/src/main/java/ing/bikeshedengineer/debtpirate/repositories/auth/models/AuthLoginRequest.kt new file mode 100644 index 0000000..ef52a18 --- /dev/null +++ b/app/app/src/main/java/ing/bikeshedengineer/debtpirate/repositories/auth/models/AuthLoginRequest.kt @@ -0,0 +1,3 @@ +package ing.bikeshedengineer.debtpirate.repositories.auth.models + +data class AuthLoginRequest() diff --git a/app/app/src/main/java/ing/bikeshedengineer/debtpirate/repositories/auth/models/AuthLoginResponse.kt b/app/app/src/main/java/ing/bikeshedengineer/debtpirate/repositories/auth/models/AuthLoginResponse.kt new file mode 100644 index 0000000..2decaee --- /dev/null +++ b/app/app/src/main/java/ing/bikeshedengineer/debtpirate/repositories/auth/models/AuthLoginResponse.kt @@ -0,0 +1,3 @@ +package ing.bikeshedengineer.debtpirate.repositories.auth.models + +data class AuthLoginResponse()