From 14a16c5cabdab2d2bc666a685e952ca0d8b5d26d Mon Sep 17 00:00:00 2001
From: Andrea <andrea@avris.it>
Date: Sat, 23 Apr 2022 01:48:40 +0200
Subject: [PATCH] [user] indieauth

---
 components/SocialConnection.vue  |  13 +++----
 components/SocialLogin.vue       |   7 ++--
 package.json                     |   1 +
 server/routes/grantOverrides.js  |  56 +++++++++++++++++++++++++++++--
 server/social.js                 |  10 ++++++
 src/socialProviders.js           |  16 +++++++++
 static/img/indieauth-inverse.png | Bin 0 -> 5553 bytes
 static/img/indieauth.png         | Bin 0 -> 5505 bytes
 yarn.lock                        |  10 ++++++
 9 files changed, 101 insertions(+), 12 deletions(-)
 create mode 100644 static/img/indieauth-inverse.png
 create mode 100644 static/img/indieauth.png

diff --git a/components/SocialConnection.vue b/components/SocialConnection.vue
index 5b9737ce..4b087eaa 100644
--- a/components/SocialConnection.vue
+++ b/components/SocialConnection.vue
@@ -1,13 +1,14 @@
 <template>
     <div class="d-flex flex-column flex-md-row justify-content-between align-items-center">
         <span class="my-2">
-            <Icon :v="providerOptions.icon || provider" set="b"/>
+            <Icon :v="providerOptions.icon || provider" set="b"
+                  :class="[providerOptions.icon && providerOptions.icon.endsWith('.png') ? 'mx-1 invertible' : '']"/>
             {{ providerOptions.name }}
         </span>
         <span v-if="connection === undefined">
             <template v-if="providerOptions.instanceRequired">
                 <form v-if="formShown"
-                      :action="`${homeUrl}/api/user/social-redirect/${provider}/${config.locale}`"
+                      :action="providerOptions.redirectViaHome ? `${homeUrl}/api/user/social-redirect/${provider}/${config.locale}` : `/api/connect/${provider}`"
                       class="input-group input-group-sm">
                     <input type="text" name="instance" class="form-control" autofocus required
                            :placeholder="$t('user.login.instancePlaceholder')"/>
@@ -20,20 +21,20 @@
                     <T>user.socialConnection.connect</T>
                 </button>
             </template>
-            <a v-else :href="`${homeUrl}/api/user/social-redirect/${provider}/${config.locale}`" class="badge bg-light text-dark border">
+            <a v-else :href="providerOptions.redirectViaHome ? `${homeUrl}/api/user/social-redirect/${provider}/${config.locale}` : `/api/connect/${provider}`" class="badge bg-light text-dark border">
                 <Icon v="link"/>
                 <T>user.socialConnection.connect</T>
             </a>
         </span>
         <span v-else class="text-center">
-            <span class="mr-3">
-                <a href="#" @click.prevent="$emit('setAvatar', provider)">
+            <span class="me-2">
+                <a v-if="providerOptions.avatars && connection.avatar" href="#" @click.prevent="$emit('setAvatar', provider)">
                     <Avatar :src="connection.avatar" :user="$user()" dsize="2rem"/>
                 </a>
                 {{connection.name}}
             </span>
             <br class="d-md-none"/>
-            <a :href="`${homeUrl}/api/user/social-redirect/${provider}/${config.locale}` + (providerOptions.instanceRequired ? '?instance=' + connection.name.split('@')[1] : '')"
+            <a :href="(providerOptions.redirectViaHome ? `${homeUrl}/api/user/social-redirect/${provider}/${config.locale}` : `/api/connect/${provider}`) + (providerOptions.instanceRequired ? '?instance=' + connection.name.split('@')[1] : '')"
                     class="badge bg-light text-dark border">
                 <Icon v="sync"/>
                 <T>user.socialConnection.refresh</T>
diff --git a/components/SocialLogin.vue b/components/SocialLogin.vue
index d11bcf2c..1d238634 100644
--- a/components/SocialLogin.vue
+++ b/components/SocialLogin.vue
@@ -3,7 +3,7 @@
         <Icon :v="options.icon || provider" set="b"/>
         {{ options.name }}
 
