Skip to content

armgit / ente

Public Imported from GitHub
0

πŸ’š End-to-end encrypted cloud for everything.

Use access token for mobile family requests

Manav Rathi906c524bbeaa
diff --git a/mobile/apps/photos/lib/gateways/users/users_gateway.dart b/mobile/apps/photos/lib/gateways/users/users_gateway.dart
index 42df5a662c..3e3862ca58 100644
--- a/mobile/apps/photos/lib/gateways/users/users_gateway.dart
+++ b/mobile/apps/photos/lib/gateways/users/users_gateway.dart
@@ -153,49 +153,29 @@ class UsersGateway {
/// Create a family with the current user as the admin.
///
/// Endpoint: POST /family/create
- Future<void> createFamily({String? authToken}) async {
- final familiesToken = authToken ?? await getFamiliesAuthToken();
- await _enteDio.post(
- "/family/create",
- options: _familyAuthOptions(familiesToken),
- );
+ Future<void> createFamily() async {
+ await _enteDio.post("/family/create");
}
/// Invite a user to join the current user's family.
///
/// Endpoint: POST /family/add-member
- Future<void> inviteFamilyMember({
- required String email,
- String? authToken,
- }) async {
- final familiesToken = authToken ?? await getFamiliesAuthToken();
- await _enteDio.post(
- "/family/add-member",
- data: {"email": email},
- options: _familyAuthOptions(familiesToken),
- );
+ Future<void> inviteFamilyMember({required String email}) async {
+ await _enteDio.post("/family/add-member", data: {"email": email});
}
/// Remove an active family member.
///
/// Endpoint: DELETE /family/remove-member/:id
- Future<void> removeFamilyMember(String id, {String? authToken}) async {
- final familiesToken = authToken ?? await getFamiliesAuthToken();
- await _enteDio.delete(
- "/family/remove-member/$id",
- options: _familyAuthOptions(familiesToken),
- );
+ Future<void> removeFamilyMember(String id) async {
+ await _enteDio.delete("/family/remove-member/$id");
}
/// Revoke a pending family invite.
///
/// Endpoint: DELETE /family/revoke-invite/:id
- Future<void> revokeFamilyInvite(String id, {String? authToken}) async {
- final familiesToken = authToken ?? await getFamiliesAuthToken();
- await _enteDio.delete(
- "/family/revoke-invite/$id",
- options: _familyAuthOptions(familiesToken),
- );
+ Future<void> revokeFamilyInvite(String id) async {
+ await _enteDio.delete("/family/revoke-invite/$id");
}
/// Update a family member's storage limit.
@@ -204,41 +184,13 @@ class UsersGateway {
Future<void> updateFamilyMemberStorage({
required String id,
int? storageLimit,
- String? authToken,
}) async {
- final familiesToken = authToken ?? await getFamiliesAuthToken();
await _enteDio.post(
"/family/modify-storage",
data: {"id": id, "storageLimit": storageLimit},
- options: _familyAuthOptions(familiesToken),
);
}
- /// Get the families portal token and URL.
- ///
- /// Returns a map containing:
- /// - `familyUrl`: The base URL for the family portal (optional)
- /// - `familiesToken`: JWT token for authenticating with the family portal
- ///
- /// Endpoint: GET /users/families-token
- Future<Map<String, dynamic>> getFamiliesToken() async {
- final response = await _enteDio.get("/users/families-token");
- return response.data as Map<String, dynamic>;
- }
-
- Future<String> getFamiliesAuthToken() async {
- final responseData = await getFamiliesToken();
- final familiesToken = responseData["familiesToken"];
- if (familiesToken is! String || familiesToken.isEmpty) {
- throw StateError("Missing familiesToken in /users/families-token");
- }
- return familiesToken;
- }
-
- Options _familyAuthOptions(String familiesToken) {
- return Options(headers: {"X-Auth-Token": familiesToken});
- }
-
// ============================================================
// Key Attributes & Recovery
// ============================================================
diff --git a/mobile/apps/photos/lib/services/family_service.dart b/mobile/apps/photos/lib/services/family_service.dart
index e1533b6d8e..cc04576f40 100644
--- a/mobile/apps/photos/lib/services/family_service.dart
+++ b/mobile/apps/photos/lib/services/family_service.dart
@@ -40,18 +40,14 @@ class FamilyService {
required UserDetails userDetails,
required List<String> emails,
}) async {
- final familyAuthToken = await usersGateway.getFamiliesAuthToken();
if (userDetails.familyData == null) {
- await usersGateway.createFamily(authToken: familyAuthToken);
+ await usersGateway.createFamily();
}
final failures = <FamilyInviteFailure>[];
for (final email in emails) {
try {
- await usersGateway.inviteFamilyMember(
- email: email,
- authToken: familyAuthToken,
- );
+ await usersGateway.inviteFamilyMember(email: email);
} catch (error, stackTrace) {
_logger.warning("Failed to invite $email", error, stackTrace);
failures.add(FamilyInviteFailure(email: email, error: error));