forked from STI/Astroport.ONE
review login/logout for G(eo)UZenCard types
This commit is contained in:
parent
e2ba742772
commit
ad8cfdaf27
|
@ -155,14 +155,14 @@ if [[ ${QRCODE:0:5} == "~~~~~" ]]; then
|
||||||
${MY_PATH}/../tools/keygen -t duniter -o ~/.zen/tmp/${MOATS}/secret.key "$salt" "$pepper"
|
${MY_PATH}/../tools/keygen -t duniter -o ~/.zen/tmp/${MOATS}/secret.key "$salt" "$pepper"
|
||||||
G1PUB=$(cat ~/.zen/tmp/${MOATS}/secret.key | grep 'pub:' | cut -d ' ' -f 2)
|
G1PUB=$(cat ~/.zen/tmp/${MOATS}/secret.key | grep 'pub:' | cut -d ' ' -f 2)
|
||||||
|
|
||||||
echo "${MY_PATH}/../tools/jaklis/jaklis.py balance -p ${G1PUB}"
|
echo "COINScheck.sh ${G1PUB}"
|
||||||
${MY_PATH}/../tools/COINScheck.sh ${G1PUB} > ~/.zen/tmp/${G1PUB}.curcoin
|
${MY_PATH}/../tools/COINScheck.sh ${G1PUB} > ~/.zen/tmp/${G1PUB}.curcoin
|
||||||
cat ~/.zen/tmp/${G1PUB}.curcoin
|
cat ~/.zen/tmp/${G1PUB}.curcoin
|
||||||
CURCOINS=$(cat ~/.zen/tmp/${G1PUB}.curcoin | tail -n 1 | cut -d '.' -f 1) ## ROUNDED G1 COIN
|
CURCOINS=$(cat ~/.zen/tmp/${G1PUB}.curcoin | tail -n 1 | cut -d '.' -f 1) ## ROUNDED G1 COIN
|
||||||
CURZEN=$(echo "($CURCOINS - 1) * 10" | bc | cut -d '.' -f 1)
|
CURZEN=$(echo "($CURCOINS - 1) * 10" | bc | cut -d '.' -f 1)
|
||||||
echo "SOURCE WALLET : $CURCOINS G1 / $CURZEN ZEN"
|
echo "= $CURCOINS G1 / $CURZEN ZEN"
|
||||||
|
|
||||||
[[ ${WHAT} == "" ]] && echo "<br> Missing amount <br>" >> ~/.zen/tmp/${MOATS}/disco
|
[[ ${WHAT} == "" ]] && echo "<br> Missing WHAT <br>" >> ~/.zen/tmp/${MOATS}/disco
|
||||||
[[ ${VAL} == "" || ${VAL} == "undefined" ]] && echo "<br> Missing Destination PublicKey <br>" >> ~/.zen/tmp/${MOATS}/disco
|
[[ ${VAL} == "" || ${VAL} == "undefined" ]] && echo "<br> Missing Destination PublicKey <br>" >> ~/.zen/tmp/${MOATS}/disco
|
||||||
|
|
||||||
G1DEST=$(echo "$VAL" | cut -d ':' -f 1) ## G1PUB:CHK format
|
G1DEST=$(echo "$VAL" | cut -d ':' -f 1) ## G1PUB:CHK format
|
||||||
|
@ -172,7 +172,7 @@ if [[ ${QRCODE:0:5} == "~~~~~" ]]; then
|
||||||
## GET DESTINATION ACCOUNT AMOUNT
|
## GET DESTINATION ACCOUNT AMOUNT
|
||||||
DESTM=$(${MY_PATH}/../tools/COINScheck.sh ${G1DEST} | tail -n 1)
|
DESTM=$(${MY_PATH}/../tools/COINScheck.sh ${G1DEST} | tail -n 1)
|
||||||
DESTMZEN=$(echo "($DESTM - 1) * 10" | bc | cut -d '.' -f 1)
|
DESTMZEN=$(echo "($DESTM - 1) * 10" | bc | cut -d '.' -f 1)
|
||||||
echo "DEST WALLET : $DESTM G1 / $DESTMZEN ZEN"
|
echo "DEST WALLET = $DESTM G1 / $DESTMZEN ZEN"
|
||||||
|
|
||||||
if [[ ${APPNAME} == "pay" ]]; then
|
if [[ ${APPNAME} == "pay" ]]; then
|
||||||
|
|
||||||
|
@ -254,11 +254,22 @@ if [[ ${QRCODE:0:5} == "~~~~~" ]]; then
|
||||||
##############################################
|
##############################################
|
||||||
if [[ ${APPNAME} == "logout" ]]; then
|
if [[ ${APPNAME} == "logout" ]]; then
|
||||||
|
|
||||||
|
player=$(echo "${salt}" | cut -d '_' -f 1 | cut -d ' ' -f 1) ## EMAIL_dice_words kind
|
||||||
## REMOVE PLAYER IPNS KEY FROM STATION
|
## REMOVE PLAYER IPNS KEY FROM STATION
|
||||||
[[ "${salt}" =~ ^[a-zA-Z0-9.%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4}$ ]] \
|
[[ "${player}" =~ ^[a-zA-Z0-9.%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4}$ ]] \
|
||||||
&& PLAYER=${salt} \
|
&& PLAYER=${player} \
|
||||||
|| PLAYER=${WHAT}
|
|| PLAYER=${WHAT}
|
||||||
|
|
||||||
|
ISTHERE=$(ipfs key list -l | grep -w ${PLAYER} | cut -d ' ' -f1)
|
||||||
|
if [[ ! ${ISTHERE} ]]; then
|
||||||
|
(
|
||||||
|
echo "$HTTPCORS
|
||||||
|
LOGIN ERROR<br>Could not find PLAYER on ZEN Station" | nc -l -p ${PORT} -q 1 > /dev/null 2>&1 \
|
||||||
|
&& echo "ERROR PLAYER SLURP"
|
||||||
|
) &
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
|
||||||
echo "TW : $myIPFS/ipns/$(ipfs key list -l | grep -w ${PLAYER} | cut -d ' ' -f1)" > ~/.zen/tmp/${MOATS}/${MOATS}.log
|
echo "TW : $myIPFS/ipns/$(ipfs key list -l | grep -w ${PLAYER} | cut -d ' ' -f1)" > ~/.zen/tmp/${MOATS}/${MOATS}.log
|
||||||
echo "<h1>$PLAYER LOGOUT ...</h1>" >> ~/.zen/tmp/${MOATS}/${MOATS}.log
|
echo "<h1>$PLAYER LOGOUT ...</h1>" >> ~/.zen/tmp/${MOATS}/${MOATS}.log
|
||||||
ipfs key rm ${G1PUB} >> ~/.zen/tmp/${MOATS}/${MOATS}.log
|
ipfs key rm ${G1PUB} >> ~/.zen/tmp/${MOATS}/${MOATS}.log
|
||||||
|
@ -275,8 +286,10 @@ if [[ ${QRCODE:0:5} == "~~~~~" ]]; then
|
||||||
|
|
||||||
if [[ ${APPNAME} == "login" ]]; then
|
if [[ ${APPNAME} == "login" ]]; then
|
||||||
|
|
||||||
[[ "${salt}" =~ ^[a-zA-Z0-9.%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4}$ ]] \
|
player=$(echo "${salt}" | cut -d '_' -f 1 | cut -d ' ' -f 1) ## EMAIL_dice_words kind
|
||||||
&& PLAYER=${salt} \
|
|
||||||
|
[[ "${player}" =~ ^[a-zA-Z0-9.%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4}$ ]] \
|
||||||
|
&& PLAYER=${player} \
|
||||||
|| PLAYER=${WHAT}
|
|| PLAYER=${WHAT}
|
||||||
|
|
||||||
ISTHERE=$(ipfs key list -l | grep -w ${PLAYER} | cut -d ' ' -f1)
|
ISTHERE=$(ipfs key list -l | grep -w ${PLAYER} | cut -d ' ' -f1)
|
||||||
|
|
|
@ -167,14 +167,15 @@ echo "UMAPNS : ${myIPFS}/ipns/${UMAPNS}"
|
||||||
|
|
||||||
## ALL TEST PASSED -> CREATE ZENCARD + ASTROID
|
## ALL TEST PASSED -> CREATE ZENCARD + ASTROID
|
||||||
NPASS=$(echo "${RANDOM}${RANDOM}${RANDOM}${RANDOM}" | tail -c-9) ## NOUVEAU PASS 8 CHIFFRES
|
NPASS=$(echo "${RANDOM}${RANDOM}${RANDOM}${RANDOM}" | tail -c-9) ## NOUVEAU PASS 8 CHIFFRES
|
||||||
PPASS=$(head /dev/urandom | tr -dc 'A-Za-z0-9' | head -c 4) ## STRONGER TW SECURITY "AlpH4nUm"
|
PPASS=$(head /dev/urandom | tr -dc 'A-Za-z0-9' | head -c 2) ## STRONGER TW SECURITY "AlpH4nUm"
|
||||||
|
DPASS=$(head /dev/urandom | tr -dc 'A-Za-z0-9' | head -c 2) ## STRONGER TW SECURITY "AlpH4nUm"
|
||||||
NPASS=$(head /dev/urandom | tr -dc 'A-Za-z0-9' | head -c 10) ## STRONGER TW SECURITY "AlpH4nUm"
|
NPASS=$(head /dev/urandom | tr -dc 'A-Za-z0-9' | head -c 10) ## STRONGER TW SECURITY "AlpH4nUm"
|
||||||
|
|
||||||
## CREATE ASTRONAUTE TW ON CURRENT ASTROPORT
|
## CREATE ASTRONAUTE TW ON CURRENT ASTROPORT
|
||||||
(
|
(
|
||||||
echo VISA.new.sh "${EMAIL}" "${NPASS}" "${EMAIL}" "UPlanet" "/ipns/${UMAPNS}" "${LAT}" "${LON}"
|
echo VISA.new.sh "${EMAIL}_${PPASS}_${DPASS}" "${NPASS}" "${EMAIL}" "UPlanet" "/ipns/${UMAPNS}" "${LAT}" "${LON}"
|
||||||
##### (☉_☉ ) #######
|
##### (☉_☉ ) #######
|
||||||
${MY_PATH}/../RUNTIME/VISA.new.sh "${EMAIL} ${PPASS}" "${NPASS}" "${EMAIL}" "UPlanet" "/ipns/${UMAPNS}" "${LAT}" "${LON}" >> ~/.zen/tmp/email.${EMAIL}.${MOATS}.txt
|
${MY_PATH}/../RUNTIME/VISA.new.sh "${EMAIL}_${PPASS}_${DPASS}" "${NPASS}" "${EMAIL}" "UPlanet" "/ipns/${UMAPNS}" "${LAT}" "${LON}" >> ~/.zen/tmp/email.${EMAIL}.${MOATS}.txt
|
||||||
|
|
||||||
# ${MY_PATH}/../tools/mailjet.sh "${EMAIL}" ~/.zen/tmp/email.${EMAIL}.${MOATS}.txt ## Send VISA.new log to EMAIL
|
# ${MY_PATH}/../tools/mailjet.sh "${EMAIL}" ~/.zen/tmp/email.${EMAIL}.${MOATS}.txt ## Send VISA.new log to EMAIL
|
||||||
|
|
||||||
|
@ -227,7 +228,7 @@ echo "$HTTPCORS
|
||||||
<h1>UPlanet Registration</h1>
|
<h1>UPlanet Registration</h1>
|
||||||
Your AstroID seeds are:<br>
|
Your AstroID seeds are:<br>
|
||||||
<br>
|
<br>
|
||||||
<h2>${EMAIL}</h2>
|
<h2>${EMAIL}_${PPASS}_${DPASS}</h2>
|
||||||
<h1>${NPASS}</h1>
|
<h1>${NPASS}</h1>
|
||||||
|
|
||||||
Generating account...
|
Generating account...
|
||||||
|
|
Loading…
Reference in New Issue