Update deactivation through updateSubjectStatus (bluesky-social#2539)

* attach hosting status to entryway session responses * integrate account deactivation in with entryway * tidy * tidy * chnageset * update changeset
hboon · Jun 4, 2024 · 9495af2 · 9495af2
1 parent c5d36d5
commit 9495af2
Show file tree

Hide file tree

Showing 11 changed files with 42 additions and 1 deletion.
diff --git a/.changeset/thirty-dolls-try.md b/.changeset/thirty-dolls-try.md
@@ -0,0 +1,7 @@
+---
+"@atproto/api": patch
+"@atproto/pds": patch
+"@atproto/dev-env": patch
+---
+
+Allow updating deactivation state through admin.updateSubjectStatus
diff --git a/lexicons/com/atproto/admin/updateSubjectStatus.json b/lexicons/com/atproto/admin/updateSubjectStatus.json
@@ -22,6 +22,10 @@
             "takedown": {
               "type": "ref",
               "ref": "com.atproto.admin.defs#statusAttr"
+            },
+            "deactivated": {
+              "type": "ref",
+              "ref": "com.atproto.admin.defs#statusAttr"
             }
           }
         }

diff --git a/packages/api/src/client/lexicons.ts b/packages/api/src/client/lexicons.ts
@@ -535,6 +535,10 @@ export const schemaDict = {
                 type: 'ref',
                 ref: 'lex:com.atproto.admin.defs#statusAttr',
               },
+              deactivated: {
+                type: 'ref',
+                ref: 'lex:com.atproto.admin.defs#statusAttr',
+              },
             },
           },
         },

diff --git a/packages/api/src/client/types/com/atproto/admin/updateSubjectStatus.ts b/packages/api/src/client/types/com/atproto/admin/updateSubjectStatus.ts
@@ -18,6 +18,7 @@ export interface InputSchema {
     | ComAtprotoAdminDefs.RepoBlobRef
     | { $type: string; [k: string]: unknown }
   takedown?: ComAtprotoAdminDefs.StatusAttr
+  deactivated?: ComAtprotoAdminDefs.StatusAttr
   [k: string]: unknown
 }
 

diff --git a/packages/bsky/src/lexicon/lexicons.ts b/packages/bsky/src/lexicon/lexicons.ts
@@ -535,6 +535,10 @@ export const schemaDict = {
                 type: 'ref',
                 ref: 'lex:com.atproto.admin.defs#statusAttr',
               },
+              deactivated: {
+                type: 'ref',
+                ref: 'lex:com.atproto.admin.defs#statusAttr',
+              },
             },
           },
         },

diff --git a/packages/bsky/src/lexicon/types/com/atproto/admin/updateSubjectStatus.ts b/packages/bsky/src/lexicon/types/com/atproto/admin/updateSubjectStatus.ts
@@ -19,6 +19,7 @@ export interface InputSchema {
     | ComAtprotoAdminDefs.RepoBlobRef
     | { $type: string; [k: string]: unknown }
   takedown?: ComAtprotoAdminDefs.StatusAttr
+  deactivated?: ComAtprotoAdminDefs.StatusAttr
   [k: string]: unknown
 }
 

diff --git a/packages/ozone/src/lexicon/lexicons.ts b/packages/ozone/src/lexicon/lexicons.ts
@@ -535,6 +535,10 @@ export const schemaDict = {
                 type: 'ref',
                 ref: 'lex:com.atproto.admin.defs#statusAttr',
               },
+              deactivated: {
+                type: 'ref',
+                ref: 'lex:com.atproto.admin.defs#statusAttr',
+              },
             },
           },
         },

diff --git a/packages/ozone/src/lexicon/types/com/atproto/admin/updateSubjectStatus.ts b/packages/ozone/src/lexicon/types/com/atproto/admin/updateSubjectStatus.ts
@@ -19,6 +19,7 @@ export interface InputSchema {
     | ComAtprotoAdminDefs.RepoBlobRef
     | { $type: string; [k: string]: unknown }
   takedown?: ComAtprotoAdminDefs.StatusAttr
+  deactivated?: ComAtprotoAdminDefs.StatusAttr
   [k: string]: unknown
 }
 

diff --git a/packages/pds/src/api/com/atproto/admin/updateSubjectStatus.ts b/packages/pds/src/api/com/atproto/admin/updateSubjectStatus.ts
@@ -13,7 +13,7 @@ export default function (server: Server, ctx: AppContext) {
   server.com.atproto.admin.updateSubjectStatus({
     auth: ctx.authVerifier.moderator,
     handler: async ({ input }) => {
-      const { subject, takedown } = input.body
+      const { subject, takedown, deactivated } = input.body
       if (takedown) {
         if (isRepoRef(subject)) {
           await ctx.accountManager.takedownAccount(subject.did, takedown)
@@ -36,6 +36,16 @@ export default function (server: Server, ctx: AppContext) {
         }
       }
 
+      if (deactivated) {
+        if (isRepoRef(subject)) {
+          if (deactivated.applied) {
+            await ctx.accountManager.deactivateAccount(subject.did, null)
+          } else {
+            await ctx.accountManager.activateAccount(subject.did)
+          }
+        }
+      }
+
       return {
         encoding: 'application/json',
         body: {

diff --git a/packages/pds/src/lexicon/lexicons.ts b/packages/pds/src/lexicon/lexicons.ts
@@ -535,6 +535,10 @@ export const schemaDict = {
                 type: 'ref',
                 ref: 'lex:com.atproto.admin.defs#statusAttr',
               },
+              deactivated: {
+                type: 'ref',
+                ref: 'lex:com.atproto.admin.defs#statusAttr',
+              },
             },
           },
         },

diff --git a/packages/pds/src/lexicon/types/com/atproto/admin/updateSubjectStatus.ts b/packages/pds/src/lexicon/types/com/atproto/admin/updateSubjectStatus.ts
@@ -19,6 +19,7 @@ export interface InputSchema {
     | ComAtprotoAdminDefs.RepoBlobRef
     | { $type: string; [k: string]: unknown }
   takedown?: ComAtprotoAdminDefs.StatusAttr
+  deactivated?: ComAtprotoAdminDefs.StatusAttr
   [k: string]: unknown
 }