Simplify token creation

diff --git a/bluesky/bluesky.php b/bluesky/bluesky.php
index 7c0bafbc07545868921811c5a79bb99afec3f9db..e83b7fd7084f4d598af3d3a80e87b1fc65ac65fa 100644 (file)
--- a/bluesky/bluesky.php
+++ b/bluesky/bluesky.php
@@ -46,7 +46,9 @@ function bluesky_settings(array &$data)
        $host        = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'bluesky', 'host') ?: 'https://bsky.social';
        $handle      = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'bluesky', 'handle');
        $did         = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'bluesky', 'did');
-       $username    = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'bluesky', 'username');
+       $token       = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'bluesky', 'access_token');
+
+       $status = $token ? DI::l10n()->t("You are authenticated to Bluesky. For security reasons the password isn't stored.") : DI::l10n()->t('You are not authenticated. Please enter the app password.');
 
        $t    = Renderer::getMarkupTemplate('connector_settings.tpl', 'addon/bluesky/');
        $html = Renderer::replaceMacros($t, [
@@ -55,8 +57,8 @@ function bluesky_settings(array &$data)
                '$host'      => ['bluesky_host', DI::l10n()->t('Bluesky host'), $host, '', '', 'readonly'],
                '$handle'    => ['bluesky_handle', DI::l10n()->t('Bluesky handle'), $handle],
                '$did'       => ['bluesky_did', DI::l10n()->t('Bluesky DID'), $did, DI::l10n()->t('This is the unique identifier. It will be fetched automatically, when the handle is entered.'), '', 'readonly'],
-               '$username'  => ['bluesky_username', DI::l10n()->t('Bluesky app username'), $username, DI::l10n()->t("Please don't add your real username here, but instead create a specific app username and app password in the Bluesky settings.")],
-               '$password'  => ['bluesky_password', DI::l10n()->t('Bluesky app password'), ''],
+               '$password'  => ['bluesky_password', DI::l10n()->t('Bluesky app password'), '', DI::l10n()->t("Please don't add your real password here, but instead create a specific app password in the Bluesky settings.")],
+               '$status'    => $status
        ]);
 
        $data = [
@@ -85,11 +87,6 @@ function bluesky_settings_post(array &$b)
        DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'bluesky', 'post_by_default', intval($_POST['bluesky_bydefault']));
        DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'bluesky', 'host',            $host);
        DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'bluesky', 'handle',          $handle);
-       DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'bluesky', 'username',        $_POST['bluesky_username']);
-
-       if (!empty($_POST['bluesky_password'])) {
-               DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'bluesky', 'app_password', $_POST['bluesky_password']);
-       }
 
        if (!empty($host) && !empty($handle)) {
                if (empty($old_did) || $old_host != $host || $old_handle != $handle) {
@@ -98,6 +95,11 @@ function bluesky_settings_post(array &$b)
        } else {
                DI::pConfig()->delete(DI::userSession()->getLocalUserId(), 'bluesky', 'did');
        }
+
+       if (!empty($_POST['bluesky_password'])) {
+               bluesky_create_token(DI::userSession()->getLocalUserId(), $_POST['bluesky_password']);
+       }
+
 }
 
 function bluesky_jot_nets(array &$jotnets_fields)
@@ -301,7 +303,7 @@ function bluesky_get_token(int $uid): string
        $token   = DI::pConfig()->get($uid, 'bluesky', 'access_token');
        $created = DI::pConfig()->get($uid, 'bluesky', 'token_created');
        if (empty($token)) {
-               return bluesky_create_token($uid);
+               return '';
        }
 
        if ($created + 300 < time()) {
@@ -326,10 +328,9 @@ function bluesky_refresh_token(int $uid): string
        return $data->accessJwt;
 }
 
-function bluesky_create_token(int $uid): string
+function bluesky_create_token(int $uid, string $password): string
 {
-       $did      = DI::pConfig()->get($uid, 'bluesky', 'did');
-       $password = DI::pConfig()->get($uid, 'bluesky', 'app_password');
+       $did = DI::pConfig()->get($uid, 'bluesky', 'did');
 
        $data = bluesky_post($uid, '/xrpc/com.atproto.server.createSession', json_encode(['identifier' => $did, 'password' => $password]), ['Content-type' => 'application/json']);
        if (empty($data)) {

diff --git a/bluesky/lang/C/messages.po b/bluesky/lang/C/messages.po
index 6e37d8d694a9d399e0691ebab76fdba9b2b6515d..a910f06163f8f87562dc062d918154541d87abcc 100644 (file)
--- a/bluesky/lang/C/messages.po
+++ b/bluesky/lang/C/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-05-21 16:55+0000\n"
+"POT-Creation-Date: 2023-05-21 19:24+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,50 +17,56 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: bluesky.php:52
+#: bluesky.php:51
+msgid ""
+"You are authenticated to Bluesky. For security reasons the password isn't "
+"stored."
+msgstr ""
+
+#: bluesky.php:51
+msgid "You are not authenticated. Please enter the app password."
+msgstr ""
+
+#: bluesky.php:55
 msgid "Enable Bluesky Post Addon"
 msgstr ""
 
-#: bluesky.php:53
+#: bluesky.php:56
 msgid "Post to Bluesky by default"
 msgstr ""
 
-#: bluesky.php:54
+#: bluesky.php:57
 msgid "Bluesky host"
 msgstr ""
 
-#: bluesky.php:55
+#: bluesky.php:58
 msgid "Bluesky handle"
 msgstr ""
 
-#: bluesky.php:56
+#: bluesky.php:59
 msgid "Bluesky DID"
 msgstr ""
 
-#: bluesky.php:56
+#: bluesky.php:59
 msgid ""
 "This is the unique identifier. It will be fetched automatically, when the "
 "handle is entered."
 msgstr ""
 
-#: bluesky.php:57
-msgid "Bluesky app username"
+#: bluesky.php:60
+msgid "Bluesky app password"
 msgstr ""
 
-#: bluesky.php:57
+#: bluesky.php:60
 msgid ""
-"Please don't add your real username here, but instead create a specific app "
-"username and app password in the Bluesky settings."
-msgstr ""
-
-#: bluesky.php:58
-msgid "Bluesky app password"
+"Please don't add your real password here, but instead create a specific app "
+"password in the Bluesky settings."
 msgstr ""
 
-#: bluesky.php:63
+#: bluesky.php:66
 msgid "Bluesky Export"
 msgstr ""
 
-#: bluesky.php:113
+#: bluesky.php:116
 msgid "Post to Bluesky"
 msgstr ""

diff --git a/bluesky/templates/connector_settings.tpl b/bluesky/templates/connector_settings.tpl
index 55fab361d886236cd845a98de6457dde6a0d8d4e..264a15d778d2877628208e645aa50ecddc1d5fda 100644 (file)
--- a/bluesky/templates/connector_settings.tpl
+++ b/bluesky/templates/connector_settings.tpl
@@ -1,7 +1,7 @@
+<p>{{$status}}</p>
 {{include file="field_checkbox.tpl" field=$enable}}
 {{include file="field_checkbox.tpl" field=$bydefault}}
 {{include file="field_input.tpl" field=$host}}
 {{include file="field_input.tpl" field=$handle}}
 {{include file="field_input.tpl" field=$did}}
-{{include file="field_input.tpl" field=$username}}
 {{include file="field_input.tpl" field=$password}}
\ No newline at end of file