From eeaf25fce8ef176625c43e02c6404abb3e036f71 Mon Sep 17 00:00:00 2001
From: danztran <ntcthemen11@gmail.com>
Date: Mon, 29 Jun 2020 10:55:54 +0700
Subject: [PATCH] plugin/auth-backend: add gitlab types

---
 .../src/providers/gitlab/provider.ts          | 17 +++++--------
 .../src/providers/gitlab/types.d.ts           | 25 +++++++++++++++++++
 2 files changed, 31 insertions(+), 11 deletions(-)
 create mode 100644 plugins/auth-backend/src/providers/gitlab/types.d.ts

diff --git a/plugins/auth-backend/src/providers/gitlab/provider.ts b/plugins/auth-backend/src/providers/gitlab/provider.ts
index 6e823a83f9..c2b1802708 100644
--- a/plugins/auth-backend/src/providers/gitlab/provider.ts
+++ b/plugins/auth-backend/src/providers/gitlab/provider.ts
@@ -23,7 +23,6 @@ import {
 } from '../../lib/PassportStrategyHelper';
 import {
   OAuthProviderHandlers,
-  OAuthPrivateInfo,
   AuthProviderConfig,
   RedirectInfo,
   EnvironmentProviderConfig,
@@ -89,7 +88,7 @@ export class GitlabAuthProvider implements OAuthProviderHandlers {
         _: any,
         params: any,
         rawProfile: any,
-        done: PassportDoneCallback<OAuthResponse, OAuthPrivateInfo>,
+        done: PassportDoneCallback<OAuthResponse>,
       ) => {
         const oauthResponse = GitlabAuthProvider.transformOAuthResponse(
           accessToken,
@@ -108,15 +107,11 @@ export class GitlabAuthProvider implements OAuthProviderHandlers {
     return await executeRedirectStrategy(req, this._strategy, options);
   }
 
-  async handler(
-    req: express.Request,
-  ): Promise<{ response: OAuthResponse; refreshToken: string }> {
-    const { response } = await executeFrameHandlerStrategy<
-      OAuthResponse,
-      OAuthPrivateInfo
-    >(req, this._strategy);
-
-    return { response };
+  async handler(req: express.Request): Promise<{ response: OAuthResponse }> {
+    return await executeFrameHandlerStrategy<OAuthResponse>(
+      req,
+      this._strategy,
+    );
   }
 }
 
diff --git a/plugins/auth-backend/src/providers/gitlab/types.d.ts b/plugins/auth-backend/src/providers/gitlab/types.d.ts
new file mode 100644
index 0000000000..8cd7373c52
--- /dev/null
+++ b/plugins/auth-backend/src/providers/gitlab/types.d.ts
@@ -0,0 +1,25 @@
+/*
+ * Copyright 2020 Spotify AB
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+declare module 'passport-gitlab2' {
+  import { Request } from 'express';
+  import { StrategyCreated } from 'passport';
+
+  export class Strategy {
+    constructor(options: any, verify: any);
+    authenticate(this: StrategyCreated<this>, req: Request, options?: any): any;
+  }
+}