Kaynağa Gözat

Separate matrix user removal script generation

Bob Mottram 7 yıl önce
ebeveyn
işleme
3fb870a6ff
1 değiştirilmiş dosya ile 8 ekleme ve 5 silme
  1. 8
    5
      src/freedombone-app-matrix

+ 8
- 5
src/freedombone-app-matrix Dosyayı Görüntüle

329
     matrix_configure_homeserver_yaml "${turnkey}" $homeserver_config
329
     matrix_configure_homeserver_yaml "${turnkey}" $homeserver_config
330
 }
330
 }
331
 
331
 
332
-function remove_user_matrix {
333
-    remove_username="$1"
334
-
335
-    ${PROJECT_NAME}-pass -u $remove_username --rmapp matrix
336
-
332
+function create_matrix_user_removal_script {
337
     read_config_param MY_USERNAME
333
     read_config_param MY_USERNAME
338
     read_config_param MATRIX_DOMAIN_NAME
334
     read_config_param MATRIX_DOMAIN_NAME
339
 
335
 
349
     echo "curl -X POST 'https://$MATRIX_DOMAIN_NAME/_matrix/client/r0/admin/deactivate/%40\$remove_username%3A$MATRIX_DOMAIN_NAME?access_token=\$TOKEN' --data '{}'" >> $matrix_remove_user
345
     echo "curl -X POST 'https://$MATRIX_DOMAIN_NAME/_matrix/client/r0/admin/deactivate/%40\$remove_username%3A$MATRIX_DOMAIN_NAME?access_token=\$TOKEN' --data '{}'" >> $matrix_remove_user
350
 
346
 
351
     chmod +x $matrix_remove_user
347
     chmod +x $matrix_remove_user
348
+}
352
 
349
 
350
+function remove_user_matrix {
351
+    remove_username="$1"
352
+
353
+    create_matrix_user_removal_script
354
+    ${PROJECT_NAME}-pass -u $remove_username --rmapp matrix
353
     $matrix_remove_user "$remove_username"
355
     $matrix_remove_user "$remove_username"
354
 }
356
 }
355
 
357
 
796
         echo $'Failed to add matrix admin user';
798
         echo $'Failed to add matrix admin user';
797
         exit 879352
799
         exit 879352
798
     fi
800
     fi
801
+    create_matrix_user_removal_script
799
 
802
 
800
     set_completion_param "matrix domain" "$MATRIX_DOMAIN_NAME"
803
     set_completion_param "matrix domain" "$MATRIX_DOMAIN_NAME"
801
 
804