TySS-Dev/nearby
1
0
Fork 0
mirror of https://github.com/kidfromjupiter/nearby.git synced 2026-09-16 15:36:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

Rename PublicCredential to SharedCredential and PrivateCredential to LocalCredential

Browse Source 
PiperOrigin-RevId: 503221477
This commit is contained in:
Anay Wadhera
2023-01-24 12:09:21 -08:00
committed by Copybara-Service
parent f4d85f9b90
commit c58b45eb50
24 changed files with 192 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/platform/implementation/credential_callbacks.h
+3 -3
View File
@@ -66,7 +66,7 @@ struct SaveCredentialsResultCallback {
struct GenerateCredentialsResultCallback {
absl::AnyInvocable<void(
absl::StatusOr<std::vector<nearby::internal::PublicCredential>>)>
absl::StatusOr<std::vector<nearby::internal::SharedCredential>>)>
credentials_generated_cb;
};
@@ -76,13 +76,13 @@ struct UpdateRemotePublicCredentialsCallback {
struct GetPrivateCredentialsResultCallback {
absl::AnyInvocable<void(
absl::StatusOr<std::vector<nearby::internal::PrivateCredential>>)>
absl::StatusOr<std::vector<nearby::internal::LocalCredential>>)>
credentials_fetched_cb;
};
struct GetPublicCredentialsResultCallback {
absl::AnyInvocable<void(
absl::StatusOr<std::vector<nearby::internal::PublicCredential>>)>
absl::StatusOr<std::vector<nearby::internal::SharedCredential>>)>
credentials_fetched_cb;
};
internal/platform/implementation/credential_storage.h
+4 -4
View File
@@ -28,8 +28,8 @@ namespace api {
// Credential Storage interface
class CredentialStorage {
public:
using PrivateCredential = ::nearby::internal::PrivateCredential;
using PublicCredential = ::nearby::internal::PublicCredential;
using LocalCredential = ::nearby::internal::LocalCredential;
using SharedCredential = ::nearby::internal::SharedCredential;
using PublicCredentialType = ::nearby::presence::PublicCredentialType;
using SaveCredentialsResultCallback =
::nearby::presence::SaveCredentialsResultCallback;
@@ -55,8 +55,8 @@ class CredentialStorage {
// which is used for querying credentials.
virtual void SaveCredentials(
absl::string_view manager_app_id, absl::string_view account_name,
const std::vector<PrivateCredential>& private_credentials,
const std::vector<PublicCredential>& public_credentials,
const std::vector<LocalCredential>& Local_credentials,
const std::vector<SharedCredential>& Shared_credentials,
PublicCredentialType public_credential_type,
SaveCredentialsResultCallback callback) = 0;
internal/platform/implementation/g3/credential_storage_impl.cc
+4 -4
View File
@@ -52,8 +52,8 @@ void FilterIdentityType(std::vector<Credential>& credentials,
void CredentialStorageImpl::SaveCredentials(
absl::string_view manager_app_id, absl::string_view account_name,
const std::vector<PrivateCredential>& private_credentials,
const std::vector<PublicCredential>& public_credentials,
const std::vector<LocalCredential>& private_credentials,
const std::vector<SharedCredential>& public_credentials,
PublicCredentialType public_credential_type,
SaveCredentialsResultCallback callback) {
if (private_credentials.empty() && public_credentials.empty()) {
@@ -117,7 +117,7 @@ void CredentialStorageImpl::GetPrivateCredentials(
absl::StrFormat("No private credentials for %v", credential_selector)));
return;
}
std::vector<PrivateCredential> private_credentials =
std::vector<LocalCredential> private_credentials =
private_credentials_map_[key];
FilterIdentityType(private_credentials, credential_selector.identity_type);
if (private_credentials.empty()) {
@@ -145,7 +145,7 @@ void CredentialStorageImpl::GetPublicCredentials(
absl::StrFormat("No public credentials for %v", credential_selector)));
return;
}
std::vector<PublicCredential> public_credentials =
std::vector<SharedCredential> public_credentials =
public_credentials_map_[key];
FilterIdentityType(public_credentials, credential_selector.identity_type);
if (public_credentials.empty()) {
internal/platform/implementation/g3/credential_storage_impl.h
+6 -6
View File
@@ -38,8 +38,8 @@ namespace g3 {
*/
class CredentialStorageImpl : public api::CredentialStorage {
public:
using PrivateCredential = ::nearby::internal::PrivateCredential;
using PublicCredential = ::nearby::internal::PublicCredential;
using LocalCredential = ::nearby::internal::LocalCredential;
using SharedCredential = ::nearby::internal::SharedCredential;
using PublicCredentialType = ::nearby::presence::PublicCredentialType;
using PrivateCredentialKey = std::pair<std::string, std::string>;
using PublicCredentialKey =
@@ -51,8 +51,8 @@ class CredentialStorageImpl : public api::CredentialStorage {
// Used to save private and public credentials.
void SaveCredentials(
absl::string_view manager_app_id, absl::string_view account_name,
const std::vector<PrivateCredential>& private_credentials,
const std::vector<PublicCredential>& public_credentials,
const std::vector<LocalCredential>& private_credentials,
const std::vector<SharedCredential>& public_credentials,
PublicCredentialType public_credential_type,
SaveCredentialsResultCallback callback) override;
@@ -79,9 +79,9 @@ class CredentialStorageImpl : public api::CredentialStorage {
return std::make_tuple(std::string(manager_app_id),
std::string(account_name), credential_type);
}
absl::flat_hash_map<PrivateCredentialKey, std::vector<PrivateCredential>>
absl::flat_hash_map<PrivateCredentialKey, std::vector<LocalCredential>>
private_credentials_map_;
absl::flat_hash_map<PublicCredentialKey, std::vector<PublicCredential>>
absl::flat_hash_map<PublicCredentialKey, std::vector<SharedCredential>>
public_credentials_map_;
absl::Mutex private_mutex_;
absl::Mutex public_mutex_;