Hide text results for events with passwords

This is not a good solution as it relies on a frontend check. Ideally this would be done in backend. This same applies for thumbnails in search results.
elan-ev · Sep 12, 2024 · a2e4d24 · a2e4d24
1 parent 29fd5df
commit a2e4d24
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 13 deletions.
diff --git a/backend/src/api/model/search/event.rs b/backend/src/api/model/search/event.rs
@@ -29,6 +29,7 @@ pub(crate) struct SearchEvent {
     pub host_realms: Vec<search::Realm>,
     pub text_matches: Vec<TextMatch>,
     pub has_password: bool,
+    pub user_is_authorized: bool,
 }
 
 #[derive(Debug, GraphQLObject)]
@@ -73,17 +74,17 @@ impl SearchEvent {
         let mut text_matches = Vec::new();
         src.slide_texts.resolve_matches(slide_matches, &mut text_matches, TextAssetType::SlideText);
         src.caption_texts.resolve_matches(caption_matches, &mut text_matches, TextAssetType::Caption);
+
+        let read_roles: Vec<String> = src.read_roles.iter()
+            .map(|role| {
+                let bytes = hex::decode(role).expect("Failed to decode role");
 
+                String::from_utf8(bytes).expect("Failed to convert bytes to string")
+            })
+            .collect();
+        let user_is_authorized = context.auth.overlaps_roles(read_roles);
         let thumbnail = {
-            let read_roles: Vec<String> = src.read_roles.iter()
-                .map(|role| {
-                    let bytes = hex::decode(role).expect("Failed to decode role");
-
-                    String::from_utf8(bytes).expect("Failed to convert bytes to string")
-                })
-                .collect();
-
-            if context.auth.overlaps_roles(read_roles) {
+            if user_is_authorized {
                 src.thumbnail
             } else {
                 None
@@ -107,6 +108,7 @@ impl SearchEvent {
             host_realms: src.host_realms,
             text_matches,
             has_password: src.has_password,
+            user_is_authorized,
         }
     }
 }
diff --git a/frontend/src/routes/Search.tsx b/frontend/src/routes/Search.tsx
@@ -52,7 +52,7 @@ import { ellipsisOverflowCss, focusStyle } from "../ui";
 import { COLORS } from "../color";
 import { BREAKPOINT_MEDIUM, BREAKPOINT_SMALL } from "../GlobalStyle";
 import { eventId, isExperimentalFlagSet, keyOfId, secondsToTimeString } from "../util";
-import { DirectVideoRoute, VideoRoute } from "./Video";
+import { DirectVideoRoute, getCredentials, VideoRoute } from "./Video";
 import { DirectSeriesRoute } from "./Series";
 import { PartOfSeriesLink } from "../ui/Blocks/VideoList";
 import { SearchSlidePreviewQuery } from "./__generated__/SearchSlidePreviewQuery.graphql";
@@ -150,6 +150,7 @@ const query = graphql`
                         endTime
                         created
                         hasPassword
+                        userIsAuthorized
                         hostRealms { path }
                         textMatches {
                             start
@@ -404,6 +405,7 @@ const SearchResults: React.FC<SearchResultsProps> = ({ items }) => (
                     hostRealms: unwrapUndefined(item.hostRealms),
                     textMatches: unwrapUndefined(item.textMatches),
                     hasPassword: unwrapUndefined(item.hasPassword),
+                    userIsAuthorized: unwrapUndefined(item.userIsAuthorized),
                 }} />;
             } else if (item.__typename === "SearchSeries") {
                 return <SearchSeries key={item.id} {...{
@@ -483,6 +485,7 @@ type SearchEventProps = {
     hostRealms: readonly { readonly path: string }[];
     textMatches: NonNullable<Results["items"][number]["textMatches"]>;
     hasPassword: boolean;
+    userIsAuthorized: boolean;
 };
 
 const SearchEvent: React.FC<SearchEventProps> = ({
@@ -502,13 +505,17 @@ const SearchEvent: React.FC<SearchEventProps> = ({
     hostRealms,
     textMatches,
     hasPassword,
+    userIsAuthorized,
 }) => {
     // TODO: decide what to do in the case of more than two host realms. Direct
     // link should be avoided.
     const link = hostRealms.length !== 1
         ? DirectVideoRoute.url({ videoId: id })
         : VideoRoute.url({ realmPath: hostRealms[0].path, videoID: id });
 
+    // TODO: This check should be done in backend.
+    const showMatches = userIsAuthorized || (hasPassword && getCredentials(keyOfId(id)));
+
     return (
         <Item key={id} link={link}>
             <WithIcon Icon={LuPlayCircle} hideIconOnMobile>
@@ -545,7 +552,7 @@ const SearchEvent: React.FC<SearchEventProps> = ({
                     {seriesTitle && seriesId && <PartOfSeriesLink {...{ seriesTitle, seriesId }} />}
 
                     {/* Show timeline with matches if there are any */}
-                    {textMatches.length > 0 && (
+                    {textMatches.length > 0 && showMatches && (
                         <TextMatchTimeline {...{ id, duration, link, textMatches }} />
                     )}
                 </div>
@@ -594,11 +601,11 @@ type TextMatchTimelineProps = Pick<SearchEventProps, "id" | "duration" | "textMa
 };
 
 const slidePreviewQuery = graphql`
-    query SearchSlidePreviewQuery($id: ID!) {
+    query SearchSlidePreviewQuery($id: ID!, $seriesUser: String, $seriesPassword: String) {
         eventById(id: $id) {
             ...on AuthorizedEvent {
                 id
-                authorizedData {
+                authorizedData(user: $seriesUser, password: $seriesPassword) {
                     segments { startTime uri }
                 }
             }

diff --git a/frontend/src/schema.graphql b/frontend/src/schema.graphql
@@ -100,6 +100,7 @@ type SearchEvent implements Node {
   hostRealms: [SearchRealm!]!
   textMatches: [TextMatch!]!
   hasPassword: Boolean!
+  userIsAuthorized: Boolean!
 }
 
 input ChildIndex {