Merge pull request #5 from StoreDev/feature/generatetoken

Add generate tokens feature

Author: tunip3

AuthCommands.cs

@@ -5,34 +5,83 @@
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using XboxWebApi.Authentication;
+using XboxWebApi.Authentication.Model;
+using XboxWebApi.Common;
+using System.IO;
+using DSharpPlus.Entities;
+using System.Net.Security;
 
 namespace StoreBot
 {
-    public class AuthCommands : BaseCommandModule
-    {
-        [Command("submittoken"), Description("Provide a MSA token to allow for flighted queries, DM ONLY")]
-        public async Task IngestAuthToken(CommandContext cct, string token)
+        public class AuthCommands : BaseCommandModule
         {
-            if(cct.Guild != null)
+            [Command("submittoken"), Description("Provide a MSA token to allow for flighted queries, DM ONLY")]
+            public async Task IngestAuthToken(CommandContext cct, [Description("MSA/Xtoken")] string token)
+            {
+                if (cct.Guild != null)
+                {
+                    var lastmessage = await cct.Channel.GetMessagesAsync(1);
+                    await cct.Channel.DeleteMessageAsync(lastmessage[0]);
+                    await cct.RespondAsync($"{cct.Message.Author.Mention} you must submit your token via a DM to avoid account takeover. Your token may have been exposed, an account relog is recommended.");
+                    return;
+                }
+                ulong DiscordAuthorID = cct.User.Id;
+                if (Program.TokenDictionary.ContainsKey(DiscordAuthorID))
+                {
+                    Program.TokenDictionary.Remove(DiscordAuthorID);
+                    Program.TokenDictionary.Add(DiscordAuthorID, token);
+                    await cct.RespondAsync("Your token has been updated.");
+                    return;
+
+                }
+                Program.TokenDictionary.Add(DiscordAuthorID, token);
+                await cct.RespondAsync($"Your token has been ingested. It will be used for all future commands coming from you. (Discord ID: {DiscordAuthorID})"); ;
+            }
+            [Command("GenerateTokens"), Description("Export tokens from authentication url, run the command with no arguments for more info")]
+            public async Task GenerateTokens(CommandContext cct, [Description("Authentication URL")] Uri tokenuri=null)
+            {
+
+            if (cct.Guild != null)
             {
                 var lastmessage = await cct.Channel.GetMessagesAsync(1);
                 await cct.Channel.DeleteMessageAsync(lastmessage[0]);
                 await cct.RespondAsync($"{cct.Message.Author.Mention} you must submit your token via a DM to avoid account takeover. Your token may have been exposed, an account relog is recommended.");
                 return;
             }
-            ulong DiscordAuthorID = cct.User.Id;
-            if (Program.TokenDictionary.ContainsKey(DiscordAuthorID))
+
+            if (tokenuri == null)
             {
-                Program.TokenDictionary.Remove(DiscordAuthorID);
-                Program.TokenDictionary.Add(DiscordAuthorID, token);
-                await cct.RespondAsync("Your token has been updated.");
+                var inforesponse = new DiscordEmbedBuilder()
+                {
+                    Title="Advanced info",
+                    Description = "The tokenuri parameter is the response from: \nhttps://login.live.com/oauth20_authorize.srf?display=touch&scope=service%3A%3Auser.auth.xboxlive.com%3A%3AMBI_SSL&redirect_uri=https%3A%2F%2Flogin.live.com%2Foauth20_desktop.srf&locale=en&response_type=token&client_id=0000000048093EE3, the full command should look something like:\n`generatetokens https://login.live.com/oauth20_desktop.srf?...access_token=...&refresh_token=...`"
+                };
+                inforesponse.Build();
+                await cct.RespondAsync(null,false,inforesponse);
                 return;
-
             }
-            Program.TokenDictionary.Add(DiscordAuthorID, token);
-            await cct.RespondAsync($"Your token has been ingested. It will be used for all future commands coming from you. (Discord ID: {DiscordAuthorID})"); ;
+            try
+            {
+                await cct.TriggerTypingAsync();
+                WindowsLiveResponse response = AuthenticationService.ParseWindowsLiveResponse(tokenuri.ToString());
+                AuthenticationService authenticator = new AuthenticationService(response);
+                //get user token
+                authenticator.UserToken = await AuthenticationService.AuthenticateXASUAsync(authenticator.AccessToken);
+                //get xtoken
+                authenticator.XToken = await AuthenticationService.AuthenticateXSTSAsync(authenticator.UserToken);
+                //set user information
+                authenticator.UserInformation = authenticator.XToken.UserInformation;
+                //export json
+                Stream stream = new MemoryStream(Encoding.UTF8.GetBytes(AuthenticationService.DumpToJson(authenticator)));
+                //respond with tokens
+                await cct.RespondWithFileAsync("tokens.json", stream);
+            }
+            catch
+            {
+                await cct.RespondAsync("An unknown authentication error occured");
+            }
+            return;
+            }
         }
-
-
     }
-}

StoreBot.csproj

@@ -9,7 +9,8 @@
     <PackageReference Include="DSharpPlus" Version="4.0.0-nightly-00709" />
     <PackageReference Include="DSharpPlus.CommandsNext" Version="4.0.0-nightly-00709" />
     <PackageReference Include="DSharpPlus.Interactivity" Version="4.0.0-nightly-00709" />
-    <PackageReference Include="StoreLib" Version="1.2.0" />
+    <PackageReference Include="OpenXbox.XboxWebApi" Version="0.3.0" />
+    <PackageReference Include="StoreLib" Version="1.2.1" />
   </ItemGroup>
 
 </Project>

StoreCommands.cs

@@ -582,7 +582,7 @@ public async Task convertid(CommandContext cct, [Description("package ID")] stri
             await dcat.QueryDCATAsync(ID,IDType);
             if (dcat.IsFound)
             {
-                if(dcat.ProductListing.Product != null) //One day ill fix the mess that is the StoreLib JSON, one day.
+                if(dcat.ProductListing.Product != null) //One day ill fix the mess that is the StoreLib JSON, one day. Yeah mate just like how one day i'll learn how to fly
                 {
                     dcat.ProductListing.Products = new(); 
                     dcat.ProductListing.Products.Add(dcat.ProductListing.Product);
@@ -608,7 +608,7 @@ public async Task convertid(CommandContext cct, [Description("package ID")] stri
                     productembedded.AddField($"PackageFamilyName:", dcat.ProductListing.Products[0].Properties.PackageFamilyName); //Add the package family name
 
                 }
-                catch(Exception ex) { };
+                catch(Exception ex) { Console.WriteLine(ex); };
                 productembedded.Build();
                 await cct.RespondAsync("", false, productembedded);
             }