Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit defe6e3d authored by Fahim Salam Chowdhury's avatar Fahim Salam Chowdhury 👽
Browse files

6839-Sanitize_userId

issue: e/backlog#6839

Sanitize userId (remove end part from the email to get userId) for ocs
requests.
parent ec5620a9
Loading
Loading
Loading
Loading
Loading
+12 −8
Original line number Diff line number Diff line
@@ -7,16 +7,9 @@ import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.WorkerThread;

import com.nextcloud.android.sso.api.ParsedResponse;
import com.nextcloud.android.sso.model.SingleSignOnAccount;

import java.util.Map;

import it.niedermann.owncloud.notes.persistence.sync.OcsAPI;
import it.niedermann.owncloud.notes.shared.model.Capabilities;
import it.niedermann.owncloud.notes.shared.model.OcsResponse;
import it.niedermann.owncloud.notes.shared.model.OcsUser;
import retrofit2.Response;

@WorkerThread
public class CapabilitiesClient {
@@ -53,7 +46,7 @@ public class CapabilitiesClient {
    public static String getDisplayName(@NonNull Context context, @NonNull SingleSignOnAccount ssoAccount, @NonNull ApiProvider apiProvider) {
        final var ocsAPI = apiProvider.getOcsAPI(context, ssoAccount);
        try {
            final var userResponse = ocsAPI.getUser(ssoAccount.userId).execute();
            final var userResponse = ocsAPI.getUser(sanitizeUserId(ssoAccount.userId)).execute();
            if (userResponse.isSuccessful()) {
                final var ocsResponse = userResponse.body();
                if (ocsResponse != null) {
@@ -69,4 +62,15 @@ public class CapabilitiesClient {
        }
        return null;
    }

    @NonNull
    private static String sanitizeUserId(@NonNull String userId) {
        int endIndex = userId.lastIndexOf("@");

        if (endIndex < 0) {
            return userId;
        }

        return userId.substring(0, endIndex);
    }
}