-        <form :action="`${homeUrl}/api/user/social-redirect/${provider}/${config.locale}`"
+        <form :action="options.redirectViaHome ? `${homeUrl}/api/user/social-redirect/${provider}/${config.locale}` : `/api/connect/${provider}`"
               v-if="options.instanceRequired" class="input-group my-2">
             <input type="text" name="instance" class="form-control" autofocus required ref="instance"
                    :placeholder="$t('user.login.instancePlaceholder')">
@@ -15,10 +15,11 @@
     <button v-else-if="options.instanceRequired && !formShown"
             class="btn btn-outline-primary"
             @click="showForm">
-        <Icon :v="options.icon || provider" set="b"/>
+        <Icon :v="options.icon || provider" set="b"
+              :class="[options.icon && options.icon.endsWith('.png') ? 'mx-1 invertible' : '']"/>
         {{ options.name }}
     </button>
-    <a v-else :href="`${homeUrl}/api/user/social-redirect/${provider}/${config.locale}`"
+    <a v-else :href="options.redirectViaHome ? `${homeUrl}/api/user/social-redirect/${provider}/${config.locale}` : `/api/connect/${provider}`"
        class="btn btn-outline-primary">
         <Icon :v="options.icon || provider" set="b"/>
         {{ options.name }}
diff --git a/package.json b/package.json
index 5377a63e..2363d3f3 100644
--- a/package.json
+++ b/package.json
@@ -42,6 +42,7 @@
     "nuxt": "^2.15.2",
     "pageres": "^6.2.3",
     "qrcode": "^1.5.0",
+    "query-string": "^7.1.1",
     "rtlcss": "^3.1.2",
     "sha1": "^1.1.1",
     "speakeasy": "^2.0.0",
diff --git a/server/routes/grantOverrides.js b/server/routes/grantOverrides.js
index 268fe51c..43906d18 100644
--- a/server/routes/grantOverrides.js
+++ b/server/routes/grantOverrides.js
@@ -6,17 +6,25 @@ import SQL from 'sql-template-strings';
 import fetch from 'node-fetch';
 import assert from 'assert';
 import { handleErrorAsync } from "../../src/helpers";
+import queryString from 'query-string';
 
 const normalizeDomainName = (domain) => {
-    const url = new URL('https://' + domain);
+    const url = new URL('https://' + domain.replace(/^https?:\/\//, ''));
     assert(url.port === '');
     return url.hostname;
 }
 
+const baseUrl = process.env.HOME_URL || 'https://pronouns.page';
+
 const config = {
     mastodon: {
         scopes: ['read:accounts'],
-        redirect_uri: `${process.env.HOME_URL || 'https://pronouns.page'}/api/user/social/mastodon`,
+        redirect_uri: `${baseUrl}/api/user/social/mastodon`,
+    },
+    indieauth: {
+        server_uri: 'https://indieauth.com/auth',
+        client_id: baseUrl,
+        redirect_uri: `${baseUrl}/api/user/social/indieauth`,
     },
 };
 
@@ -52,6 +60,7 @@ const mastodonGetOAuthKeys = async (db, instance) => {
     `);
     return keys;
 };
+
 router.get('/connect/mastodon', handleErrorAsync(async (req, res) => {
     assert(req.query.instance);
     const instance = normalizeDomainName(req.query.instance);
@@ -64,6 +73,7 @@ router.get('/connect/mastodon', handleErrorAsync(async (req, res) => {
         response_type: 'code',
     }));
 }));
+
 router.get('/user/social/mastodon', handleErrorAsync(async (req, res, next) => {
     if (!req.session.grant || !req.session.grant.instance || !req.query.code) {
         next();
@@ -99,7 +109,47 @@ router.get('/user/social/mastodon', handleErrorAsync(async (req, res, next) => {
     response.instance = instance;
     req.session.grant.response = response;
     next();
-    return;
+}));
+
+router.get('/connect/indieauth', handleErrorAsync(async (req, res) => {
+    assert(req.query.instance);
+    const instance = normalizeDomainName(req.query.instance);
+    req.session.grant = { instance };
+    res.redirect(`${config.indieauth.server_uri}?` + new URLSearchParams({
+        me: `https://${instance}`,
+        client_id: config.indieauth.client_id,
+        redirect_uri: config.indieauth.redirect_uri,
+    }));
+}));
+
+router.get('/user/social/indieauth', handleErrorAsync(async (req, res, next) => {
+    if (!req.session.grant || !req.session.grant.instance || !req.query.code) { next(); return; }
+
+    const response = await fetch(config.indieauth.server_uri, {
+        method: 'POST',
+        body: new URLSearchParams({
+            code: req.query.code,
+            client_id: config.indieauth.client_id,
+            redirect_uri: config.indieauth.redirect_uri,
+        }).toString(),
+        headers: {
+            'Content-Type': 'application/x-www-form-urlencoded',
+            'User-Agent': 'pronouns.page',
+        },
+    }).then(res => res.text());
+
+    const profile = queryString.parse(response);
+
+    if (!profile || !profile.me) { next(); return; }
+
+    profile.domain = normalizeDomainName(profile.me);
+
+    req.session.grant.response = {
+        profile,
+        instance: req.session.grant.instance,
+        access_token: true,
+    };
+    next();
 }));
 
 export default router;
