3.1.0.1 release

SSO-Auth/SSO-Auth.csproj

@@ -3,8 +3,8 @@
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
     <RootNamespace>Jellyfin.Plugin.SSO_Auth</RootNamespace>
-    <AssemblyVersion>3.1.0.0</AssemblyVersion>
-    <FileVersion>3.1.0.0</FileVersion>
+    <AssemblyVersion>3.1.0.1</AssemblyVersion>
+    <FileVersion>3.1.0.1</FileVersion>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
   </PropertyGroup>

SSO-Auth/WebResponse.cs

@@ -393,6 +393,10 @@ function getDeviceName() {
     return deviceName;
 }
 
+const sleep = (milliseconds) => {
+    return new Promise(resolve => setTimeout(resolve, milliseconds))
+}
+
 ";
 
     public static string Generator(string data, string provider, string baseUrl, string mode)
@@ -400,44 +404,45 @@ function getDeviceName() {
         return Base + @"
 async function main() {
     var data = '" + data + @"';
-    if (localStorage.getItem(""_deviceId2"") == null || localStorage.getItem(""jellyfin_credentials"") == null) {
+    while (localStorage.getItem(""_deviceId2"") == null ||
+        localStorage.getItem(""jellyfin_credentials"") == null ||
+        JSON.parse(localStorage.getItem(""jellyfin_credentials""))['Servers'][0]['Id'] == null) {
         // If localStorage isn't initialized yet, try again.
-        setTimeout(main, 100);
-    } else {
-        var deviceId = localStorage.getItem(""_deviceId2"");
-        var appName = ""Jellyfin Web"";
-        var appVersion = ""10.8.0"";
-        var deviceName = getDeviceName();
-        var provider = '" + provider + @"';
-
-        var request = {deviceId, appName, appVersion, deviceName, data, provider: '" + provider + @"'};
-
-        var url = '" + baseUrl + "/sso/" + mode + @"/Auth';
-
-        let response = await new Promise(resolve => {
-           var xhr = new XMLHttpRequest();
-           xhr.open('POST', url, true);
-           xhr.setRequestHeader('Content-Type', 'application/json');
-           xhr.setRequestHeader('Accept', 'application/json');
-           xhr.onload = function(e) {
-             resolve(xhr.response);
-           };
-           xhr.onerror = function () {
-             resolve(undefined);
-           };
-           xhr.send(JSON.stringify(request));
-        })
-        var responseJson = JSON.parse(response);
-        var userId = 'user-' + responseJson['User']['Id'] + '-' + responseJson['User']['ServerId'];
-        responseJson['User']['EnableAutoLogin'] = true;
-        localStorage.setItem(userId, JSON.stringify(responseJson['User']));
-        var jfCreds = JSON.parse(localStorage.getItem('jellyfin_credentials'));
-        jfCreds['Servers'][0]['AccessToken'] = responseJson['AccessToken'];
-        jfCreds['Servers'][0]['UserId'] = responseJson['User']['Id'];
-        localStorage.setItem('jellyfin_credentials', JSON.stringify(jfCreds));
-        localStorage.setItem('enableAutoLogin', 'true');
-        window.location.replace('" + baseUrl + @"');
+        await sleep(100);
     }
+    var deviceId = localStorage.getItem(""_deviceId2"");
+    var appName = ""Jellyfin Web"";
+    var appVersion = ""10.8.0"";
+    var deviceName = getDeviceName();
+    var provider = '" + provider + @"';
+
+    var request = {deviceId, appName, appVersion, deviceName, data, provider: '" + provider + @"'};
+
+    var url = '" + baseUrl + "/sso/" + mode + @"/Auth';
+
+    let response = await new Promise(resolve => {
+       var xhr = new XMLHttpRequest();
+       xhr.open('POST', url, true);
+       xhr.setRequestHeader('Content-Type', 'application/json');
+       xhr.setRequestHeader('Accept', 'application/json');
+       xhr.onload = function(e) {
+         resolve(xhr.response);
+       };
+       xhr.onerror = function () {
+         resolve(undefined);
+       };
+       xhr.send(JSON.stringify(request));
+    })
+    var responseJson = JSON.parse(response);
+    var userId = 'user-' + responseJson['User']['Id'] + '-' + responseJson['User']['ServerId'];
+    responseJson['User']['EnableAutoLogin'] = true;
+    localStorage.setItem(userId, JSON.stringify(responseJson['User']));
+    var jfCreds = JSON.parse(localStorage.getItem('jellyfin_credentials'));
+    jfCreds['Servers'][0]['AccessToken'] = responseJson['AccessToken'];
+    jfCreds['Servers'][0]['UserId'] = responseJson['User']['Id'];
+    localStorage.setItem('jellyfin_credentials', JSON.stringify(jfCreds));
+    localStorage.setItem('enableAutoLogin', 'true');
+    window.location.replace('" + baseUrl + @"');
 }
 
 document.addEventListener('DOMContentLoaded', function () {
@@ -445,6 +450,6 @@ document.addEventListener('DOMContentLoaded', function () {
 });
 
 // https://stackoverflow.com/a/25435165
-</script><iframe class='docs-texteventtarget-iframe' src='" + baseUrl + "' style='position: absolute;width:0;height:0;border:0;'></iframe></body></html>";
+</script><iframe class='docs-texteventtarget-iframe' sandbox='allow-same-origin allow-forms allow-scripts' src='" + baseUrl + "' style='position: absolute;width:0;height:0;border:0;'></iframe></body></html>";
     }
 }

build.yaml

@@ -1,7 +1,7 @@
 name: "SSO Authentication"
 guid: "505ce9d1-d916-42fa-86ca-673ef241d7df"
 imageUrl: "https://raw.githubusercontent.com/9p4/jellyfin-plugin-sso/main/img/logo.png"
-version: "3.1.0.0"
+version: "3.1.0.1"
 targetAbi: "10.8.0.0"
 framework: "net6.0"
 owner: "9p4"
@@ -15,6 +15,7 @@ artifacts:
   - "IdentityModel.OidcClient.dll"
   - "IdentityModel.dll"
 changelog: |
+  3.1.0.1: Fix redirect bug in WebResponse (#7)
   3.1.0.0: Simplify auth flow so loading the web UI is not required
   3.0.0.0: Add more RBAC features and option to unregister user from SSO
   2.0.1.0: Fix improper artifact loading