Overseer urlencode fix

darkalfx · Mar 13, 2021 · 27a84e2 · 27a84e2
1 parent 78776a8
commit 27a84e2
Show file tree

Hide file tree

Showing 12 changed files with 51 additions and 14 deletions.
diff --git a/Requestrr.WebApi/ClientApp/package-lock.json b/Requestrr.WebApi/ClientApp/package-lock.json
diff --git a/Requestrr.WebApi/ClientApp/package.json b/Requestrr.WebApi/ClientApp/package.json
@@ -1,6 +1,6 @@
 {
   "name": "Requestrr",
-  "version": "1.0.15",
+  "version": "1.0.16",
   "description": "Requestrr is a server designed to faciliate the request of media through chat applications.",
   "main": "index.js",
   "author": "Darkalfx",

diff --git a/Requestrr.WebApi/ClientApp/src/components/DownloadClients/Overseerr.jsx b/Requestrr.WebApi/ClientApp/src/components/DownloadClients/Overseerr.jsx
@@ -30,6 +30,7 @@ class Overseerr extends React.Component {
       apiKey: "",
       isApiKeyValid: false,
       defaultApiUserID: "",
+      isDefaultApiUserIDValid: true,
       useSSL: "",
       apiVersion: "",
     };
@@ -41,6 +42,7 @@ class Overseerr extends React.Component {
     this.updateStateFromProps = this.updateStateFromProps.bind(this);
     this.validateNonEmptyString = this.validateNonEmptyString.bind(this);
     this.validatePort = this.validatePort.bind(this);
+    this.validateDefaultUserId = this.validateDefaultUserId.bind(this);
   }
 
   componentDidMount() {
@@ -61,6 +63,7 @@ class Overseerr extends React.Component {
       apiKey: props.settings.apiKey,
       isApiKeyValid: false,
       defaultApiUserID: props.settings.defaultApiUserID,
+      isDefaultApiUserIDValid: true,
       useSSL: props.settings.useSSL,
       apiVersion: props.settings.version,
     });
@@ -80,12 +83,17 @@ class Overseerr extends React.Component {
     return /^([0-9]{1,4}|[1-5][0-9]{4}|6[0-4][0-9]{3}|65[0-4][0-9]{2}|655[0-2][0-9]|6553[0-5])$/.test(value);
   }
 
+  validateDefaultUserId = value => {
+    return (!value || value.length === 0 || /^\s*$/.test(value)) || (/^[1-9]\d*$/).test(value);
+  }
+
   onTestSettings = e => {
     e.preventDefault();
 
     if (!this.state.isTestingSettings
       && this.state.isHostnameValid
       && this.state.isPortValid
+      && this.state.isDefaultApiUserIDValid
       && this.state.isApiKeyValid) {
       this.setState({ isTestingSettings: true });
 
@@ -94,6 +102,7 @@ class Overseerr extends React.Component {
         port: this.state.port,
         apiKey: this.state.apiKey,
         useSSL: this.state.useSSL,
+        defaultApiUserID: this.state.defaultApiUserID,
         version: this.state.apiVersion,
       })
         .then(data => {
@@ -140,7 +149,7 @@ class Overseerr extends React.Component {
   }
 
   onValidate() {
-    this.props.onValidate(this.state.isApiKeyValid && this.state.isHostnameValid && this.state.isPortValid);
+    this.props.onValidate(this.state.isApiKeyValid && this.state.isHostnameValid && this.state.isPortValid && this.state.isDefaultApiUserIDValid);
   }
 
   render() {
@@ -200,12 +209,17 @@ class Overseerr extends React.Component {
             </Col>
           </Row>
           <Row>
-          <Col lg="6">
-              <Textbox
+            <Col lg="6">
+              <ValidatedTextbox
                 name="Default Overseerr User ID for requests"
                 placeholder="Enter default user ID (Optional)"
+                alertClassName="mt-3 mb-0"
+                errorMessage="The user id must be a number."
+                isSubmitted={this.props.isSubmitted}
                 value={this.state.defaultApiUserID}
-                onChange={newDefaultApiUserID => this.setState({ defaultApiUserID: newDefaultApiUserID }, this.onValueChange)} />
+                validation={this.validateDefaultUserId}
+                onChange={newDefaultApiUserID => this.setState({ defaultApiUserID: newDefaultApiUserID }, this.onValueChange)}
+                onValidate={isValid => this.setState({ isDefaultApiUserIDValid: isValid }, this.onValidate)} />
             </Col>
             <Col lg="6"></Col>
           </Row>
@@ -250,7 +264,7 @@ class Overseerr extends React.Component {
           <Row>
             <Col>
               <FormGroup className="text-right">
-                <button onClick={this.onTestSettings} disabled={!this.state.isHostnameValid || !this.state.isPortValid || !this.state.isApiKeyValid} className="btn btn-icon btn-3 btn-default" type="button">
+                <button onClick={this.onTestSettings} disabled={!this.state.isHostnameValid || !this.state.isPortValid || !this.state.isApiKeyValid || !this.state.isDefaultApiUserIDValid} className="btn btn-icon btn-3 btn-default" type="button">
                   <span className="btn-inner--icon">
                     {
                       this.state.isTestingSettings ? (

diff --git a/Requestrr.WebApi/ClientApp/src/components/Footers/AdminFooter.jsx b/Requestrr.WebApi/ClientApp/src/components/Footers/AdminFooter.jsx
@@ -29,7 +29,7 @@ class Footer extends React.Component {
           <Col xl="6">
             <div className="copyright text-center text-xl-left text-muted">
               © {new Date().getFullYear()}{" "}
-              Requestrr (v1.0.15)
+              Requestrr (v1.0.16)
             </div>
           </Col>
         </Row>

diff --git a/Requestrr.WebApi/ClientApp/src/components/Footers/AuthFooter.jsx b/Requestrr.WebApi/ClientApp/src/components/Footers/AuthFooter.jsx
@@ -31,7 +31,7 @@ class AuthFooter extends React.Component {
               <Col xl="6">
                 <div className="copyright text-center text-xl-left text-muted">
                   © {new Date().getFullYear()}{" "}
-                  Requestrr (v1.0.15)
+                  Requestrr (v1.0.16)
                 </div>
               </Col>
             </Row>

diff --git a/Requestrr.WebApi/ClientApp/src/store/actions/MovieClientsActions.jsx b/Requestrr.WebApi/ClientApp/src/store/actions/MovieClientsActions.jsx
@@ -103,6 +103,7 @@ export function testOverseerrSettings(settings) {
                 "Hostname": settings.hostname,
                 "Port": Number(settings.port),
                 "ApiKey": settings.apiKey,
+                'DefaultApiUserID': settings.defaultApiUserID,
                 "UseSSL": settings.useSSL,
                 "Version": settings.version,
             })

diff --git a/Requestrr.WebApi/ClientApp/src/store/actions/TvShowsClientsActions.jsx b/Requestrr.WebApi/ClientApp/src/store/actions/TvShowsClientsActions.jsx
@@ -103,6 +103,7 @@ export function testOverseerrSettings(settings) {
                 "Hostname": settings.hostname,
                 "Port": Number(settings.port),
                 "ApiKey": settings.apiKey,
+                'DefaultApiUserID': settings.defaultApiUserID,
                 "UseSSL": settings.useSSL,
                 "Version": settings.version,
             })

diff --git a/Requestrr.WebApi/ClientApp/src/views/ChatClients.jsx b/Requestrr.WebApi/ClientApp/src/views/ChatClients.jsx
@@ -444,7 +444,7 @@ class ChatClients extends React.Component {
                               name="Channel(s) to monitor"
                               create={true}
                               searchable={true}
-                              placeholder="Enter channels here. Leave blank for all channels."
+                              placeholder="Enter channels names here. Leave blank for all channels."
                               labelField="name"
                               valueField="id"
                               dropdownHandle={false}

diff --git a/Requestrr.WebApi/Controllers/DownloadClients/Overseerr/OverseerrClientController.cs b/Requestrr.WebApi/Controllers/DownloadClients/Overseerr/OverseerrClientController.cs
@@ -38,6 +38,7 @@ public async Task<IActionResult> TestOverseerrSettings([FromBody]TestOverseerrSe
                     Hostname = model.Hostname.Trim(),
                     Port = model.Port,
                     UseSSL = model.UseSSL,
+                    DefaultApiUserID = model.DefaultApiUserID,
                     Version = model.Version,
                 });
 

diff --git a/Requestrr.WebApi/Controllers/DownloadClients/Overseerr/OverseerrSettingsModel.cs b/Requestrr.WebApi/Controllers/DownloadClients/Overseerr/OverseerrSettingsModel.cs
@@ -2,6 +2,5 @@
 {
     public class OverseerrSettingsModel : TestOverseerrSettingsModel
     {
-        public string DefaultApiUserID { get; set; }
     }
 }
diff --git a/Requestrr.WebApi/Controllers/DownloadClients/Overseerr/TestOverseerrSettingsModel.cs b/Requestrr.WebApi/Controllers/DownloadClients/Overseerr/TestOverseerrSettingsModel.cs
@@ -12,6 +12,7 @@ public class TestOverseerrSettingsModel
         public string ApiKey { get; set; }
         [Required]
         public bool UseSSL { get; set; }
+        public string DefaultApiUserID { get; set; }
         [Required]
         public string Version { get; set; }
     }

diff --git a/Requestrr.WebApi/RequestrrBot/DownloadClients/Overseerr/OverseerrClient.cs b/Requestrr.WebApi/RequestrrBot/DownloadClients/Overseerr/OverseerrClient.cs
@@ -63,6 +63,26 @@ public static async Task TestConnectionAsync(HttpClient httpClient, ILogger<Over
                     throw new Exception("Invalid host and/or port");
                 }
 
+                if (!string.IsNullOrWhiteSpace(settings.DefaultApiUserID))
+                {
+                    if (!int.TryParse(settings.DefaultApiUserID, out var userId))
+                    {
+                        throw new Exception("Overseerr default user ID must be a number.");
+                    }
+
+                    response = await HttpGetAsync(httpClient, settings, $"{GetBaseURL(settings)}user/{userId}");
+
+                    try
+                    {
+                        await response.ThrowIfNotSuccessfulAsync("OverseerrFindSpecificUser failed", x => x.error);
+                    }
+                    catch (System.Exception ex)
+                    {
+                        logger.LogWarning(ex, $"Default overseerr user with user id  \"{userId}\" could not found: " + ex.Message);
+                        throw new Exception($"Default overseerr user with user id \"{userId}\" could not found.");
+                    }
+                }
+
                 testSuccessful = true;
             }
             catch (HttpRequestException ex)
@@ -154,7 +174,7 @@ public async Task<IReadOnlyList<Movie>> SearchMovieAsync(string movieName)
         {
             try
             {
-                var response = await HttpGetAsync($"{BaseURL}search/?query={movieName}&page=1&language=en");
+                var response = await HttpGetAsync($"{BaseURL}search/?query={Uri.EscapeDataString(movieName)}&page=1&language=en");
                 await response.ThrowIfNotSuccessfulAsync("OverseerrMovieSearch failed", x => x.error);
 
                 var jsonResponse = await response.Content.ReadAsStringAsync();
@@ -231,7 +251,7 @@ async Task<IReadOnlyList<SearchedTvShow>> ITvShowSearcher.SearchTvShowAsync(stri
         {
             try
             {
-                var response = await HttpGetAsync($"{BaseURL}search/?query={tvShowName}&page=1&language=en");
+                var response = await HttpGetAsync($"{BaseURL}search/?query={Uri.EscapeDataString(tvShowName)}&page=1&language=en");
                 await response.ThrowIfNotSuccessfulAsync("OverseerrTvShowSearch failed", x => x.error);
 
                 var jsonResponse = await response.Content.ReadAsStringAsync();
@@ -361,7 +381,7 @@ private async Task<JSONUserNotificationSettings> GetUserNotificationSettings(int
         {
             var response = await HttpGetAsync($"{BaseURL}user/{userId}/settings/notifications");
             var jsonResponse = await response.Content.ReadAsStringAsync();
-            await response.ThrowIfNotSuccessfulAsync("OverseerrFindSpecificUsers failed", x => x.error);
+            await response.ThrowIfNotSuccessfulAsync("OverseerrFindSpecificUserNotifications failed", x => x.error);
 
             return JsonConvert.DeserializeObject<JSONUserNotificationSettings>(jsonResponse);
         }