fixup: move API mappting to protocol

Author: AlexTugarev

components/dashboard/src/service/json-rpc-authprovider-client.ts

@@ -4,27 +4,24 @@
  * See License.AGPL.txt in the project root for license information.
  */
 
-import { Code, ConnectError, PromiseClient } from "@connectrpc/connect";
 import { PartialMessage } from "@bufbuild/protobuf";
+import { Code, ConnectError, PromiseClient } from "@connectrpc/connect";
 import { AuthProviderService } from "@gitpod/public-api/lib/gitpod/v1/authprovider_connect";
 import {
     CreateAuthProviderRequest,
-    GetAuthProviderRequest,
-    ListAuthProvidersRequest,
-    ListAuthProviderDescriptionsRequest,
-    UpdateAuthProviderRequest,
-    DeleteAuthProviderRequest,
     CreateAuthProviderResponse,
-    ListAuthProvidersResponse,
+    DeleteAuthProviderRequest,
+    DeleteAuthProviderResponse,
+    GetAuthProviderRequest,
     GetAuthProviderResponse,
+    ListAuthProviderDescriptionsRequest,
     ListAuthProviderDescriptionsResponse,
+    ListAuthProvidersRequest,
+    ListAuthProvidersResponse,
+    UpdateAuthProviderRequest,
     UpdateAuthProviderResponse,
-    DeleteAuthProviderResponse,
-    AuthProvider,
-    AuthProviderType,
-    OAuth2Config,
 } from "@gitpod/public-api/lib/gitpod/v1/authprovider_pb";
-import { AuthProviderEntry } from "@gitpod/gitpod-protocol";
+import { converter } from "./public-api";
 import { getGitpodService } from "./service";
 
 export class JsonRpcAuthProviderClient implements PromiseClient<typeof AuthProviderService> {
@@ -49,13 +46,13 @@ export class JsonRpcAuthProviderClient implements PromiseClient<typeof AuthProvi
                 organizationId,
             });
             const response = new ListAuthProvidersResponse();
-            response.list = result.map(toAuthProvider);
+            response.list = result.map(converter.toAuthProvider);
             return response;
         }
         if (userId) {
             const result = await getGitpodService().server.getOwnAuthProviders();
             const response = new ListAuthProvidersResponse();
-            response.list = result.map(toAuthProvider);
+            response.list = result.map(converter.toAuthProvider);
             return response;
         }
         throw new ConnectError("either organizationId or userId are required", Code.InvalidArgument);
@@ -89,37 +86,3 @@ export class JsonRpcAuthProviderClient implements PromiseClient<typeof AuthProvi
         return new DeleteAuthProviderResponse();
     }
 }
-
-function toAuthProvider(entry: AuthProviderEntry): AuthProvider {
-    const ap = new AuthProvider();
-    ap.verified = entry.status === "verified";
-    ap.host = entry.host;
-    ap.id = entry.id;
-    ap.type = toAuthProviderType(entry.type);
-    ap.oauth2Config = toOAuth2Config(entry);
-    ap.scopes = entry.oauth?.scope?.split(entry.oauth?.scopeSeparator || " ") || [];
-    ap.settingsUrl = entry.oauth.settingsUrl;
-    return ap;
-}
-
-function toOAuth2Config(entry: AuthProviderEntry): OAuth2Config {
-    const config = new OAuth2Config();
-    config.clientId = entry.oauth.clientId;
-    config.clientSecret = entry.oauth.clientSecret;
-    return config;
-}
-
-function toAuthProviderType(type: string): AuthProviderType {
-    switch (type) {
-        case "GitHub":
-            return AuthProviderType.GITHUB;
-        case "GitLab":
-            return AuthProviderType.GITLAB;
-        case "Bitbucket":
-            return AuthProviderType.BITBUCKET;
-        case "BitbucketServer":
-            return AuthProviderType.BITBUCKET_SERVER;
-        default:
-            return AuthProviderType.UNSPECIFIED; // not allowed
-    }
-}

components/gitpod-protocol/src/public-api-converter.ts

@@ -4,8 +4,15 @@
  * See License.AGPL.txt in the project root for license information.
  */
 
