@adonisjs/ally 5.0.0-5 → 5.0.0-6

package/build/index.d.ts

@@ -1,11 +1,9 @@
-import './src/bindings/types.js';
 export { HttpClient as ApiRequest } from '@poppinss/oauth-client';
 export * as errors from './src/errors.js';
+export { configure } from './configure.js';
+export { stubsRoot } from './stubs/main.js';
 export { AllyManager } from './src/ally_manager.js';
-export { defineConfig } from './src/define_config.js';
+export { defineConfig, services } from './src/define_config.js';
 export { RedirectRequest } from './src/redirect_request.js';
 export { Oauth1Driver } from './src/abstract_drivers/oauth1.js';
 export { Oauth2Driver } from './src/abstract_drivers/oauth2.js';
-export { default as driversList } from './src/drivers_collection.js';
-export { stubsRoot } from './stubs/main.js';
-export { configure } from './configure.js';

package/build/index.js

@@ -6,14 +6,12 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
-import './src/bindings/types.js';
 export { HttpClient as ApiRequest } from '@poppinss/oauth-client';
 export * as errors from './src/errors.js';
+export { configure } from './configure.js';
+export { stubsRoot } from './stubs/main.js';
 export { AllyManager } from './src/ally_manager.js';
-export { defineConfig } from './src/define_config.js';
+export { defineConfig, services } from './src/define_config.js';
 export { RedirectRequest } from './src/redirect_request.js';
 export { Oauth1Driver } from './src/abstract_drivers/oauth1.js';
 export { Oauth2Driver } from './src/abstract_drivers/oauth2.js';
-export { default as driversList } from './src/drivers_collection.js';
-export { stubsRoot } from './stubs/main.js';
-export { configure } from './configure.js';

package/build/providers/ally_provider.d.ts

@@ -1,4 +1,10 @@
 import type { ApplicationService } from '@adonisjs/core/types';
+import type { AllyService } from '../src/types.js';
+declare module '@adonisjs/core/http' {
+    interface HttpContext {
+        ally: AllyService;
+    }
+}
 /**
  * AllyProvider extends the HTTP context with the "ally" property
  */

package/build/providers/ally_provider.js

@@ -6,8 +6,10 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
-import driversList from '../src/drivers_collection.js';
-import { extendHttpContext } from '../src/bindings/http_context.js';
+import { configProvider } from '@adonisjs/core';
+import { HttpContext } from '@adonisjs/core/http';
+import { RuntimeException } from '@poppinss/utils';
+import { AllyManager } from '../src/ally_manager.js';
 /**
  * AllyProvider extends the HTTP context with the "ally" property
  */
@@ -17,8 +19,19 @@ export default class AllyProvider {
         this.app = app;
     }
     async boot() {
-        const config = this.app.config.get('ally');
-        extendHttpContext(config.services);
-        await driversList.registerBundledDrivers(config.driversInUse);
+        const allyConfigProvider = this.app.config.get('ally');
+        /**
+         * Resolve config from the provider
+         */
+        const config = await configProvider.resolve(this.app, allyConfigProvider);
+        if (!config) {
+            throw new RuntimeException('Invalid "config/ally.ts" file. Make sure you are using the "defineConfig" method');
+        }
+        /**
+         * Setup HTTPContext getter
+         */
+        HttpContext.getter('ally', function () {
+            return new AllyManager(config, this);
+        }, true);
     }
 }

package/build/src/abstract_drivers/oauth1.d.ts

@@ -1,5 +1,5 @@
-import { Oauth1Client } from '@poppinss/oauth-client/oauth1';
 import type { HttpContext } from '@adonisjs/core/http';
+import { Oauth1Client } from '@poppinss/oauth-client/oauth1';
 import { AllyUserContract, Oauth1AccessToken, Oauth1DriverConfig, ApiRequestContract, AllyDriverContract, RedirectRequestContract } from '../types.js';
 import { RedirectRequest } from '../redirect_request.js';
 /**

package/build/src/abstract_drivers/oauth2.d.ts

@@ -1,5 +1,5 @@
-import { Oauth2Client } from '@poppinss/oauth-client/oauth2';
 import type { HttpContext } from '@adonisjs/core/http';
+import { Oauth2Client } from '@poppinss/oauth-client/oauth2';
 import { AllyUserContract, Oauth2AccessToken, Oauth2DriverConfig, ApiRequestContract, AllyDriverContract, RedirectRequestContract } from '../types.js';
 import { RedirectRequest } from '../redirect_request.js';
 /**

package/build/src/debug.d.ts

@@ -1,3 +1,3 @@
-/// <reference types="@types/node" resolution-mode="require"/>
+/// <reference types="node" resolution-mode="require"/>
 declare const _default: import("util").DebugLogger;
 export default _default;

package/build/src/define_config.d.ts

@@ -1,15 +1,34 @@
 import type { HttpContext } from '@adonisjs/core/http';
-import type { AllyDriversList } from './types.js';
+import type { ConfigProvider } from '@adonisjs/core/types';
+import type { GoogleDriver } from './drivers/google.js';
+import type { GithubDriver } from './drivers/github.js';
+import type { SpotifyDriver } from './drivers/spotify.js';
+import type { TwitterDriver } from './drivers/twitter.js';
+import type { DiscordDriver } from './drivers/discord.js';
+import type { FacebookDriver } from './drivers/facebook.js';
+import type { LinkedInDriver } from './drivers/linked_in.js';
+import type { GoogleDriverConfig, GithubDriverConfig, SpotifyDriverConfig, DiscordDriverConfig, TwitterDriverConfig, LinkedInDriverConfig, FacebookDriverConfig, AllyManagerDriverFactory } from './types.js';
+/**
+ * Shape of config after it has been resolved from
+ * the config provider
+ */
+type ResolvedConfig<KnownSocialProviders extends Record<string, AllyManagerDriverFactory | ConfigProvider<AllyManagerDriverFactory>>> = {
+    [K in keyof KnownSocialProviders]: KnownSocialProviders[K] extends ConfigProvider<infer A> ? A : KnownSocialProviders[K];
+};
 /**
  * Define config for the ally
  */
