agentlang 0.3.4 → 0.3.6

package/src/runtime/modules/auth.ts

@@ -340,6 +340,10 @@ entity Session {
 @public workflow acceptInvitation {
   await Auth.acceptInvitationUser(acceptInvitation.email, acceptInvitation.tempPassword, acceptInvitation.newPassword)
 }
+
+@public workflow callback {
+  await Auth.callbackUser(callback.code)
+}
 `;
 
 const evalEvent = makeEventEvaluator(CoreAuthModuleName);
@@ -607,10 +611,10 @@ export async function findUserRoles(userId: string, env: Environment): Promise<R
   const inst: Instance | undefined = result ? (result[0] as Instance) : undefined;
   if (inst) {
     let roles: Instance[] | undefined = inst.getRelatedInstances('UserRole');
-    if (roles == undefined) {
+    if (roles === undefined) {
       roles = [];
     }
-    if (DefaultRoleInstance == undefined) {
+    if (DefaultRoleInstance === undefined) {
       DefaultRoleInstance = makeInstance(
         CoreAuthModuleName,
         'Role',
@@ -664,7 +668,7 @@ export async function userHasPermissions(
     return true;
   }
   let userRoles: string[] | null | undefined = UserRoleCache.get(userId);
-  if (userRoles == undefined) {
+  if (!userRoles) {
     const roles: any = await findUserRoles(userId, env);
     userRoles = [];
     if (roles) {
@@ -680,6 +684,7 @@ export async function userHasPermissions(
     UserRoleCache.set(userId, userRoles);
   }
   if (
+    userRoles &&
     userRoles.find((role: string) => {
       return role === 'admin';
     })
@@ -692,21 +697,23 @@ export async function userHasPermissions(
     perms.has(RbacPermissionFlag.UPDATE),
     perms.has(RbacPermissionFlag.DELETE),
   ];
-  for (let i = 0; i < userRoles.length; ++i) {
-    const permInsts: RbacPermission[] | undefined = RolePermissionsCache.get(userRoles[i]);
-    if (permInsts) {
-      if (
-        permInsts.find((p: RbacPermission) => {
-          return (
-            p.resourceFqName == resourceFqName &&
-            (c ? isSqlTrue(p.c) : true) &&
-            (r ? isSqlTrue(p.r) : true) &&
-            (u ? isSqlTrue(p.u) : true) &&
-            (d ? isSqlTrue(p.d) : true)
-          );
-        })
-      )
-        return true;
+  if (userRoles !== null) {
+    for (let i = 0; i < userRoles.length; ++i) {
+      const permInsts: RbacPermission[] | undefined = RolePermissionsCache.get(userRoles[i]);
+      if (permInsts) {
+        if (
+          permInsts.find((p: RbacPermission) => {
+            return (
+              p.resourceFqName == resourceFqName &&
+              (c ? isSqlTrue(p.c) : true) &&
+              (r ? isSqlTrue(p.r) : true) &&
+              (u ? isSqlTrue(p.u) : true) &&
+              (d ? isSqlTrue(p.d) : true)
+            );
+          })
+        )
+          return true;
+      }
     }
   }
   return false;
@@ -878,6 +885,32 @@ export async function loginUser(
   }
 }
 
+export async function callbackUser(code: string, env: Environment): Promise<string | object> {
+  let result: string | object = '';
+  try {
+    await fetchAuthImpl().callback(code, env, (r: SessionInfo) => {
+      UserRoleCache.set(r.userId, null);
+      if (r.idToken && r.accessToken && r.refreshToken) {
+        result = {
+          id_token: r.idToken,
+          access_token: r.accessToken,
+          refresh_token: r.refreshToken,
+          token_type: 'Bearer',
+          expires_in: 3600,
+          userId: r.userId,
+          sessionId: r.sessionId,
+        };
+      } else {
+        result = `${r.userId}/${r.sessionId}`;
+      }
+    });
+    return result;
+  } catch (err: any) {
+    logger.error(`Callback failed for ${code}: ${err.message}`);
+    throw err;
+  }
+}
+
 async function logoutSession(userId: string, sess: Instance, env: Environment): Promise<Result> {
   const sessId = sess.lookup('id');
   const tok = sess.lookup('authToken');
@@ -1030,7 +1063,7 @@ async function verifySessionToken(token: string, env?: Environment): Promise<Act
   const f = async () => {
     try {
       const sess: Instance = await findSession(sessId, env);
-      if (sess != undefined) {
+      if (sess !== undefined) {
         await fetchAuthImpl().verifyToken(sess.lookup('authToken'), env);
         return { sessionId: sessId, userId: parts[0] };
       } else {
@@ -1194,7 +1227,8 @@ export function requireAuth(moduleName: string, eventName: string): boolean {
         eventName == 'forgotPassword' ||
         eventName == 'confirmForgotPassword' ||
         eventName == 'refreshToken' ||
-        eventName == 'acceptInvitation');
+        eventName == 'acceptInvitation' ||
+        eventName == 'callback');
     return !f;
   } else {
     return false;

package/src/runtime/modules/core.ts

@@ -84,7 +84,7 @@ export function setTimerRunning(timerInst: Instance) {
 export async function maybeCancelTimer(name: string, timer: NodeJS.Timeout, env: Environment) {
   await parseAndEvaluateStatement(`{agentlang/timer {name? "${name}"}}`, undefined, env).then(
     (result: any) => {
-      if (result == null || (result instanceof Array && result.length == 0)) {
+      if (result === null || (result instanceof Array && result.length == 0)) {
         clearInterval(timer);
       }
     }

package/src/runtime/openapi.ts

@@ -15,7 +15,7 @@ export async function registerOpenApiModule(
   moduleName: string,
   handle: OpenApiHandle
 ): Promise<string> {
-  if (OpenApiModules == undefined) {
+  if (OpenApiModules === undefined) {
     OpenApiModules = new Map();
   }
   const m = new Map(Object.entries(handle.client));
@@ -37,7 +37,7 @@ export async function registerOpenApiModule(
 }
 
 export function isOpenApiModule(moduleName: string): boolean {
-  return OpenApiModules != undefined && OpenApiModules.has(moduleName);
+  return OpenApiModules !== undefined && OpenApiModules.has(moduleName);
 }
 
 export type OpenApiArgs = {

package/src/runtime/relgraph.ts

@@ -107,7 +107,7 @@ export function buildGraph(moduleName: string): RelationshipGraph {
       }
     });
   });
-  if (localMod == undefined) {
+  if (localMod === undefined) {
     throw new Error(`Failed to find module ${moduleName}`);
   }
   const remEnts: Set<string> = new Set();

package/src/runtime/resolvers/authinfo.ts

@@ -5,8 +5,8 @@ export class ResolverAuthInfo {
 
   constructor(userId: string, readForUpdate?: boolean, readForDelete?: boolean) {
     this.userId = userId;
-    if (readForUpdate != undefined) this.readForUpdate = readForUpdate;
-    if (readForDelete != undefined) this.readForDelete = readForDelete;
+    if (readForUpdate !== undefined) this.readForUpdate = readForUpdate;
+    if (readForDelete !== undefined) this.readForDelete = readForDelete;
   }
 }
 

package/src/runtime/resolvers/interface.ts

@@ -215,7 +215,7 @@ export class Resolver {
   }
 
   public async onSubscription(result: any, callPostCrudEvent: boolean = false): Promise<any> {
-    if (result != undefined) {
+    if (result !== undefined) {
       try {
         if (callPostCrudEvent) {
           const inst = result as Instance;

package/src/runtime/resolvers/registry.ts

@@ -24,7 +24,7 @@ export function getResolverNameForPath(fqEntryName: string): string | undefined
 
 export function getResolver(fqEntryName: string): Resolver {
   const resName: string | undefined = resolverPathMappings.get(fqEntryName);
-  if (resName != undefined) {
+  if (resName !== undefined) {
     const f: MakeResolver | undefined = resolverDb.get(resName);
     if (f) return f();
   }

package/src/runtime/resolvers/sqldb/database.ts

@@ -48,7 +48,7 @@ export class DbContext {
     this.authInfo = authInfo;
     this.activeEnv = activeEnv;
     this.txnId = txnId;
-    if (inKernelMode != undefined) {
+    if (inKernelMode !== undefined) {
       this.inKernelMode = inKernelMode;
     }
     this.rbacRules = rbacRules;
@@ -56,7 +56,7 @@ export class DbContext {
   private static GlobalDbContext: DbContext | undefined;
 
   static getGlobalContext(): DbContext {
-    if (DbContext.GlobalDbContext == undefined) {
+    if (DbContext.GlobalDbContext === undefined) {
       DbContext.GlobalDbContext = new DbContext(
         '',
         DefaultAuthInfo,
@@ -282,7 +282,7 @@ export function isVectorStoreSupported(): boolean {
 }
 
 export async function initDatabase(config: DatabaseConfig | undefined) {
-  if (defaultDataSource == undefined) {
+  if (defaultDataSource === undefined) {
     const mkds = getDsFunction(config);
     if (mkds) {
       const ormScm = modulesAsOrmSchema();
@@ -405,7 +405,7 @@ export async function vectorStoreSearchEntryExists(
     const qb = getDatasourceForTransaction(ctx.txnId).getRepository(tableName).manager;
     const vecTableName = tableName + VectorSuffix;
     const result: any[] = await qb.query(`select id from ${vecTableName} where id = $1`, [id]);
-    return result != null && result.length > 0;
+    return result !== null && result.length > 0;
   } catch (err: any) {
     logger.error(`Vector store search failed - ${err}`);
   }
@@ -448,7 +448,7 @@ async function checkUserPerm(
       default:
         f = undefined;
     }
-    if (f != undefined) {
+    if (f !== undefined) {
       hasPerm = await f(userId, ctx.resourceFqName, ctx.activeEnv);
     }
   }
@@ -642,7 +642,7 @@ async function isOwner(parentName: string, instPath: string, ctx: DbContext): Pr
   } catch (reason: any) {
     logger.error(`Failed to check ownership on parent ${parentName} - ${reason}`);
   }
-  if (result == undefined || result.length == 0) {
+  if (result === undefined || result.length === 0) {
     return false;
   }
   return true;
@@ -760,7 +760,7 @@ export async function getMany(
   const alias: string = tableName.toLowerCase();
   const queryStr: string = withNotDeletedClause(
     alias,
-    queryObj != undefined ? objectToWhereClause(queryObj, queryVals, alias) : ''
+    queryObj !== undefined ? objectToWhereClause(queryObj, queryVals, alias) : ''
   );
   let ownersJoinCond: string[] | undefined;
   let ot: string = '';
@@ -819,7 +819,7 @@ export async function getManyByJoin(
   const alias: string = tableName.toLowerCase();
   const queryStr: string = withNotDeletedClause(
     alias,
-    queryObj != undefined ? objectToRawWhereClause(queryObj, queryVals, alias) : ''
+    queryObj !== undefined ? objectToRawWhereClause(queryObj, queryVals, alias) : ''
   );
   let ot: string = '';
   let otAlias: string = '';
@@ -928,7 +928,7 @@ export async function getAllConnected(
 const transactionsDb: Map<string, QueryRunner> = new Map<string, QueryRunner>();
 
 export async function startDbTransaction(): Promise<string> {
-  if (defaultDataSource != undefined) {
+  if (defaultDataSource !== undefined) {
     const queryRunner = defaultDataSource.createQueryRunner();
     await queryRunner.startTransaction();
     const txnId: string = crypto.randomUUID();
@@ -942,13 +942,13 @@ export async function startDbTransaction(): Promise<string> {
 function getDatasourceForTransaction(txnId: string | undefined): DataSource | EntityManager {
   if (txnId) {
     const qr: QueryRunner | undefined = transactionsDb.get(txnId);
-    if (qr == undefined) {
+    if (qr === undefined) {
       throw new Error(`Transaction not found - ${txnId}`);
     } else {
       return qr.manager;
     }
   } else {
-    if (defaultDataSource != undefined) return defaultDataSource;
+    if (defaultDataSource !== undefined) return defaultDataSource;
     else throw new Error('No default datasource is initialized');
   }
 }

package/src/runtime/resolvers/sqldb/impl.ts

@@ -44,7 +44,7 @@ import { logger } from '../../logger.js';
 
 function maybeFindIdAttributeName(inst: Instance): string | undefined {
   const attrEntry: AttributeEntry | undefined = findIdAttribute(inst);
-  if (attrEntry != undefined) {
+  if (attrEntry !== undefined) {
     return attrEntry.name;
   }
   return undefined;
@@ -95,11 +95,11 @@ export class SqlDbResolver extends Resolver {
       ensureOneToOneAttributes(inst);
       const attrs: InstanceAttributes = inst.attributes;
       const idAttrVal: any = idAttrName ? attrs.get(idAttrName) : crypto.randomUUID();
-      if (idAttrVal != undefined) {
+      if (idAttrVal !== undefined) {
         const pp: string | undefined = attrs.get(PathAttributeName);
         const n: string = `${inst.moduleName}/${inst.name}`;
         let p: string = '';
-        if (pp != undefined) p = `${pp}/${escapeFqName(n)}/${idAttrVal}`;
+        if (pp !== undefined) p = `${pp}/${escapeFqName(n)}/${idAttrVal}`;
         else p = `${n.replace('/', '$')}/${idAttrVal}`;
         attrs.set(PathAttributeName, p);
       }
@@ -186,7 +186,7 @@ export class SqlDbResolver extends Resolver {
     target: Instance | Instance[],
     purge: boolean
   ): Promise<Instance[] | Instance> {
-    if (target != null) {
+    if (target !== null) {
       if (target instanceof Array) {
         for (let i = 0; i < target.length; ++i) {
           await this.deleteInstanceHelper(target[i], purge);

package/src/runtime/util.ts

@@ -50,11 +50,11 @@ export function isStringNumeric(str: string): boolean {
 type MaybeString = string | undefined;
 
 export function isString(s: MaybeString): boolean {
-  return s != undefined && typeof s === 'string';
+  return s !== undefined && typeof s === 'string';
 }
 
 function asString(s: MaybeString): string {
-  if (s == undefined) return '';
+  if (s === undefined) return '';
   else return s;
 }
 
@@ -351,7 +351,7 @@ export function findAllPrePostTriggerSchema(
     for (let i = 0; i < scm.extras.length; ++i) {
       const rex: RecordExtraDefinition = scm.extras[i];
       if (rex.prePost) {
-        if (result == undefined) {
+        if (result === undefined) {
           result = new Array<PrePostTriggerDefinition>();
         }
         result.push(rex.prePost);
@@ -372,7 +372,7 @@ export enum CrudType {
 
 export function asCrudType(s: string): CrudType {
   const r: CrudType | undefined = CrudType[s.toUpperCase() as keyof typeof CrudType];
-  if (r == undefined) {
+  if (r === undefined) {
     throw new Error(`${s} does not represent a valid CrudType`);
   }
   return r;
@@ -440,7 +440,7 @@ function maybeExtractModuleName(n: string, moduleName?: string | undefined): str
   if (i > 0) {
     return n.substring(0, i);
   }
-  if (moduleName == undefined) {
+  if (moduleName === undefined) {
     throw new Error(`Failed to extract module-name from ${n}`);
   }
   return moduleName;

package/src/utils/runtime.ts

@@ -2,7 +2,7 @@ export let chalk: any;
 
 // Environment detection
 export const isNodeEnv =
-  typeof process !== 'undefined' && process.versions != null && process.versions.node != null;
+  typeof process !== 'undefined' && process.versions !== null && process.versions.node !== null;
 
 if (isNodeEnv) {
   // Only import Node.js modules in Node environment
@@ -15,7 +15,7 @@ if (isNodeEnv) {
 export function isExecGraphEnabled(): boolean {
   if (isNodeEnv) {
     const flag = process.env['AL_EXEC_GRAPH_ENABLED'];
-    if (flag != undefined && flag == 'false') {
+    if (flag !== undefined && flag === 'false') {
       return false;
     }
   }