-import { Code, ConnectError } from "@connectrpc/connect";
 import { Timestamp } from "@bufbuild/protobuf";
+import { Code, ConnectError } from "@connectrpc/connect";
+import { AuthProvider, AuthProviderType, OAuth2Config } from "@gitpod/public-api/lib/gitpod/v1/authprovider_pb";
+import {
+    Organization,
+    OrganizationMember,
+    OrganizationRole,
+    OrganizationSettings,
+} from "@gitpod/public-api/lib/gitpod/v1/organization_pb";
 import {
     AdmissionLevel,
     EditorReference,
@@ -20,37 +27,32 @@ import {
     WorkspacePort_Protocol,
     WorkspaceStatus,
 } from "@gitpod/public-api/lib/gitpod/v1/workspace_pb";
-import {
-    Organization,
-    OrganizationMember,
-    OrganizationRole,
-    OrganizationSettings,
-} from "@gitpod/public-api/lib/gitpod/v1/organization_pb";
+import { ContextURL } from "./context-url";
 import { ApplicationError, ErrorCode, ErrorCodes } from "./messaging/error";
 import {
+    AuthProviderEntry as AuthProviderProtocol,
     CommitContext,
     EnvVarWithValue,
+    Workspace as ProtocolWorkspace,
     WithEnvvarsContext,
     WithPrebuild,
     WorkspaceContext,
     WorkspaceInfo,
-    Workspace as ProtocolWorkspace,
 } from "./protocol";
+import {
+    OrgMemberInfo,
+    OrgMemberRole,
+    OrganizationSettings as OrganizationSettingsProtocol,
+    Organization as ProtocolOrganization,
+} from "./teams-projects-protocol";
+import { TrustedValue } from "./util/scrubbing";
 import {
     ConfigurationIdeConfig,
     PortProtocol,
     WorkspaceInstance,
     WorkspaceInstanceConditions,
     WorkspaceInstancePort,
 } from "./workspace-instance";
-import { ContextURL } from "./context-url";
-import { TrustedValue } from "./util/scrubbing";
-import {
-    Organization as ProtocolOrganization,
-    OrgMemberInfo,
-    OrgMemberRole,
-    OrganizationSettings as OrganizationSettingsProtocol,
-} from "./teams-projects-protocol";
 
 const applicationErrorCode = "application-error-code";
 const applicationErrorData = "application-error-data";
@@ -376,4 +378,50 @@ export class PublicAPIConverter {
         result.defaultWorkspaceImage = settings.defaultWorkspaceImage || undefined;
         return result;
     }
+
+    toAuthProvider(ap: AuthProviderProtocol): AuthProvider {
+        const result = new AuthProvider({
+            id: ap.id,
+            host: ap.host,
+            type: this.toAuthProviderType(ap),
+            verified: ap.status === "verified",
+            settingsUrl: ap.oauth?.settingsUrl,
+            scopes: ap.oauth?.scope?.split(ap.oauth?.scopeSeparator || " ") || [],
+        });
+        if (ap.organizationId) {
+            result.owner = {
+                case: "organizationId",
+                value: ap.organizationId,
+            };
+        } else {
+            result.owner = {
+                case: "ownerId",
+                value: ap.ownerId,
+            };
+        }
+        result.oauth2Config = this.toOAuth2Config(ap);
+        return result;
+    }
+
+    toOAuth2Config(ap: AuthProviderProtocol): OAuth2Config {
+        return new OAuth2Config({
+            clientId: ap.oauth?.clientId,
+            clientSecret: ap.oauth?.clientSecret,
+        });
+    }
+
+    toAuthProviderType(ap: AuthProviderProtocol): AuthProviderType {
+        switch (ap.type) {
+            case "GitHub":
+                return AuthProviderType.GITHUB;
+            case "GitLab":
+                return AuthProviderType.GITLAB;
+            case "Bitbucket":
+                return AuthProviderType.BITBUCKET;
+            case "BitbucketServer":
+                return AuthProviderType.BITBUCKET_SERVER;
+            default:
+                return AuthProviderType.UNSPECIFIED; // not allowed
+        }
+    }
 }