Skip to content

Commit ade2115

Browse files
authored
Merge branch 'master' into ss-admin-auth-features
2 parents 9dca306 + 209c0f5 commit ade2115

File tree

33 files changed

+7770
-7302
lines changed

33 files changed

+7770
-7302
lines changed

.github/workflows/node.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,5 @@ jobs:
2929

3030
- run: npm install
3131

32-
- name: "Set up Cloud credentials"
33-
run: echo ${{ secrets.service_account_json_base64 }} | base64 -d > ./scripts/service-account.json
34-
3532
- name: "Lint and Test"
36-
env:
37-
FIREBASE_TOKEN: ${{ secrets.firebase_token }}
3833
run: ./scripts/test.sh

.gitignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,6 @@ firebase-debug.log
99

1010
*-debug.log
1111

12-
.DS_Store
12+
.DS_Store
13+
14+
.idea/

auth/import_users.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ admin.auth().importUsers([{
154154
// All the parameters below can be obtained from the Firebase Console's users section.
155155
// Must be provided in a byte buffer.
156156
key: Buffer.from('base64-secret', 'base64'),
157-
saltSeparator: Buffer.from('base64SaltSeparator', 'base64').toString(),
157+
saltSeparator: Buffer.from('base64SaltSeparator', 'base64'),
158158
rounds: 8,
159159
memoryCost: 14
160160
}

auth/manage_users.js

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -170,20 +170,6 @@ admin.auth().deleteUser(uid)
170170
});
171171
// [END delete_user]
172172

173-
// [START bulk_delete_users]
174-
admin.auth().deleteUsers([uid1, uid2, uid3])
175-
.then(function(deleteUsersResult) {
176-
console.log('Successfully deleted ' + deleteUsersResult.successCount + ' users');
177-
console.log('Failed to delete ' + deleteUsersResult.failureCount + ' users');
178-
deleteUsersResult.errors.forEach(function(err) {
179-
console.log(err.error.toJSON());
180-
});
181-
})
182-
.catch(function(error) {
183-
console.log('Error deleting users:', error);
184-
});
185-
// [END bulk_delete_users]
186-
187173
// [START list_all_users]
188174
function listAllUsers(nextPageToken) {
189175
// List batch of users, 1000 at a time.
@@ -203,4 +189,4 @@ function listAllUsers(nextPageToken) {
203189
}
204190
// Start listing users from the beginning, 1000 at a time.
205191
listAllUsers();
206-
// [END list_all_users]
192+
// [END list_all_users]

0 commit comments

Comments
 (0)