-export declare function defineConfig<KnownSocialProviders extends Record<string, {
-    [K in keyof AllyDriversList]: {
-        driver: K;
-    } & Parameters<AllyDriversList[K]>[0];
-}[keyof AllyDriversList]>>(config: KnownSocialProviders): {
-    services: {
-        [K in keyof KnownSocialProviders]: (ctx: HttpContext) => ReturnType<AllyDriversList[KnownSocialProviders[K]['driver']]>;
-    };
-    driversInUse: Set<keyof AllyDriversList>;
+export declare function defineConfig<KnownSocialProviders extends Record<string, AllyManagerDriverFactory | ConfigProvider<AllyManagerDriverFactory>>>(config: KnownSocialProviders): ConfigProvider<ResolvedConfig<KnownSocialProviders>>;
+/**
+ * Helpers to configure social auth services
+ */
+export declare const services: {
+    discord: (config: DiscordDriverConfig) => ConfigProvider<(ctx: HttpContext) => DiscordDriver>;
+    facebook: (config: FacebookDriverConfig) => ConfigProvider<(ctx: HttpContext) => FacebookDriver>;
+    github: (config: GithubDriverConfig) => ConfigProvider<(ctx: HttpContext) => GithubDriver>;
+    google: (config: GoogleDriverConfig) => ConfigProvider<(ctx: HttpContext) => GoogleDriver>;
+    linkedin: (config: LinkedInDriverConfig) => ConfigProvider<(ctx: HttpContext) => LinkedInDriver>;
+    spotify: (config: SpotifyDriverConfig) => ConfigProvider<(ctx: HttpContext) => SpotifyDriver>;
+    twitter: (config: TwitterDriverConfig) => ConfigProvider<(ctx: HttpContext) => TwitterDriver>;
 };
+export {};

package/build/src/define_config.js

@@ -6,26 +6,70 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
-import allyDriversCollection from './drivers_collection.js';
+import { configProvider } from '@adonisjs/core';
 /**
  * Define config for the ally
  */
 export function defineConfig(config) {
-    /**
-     * Converting user defined config to an object of services
-     * that can be injected into the AllyManager class
-     */
-    const driversInUse = new Set();
-    const services = Object.keys(config).reduce((result, provider) => {
-        const providerConfig = config[provider];
-        driversInUse.add(providerConfig.driver);
-        result[provider] = (ctx) => {
-            return allyDriversCollection.create(providerConfig.driver, providerConfig, ctx);
-        };
-        return result;
-    }, {});
-    return {
-        services,
-        driversInUse,
-    };
+    return configProvider.create(async (app) => {
+        const serviceNames = Object.keys(config);
+        const services = {};
+        for (let serviceName of serviceNames) {
+            const service = config[serviceName];
+            if (typeof service === 'function') {
+                services[serviceName] = service;
+            }
+            else {
+                services[serviceName] = await service.resolver(app);
+            }
+        }
+        return services;
+    });
 }
+/**
+ * Helpers to configure social auth services
+ */
+export const services = {
+    discord(config) {
+        return configProvider.create(async () => {
+            const { DiscordDriver } = await import('./drivers/discord.js');
+            return (ctx) => new DiscordDriver(ctx, config);
+        });
+    },
+    facebook(config) {
+        return configProvider.create(async () => {
+            const { FacebookDriver } = await import('./drivers/facebook.js');
+            return (ctx) => new FacebookDriver(ctx, config);
+        });
+    },
+    github(config) {
+        return configProvider.create(async () => {
+            const { GithubDriver } = await import('./drivers/github.js');
+            return (ctx) => new GithubDriver(ctx, config);
+        });
+    },
+    google(config) {
+        return configProvider.create(async () => {
+            const { GoogleDriver } = await import('./drivers/google.js');
+            return (ctx) => new GoogleDriver(ctx, config);
+        });
+    },
+    linkedin(config) {
+        return configProvider.create(async () => {
+            const { LinkedInDriver } = await import('./drivers/linked_in.js');
+            return (ctx) => new LinkedInDriver(ctx, config);
+        });
+    },
+    spotify(config) {
+        return configProvider.create(async () => {
+            const { SpotifyDriver } = await import('./drivers/spotify.js');
+            return (ctx) => new SpotifyDriver(ctx, config);
+        });
+    },
+    twitter(config) {
+        return configProvider.create(async () => {
+            const { TwitterDriver } = await import('./drivers/twitter.js');
+            return (ctx) => new TwitterDriver(ctx, config);
+        });
+    },
+};

package/build/src/drivers/discord.d.ts

@@ -1,10 +1,11 @@
 import type { HttpContext } from '@adonisjs/core/http';
-import { DiscordScopes, DiscordToken, ApiRequestContract, DiscordDriverConfig, DiscordDriverContract, RedirectRequestContract } from '../types.js';
+import type { HttpClient } from '@poppinss/oauth-client';
+import type { DiscordScopes, DiscordToken, ApiRequestContract, DiscordDriverConfig, RedirectRequestContract } from '../types.js';
 import { Oauth2Driver } from '../abstract_drivers/oauth2.js';
 /**
  * Discord driver to login user via Discord
  */
-export declare class DiscordDriver extends Oauth2Driver<DiscordToken, DiscordScopes> implements DiscordDriverContract {
+export declare class DiscordDriver extends Oauth2Driver<DiscordToken, DiscordScopes> {
     config: DiscordDriverConfig;
     protected accessTokenUrl: string;
     protected authorizeUrl: string;
@@ -46,7 +47,7 @@ export declare class DiscordDriver extends Oauth2Driver<DiscordToken, DiscordSco
     /**
      * Returns the HTTP request with the authorization header set
      */
-    protected getAuthenticatedRequest(url: string, token: string): import("@poppinss/oauth-client").HttpClient;
+    protected getAuthenticatedRequest(url: string, token: string): HttpClient;
     /**
      * Fetches the user info from the Discord API
      * https://discord.com/developers/docs/resources/user#get-current-user

package/build/src/drivers/facebook.d.ts

@@ -1,10 +1,11 @@
+import type { HttpClient } from '@poppinss/oauth-client';
 import type { HttpContext } from '@adonisjs/core/http';
-import { FacebookToken, FacebookScopes, LiteralStringUnion, ApiRequestContract, FacebookDriverConfig, FacebookProfileFields, FacebookDriverContract, RedirectRequestContract } from '../types.js';
+import type { FacebookToken, FacebookScopes, LiteralStringUnion, ApiRequestContract, FacebookDriverConfig, FacebookProfileFields, RedirectRequestContract } from '../types.js';
 import { Oauth2Driver } from '../abstract_drivers/oauth2.js';
 /**
  * Facebook driver to login user via Facebook
  */
-export declare class FacebookDriver extends Oauth2Driver<FacebookToken, FacebookScopes> implements FacebookDriverContract {
+export declare class FacebookDriver extends Oauth2Driver<FacebookToken, FacebookScopes> {
     config: FacebookDriverConfig;
     protected accessTokenUrl: string;
     protected authorizeUrl: string;
@@ -46,7 +47,7 @@ export declare class FacebookDriver extends Oauth2Driver<FacebookToken, Facebook
     /**
      * Returns the HTTP request with the authorization header set
      */
-    protected getAuthenticatedRequest(url: string, token: string): import("@poppinss/oauth-client").HttpClient;
+    protected getAuthenticatedRequest(url: string, token: string): HttpClient;
     /**
      * Fetches the user info from the Facebook API
      * https://developers.facebook.com/docs/graph-api/reference/user/

package/build/src/drivers/github.d.ts

@@ -1,10 +1,11 @@
 import type { HttpContext } from '@adonisjs/core/http';
-import { GithubToken, GithubScopes, GithubDriverConfig, ApiRequestContract, GithubDriverContract, RedirectRequestContract } from '../types.js';
+import type { HttpClient } from '@poppinss/oauth-client';
+import type { GithubToken, GithubScopes, GithubDriverConfig, ApiRequestContract, RedirectRequestContract } from '../types.js';
 import { Oauth2Driver } from '../abstract_drivers/oauth2.js';
 /**
  * Github driver to login user via Github
  */
-export declare class GithubDriver extends Oauth2Driver<GithubToken, GithubScopes> implements GithubDriverContract {
+export declare class GithubDriver extends Oauth2Driver<GithubToken, GithubScopes> {
     config: GithubDriverConfig;
     protected accessTokenUrl: string;
     protected authorizeUrl: string;
@@ -47,7 +48,7 @@ export declare class GithubDriver extends Oauth2Driver<GithubToken, GithubScopes
     /**
      * Returns the HTTP request with the authorization header set
      */
-    protected getAuthenticatedRequest(url: string, token: string): import("@poppinss/oauth-client").HttpClient;
+    protected getAuthenticatedRequest(url: string, token: string): HttpClient;
     /**
      * Fetches the user info from the Github API
      * https://docs.github.com/en/rest/reference/users#get-the-authenticated-user

package/build/src/drivers/google.d.ts

@@ -1,10 +1,11 @@
 import type { HttpContext } from '@adonisjs/core/http';
-import { GoogleToken, GoogleScopes, GoogleDriverConfig, ApiRequestContract, GoogleDriverContract, RedirectRequestContract } from '../types.js';
+import type { HttpClient } from '@poppinss/oauth-client';
+import type { GoogleToken, GoogleScopes, GoogleDriverConfig, ApiRequestContract, RedirectRequestContract } from '../types.js';
 import { Oauth2Driver } from '../abstract_drivers/oauth2.js';
 /**
  * Google driver to login user via Google
  */
-export declare class GoogleDriver extends Oauth2Driver<GoogleToken, GoogleScopes> implements GoogleDriverContract {
+export declare class GoogleDriver extends Oauth2Driver<GoogleToken, GoogleScopes> {
     config: GoogleDriverConfig;
     protected accessTokenUrl: string;
     protected authorizeUrl: string;
@@ -42,7 +43,7 @@ export declare class GoogleDriver extends Oauth2Driver<GoogleToken, GoogleScopes
     /**
      * Returns the HTTP request with the authorization header set
      */
-    protected getAuthenticatedRequest(url: string, token: string): import("@poppinss/oauth-client").HttpClient;
+    protected getAuthenticatedRequest(url: string, token: string): HttpClient;
     /**
      * Fetches the user info from the Google API
      */

package/build/src/drivers/linked_in.d.ts

@@ -1,10 +1,11 @@
 import type { HttpContext } from '@adonisjs/core/http';
-import { LinkedInToken, LinkedInScopes, ApiRequestContract, LinkedInDriverConfig, LinkedInDriverContract, RedirectRequestContract } from '../types.js';
+import type { HttpClient } from '@poppinss/oauth-client';
+import type { LinkedInToken, LinkedInScopes, ApiRequestContract, LinkedInDriverConfig, RedirectRequestContract } from '../types.js';
 import { Oauth2Driver } from '../abstract_drivers/oauth2.js';
 /**
  * LinkedIn driver to login user via LinkedIn
  */
-export declare class LinkedInDriver extends Oauth2Driver<LinkedInToken, LinkedInScopes> implements LinkedInDriverContract {
+export declare class LinkedInDriver extends Oauth2Driver<LinkedInToken, LinkedInScopes> {
     config: LinkedInDriverConfig;
     protected accessTokenUrl: string;
     protected authorizeUrl: string;
@@ -43,7 +44,7 @@ export declare class LinkedInDriver extends Oauth2Driver<LinkedInToken, LinkedIn
     /**
      * Returns the HTTP request with the authorization header set
      */
-    protected getAuthenticatedRequest(url: string, token: string): import("@poppinss/oauth-client").HttpClient;
+    protected getAuthenticatedRequest(url: string, token: string): HttpClient;
     /**
      * Fetches the user info from the LinkedIn API
      */

package/build/src/drivers/spotify.d.ts

@@ -1,10 +1,11 @@
 import type { HttpContext } from '@adonisjs/core/http';
-import { SpotifyScopes, SpotifyToken, ApiRequestContract, SpotifyDriverConfig, SpotifyDriverContract, RedirectRequestContract } from '../types.js';
+import type { HttpClient } from '@poppinss/oauth-client';
+import type { SpotifyScopes, SpotifyToken, ApiRequestContract, SpotifyDriverConfig, RedirectRequestContract } from '../types.js';
 import { Oauth2Driver } from '../abstract_drivers/oauth2.js';
 /**
  * Spotify driver to login user via Spotify
  */
-export declare class SpotifyDriver extends Oauth2Driver<SpotifyToken, SpotifyScopes> implements SpotifyDriverContract {
+export declare class SpotifyDriver extends Oauth2Driver<SpotifyToken, SpotifyScopes> {
     config: SpotifyDriverConfig;
     protected accessTokenUrl: string;
     protected authorizeUrl: string;
@@ -42,7 +43,7 @@ export declare class SpotifyDriver extends Oauth2Driver<SpotifyToken, SpotifySco
     /**
      * Returns the HTTP request with the authorization header set
      */
-    protected getAuthenticatedRequest(url: string, token: string): import("@poppinss/oauth-client").HttpClient;
+    protected getAuthenticatedRequest(url: string, token: string): HttpClient;
     /**
      * Fetches the user info from the Spotify API
      * https://discord.com/developers/docs/resources/user#get-current-user

package/build/src/drivers/twitter.d.ts

@@ -1,10 +1,10 @@
 import type { HttpContext } from '@adonisjs/core/http';
-import { TwitterToken, AllyUserContract, ApiRequestContract, TwitterDriverConfig, TwitterDriverContract } from '../types.js';
+import { TwitterToken, AllyUserContract, ApiRequestContract, TwitterDriverConfig } from '../types.js';
 import { Oauth1Driver } from '../abstract_drivers/oauth1.js';
 /**
  * Twitter driver to login user via twitter
  */
-export declare class TwitterDriver extends Oauth1Driver<TwitterToken, string> implements TwitterDriverContract {
+export declare class TwitterDriver extends Oauth1Driver<TwitterToken, string> {
     protected ctx: HttpContext;
     config: TwitterDriverConfig;
     protected requestTokenUrl: string;

package/build/src/types.d.ts

@@ -1,5 +1,7 @@
-import { HttpContext } from '@adonisjs/core/http';
-import { Oauth2AccessToken, Oauth1RequestToken, Oauth1AccessToken, Oauth1ClientConfig, Oauth2ClientConfig, ApiRequestContract, RedirectRequestContract as ClientRequestContract } from '@poppinss/oauth-client/types';
+import type { HttpContext } from '@adonisjs/core/http';
+import type { ConfigProvider } from '@adonisjs/core/types';
+import type { Oauth2AccessToken, Oauth1RequestToken, Oauth1AccessToken, Oauth1ClientConfig, Oauth2ClientConfig, ApiRequestContract, RedirectRequestContract as ClientRequestContract } from '@poppinss/oauth-client/types';
+import type { AllyManager } from './ally_manager.js';
 export type { Oauth2AccessToken };
 export type { Oauth1AccessToken };
 export type { Oauth1RequestToken };
@@ -115,6 +117,11 @@ export interface AllyDriverContract<Token extends Oauth2AccessToken | Oauth1Acce
         secret: string;
     }>>;
 }
+/**
+ * The manager driver factory method is called by the AllyManager to create
+ * an instance of a driver during an HTTP request
+ */
+export type AllyManagerDriverFactory = (ctx: HttpContext) => AllyDriverContract<any, any>;
 /**
  * ----------------------------------------
  * Discord driver
@@ -147,9 +154,6 @@ export type DiscordDriverConfig = Oauth2ClientConfig & {
     disableGuildSelect?: boolean;
     permissions?: number;
 };
-export interface DiscordDriverContract extends AllyDriverContract<DiscordToken, DiscordScopes> {
-    version: 'oauth2';
-}
 /**
  * ----------------------------------------
  * Github driver
@@ -178,9 +182,6 @@ export type GithubDriverConfig = Oauth2ClientConfig & {
     userInfoUrl?: string;
     userEmailUrl?: string;
 };
-export interface GithubDriverContract extends AllyDriverContract<GithubToken, GithubScopes> {
-    version: 'oauth2';
-}
 /**
  * ----------------------------------------
  * Twitter driver
@@ -201,9 +202,6 @@ export type TwitterToken = {
 export type TwitterDriverConfig = Oauth1ClientConfig & {
     userInfoUrl?: string;
 };
-export interface TwitterDriverContract extends AllyDriverContract<TwitterToken, string> {
-    version: 'oauth1';
-}
 /**
  * ----------------------------------------
  * Google driver
@@ -242,9 +240,6 @@ export type GoogleDriverConfig = Oauth2ClientConfig & {
     hostedDomain?: string;
     display?: 'page' | 'popup' | 'touch' | 'wrap';
 };
-export interface GoogleDriverContract extends AllyDriverContract<GoogleToken, GoogleScopes> {
-    version: 'oauth2';
-}
 /**
  * ----------------------------------------
  * LinkedIn driver
@@ -278,9 +273,6 @@ export type LinkedInDriverConfig = Oauth2ClientConfig & {
      */
     scopes?: LiteralStringUnion<LinkedInScopes>[];
 };
-export interface LinkedInDriverContract extends AllyDriverContract<LinkedInToken, LinkedInScopes> {
-    version: 'oauth2';
-}
 /**
  * ----------------------------------------
  * Facebook driver
@@ -320,9 +312,6 @@ export type FacebookDriverConfig = Oauth2ClientConfig & {
     display?: string;
     authType?: string;
 };
-export interface FacebookDriverContract extends AllyDriverContract<FacebookToken, FacebookScopes> {
-    version: 'oauth2';
-}
 /**
  * ----------------------------------------
  * Spotify driver
@@ -350,36 +339,18 @@ export type SpotifyDriverConfig = Oauth2ClientConfig & {
     scopes?: LiteralStringUnion<SpotifyScopes>[];
     showDialog?: boolean;
 };
-export interface SpotifyDriverContract extends AllyDriverContract<SpotifyToken, SpotifyScopes> {
-    version: 'oauth2';
-}
 /**
  * END OF DRIVERS
  */
-/**
- * List of known ally drivers. The list can be extended using
- * declaration merging
- */
-export interface AllyDriversList {
-    discord: (config: DiscordDriverConfig, ctx: HttpContext) => DiscordDriverContract;
-    facebook: (config: FacebookDriverConfig, ctx: HttpContext) => FacebookDriverContract;
-    github: (config: GithubDriverConfig, ctx: HttpContext) => GithubDriverContract;
-    google: (config: GoogleDriverConfig, ctx: HttpContext) => GoogleDriverContract;
-    linkedin: (config: LinkedInDriverConfig, ctx: HttpContext) => LinkedInDriverContract;
-    spotify: (config: SpotifyDriverConfig, ctx: HttpContext) => SpotifyDriverContract;
-    twitter: (config: TwitterDriverConfig, ctx: HttpContext) => TwitterDriverContract;
-}
-/**
- * The manager driver factory method is called by the AllyManager to create
- * an instance of a driver during an HTTP request
- */
-export type AllyManagerDriverFactory = (ctx: HttpContext) => AllyDriverContract<any, any>;
 /**
  * Social providers are inferred inside the user application
  * from the config file
  */
 export interface SocialProviders {
 }
-export type InferSocialProviders<T extends {
-    services: Record<string, AllyManagerDriverFactory>;
-}> = T['services'];
+export type InferSocialProviders<T extends ConfigProvider<Record<string, AllyManagerDriverFactory>>> = Awaited<ReturnType<T['resolver']>>;
+/**
+ * Ally service is shared with the HTTP context
+ */
+export interface AllyService extends AllyManager<SocialProviders extends Record<string, AllyManagerDriverFactory> ? SocialProviders : never> {
+}

package/build/stubs/config.stub

@@ -1,17 +1,16 @@
----
-to: {{ app.configPath('ally.ts') }}
----
+{{{
+  exports({ to: app.configPath('ally.ts') })
+}}}
 import env from '#start/env'
-import { defineConfig } from '@adonisjs/ally'
+import { defineConfig, services } from '@adonisjs/ally'
 
 const allyConfig = defineConfig({
 {{#each providers as provider}}
-  {{provider.provider}}: {
-    driver: '{{provider.provider}}',
+  {{provider.provider}}: services.{{provider.provider}}({
     clientId: env.get('{{provider.envPrefix}}_CLIENT_ID'),
     clientSecret: env.get('{{provider.envPrefix}}_CLIENT_SECRET'),
     callbackUrl: '',
-  },
+  }),
 {{/each}}
 })
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adonisjs/ally",
-  "version": "5.0.0-5",
+  "version": "5.0.0-6",
   "description": "Social authentication provider for AdonisJS",
   "type": "module",
   "main": "build/index.js",
@@ -47,38 +47,38 @@
   "author": "adonisjs,virk",
   "license": "MIT",
   "devDependencies": {
-    "@adonisjs/assembler": "^6.1.3-22",
-    "@adonisjs/core": "^6.1.5-26",
+    "@adonisjs/assembler": "^6.1.3-25",
+    "@adonisjs/core": "^6.1.5-29",
     "@adonisjs/eslint-config": "^1.1.8",
     "@adonisjs/prettier-config": "^1.1.8",
     "@adonisjs/tsconfig": "^1.1.8",
-    "@commitlint/cli": "^17.7.1",
-    "@commitlint/config-conventional": "^17.7.0",
-    "@japa/assert": "^2.0.0-1",
-    "@japa/expect-type": "^2.0.0-0",
-    "@japa/file-system": "^2.0.0-1",
-    "@japa/runner": "^3.0.0-6",
+    "@commitlint/cli": "^17.8.0",
+    "@commitlint/config-conventional": "^17.8.0",
+    "@japa/assert": "^2.0.0",
+    "@japa/expect-type": "^2.0.0",
+    "@japa/file-system": "^2.0.0",
+    "@japa/runner": "^3.0.4",
     "@swc/core": "1.3.82",
-    "@types/node": "^20.7.0",
+    "@types/node": "^20.8.7",
     "c8": "^8.0.1",
     "copyfiles": "^2.4.1",
     "del-cli": "^5.1.0",
     "dotenv": "^16.3.1",
-    "eslint": "^8.50.0",
+    "eslint": "^8.51.0",
     "github-label-sync": "^2.3.1",
     "husky": "^8.0.3",
-    "nock": "^13.3.3",
+    "nock": "^13.3.4",
     "np": "^8.0.4",
     "prettier": "^3.0.3",
     "ts-node": "^10.9.1",
     "typescript": "^5.2.2"
   },
   "dependencies": {
-    "@poppinss/oauth-client": "^5.1.0-4",
-    "@poppinss/utils": "^6.5.0-7"
+    "@poppinss/oauth-client": "^5.1.0",
+    "@poppinss/utils": "^6.5.0"
   },
   "peerDependencies": {
-    "@adonisjs/core": "^6.1.5-19"
+    "@adonisjs/core": "^6.1.5-29"
   },
   "repository": {
     "type": "git",

package/build/src/bindings/http_context.d.ts

@@ -1,6 +0,0 @@
-import './types.js';
-import { AllyManagerDriverFactory } from '../types.js';
-/**
- * Extends HttpContext class with the ally getter
- */
-export declare function extendHttpContext(config: Record<string, AllyManagerDriverFactory>): void;

package/build/src/bindings/http_context.js

@@ -1,19 +0,0 @@
-/*
- * @adonisjs/ally
- *
- * (c) AdonisJS
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-import { HttpContext } from '@adonisjs/core/http';
-import './types.js';
-import { AllyManager } from '../ally_manager.js';
-/**
- * Extends HttpContext class with the ally getter
- */
-export function extendHttpContext(config) {
-    HttpContext.getter('ally', function () {
-        return new AllyManager(config, this);
-    }, true);
-}

package/build/src/bindings/types.d.ts

@@ -1,12 +0,0 @@
-import type { AllyManager } from '../ally_manager.js';
-import type { AllyManagerDriverFactory, SocialProviders } from '../types.js';
-/**
- * In order for types to get picked up, this module must get
- * imported by TypeScript. Therefore, we export this module
- * from the package entrypoint
- */
-declare module '@adonisjs/core/http' {
-    interface HttpContext {
-        ally: AllyManager<SocialProviders extends Record<string, AllyManagerDriverFactory> ? SocialProviders : never>;
-    }
-}

package/build/src/bindings/types.js

@@ -1,9 +0,0 @@
-/*
- * @adonisjs/ally
- *
- * (c) AdonisJS
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-export {};

package/build/src/defaults/config.d.ts

@@ -1,50 +0,0 @@
-export declare const twitter: {
-    REQUEST_TOKEN_URL: string;
-    AUTHORIZE_URL: string;
-    ACCESS_TOKEN_URL: string;
-};
-export declare const github: {
-    AUTHORIZE_URL: string;
-    ACCESS_TOKEN_URL: string;
-    USER_INFO_URL: string;
-    USER_EMAIL_URL: string;
-};
-export declare const google: {
-    AUTHORIZE_URL: string;
-    ACCESS_TOKEN_URL: string;
-    USER_INFO_URL: string;
-};
-export declare const gitlab: {
-    AUTHORIZE_URL: string;
-    ACCESS_TOKEN_URL: string;
-};
-export declare const linkedin: {
-    AUTHORIZE_URL: string;
-    ACCESS_TOKEN_URL: string;
-};
-export declare const patreon: {
-    AUTHORIZE_URL: string;
-    ACCESS_TOKEN_URL: string;
-};
-export declare const discord: {
-    AUTHORIZE_URL: string;
-    ACCESS_TOKEN_URL: string;
-    USER_INFO_URL: string;
-};
-export declare const microsoft: {
-    AUTHORIZE_URL: string;
-    ACCESS_TOKEN_URL: string;
-};
-export declare const bitbucket: {
-    AUTHORIZE_URL: string;
-    ACCESS_TOKEN_URL: string;
-};
-export declare const facebook: {
-    AUTHORIZE_URL: string;
-    ACCESS_TOKEN_URL: string;
-};
-export declare const spotify: {
-    AUTHORIZE_URL: string;
-    ACCESS_TOKEN_URL: string;
-    USER_INFO_URL: string;
-};

package/build/src/defaults/config.js

@@ -1,58 +0,0 @@
-/*
- * @adonisjs/ally
- *
- * (c) AdonisJS
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-export const twitter = {
-    REQUEST_TOKEN_URL: 'https://api.twitter.com/oauth/request_token',
-    AUTHORIZE_URL: 'https://api.twitter.com/oauth/authenticate',
-    ACCESS_TOKEN_URL: 'https://api.twitter.com/oauth/access_token',
-};
-export const github = {
-    AUTHORIZE_URL: 'https://github.com/login/oauth/authorize',
-    ACCESS_TOKEN_URL: 'https://github.com/login/oauth/access_token',
-    USER_INFO_URL: 'https://api.github.com/user',
-    USER_EMAIL_URL: 'https://api.github.com/user/emails',
-};
-export const google = {
-    AUTHORIZE_URL: 'https://accounts.google.com/o/oauth2/v2/auth',
-    ACCESS_TOKEN_URL: 'https://oauth2.googleapis.com/token',
-    USER_INFO_URL: 'https://www.googleapis.com/oauth2/v3/userinfo',
-};
-export const gitlab = {
-    AUTHORIZE_URL: 'https://gitlab.com/oauth/authorize',
-    ACCESS_TOKEN_URL: 'https://gitlab.com/oauth/token',
-};
-export const linkedin = {
-    AUTHORIZE_URL: 'https://www.linkedin.com/oauth/v2/authorization',
-    ACCESS_TOKEN_URL: 'https://www.linkedin.com/oauth/v2/accessToken',
-};
-export const patreon = {
-    AUTHORIZE_URL: 'https://www.patreon.com/oauth2/authorize',
-    ACCESS_TOKEN_URL: 'https://www.patreon.com/api/oauth2/token',
-};
-export const discord = {
-    AUTHORIZE_URL: 'https://discord.com/api/oauth2/authorize',
-    ACCESS_TOKEN_URL: 'https://discord.com/api/oauth2/token',
-    USER_INFO_URL: 'https://discord.com/api/users/@me',
-};
-export const microsoft = {
-    AUTHORIZE_URL: 'https://login.microsoftonline.com/{tenant}/oauth2/v2.0/authorize',
-    ACCESS_TOKEN_URL: 'https://login.microsoftonline.com/{tenant}/oauth2/v2.0/token',
-};
-export const bitbucket = {
-    AUTHORIZE_URL: 'https://bitbucket.org/site/oauth2/authorize',
-    ACCESS_TOKEN_URL: 'https://bitbucket.org/site/oauth2/access_token',
-};
-export const facebook = {
-    AUTHORIZE_URL: 'https://www.facebook.com/v10.0/dialog/oauth',
-    ACCESS_TOKEN_URL: 'https://graph.facebook.com/v10.0/dialog/oauth/access_token',
-};
-export const spotify = {
-    AUTHORIZE_URL: 'https://accounts.spotify.com/authorize',
-    ACCESS_TOKEN_URL: 'https://accounts.spotify.com/api/token',
-    USER_INFO_URL: 'https://api.spotify.com/v1/me',
-};

package/build/src/drivers_collection.d.ts

@@ -1,23 +0,0 @@
-import type { HttpContext } from '@adonisjs/core/http';
-import type { AllyDriversList } from './types.js';
-/**
- * A global collection of ally drivers.
- */
-declare class AllyDriversCollection {
-    registerBundledDrivers(drivers: Set<keyof AllyDriversList>): Promise<void>;
-    /**
-     * List of registered drivers
-     */
-    list: Partial<AllyDriversList>;
-    /**
-     * Extend drivers collection and add a custom
-     * driver to it.
-     */
-    extend<Name extends keyof AllyDriversList>(driverName: Name, factoryCallback: AllyDriversList[Name]): this;
-    /**
-     * Creates the driver instance with config
-     */
-    create<Name extends keyof AllyDriversList>(name: Name, config: Parameters<AllyDriversList[Name]>[0], ctx: HttpContext): ReturnType<AllyDriversList[Name]>;
-}
-declare const allyDriversCollection: AllyDriversCollection;
-export default allyDriversCollection;

package/build/src/drivers_collection.js

@@ -1,72 +0,0 @@
-/*
- * @adonisjs/ally
- *
- * (c) AdonisJS
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-import { RuntimeException } from '@poppinss/utils';
-import debug from './debug.js';
-/**
- * A global collection of ally drivers.
- */
-class AllyDriversCollection {
-    async registerBundledDrivers(drivers) {
-        debug('drivers in use %O', drivers);
-        if (drivers.has('discord') && !this.list['discord']) {
-            const { DiscordDriver } = await import('../src/drivers/discord.js');
-            this.extend('discord', (config, ctx) => new DiscordDriver(ctx, config));
-        }
-        if (drivers.has('facebook') && !this.list['facebook']) {
-            const { FacebookDriver } = await import('../src/drivers/facebook.js');
-            this.extend('facebook', (config, ctx) => new FacebookDriver(ctx, config));
-        }
-        if (drivers.has('github') && !this.list['github']) {
-            const { GithubDriver } = await import('../src/drivers/github.js');
-            this.extend('github', (config, ctx) => new GithubDriver(ctx, config));
-        }
-        if (drivers.has('google') && !this.list['google']) {
-            const { GoogleDriver } = await import('../src/drivers/google.js');
-            this.extend('google', (config, ctx) => new GoogleDriver(ctx, config));
-        }
-        if (drivers.has('linkedin') && !this.list['linkedin']) {
-            const { LinkedInDriver } = await import('../src/drivers/linked_in.js');
-            this.extend('linkedin', (config, ctx) => new LinkedInDriver(ctx, config));
-        }
-        if (drivers.has('spotify') && !this.list['spotify']) {
-            const { SpotifyDriver } = await import('../src/drivers/spotify.js');
-            this.extend('spotify', (config, ctx) => new SpotifyDriver(ctx, config));
-        }
-        if (drivers.has('twitter') && !this.list['twitter']) {
-            const { TwitterDriver } = await import('../src/drivers/twitter.js');
-            this.extend('twitter', (config, ctx) => new TwitterDriver(ctx, config));
-        }
-    }
-    /**
-     * List of registered drivers
-     */
-    list = {};
-    /**
-     * Extend drivers collection and add a custom
-     * driver to it.
-     */
-    extend(driverName, factoryCallback) {
-        debug('registering %s driver', driverName);
-        this.list[driverName] = factoryCallback;
-        return this;
-    }
-    /**
-     * Creates the driver instance with config
-     */
-    create(name, config, ctx) {
-        const driverFactory = this.list[name];
-        if (!driverFactory) {
-            throw new RuntimeException(`Unknown ally driver "${String(name)}". Make sure the driver is registered`);
-        }
-        debug('creating instance of %s driver', name);
-        return driverFactory(config, ctx);
-    }
-}
-const allyDriversCollection = new AllyDriversCollection();
-export default allyDriversCollection;