@boxyhq/saml-jackson 0.2.3-beta.220 → 0.2.3-beta.222

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@boxyhq/saml-jackson",
-  "version": "0.2.3-beta.220",
+  "version": "0.2.3-beta.222",
   "license": "Apache 2.0",
   "description": "SAML 2.0 service",
   "main": "dist/index.js",

package/src/controller/api.ts

@@ -4,8 +4,7 @@ import * as dbutils from '../db/utils';
 import saml from '../saml/saml';
 import { JacksonError } from './error';
 import { IndexNames } from './utils';
-
-const x509 = require('../saml/x509.js');
+import x509 from '../saml/x509';
 
 export class SAMLConfig implements ISAMLConfig {
   private configStore: Storable;

package/src/saml/{claims.js → claims.ts}

@@ -17,9 +17,12 @@ const mapping = [
     attribute: 'lastName',
     schema: 'http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname',
   },
-];
+] as const;
 
-const map = (claims) => {
+type attributes = typeof mapping[number]['attribute'];
+type schemas = typeof mapping[number]['schema'];
+
+const map = (claims: Record<attributes | schemas, unknown>) => {
   const profile = {
     raw: claims,
   };
@@ -35,6 +38,4 @@ const map = (claims) => {
   return profile;
 };
 
-module.exports = {
-  map,
-};
+export default { map };

package/src/saml/{x509.js → x509.ts}

@@ -1,5 +1,5 @@
-const x509 = require('@peculiar/x509');
-const { Crypto } = require('@peculiar/webcrypto');
+import * as x509 from '@peculiar/x509';
+import { Crypto } from '@peculiar/webcrypto';
 
 const crypto = new Crypto();
 x509.cryptoProvider.set(crypto);
@@ -14,16 +14,18 @@ const alg = {
 const generate = async () => {
   const keys = await crypto.subtle.generateKey(alg, true, ['sign', 'verify']);
 
-  const extensions = [
+  const extensions: x509.Extension[] = [
     new x509.BasicConstraintsExtension(false, undefined, true),
   ];
 
   extensions.push(
     new x509.KeyUsagesExtension(x509.KeyUsageFlags.digitalSignature, true)
   );
-  extensions.push(
-    await x509.SubjectKeyIdentifierExtension.create(keys.publicKey)
-  );
+  if (keys.publicKey) {
+    extensions.push(
+      await x509.SubjectKeyIdentifierExtension.create(keys.publicKey)
+    );
+  }
 
   const cert = await x509.X509CertificateGenerator.createSelfSigned({
     serialNumber: '01',
@@ -34,15 +36,16 @@ const generate = async () => {
     keys: keys,
     extensions,
   });
-
-  const pkcs8 = await crypto.subtle.exportKey('pkcs8', keys.privateKey);
-
-  return {
-    publicKey: cert.toString('pem'),
-    privateKey: x509.PemConverter.encode(pkcs8, 'private key'),
-  };
+  if (keys.privateKey) {
+    const pkcs8 = await crypto.subtle.exportKey('pkcs8', keys.privateKey);
+
+    return {
+      publicKey: cert.toString('pem'),
+      privateKey: x509.PemConverter.encode(pkcs8, 'private key'),
+    };
+  }
 };
 
-module.exports = {
+export default {
   generate,
 };