[neon/ubuntu-core] /: Revert "Use canonical as authority-id if the account is not verified"

[Kevin Ottens]

Git commit 1d26f0663974f9e62b36aa65ee00fb8cf8dc1a90 by Kevin Ottens.
Committed on 04/04/2024 at 14:51.
Pushed by ervin into branch 'master'.

Revert "Use canonical as authority-id if the account is not verified"

This reverts commit 18497ffda71ec3542224fead6c11bce3e8d88bb4.

M  +1    -8    finalize-json.sh

https://invent.kde.org/neon/ubuntu-core/-/commit/1d26f0663974f9e62b36aa65ee00fb8cf8dc1a90

diff --git a/finalize-json.sh b/finalize-json.sh
index a5e5dac..b3e8765 100755
--- a/finalize-json.sh
+++ b/finalize-json.sh
@@ -5,16 +5,9 @@ INPUT=$2
 OUTPUT=$3
 
 UBUNTU_ID=`snapcraft whoami | grep '^id:' | awk '{print $2;}'`
-ACCOUNT_VALIDATION=`snap known --remote account account-id=$UBUNTU_ID | grep '^validation:' | awk '{print $2;}'`
 TIMESTAMP=`date -Iseconds --utc`
-
-AUTHORITY_ID="canonical"
-if [ $ACCOUNT_VALIDATION = "verified" ]; then
-  AUTHORITY_ID=$UBUNTU_ID
-fi
-
 JQ_SCRIPT="
-  .[\"authority-id\"] = \"$AUTHORITY_ID\" |
+  .[\"authority-id\"] = \"$UBUNTU_ID\" | 
   .[\"brand-id\"] = \"$UBUNTU_ID\" |
   .[\"grade\"] = \"$GRADE\" |
   .[\"display-name\"] = (.[\"display-name\"] + \", $GRADE\") |