@adonisjs/ally 6.2.0 → 6.3.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/build/{chunk-7V2EH7U6.js → chunk-EXGR73T6.js} +5 -1
- package/build/{chunk-4QTU45GZ.js → chunk-STBND7WI.js} +5 -1
- package/build/config/ally.stub +2 -2
- package/build/index.js +14 -13
- package/build/src/drivers/discord.js +1 -1
- package/build/src/drivers/facebook.js +1 -1
- package/build/src/drivers/github.js +1 -1
- package/build/src/drivers/google.js +1 -1
- package/build/src/drivers/linked_in.js +1 -1
- package/build/src/drivers/linked_in_openid_connect.d.ts +3 -3
- package/build/src/drivers/linked_in_openid_connect.js +2 -2
- package/build/src/drivers/spotify.js +1 -1
- package/build/src/drivers/twitter.js +1 -1
- package/build/src/drivers/twitter_x.js +1 -1
- package/package.json +11 -6
|
@@ -184,7 +184,11 @@ var Oauth2Driver = class extends Oauth2Client {
|
|
|
184
184
|
callback(request);
|
|
185
185
|
}
|
|
186
186
|
});
|
|
187
|
-
this.ctx.
|
|
187
|
+
if ("inertia" in this.ctx && this.ctx.inertia.requestInfo().isInertiaRequest) {
|
|
188
|
+
this.ctx.inertia.location(url);
|
|
189
|
+
} else {
|
|
190
|
+
this.ctx.response.redirect(url);
|
|
191
|
+
}
|
|
188
192
|
}
|
|
189
193
|
/**
|
|
190
194
|
* Check if the state parameter from the callback matches the state
|
|
@@ -139,7 +139,11 @@ var Oauth1Driver = class extends Oauth1Client {
|
|
|
139
139
|
callback(request);
|
|
140
140
|
}
|
|
141
141
|
});
|
|
142
|
-
this.ctx.
|
|
142
|
+
if ("inertia" in this.ctx && this.ctx.inertia.requestInfo().isInertiaRequest) {
|
|
143
|
+
this.ctx.inertia.location(url);
|
|
144
|
+
} else {
|
|
145
|
+
this.ctx.response.redirect(url);
|
|
146
|
+
}
|
|
143
147
|
}
|
|
144
148
|
/**
|
|
145
149
|
* Check if the OAuth token from the callback matches the token
|
package/build/config/ally.stub
CHANGED
|
@@ -6,10 +6,10 @@ import { defineConfig, services } from '@adonisjs/ally'
|
|
|
6
6
|
|
|
7
7
|
const allyConfig = defineConfig({
|
|
8
8
|
{{#each providers as provider}}
|
|
9
|
-
{{provider.
|
|
9
|
+
{{provider.name}}: services.{{provider.provider}}({
|
|
10
10
|
clientId: env.get('{{provider.envPrefix}}_CLIENT_ID'),
|
|
11
11
|
clientSecret: env.get('{{provider.envPrefix}}_CLIENT_SECRET'),
|
|
12
|
-
callbackUrl: ''
|
|
12
|
+
callbackUrl: \`\${env.get('APP_URL')}/oauth/{{provider.name}}/callback\`,
|
|
13
13
|
}),
|
|
14
14
|
{{/each}}
|
|
15
15
|
})
|
package/build/index.js
CHANGED
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
import {
|
|
2
2
|
Oauth1Driver
|
|
3
|
-
} from "./chunk-
|
|
3
|
+
} from "./chunk-STBND7WI.js";
|
|
4
4
|
import {
|
|
5
5
|
AllyManager
|
|
6
6
|
} from "./chunk-ISWHUP4Q.js";
|
|
7
7
|
import {
|
|
8
8
|
Oauth2Driver
|
|
9
|
-
} from "./chunk-
|
|
9
|
+
} from "./chunk-EXGR73T6.js";
|
|
10
10
|
import {
|
|
11
11
|
RedirectRequest
|
|
12
12
|
} from "./chunk-NK6X76EQ.js";
|
|
@@ -22,19 +22,20 @@ var stubsRoot = import.meta.dirname;
|
|
|
22
22
|
|
|
23
23
|
// configure.ts
|
|
24
24
|
var AVAILABLE_PROVIDERS = [
|
|
25
|
-
{ name: "discord", message: "Discord", envPrefix: "DISCORD" },
|
|
26
|
-
{ name: "facebook", message: "Facebook", envPrefix: "FACEBOOK" },
|
|
27
|
-
{ name: "github", message: "GitHub", envPrefix: "GITHUB" },
|
|
28
|
-
{ name: "google", message: "Google", envPrefix: "GOOGLE" },
|
|
29
|
-
{ name: "linkedin", message: "LinkedIn", envPrefix: "LINKEDIN" },
|
|
25
|
+
{ name: "discord", configKey: "discord", message: "Discord", envPrefix: "DISCORD" },
|
|
26
|
+
{ name: "facebook", configKey: "facebook", message: "Facebook", envPrefix: "FACEBOOK" },
|
|
27
|
+
{ name: "github", configKey: "github", message: "GitHub", envPrefix: "GITHUB" },
|
|
28
|
+
{ name: "google", configKey: "google", message: "Google", envPrefix: "GOOGLE" },
|
|
29
|
+
{ name: "linkedin", configKey: "linkedin", message: "LinkedIn", envPrefix: "LINKEDIN" },
|
|
30
30
|
{
|
|
31
31
|
name: "linkedinOpenidConnect",
|
|
32
|
+
configKey: "linkedin",
|
|
32
33
|
message: "LinkedIn (OpenID Connect)",
|
|
33
34
|
envPrefix: "LINKEDIN_OC"
|
|
34
35
|
},
|
|
35
|
-
{ name: "spotify", message: "Spotify", envPrefix: "SPOTIFY" },
|
|
36
|
-
{ name: "twitter", message: "Twitter", envPrefix: "TWITTER" },
|
|
37
|
-
{ name: "twitterX", message: "Twitter X (OAuth2)", envPrefix: "TWITTER_X" }
|
|
36
|
+
{ name: "spotify", configKey: "spotify", message: "Spotify", envPrefix: "SPOTIFY" },
|
|
37
|
+
{ name: "twitter", configKey: "twitter", message: "Twitter", envPrefix: "TWITTER" },
|
|
38
|
+
{ name: "twitterX", configKey: "x", message: "Twitter X (OAuth2)", envPrefix: "TWITTER_X" }
|
|
38
39
|
];
|
|
39
40
|
async function configure(command) {
|
|
40
41
|
let selectedProviders = command.parsedFlags.providers;
|
|
@@ -62,7 +63,7 @@ async function configure(command) {
|
|
|
62
63
|
const codemods = await command.createCodemods();
|
|
63
64
|
await codemods.makeUsingStub(stubsRoot, "config/ally.stub", {
|
|
64
65
|
providers: providers.map((provider) => {
|
|
65
|
-
return { provider: provider.name, envPrefix: provider.envPrefix };
|
|
66
|
+
return { name: provider.configKey, provider: provider.name, envPrefix: provider.envPrefix };
|
|
66
67
|
})
|
|
67
68
|
});
|
|
68
69
|
await codemods.updateRcFile((rcFile) => {
|
|
@@ -70,8 +71,8 @@ async function configure(command) {
|
|
|
70
71
|
});
|
|
71
72
|
await codemods.defineEnvVariables(
|
|
72
73
|
providers.reduce((result, provider) => {
|
|
73
|
-
result[`${provider.envPrefix}_CLIENT_ID`] = "";
|
|
74
|
-
result[`${provider.envPrefix}_CLIENT_SECRET`] = "";
|
|
74
|
+
result[`${provider.envPrefix}_CLIENT_ID`] = "placeholder";
|
|
75
|
+
result[`${provider.envPrefix}_CLIENT_SECRET`] = "placeholder";
|
|
75
76
|
return result;
|
|
76
77
|
}, {})
|
|
77
78
|
);
|
|
@@ -106,7 +106,7 @@ export declare class LinkedInOpenidConnectDriver extends Oauth2Driver<LinkedInOp
|
|
|
106
106
|
name: any;
|
|
107
107
|
avatarUrl: any;
|
|
108
108
|
email: any;
|
|
109
|
-
emailVerificationState: "
|
|
109
|
+
emailVerificationState: "verified" | "unverified";
|
|
110
110
|
original: any;
|
|
111
111
|
}>;
|
|
112
112
|
/**
|
|
@@ -138,7 +138,7 @@ export declare class LinkedInOpenidConnectDriver extends Oauth2Driver<LinkedInOp
|
|
|
138
138
|
name: any;
|
|
139
139
|
avatarUrl: any;
|
|
140
140
|
email: any;
|
|
141
|
-
emailVerificationState: "
|
|
141
|
+
emailVerificationState: "verified" | "unverified";
|
|
142
142
|
original: any;
|
|
143
143
|
}>;
|
|
144
144
|
/**
|
|
@@ -163,7 +163,7 @@ export declare class LinkedInOpenidConnectDriver extends Oauth2Driver<LinkedInOp
|
|
|
163
163
|
name: any;
|
|
164
164
|
avatarUrl: any;
|
|
165
165
|
email: any;
|
|
166
|
-
emailVerificationState: "
|
|
166
|
+
emailVerificationState: "verified" | "unverified";
|
|
167
167
|
original: any;
|
|
168
168
|
}>;
|
|
169
169
|
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import {
|
|
2
2
|
Oauth2Driver
|
|
3
|
-
} from "../../chunk-
|
|
3
|
+
} from "../../chunk-EXGR73T6.js";
|
|
4
4
|
import "../../chunk-NK6X76EQ.js";
|
|
5
5
|
import "../../chunk-TSIMPJ6I.js";
|
|
6
6
|
|
|
@@ -96,7 +96,7 @@ var LinkedInOpenidConnectDriver = class extends Oauth2Driver {
|
|
|
96
96
|
name: body.family_name,
|
|
97
97
|
avatarUrl: body.picture,
|
|
98
98
|
email: body.email,
|
|
99
|
-
emailVerificationState: "
|
|
99
|
+
emailVerificationState: body.email_verified === true ? "verified" : "unverified",
|
|
100
100
|
original: body
|
|
101
101
|
};
|
|
102
102
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@adonisjs/ally",
|
|
3
|
-
"version": "6.
|
|
3
|
+
"version": "6.3.0",
|
|
4
4
|
"description": "Social authentication provider for AdonisJS",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "build/index.js",
|
|
@@ -40,11 +40,12 @@
|
|
|
40
40
|
},
|
|
41
41
|
"devDependencies": {
|
|
42
42
|
"@adonisjs/assembler": "^8.4.0",
|
|
43
|
-
"@adonisjs/core": "^7.3.
|
|
43
|
+
"@adonisjs/core": "^7.3.1",
|
|
44
44
|
"@adonisjs/eslint-config": "^3.0.0",
|
|
45
45
|
"@adonisjs/i18n": "^3.0.0",
|
|
46
|
+
"@adonisjs/inertia": "^4.2.0",
|
|
46
47
|
"@adonisjs/prettier-config": "^1.4.5",
|
|
47
|
-
"@adonisjs/session": "^8.
|
|
48
|
+
"@adonisjs/session": "^8.1.0",
|
|
48
49
|
"@adonisjs/tsconfig": "^2.0.0",
|
|
49
50
|
"@japa/assert": "^4.2.0",
|
|
50
51
|
"@japa/expect-type": "^2.0.4",
|
|
@@ -52,13 +53,13 @@
|
|
|
52
53
|
"@japa/runner": "^5.3.0",
|
|
53
54
|
"@poppinss/ts-exec": "^1.4.4",
|
|
54
55
|
"@release-it/conventional-changelog": "^10.0.6",
|
|
55
|
-
"@types/node": "^25.
|
|
56
|
+
"@types/node": "^25.6.0",
|
|
56
57
|
"c8": "^11.0.0",
|
|
57
58
|
"copyfiles": "^2.4.1",
|
|
58
59
|
"cross-env": "^10.1.0",
|
|
59
60
|
"del-cli": "^7.0.0",
|
|
60
61
|
"eslint": "^10.2.0",
|
|
61
|
-
"prettier": "^3.8.
|
|
62
|
+
"prettier": "^3.8.2",
|
|
62
63
|
"release-it": "^19.2.4",
|
|
63
64
|
"tsup": "^8.5.1",
|
|
64
65
|
"typescript": "^6.0.2"
|
|
@@ -70,7 +71,8 @@
|
|
|
70
71
|
"@adonisjs/assembler": "^8.0.0",
|
|
71
72
|
"@adonisjs/core": "^7.0.0-next.8 || ^7.0.0",
|
|
72
73
|
"@adonisjs/i18n": "^3.0.0",
|
|
73
|
-
"@adonisjs/session": "^8.0.0"
|
|
74
|
+
"@adonisjs/session": "^8.0.0",
|
|
75
|
+
"@adonisjs/inertia": "^4.2.0"
|
|
74
76
|
},
|
|
75
77
|
"peerDependenciesMeta": {
|
|
76
78
|
"@adonisjs/assembler": {
|
|
@@ -81,6 +83,9 @@
|
|
|
81
83
|
},
|
|
82
84
|
"@adonisjs/session": {
|
|
83
85
|
"optional": true
|
|
86
|
+
},
|
|
87
|
+
"@adonisjs/inertia": {
|
|
88
|
+
"optional": true
|
|
84
89
|
}
|
|
85
90
|
},
|
|
86
91
|
"homepage": "https://github.com/adonisjs/ally#readme",
|