Merge pull request #8331 from sagemathinc/fix-sso-separator

sso/auth: fix silly mistake in e879895

Author: haraldschilly

src/packages/server/auth/sso/types.ts

@@ -68,14 +68,17 @@ export interface StrategyConf {
   };
   auth_opts?: AuthenticateOptions;
   // return type has to partially fit with passport_login
-  login_info: {
-    id: string | LoginInfoDerivator<string>; // id is required!
-    first_name?: string | LoginInfoDerivator<string>;
-    last_name?: string | LoginInfoDerivator<string>;
-    full_name?: string | LoginInfoDerivator<string>;
-    emails?: string | LoginInfoDerivator<string[]>;
-  };
+  login_info: LoginInfo;
   userinfoURL?: string; // OAuth2, to get a profile
   update_on_login?: boolean; // if true, update the user's profile on login
   cookie_ttl_s?: number; // how long the remember_me cookied lasts (default is a month or so)
 }
+
+export type LoginInfo = Readonly<{
+  id: string | LoginInfoDerivator<string>; // id is required!
+  first_name?: string | LoginInfoDerivator<string>;
+  last_name?: string | LoginInfoDerivator<string>;
+  full_name?: string | LoginInfoDerivator<string>;
+  emails?: string | LoginInfoDerivator<string[]>;
+  _sep?: string;
+}>;

src/packages/server/hub/auth.ts

@@ -57,6 +57,7 @@ import { addUserProfileCallback } from "@cocalc/server/auth/sso/oauth2-user-prof
 import { PassportLogin } from "@cocalc/server/auth/sso/passport-login";
 import {
   InitPassport,
+  LoginInfo,
   PassportManagerOpts,
   StrategyConf,
   StrategyInstanceOpts,
@@ -144,7 +145,7 @@ interface HandleReturnOpts {
   type: PassportTypes;
   update_on_login: boolean;
   cookie_ttl_s: number | undefined;
-  login_info;
+  login_info: LoginInfo;
 }
 
 export class PassportManager {
@@ -656,9 +657,11 @@ export class PassportManager {
         site_url: this.site_url,
       };
 
-      const dotInstance = this.getDot(login_info);
+      const dotInstance =
+        typeof login_info._sep === "string" ? new dot(login_info._sep) : dot;
 
       for (const k in login_info) {
+        if (k === "_sep") continue; // used above, not useful here
         const v = login_info[k];
         const param: string | string[] =
           typeof v == "function"
@@ -690,18 +693,6 @@ export class PassportManager {
     };
   }
 
-  private getDot(login_info): DotObject.Dot {
-    // if login_info contains a key "_delimiter", take it from that object and remove it
-    // then instantiate dot with that delimiter and use it to pick the values
-    if (typeof login_info._sep === "string") {
-      const sep = login_info._sep;
-      delete login_info._sep;
-      return new dot(sep);
-    } else {
-      return dot;
-    }
-  }
-
   // right now, we only set this for OAauth2 (SAML knows what to do on its own)
   // This does not encode any information for now.
   private setState(