Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
R
Rocket.Chat
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Package Registry
Model registry
Operate
Terraform modules
Analyze
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
RocketChat
Rocket.Chat
Commits
061667f4
Commit
061667f4
authored
4 months ago
by
Guilherme Gazzo
Browse files
Options
Downloads
Patches
Plain Diff
regression: properly overwrite `OAuth._retrievePendingCredential`
parent
d983b7b3
Loading
Loading
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
apps/meteor/app/2fa/server/loginHandler.ts
+2
-2
2 additions, 2 deletions
apps/meteor/app/2fa/server/loginHandler.ts
apps/meteor/definition/externals/meteor/oauth.d.ts
+1
-1
1 addition, 1 deletion
apps/meteor/definition/externals/meteor/oauth.d.ts
with
3 additions
and
3 deletions
apps/meteor/app/2fa/server/loginHandler.ts
+
2
−
2
View file @
061667f4
...
@@ -71,11 +71,11 @@ const recreateError = (errorDoc: Error | Meteor.Error): Error | Meteor.Error =>
...
@@ -71,11 +71,11 @@ const recreateError = (errorDoc: Error | Meteor.Error): Error | Meteor.Error =>
return
copyTo
(
errorDoc
,
error
);
return
copyTo
(
errorDoc
,
error
);
};
};
OAuth
.
_retrievePendingCredential
=
function
(
key
,
...
args
):
string
|
Error
|
void
{
OAuth
.
_retrievePendingCredential
=
async
function
(
key
,
...
args
):
Promise
<
string
|
Error
|
void
>
{
const
credentialSecret
=
args
.
length
>
0
&&
args
[
0
]
!==
undefined
?
args
[
0
]
:
undefined
;
const
credentialSecret
=
args
.
length
>
0
&&
args
[
0
]
!==
undefined
?
args
[
0
]
:
undefined
;
check
(
key
,
String
);
check
(
key
,
String
);
const
pendingCredential
=
OAuth
.
_pendingCredentials
.
findOne
({
const
pendingCredential
=
await
OAuth
.
_pendingCredentials
.
findOne
Async
({
key
,
key
,
credentialSecret
,
credentialSecret
,
});
});
...
...
This diff is collapsed.
Click to expand it.
apps/meteor/definition/externals/meteor/oauth.d.ts
+
1
−
1
View file @
061667f4
...
@@ -13,7 +13,7 @@ declare module 'meteor/oauth' {
...
@@ -13,7 +13,7 @@ declare module 'meteor/oauth' {
}
}
namespace
OAuth
{
namespace
OAuth
{
function
_retrievePendingCredential
(
key
:
string
,
...
args
:
string
[]):
void
;
function
_retrievePendingCredential
(
key
:
string
,
...
args
:
string
[]):
Promise
<
string
|
Error
|
void
>
;
function
openSecret
(
secret
:
string
):
string
;
function
openSecret
(
secret
:
string
):
string
;
function
retrieveCredential
(
credentialToken
:
string
,
credentialSecret
:
string
);
function
retrieveCredential
(
credentialToken
:
string
,
credentialSecret
:
string
);
function
_retrieveCredentialSecret
(
credentialToken
:
string
):
string
|
null
;
function
_retrieveCredentialSecret
(
credentialToken
:
string
):
string
|
null
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment