Merge pull request #49 from 6nz/main

Added auto-login example, user data dumping to auth file on login,removed unused modules, replaced sys.exit with os._exit(1) cuz os._exit calls the C function _exit() which does an immediate program termination(sys.exit can't stop threads), added a few "detailed" comments
+smaller keyauth.py file size when compiled bc removed all the unused modules

Author: 6nz

keyauth.py

@@ -5,16 +5,10 @@
 
 import binascii  # hex encoding
 
-  # https requests
-
 from uuid import uuid4  # gen random guid
-import webbrowser
 import platform
-import subprocess
-import datetime
-import sys
 import os
-import requests
+import requests # https requests
 from requests_toolbelt.adapters.fingerprint import FingerprintAdapter
 
 try:
@@ -70,7 +64,7 @@ def init(self):
 
         if response == "KeyAuth_Invalid":
             print("The application doesn't exist")
-            sys.exit()
+            os._exit(1)
 
         response = encryption.decrypt(response, self.secret, init_iv)
         json = jsond.loads(response)
@@ -80,14 +74,14 @@ def init(self):
                 print("New Version Available")
                 download_link = json["download"]
                 os.system(f"start {download_link}")
-                sys.exit()
+                os._exit(1)
             else:
                 print("Invalid Version, Contact owner to add download link to latest app version")
-                sys.exit()
+                os._exit(1)
 
         if not json["success"]:
             print(json["message"])
-            sys.exit()
+            os._exit(1)
 
         self.sessionid = json["sessionid"]
         self.initialized = True
@@ -123,7 +117,7 @@ def register(self, user, password, license, hwid=None):
             self.__load_user_data(json["info"])
         else:
             print(json["message"])
-            sys.exit()
+            os._exit(1)
 
     def upgrade(self, user, license):
         self.checkinit()
@@ -148,10 +142,10 @@ def upgrade(self, user, license):
         if json["success"]:
             print("successfully upgraded user")
             print("please restart program and login")
-            sys.exit()
+            os._exit(1)
         else:
             print(json["message"])
-            sys.exit()
+            os._exit(1)
 
     def login(self, user, password, hwid=None):
         self.checkinit()
@@ -182,7 +176,7 @@ def login(self, user, password, hwid=None):
             print("successfully logged in")
         else:
             print(json["message"])
-            sys.exit()
+            os._exit(1)
 
     def license(self, key, hwid=None):
         self.checkinit()
@@ -211,7 +205,7 @@ def license(self, key, hwid=None):
             print("successfully logged into license")
         else:
             print(json["message"])
-            sys.exit()
+            os._exit(1)
 
     def var(self, name):
         self.checkinit()
@@ -237,7 +231,7 @@ def var(self, name):
         else:
             print(json["message"])
             time.sleep(5)
-            sys.exit()
+            os._exit(1)
 
     def getvar(self, var_name):
         self.checkinit()
@@ -260,7 +254,7 @@ def getvar(self, var_name):
         else:
             print(json["message"])
             time.sleep(5)
-            sys.exit()
+            os._exit(1)
 
     def setvar(self, var_name, var_data):
         self.checkinit()
@@ -283,7 +277,7 @@ def setvar(self, var_name, var_data):
         else:
             print(json["message"])
             time.sleep(5)
-            sys.exit()    
+            os._exit(1)    
 
     def ban(self):
         self.checkinit()
@@ -304,7 +298,7 @@ def ban(self):
         else:
             print(json["message"])
             time.sleep(5)
-            sys.exit()    
+            os._exit(1)    
 
     def file(self, fileid):
         self.checkinit()
@@ -328,7 +322,7 @@ def file(self, fileid):
         if not json["success"]:
             print(json["message"])
             time.sleep(5)
-            sys.exit()
+            os._exit(1)
         return binascii.unhexlify(json["contents"])
 
     def webhook(self, webid, param):
@@ -355,7 +349,7 @@ def webhook(self, webid, param):
         else:
             print(json["message"])
             time.sleep(5)
-            sys.exit()
+            os._exit(1)
 
     def check(self):
         self.checkinit()
@@ -488,7 +482,7 @@ def chatSend(self, message, channel):
     def checkinit(self):
         if not self.initialized:
             print("Initialize first, in order to use the functions")
-            sys.exit()
+            os._exit(1)
 
     def __do_request(self, post_data):
 
@@ -572,7 +566,7 @@ def encrypt(message, enc_key, iv):
             return encryption.encrypt_string(message.encode(), _key.encode(), _iv.encode()).decode()
         except:
             print("Invalid Application Information. Long text is secret short text is ownerid. Name is supposed to be app name not username")
-            sys.exit()
+            os._exit(1)
 
     @staticmethod
     def decrypt(message, enc_key, iv):
@@ -584,4 +578,4 @@ def decrypt(message, enc_key, iv):
             return encryption.decrypt_string(message.encode(), _key.encode(), _iv.encode()).decode()
         except:
             print("Invalid Application Information. Long text is secret short text is ownerid. Name is supposed to be app name not username")
-            sys.exit()
+            os._exit(1)

main.py

@@ -1,12 +1,13 @@
 from keyauth import api
 import os
-import sys
 import os.path
-import platform
 import hashlib
 from time import sleep
 from datetime import datetime
 
+#import json as jsond 
+#^^ only for auto login/json writing/reading
+
 # watch setup video if you need help https://www.youtube.com/watch?v=L2eAQOmuUiA
 os.system("cls")
 os.system("title Python Example")
@@ -23,11 +24,11 @@ def getchecksum():
 	return digest
 
 keyauthapp = api(
-	name = "",
-	ownerid = "",
-	secret = "",
-	version = "1.0",
-	hash_to_check = getchecksum()
+    name = "", #App name (Manage Applications --> Application name)
+    ownerid = "", #Owner ID (Account-Settings --> OwnerID)
+    secret = "", #App secret(Manage Applications --> App credentials code)
+    version = "1.0",
+    hash_to_check = getchecksum()
 )
 
 print(f"""
@@ -66,7 +67,7 @@ def getchecksum():
 	keyauthapp.license(key)
 else:
 	print("\nNot Valid Option") 
-	sys.exit()
+	os._exit(1)
 
 
 #region Extra Functions
@@ -114,8 +115,121 @@ def getchecksum():
 #* Send chat message
 #keyauthapp.chatSend("MESSAGE", "CHANNEL")
 
+
+#* Auto-Login Example (THIS IS JUST AN EXAMPLE --> YOU WILL HAVE TO EDIT THE CODE PROBABLY)
+#1. Checking and Reading JSON
+
+#### Note: Remove the ''' on line 124 and 183
+
+'''try:
+	if os.path.isfile('auth.json'): #Checking if the auth file exist
+		if jsond.load(open("auth.json"))["authusername"] == "": #Checks if the authusername is empty or not
+			print("""
+1. Login
+2. Register
+			""")
+			ans=input("Select Option: ")  #Skipping auto-login bc auth file is empty
+			if ans=="1": 
+				user = input('Provide username: ')
+				password = input('Provide password: ')
+				keyauthapp.login(user,password)
+			elif ans=="2":
+				user = input('Provide username: ')
+				password = input('Provide password: ')
+				license = input('Provide License: ')
+				keyauthapp.register(user,password,license) 
+			else:
+				print("\nNot Valid Option") 
+				os._exit(1) 
+		else:
+			try: #2. Auto login
+				with open('auth.json', 'r') as f:
+					authfile = jsond.load(f)
+					authuser = authfile.get('authusername')
+					authpass = authfile.get('authpassword')
+					keyauthapp.login(authuser,authpass)
+			except Exception as e: #Error stuff
+				print(e)
+	else: #Creating auth file bc its missing
+		try:
+			f = open("auth.json", "a") #Writing content
+			f.write("""{
+	"authusername": "",
+	"authpassword": ""
+}""")
+			f.close()
+			print ("""
+1. Login
+2. Register
+			""")#Again skipping auto-login bc the file is empty/missing
+			ans=input("Select Option: ") 
+			if ans=="1": 
+				user = input('Provide username: ')
+				password = input('Provide password: ')
+				keyauthapp.login(user,password)
+			elif ans=="2":
+				user = input('Provide username: ')
+				password = input('Provide password: ')
+				license = input('Provide License: ')
+				keyauthapp.register(user,password,license) 
+			else:
+				print("\nNot Valid Option") 
+				os._exit(1) 
+		except Exception as e: #Error stuff
+			print(e)
+			os._exit(1) 
+except Exception as e: #Error stuff
+	print(e)
+	os._exit(1)'''
+
+
+#Writing user data on login:
+#Check Keyauth.py file --> Line 152
+#Replace the whole login function with this login function (This has auto user data dumping, so the user only have to login once)
+#Note: The auto login function above is needed for this bc it creates the auth file, if the auth file is missing this wont work
+
+'''def login(self, user, password, hwid=None):
+	self.checkinit()
+	if hwid is None:
+		hwid = others.get_hwid()
+
+	init_iv = SHA256.new(str(uuid4())[:8].encode()).hexdigest()
+
+	post_data = {
+		"type": binascii.hexlify(("login").encode()),
+		"username": encryption.encrypt(user, self.enckey, init_iv),
+		"pass": encryption.encrypt(password, self.enckey, init_iv),
+		"hwid": encryption.encrypt(hwid, self.enckey, init_iv),
+		"sessionid": binascii.hexlify(self.sessionid.encode()),
+		"name": binascii.hexlify(self.name.encode()),
+		"ownerid": binascii.hexlify(self.ownerid.encode()),
+		"init_iv": init_iv
+	}
+
+	response = self.__do_request(post_data)
+
+	response = encryption.decrypt(response, self.enckey, init_iv)
+
+	json = jsond.loads(response)
+
+	if json["success"]:
+		self.__load_user_data(json["info"])
+		if jsond.load(open("auth.json"))["authusername"] == "": #Check if the authusername is empty so it can write the user data
+			authfile = jsond.load(open("Files/auth.json"))
+			authfile["authusername"] = user #login(self, user)
+			jsond.dump(authfile, open('Files/auth.json', 'w'), sort_keys=False, indent=4) #Dumping username to auth file/You can change the indent
+			authfile["authpassword"] = password #login(self, password)
+			jsond.dump(authfile, open('Files/auth.json', 'w'), sort_keys=False, indent=4) #Dumping password to auth file/You can change the indent 
+		else: #Auth file is filled with data so it skips the user data dumping
+			pass
+		print("successfully logged in")
+	else:
+		print(json["message"])
+		os._exit(1)'''
+
 #endregion
 
+
 print("\nUser data: ") 
 print("Username: " + keyauthapp.user_data.username)
 print("IP address: " + keyauthapp.user_data.ip)
@@ -147,4 +261,4 @@ def getchecksum():
 print(f"Current Session Validation Status: {keyauthapp.check()}")
 print("Exiting in 10 secs....")
 sleep(10)
-sys.exit(0)
+os._exit(1)