fix(logout): use isBasicAuth attribute · npm/cli@1c4eff7 (original) (raw)
`@@ -29,7 +29,7 @@ const logout = new Logout(npm)
`
29
29
`t.test('token logout', async (t) => {
`
30
30
`t.plan(6)
`
31
31
``
32
``
`-
flatOptions.token = '@foo/'
`
``
32
`+
flatOptions['//registry.npmjs.org/:_authToken'] = '@foo/'
`
33
33
``
34
34
`npmlog.verbose = (title, msg) => {
`
35
35
`t.equal(title, 'logout', 'should have correcct log prefix')
`
`@@ -63,7 +63,7 @@ t.test('token logout', async (t) => {
`
63
63
`opts: {
`
64
64
`registry: 'https://registry.npmjs.org/',
`
65
65
`scope: '',
`
66
``
`-
token: '@foo/',
`
``
66
`+
'//registry.npmjs.org/:_authToken': '@foo/',
`
67
67
`method: 'DELETE',
`
68
68
`ignoreBody: true,
`
69
69
`},
`
`@@ -87,7 +87,8 @@ t.test('token logout', async (t) => {
`
87
87
`t.test('token scoped logout', async (t) => {
`
88
88
`t.plan(8)
`
89
89
``
90
``
`-
flatOptions.token = '@foo/'
`
``
90
`+
flatOptions['//diff-registry.npmjs.com/:_authToken'] = '@bar/'
`
``
91
`+
flatOptions['//registry.npmjs.org/:_authToken'] = '@foo/'
`
91
92
`config.scope = '@myscope'
`
92
93
`config['@myscope:registry'] = 'https://diff-registry.npmjs.com/'
`
93
94
`flatOptions.scope = '@myscope'
`
`@@ -130,12 +131,13 @@ t.test('token scoped logout', async (t) => {
`
130
131
`t.same(
`
131
132
`result,
`
132
133
`{
`
133
``
`-
url: '/-/user/token/%40foo%2F',
`
``
134
`+
url: '/-/user/token/%40bar%2F',
`
134
135
`opts: {
`
135
136
`registry: 'https://registry.npmjs.org/',
`
136
137
`'@myscope:registry': 'https://diff-registry.npmjs.com/',
`
137
138
`scope: '@myscope',
`
138
``
`-
token: '@foo/',
`
``
139
`+
'//registry.npmjs.org/:_authToken': '@foo/', // <- removed by npm-registry-fetch
`
``
140
`+
'//diff-registry.npmjs.com/:_authToken': '@bar/',
`
139
141
`method: 'DELETE',
`
140
142
`ignoreBody: true,
`
141
143
`},
`
`@@ -144,8 +146,10 @@ t.test('token scoped logout', async (t) => {
`
144
146
`)
`
145
147
``
146
148
`config.scope = ''
`
``
149
`+
delete flatOptions['//diff-registry.npmjs.com/:_authToken']
`
``
150
`+
delete flatOptions['//registry.npmjs.org/:_authToken']
`
147
151
`delete config['@myscope:registry']
`
148
``
`-
delete flatOptions.token
`
``
152
`+
delete flatOptions.scope
`
149
153
`result = null
`
150
154
`mocks['npm-registry-fetch'] = null
`
151
155
`config.clearCredentialsByURI = null
`
`@@ -161,11 +165,11 @@ t.test('token scoped logout', async (t) => {
`
161
165
`t.test('user/pass logout', async (t) => {
`
162
166
`t.plan(3)
`
163
167
``
164
``
`-
flatOptions.username = 'foo'
`
165
``
`-
flatOptions.password = 'bar'
`
``
168
`+
flatOptions['//registry.npmjs.org/:username'] = 'foo'
`
``
169
`+
flatOptions['//registry.npmjs.org/:_password'] = 'bar'
`
166
170
``
167
171
`npmlog.verbose = (title, msg) => {
`
168
``
`-
t.equal(title, 'logout', 'should have correcct log prefix')
`
``
172
`+
t.equal(title, 'logout', 'should have correct log prefix')
`
169
173
`t.equal(
`
170
174
`msg,
`
171
175
`'clearing user credentials for https://registry.npmjs.org/',
`
`@@ -180,8 +184,8 @@ t.test('user/pass logout', async (t) => {
`
180
184
`logout.exec([], (err) => {
`
181
185
`t.error(err, 'should not error out')
`
182
186
``
183
``
`-
delete flatOptions.username
`
184
``
`-
delete flatOptions.password
`
``
187
`+
delete flatOptions['//registry.npmjs.org/:username']
`
``
188
`+
delete flatOptions['//registry.npmjs.org/:_password']
`
185
189
`npm.config.clearCredentialsByURI = null
`
186
190
`npm.config.save = null
`
187
191
`npmlog.verbose = null
`
`@@ -206,7 +210,7 @@ t.test('missing credentials', (t) => {
`
206
210
`t.test('ignore invalid scoped registry config', async (t) => {
`
207
211
`t.plan(5)
`
208
212
``
209
``
`-
flatOptions.token = '@foo/'
`
``
213
`+
flatOptions['//registry.npmjs.org/:_authToken'] = '@foo/'
`
210
214
`config.scope = '@myscope'
`
211
215
`flatOptions['@myscope:registry'] = ''
`
212
216
``
`@@ -239,10 +243,9 @@ t.test('ignore invalid scoped registry config', async (t) => {
`
239
243
`{
`
240
244
`url: '/-/user/token/%40foo%2F',
`
241
245
`opts: {
`
``
246
`+
'//registry.npmjs.org/:_authToken': '@foo/',
`
242
247
`registry: 'https://registry.npmjs.org/',
`
243
``
`-
scope: '@myscope',
`
244
248
`'@myscope:registry': '',
`
245
``
`-
token: '@foo/',
`
246
249
`method: 'DELETE',
`
247
250
`ignoreBody: true,
`
248
251
`},
`