diff --git a/server/social.js b/server/social.js
index 4d0a8963..9f3713e9 100644
--- a/server/social.js
+++ b/server/social.js
@@ -32,6 +32,7 @@ module.exports.config = {
     },
     // non-grant, but things break if it's not there
     mastodon: {},
+    indieauth: {},
 }
 
 module.exports.handlers = {
@@ -84,6 +85,15 @@ module.exports.handlers = {
             name: acct,
             avatar: r.profile.avatar,
             access_token: r.access_token,
+            instance: r.instance,
         };
     },
+    indieauth(r) {
+        return {
+            id: r.profile.me,
+            email: 'indieauth@' + r.profile.domain,
+            name: r.profile.domain,
+            instance: r.instance,
+        }
+    },
 };
diff --git a/src/socialProviders.js b/src/socialProviders.js
index 8a6343d2..36250a6d 100644
--- a/src/socialProviders.js
+++ b/src/socialProviders.js
@@ -3,18 +3,34 @@ export const socialProviders = {
         name: 'Mastodon',
         instanceRequired: true,
         linkRegex: (p) => `^https?://(?:www.)?${p.name.split('@')[1]}/(?:(?:web/)?@|users/)?${p.name.split('@')[0]}/?$`,
+        avatars: true,
+    },
+    indieauth: {
+        name: 'IndieAuth',
+        instanceRequired: true,
+        icon: 'indieauth.png',
+        iconMargin: true,
+        avatars: false,
     },
     twitter: {
         name: 'Twitter',
         linkRegex: (p) => `^https?://(?:www.)?twitter.com/${p.name}/?$`,
+        redirectViaHome: true,
+        avatars: true,
     },
     discord: {
         name: 'Discord',
+        redirectViaHome: true,
+        avatars: true,
     },
     facebook: {
         name: 'Facebook',
+        redirectViaHome: true,
+        avatars: false,
     },
     google: {
         name: 'Google',
+        redirectViaHome: true,
+        avatars: true,
     },
 }
diff --git a/static/img/indieauth-inverse.png b/static/img/indieauth-inverse.png
new file mode 100644
index 0000000000000000000000000000000000000000..5a48219bdba12cbee39cf52b4a88e6c1459ccd8b
GIT binary patch
literal 5553
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
I!kxA5zn}PmcmMzZ

literal 0
HcmV?d00001

diff --git a/static/img/indieauth.png b/static/img/indieauth.png
new file mode 100644
index 0000000000000000000000000000000000000000..9a5b7cc2b78feed87dd6f83ff5614af3e82ee8cb
GIT binary patch
literal 5505
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
Hu+;woj!0ln

literal 0
HcmV?d00001

diff --git a/yarn.lock b/yarn.lock
index 743a8346..73714abe 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8467,6 +8467,16 @@ query-string@^6.13.8:
     split-on-first "^1.0.0"
     strict-uri-encode "^2.0.0"
 
+query-string@^7.1.1:
+  version "7.1.1"
+  resolved "https://registry.yarnpkg.com/query-string/-/query-string-7.1.1.tgz#754620669db978625a90f635f12617c271a088e1"
+  integrity sha512-MplouLRDHBZSG9z7fpuAAcI7aAYjDLhtsiVZsevsfaHWDS2IDdORKbSd1kWUA+V4zyva/HZoSfpwnYMMQDhb0w==
+  dependencies:
+    decode-uri-component "^0.2.0"
+    filter-obj "^1.1.0"
+    split-on-first "^1.0.0"
+    strict-uri-encode "^2.0.0"
+
 querystring-es3@^0.2.0:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/querystring-es3/-/querystring-es3-0.2.1.tgz#9ec61f79049875707d69414596fd907a4d711e73"