Skip to content

Commit e6ebf2d

Browse files
authored
Remove migration routine (#1535)
* Plenty of notice for this... no excuses. * Leaving redirect conditionals in as this probably won't be the only instance we need this down the line. Post #1347 #1353 Auto-merge
1 parent 717a2f2 commit e6ebf2d

File tree

1 file changed

+2
-51
lines changed

1 file changed

+2
-51
lines changed

libs/passportVerify.js

+2-51
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ var allStrategies = require('../controllers/strategies.json');
1919
exports.verify = function (aId, aStrategy, aUsername, aLoggedIn, aDone) {
2020
var shasum = crypto.createHash('sha256');
2121
var digest = null;
22-
var digestUnsecure = null;
2322
var query = {};
2423
var ids = [];
2524

@@ -89,56 +88,8 @@ exports.verify = function (aId, aStrategy, aUsername, aLoggedIn, aDone) {
8988
}
9089
} else if (aUser) {
9190
// user was found matching name but can't be authenticated
92-
93-
if (aStrategy === 'steam') {
94-
// Attempt to recover from http to https switch #1347
95-
if (new Date(aUser._since) < new Date('2018-04-05T00:00:00.000Z')) {
96-
97-
digestUnsecure = crypto.createHash('sha256').update(String(aId)
98-
.replace(/^https:/, 'http:')).digest('hex');
99-
pos = aUser.auths.indexOf(digestUnsecure);
100-
101-
if (pos > -1) {
102-
if (aUser.strategies[pos] === 'steam') {
103-
aUser.auths[pos] = digest;
104-
105-
aUser.markModified('auths');
106-
aUser.save(function (aErr, aUser) {
107-
if (aErr) {
108-
console.error('UNRECOVERED STEAM AUTH WITH ERROR WRITE',
109-
aUser.name, digestUnsecure, '->', digest);
110-
111-
aDone(null, false, 'username recovery failed');
112-
return;
113-
}
114-
115-
console.log('RECOVERED STEAM AUTH',
116-
aUser.name, digestUnsecure, '->', digest);
117-
118-
aDone(null, false, 'username recovered');
119-
return;
120-
});
121-
} else {
122-
console.warn('UNRECOVERED STEAM AUTH',
123-
aUser.name, digestUnsecure, '->', digest,
124-
'WARNING TYPE', aUser.strategies[pos]);
125-
126-
aDone(null, false, 'username multi-auth collision');
127-
return;
128-
}
129-
} else {
130-
aDone(null, false, 'username is taken');
131-
return;
132-
}
133-
} else {
134-
aDone(null, false, 'username is taken');
135-
return;
136-
}
137-
138-
} else {
139-
aDone(null, false, 'username is taken');
140-
return;
141-
}
91+
aDone(null, false, 'username is taken');
92+
return;
14293
} else {
14394
// Check for strategy readonly
14495
if (allStrategies[aStrategy].readonly) {

0 commit comments

Comments
 (0)