From a0f1895e6cb9a6bdba9be4ce3106e4ded83a2df5 Mon Sep 17 00:00:00 2001
From: Joe Tretter <joerg.tretter@gmail.com>
Date: Thu, 9 May 2024 16:22:18 -0500
Subject: [PATCH] Change the callback port to 2222 so that no sudo is needed.

---
 .gitignore                                 |  6 ++++++
 allSymbols.json.example => allSymbols.json |  0
 codeReceiveServer.py                       |  4 ++--
 getNewAccessToken.sh                       |  3 +++
 getNewRefreshToken.sh                      | 10 +++++++---
 5 files changed, 18 insertions(+), 5 deletions(-)
 rename allSymbols.json.example => allSymbols.json (100%)

diff --git a/.gitignore b/.gitignore
index c1c19d0..0bd77b0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,9 @@
 access_token.dat
 data/*
 temp/*
+appCredentials.dat
+refresh_token.dat
+Unstaged changes after reset:
+M	.gitignore
+appKey.dat
+cert.pem
diff --git a/allSymbols.json.example b/allSymbols.json
similarity index 100%
rename from allSymbols.json.example
rename to allSymbols.json
diff --git a/codeReceiveServer.py b/codeReceiveServer.py
index a82ffe8..0665d80 100755
--- a/codeReceiveServer.py
+++ b/codeReceiveServer.py
@@ -1,11 +1,11 @@
-#!/bin/python
+#!/bin/python3
 
 import http.server, ssl, socketserver
 import urllib.parse
 
 context = ssl.SSLContext(ssl.PROTOCOL_TLS_SERVER)
 context.load_cert_chain("cert.pem") # PUT YOUR cert.pem HERE
-server_address = ("0.0.0.0", 443) # CHANGE THIS IP & PORT
+server_address = ("0.0.0.0", 2222) # CHANGE THIS IP & PORT
 #handler = http.server.SimpleHTTPRequestHandler
 
 #class MyHandler(http.server.SimpleHTTPRequestHandler):
diff --git a/getNewAccessToken.sh b/getNewAccessToken.sh
index 51c44ad..c9bcdeb 100755
--- a/getNewAccessToken.sh
+++ b/getNewAccessToken.sh
@@ -1,5 +1,8 @@
 #!/bin/bash
 #set -x
+
+mkdir -p temp
+
 curl -s -X POST https://api.schwabapi.com/v1/oauth/token \
   -H "Authorization: Basic $(<appCredentials.dat)" \
   -H 'Content-Type: application/x-www-form-urlencoded' \
diff --git a/getNewRefreshToken.sh b/getNewRefreshToken.sh
index 4c779ce..6c17a28 100755
--- a/getNewRefreshToken.sh
+++ b/getNewRefreshToken.sh
@@ -1,18 +1,22 @@
 #!/bin/bash
 #set -x
+
+mkdir -p temp
+
 myIP=$(ip a | grep 'inet.*192.168.10' | awk -F "[ /]*" '{print $3}')
 curl -s "https://ddns.kawomi.com/?domain=cstradebotcallback&address=${myIP}"
 echo
 
-echo OPEN URL: "https://api.schwabapi.com/v1/oauth/authorize?client_id=$(<appKey.dat)&redirect_uri=https://cstradebotcallback.ddns.kawomi.com/"
+echo OPEN URL: "https://api.schwabapi.com/v1/oauth/authorize?client_id=$(<appKey.dat)&redirect_uri=https://cstradebotcallback.ddns.kawomi.com:2222/"
 echo
-theCode=$(sudo ./codeReceiveServer.py)
+#theCode=$(sudo ./codeReceiveServer.py)
+theCode=$(./codeReceiveServer.py)
 echo Code is $theCode
 
 curl -s -X POST "https://api.schwabapi.com/v1/oauth/token" \
   -H "Authorization: Basic $(<appCredentials.dat)" \
   -H 'Content-Type: application/x-www-form-urlencoded' \
-  -d "grant_type=authorization_code&code=${theCode}&redirect_uri=https://cstradebotcallback.ddns.kawomi.com/" > temp/refreshTokenReqResp.$$.json
+  -d "grant_type=authorization_code&code=${theCode}&redirect_uri=https://cstradebotcallback.ddns.kawomi.com:2222/" > temp/refreshTokenReqResp.$$.json
 jq -r .refresh_token temp/refreshTokenReqResp.$$.json > refresh_token.dat
 echo Refresh Token: $(<refresh_token.dat)