-
OAuth2 Settings
+
escape(ucfirst($provider)); ?> OAuth2 Settings
+ {{console-project.usersOauth2escape(ucfirst($provider)); ?>Appid}} &&
+ {{console-project.usersOauth2escape(ucfirst($provider)); ?>Secret}}">
-
+ !{{console-project.usersOauth2escape(ucfirst($provider)); ?>Appid}} ||
+ !{{console-project.usersOauth2escape(ucfirst($provider)); ?>Secret}}">
+
- ; ?>.png?buster=<?php echo APP_CACHE_BUSTER; ?>)
+ ); ?>.png?buster=<?php echo APP_CACHE_BUSTER; ?>)
-
+ (beta)
OAuth2 Developer Docs
diff --git a/composer.lock b/composer.lock
index 940945a9af..6b23ee63e8 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1741,7 +1741,7 @@
"source": {
"type": "git",
"url": "https://github.com/appwrite/sdk-generator",
- "reference": "ca18c48a3252e1e2e7c7d823871cc4f3453b6ee0"
+ "reference": "a1672098ecc6a08cc400314e373b0d1cd5885f79"
},
"require": {
"ext-curl": "*",
@@ -1771,7 +1771,7 @@
}
],
"description": "Appwrite PHP library for generating API SDKs for multiple programming languages and platforms",
- "time": "2020-05-29T18:54:37+00:00"
+ "time": "2020-05-30T11:38:32+00:00"
},
{
"name": "doctrine/instantiator",
@@ -1779,16 +1779,16 @@
"source": {
"type": "git",
"url": "https://github.com/doctrine/instantiator.git",
- "reference": "6a1471ddbf2f448b35f3a8e390c903435e6dd5de"
+ "reference": "a390fde13fc9bc2ffb73340bb8f07201a8e85af8"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/doctrine/instantiator/zipball/6a1471ddbf2f448b35f3a8e390c903435e6dd5de",
- "reference": "6a1471ddbf2f448b35f3a8e390c903435e6dd5de",
+ "url": "https://api.github.com/repos/doctrine/instantiator/zipball/a390fde13fc9bc2ffb73340bb8f07201a8e85af8",
+ "reference": "a390fde13fc9bc2ffb73340bb8f07201a8e85af8",
"shasum": ""
},
"require": {
- "php": "^7.1"
+ "php": "^7.1 || ^8.0"
},
"require-dev": {
"doctrine/coding-standard": "^6.0",
@@ -1827,7 +1827,7 @@
"constructor",
"instantiate"
],
- "time": "2019-12-23T19:18:31+00:00"
+ "time": "2020-05-30T16:47:47+00:00"
},
{
"name": "matthiasmullie/minify",
diff --git a/docs/references/database/create-document.md b/docs/references/database/create-document.md
index d2ab330bc5..37cb7fb93a 100644
--- a/docs/references/database/create-document.md
+++ b/docs/references/database/create-document.md
@@ -1 +1 @@
-Create a new Document.
\ No newline at end of file
+Create a new Document. Before using this route, you should create a new collection resource using either a [server integration](/docs/server/database?sdk=nodejs#createCollection) API or directly from your database console.
\ No newline at end of file
diff --git a/docs/services/database.md b/docs/services/database.md
index 63f9a9d13f..95ef95be63 100644
--- a/docs/services/database.md
+++ b/docs/services/database.md
@@ -1,7 +1,7 @@
-The Database service allows you to create structured collections of documents, query and filter lists of documents, and manage an advanced set of read and write access.
+The Database service allows you to create structured collections of documents, query and filter lists of documents, and manage an advanced set of read and write access permissions.
-All the data in the database service is stored in structured JSON documents. The Appwrite database service also allows you to nest child documents in documents and use advanced filters to both search and query the database just like you would with a classic graph database.
+All the data in the database service is stored in structured JSON documents. The Appwrite database service also allows you to nest child documents in parent documents and use deep filters to both search and query your data.
Each database document structure in your project is defined using the Appwrite [collection rules](/docs/rules). The collections rules help you ensure all your user-submitted data is validated and stored according to the collection structure.
-Using Appwrite permissions architecture, you can assign read or write access to each document in your project for either a specific user, team, user role, or even grant it with public access. You can learn more about [how Appwrite handles permissions and access control](/docs/permissions).
\ No newline at end of file
+Using Appwrite permissions architecture, you can assign read or write access to each document in your project for either a specific user, team, user role, or even grant it with public access (*). You can learn more about [how Appwrite handles permissions and access control](/docs/permissions).
\ No newline at end of file
diff --git a/gulpfile.js b/gulpfile.js
index a0be3a4058..b45d16bf7e 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -47,6 +47,7 @@ const configApp = {
'public/scripts/views/forms/move-down.js',
'public/scripts/views/forms/move-up.js',
'public/scripts/views/forms/nav.js',
+ 'public/scripts/views/forms/oauth-apple.js',
'public/scripts/views/forms/password-meter.js',
'public/scripts/views/forms/pell.js',
'public/scripts/views/forms/remove.js',
diff --git a/public/dist/scripts/app-all.js b/public/dist/scripts/app-all.js
index f7b6ba5a93..7085090762 100644
--- a/public/dist/scripts/app-all.js
+++ b/public/dist/scripts/app-all.js
@@ -2402,7 +2402,7 @@ container.set(as,container.path(context),true,watch);container.set(key,index,tru
element.dispatchEvent(new Event('looped'));};let template=(element.children.length===1)?element.children[0]:window.document.createElement('li');echo();container.bind(element,expr+'.length',echo);let path=(expr+'.length').split('.');while(path.length){container.bind(element,path.join('.'),echo);path.pop();}}});window.ls.container.get('view').add({selector:'data-ls-template',template:false,repeat:false,controller:function(element,view,http,expression,document,container){let template=element.getAttribute('data-ls-template')||'';let type=element.getAttribute('data-type')||'url';let debug=element.getAttribute('data-debug')||false;let paths=[];let check=function(init=false){let source=expression.parse(template);paths=expression.getPaths();element.innerHTML='';if('script'===type){let inlineTemplate=document.getElementById(source);if(inlineTemplate&&inlineTemplate.innerHTML){element.innerHTML=inlineTemplate.innerHTML;element.dispatchEvent(new CustomEvent('template-loaded',{bubbles:true,cancelable:false}));}else{if(debug){console.error('Missing template "'+source+'"');}}
if(!init){view.render(element);}
return;}
-http.get(source).then(function(element){return function(data){element.innerHTML=data;view.render(element);element.dispatchEvent(new CustomEvent('template-loaded',{bubbles:true,cancelable:false}));}}(element),function(){throw new Error('Failed loading template');});};check(true);for(let i=0;iscope.max){scope.list.pop();scope.counter--;}
+http.get(source).then(function(element){return function(data){element.innerHTML=data;view.render(element);element.dispatchEvent(new CustomEvent('template-loaded',{bubbles:true,cancelable:false}));}}(element),function(){throw new Error('Failed loading template');});};check(true);for(let i=0;iscope.max){scope.list.pop();scope.counter--;}
if(time>0){window.setTimeout(function(message){return function(){scope.remove(message.id)}}(message),time);}
return message.id;},remove:function(id){let scope=this;for(let index=0;index=thresh&&u'+
units[u]+"");}).add("statsTotal",function($value){if(!$value){return 0;}
-$value=abbreviate($value,1,false,false);return $value==="0"?"N/A":$value;}).add("isEmpty",function($value){return(!!$value);}).add("isEmptyObject",function($value){return((Object.keys($value).length===0&&$value.constructor===Object)||$value.length===0)}).add("activeDomainsCount",function($value){let result=[];if(Array.isArray($value)){result=$value.filter(function(node){return(node.verification&&node.certificateId);});}
+$value=abbreviate($value,0,false,false);return $value==="0"?"N/A":$value;}).add("isEmpty",function($value){return(!!$value);}).add("isEmptyObject",function($value){return((Object.keys($value).length===0&&$value.constructor===Object)||$value.length===0)}).add("activeDomainsCount",function($value){let result=[];if(Array.isArray($value)){result=$value.filter(function(node){return(node.verification&&node.certificateId);});}
return result.length;}).add("documentAction",function(container){let collection=container.get('project-collection');let document=container.get('project-document');if(collection&&document&&!document.$id){return'database.createDocument';}
return'database.updateDocument';}).add("documentSuccess",function(container){let document=container.get('project-document');if(document&&!document.$id){return',redirect';}
return'';}).add("firstElement",function($value){if($value&&$value[0]){return $value[0];}
@@ -2640,7 +2640,11 @@ list["filters-"+filter.key]=params[key][i];}}}}
return list;};let apply=function(params){let cached=container.get(name);cached=cached?cached.params:[];params=Object.assign(cached,params);container.set(name,{name:name,params:params,query:serialize(params),forward:parseInt(params.offset)+parseInt(params.limit),backward:parseInt(params.offset)-parseInt(params.limit),keys:flatten(params)},true,name);document.dispatchEvent(new CustomEvent(name+"-changed",{bubbles:false,cancelable:true}));};switch(element.tagName){case"INPUT":break;case"TEXTAREA":break;case"BUTTON":element.addEventListener("click",function(){apply(JSON.parse(expression.parse(element.dataset["params"]||"{}")));});break;case"FORM":element.addEventListener("input",function(){apply(form.toJson(element));});element.addEventListener("change",function(){apply(form.toJson(element));});element.addEventListener("reset",function(){setTimeout(function(){apply(form.toJson(element));},0);});events=events.trim().split(",");for(let y=0;y=distance)&&(distance>=0)){if(minLink){minLink.classList.remove('selected');}
-console.log('old',minLink);minDistance=distance;minElement=title;minLink=links[i];minLink.classList.add('selected');console.log('new',minLink);}}};window.addEventListener('scroll',check);check();}});})(window);(function(window){"use strict";window.ls.container.get("view").add({selector:"data-forms-password-meter",controller:function(element,window){var calc=function(password){var score=0;if(!password)return score;var letters=new window.Object();for(var i=0;i60)return(meter.className="password-meter strong");if(score>30)return(meter.className="password-meter medium");if(score>=0)return(meter.className="password-meter weak");};var meter=window.document.createElement("div");meter.className="password-meter";element.parentNode.insertBefore(meter,element.nextSibling);element.addEventListener("change",callback);element.addEventListener("keypress",callback);element.addEventListener("keyup",callback);element.addEventListener("keydown",callback);}});})(window);(function(window){"use strict";window.ls.container.get("view").add({selector:"data-forms-pell",controller:function(element,window,document,markdown,rtl){var div=document.createElement("div");element.className="pell hide";div.className="input pell";element.parentNode.insertBefore(div,element);element.tabIndex=-1;var turndownService=new TurndownService();turndownService.addRule("underline",{filter:["u"],replacement:function(content){return"__"+content+"__";}});var editor=window.pell.init({element:div,onChange:function onChange(html){alignText();element.value=turndownService.turndown(html);},defaultParagraphSeparator:"p",actions:[{name:"bold",icon:''},{name:"underline",icon:''},{name:"italic",icon:''},{name:"olist",icon:''},{name:"ulist",icon:''},{name:"link",icon:''}]});var clean=function(e){e.stopPropagation();e.preventDefault();var clipboardData=e.clipboardData||window.clipboardData;console.log(clipboardData.getData("Text"));window.pell.exec("insertText",clipboardData.getData("Text"));return true;};var alignText=function(){let paragraphs=editor.content.querySelectorAll('p,li');let last='';for(let paragraph of paragraphs){var content=paragraph.textContent;if(content.trim()===''){content=last.textContent;}
if(rtl.isRTL(content)){paragraph.style.direction='rtl';paragraph.style.textAlign='right';}
diff --git a/public/dist/scripts/app.js b/public/dist/scripts/app.js
index 6643c8f322..6d85d8e384 100644
--- a/public/dist/scripts/app.js
+++ b/public/dist/scripts/app.js
@@ -118,7 +118,7 @@ container.set(as,container.path(context),true,watch);container.set(key,index,tru
element.dispatchEvent(new Event('looped'));};let template=(element.children.length===1)?element.children[0]:window.document.createElement('li');echo();container.bind(element,expr+'.length',echo);let path=(expr+'.length').split('.');while(path.length){container.bind(element,path.join('.'),echo);path.pop();}}});window.ls.container.get('view').add({selector:'data-ls-template',template:false,repeat:false,controller:function(element,view,http,expression,document,container){let template=element.getAttribute('data-ls-template')||'';let type=element.getAttribute('data-type')||'url';let debug=element.getAttribute('data-debug')||false;let paths=[];let check=function(init=false){let source=expression.parse(template);paths=expression.getPaths();element.innerHTML='';if('script'===type){let inlineTemplate=document.getElementById(source);if(inlineTemplate&&inlineTemplate.innerHTML){element.innerHTML=inlineTemplate.innerHTML;element.dispatchEvent(new CustomEvent('template-loaded',{bubbles:true,cancelable:false}));}else{if(debug){console.error('Missing template "'+source+'"');}}
if(!init){view.render(element);}
return;}
-http.get(source).then(function(element){return function(data){element.innerHTML=data;view.render(element);element.dispatchEvent(new CustomEvent('template-loaded',{bubbles:true,cancelable:false}));}}(element),function(){throw new Error('Failed loading template');});};check(true);for(let i=0;iscope.max){scope.list.pop();scope.counter--;}
+http.get(source).then(function(element){return function(data){element.innerHTML=data;view.render(element);element.dispatchEvent(new CustomEvent('template-loaded',{bubbles:true,cancelable:false}));}}(element),function(){throw new Error('Failed loading template');});};check(true);for(let i=0;iscope.max){scope.list.pop();scope.counter--;}
if(time>0){window.setTimeout(function(message){return function(){scope.remove(message.id)}}(message),time);}
return message.id;},remove:function(id){let scope=this;for(let index=0;index=thresh&&u'+
units[u]+"");}).add("statsTotal",function($value){if(!$value){return 0;}
-$value=abbreviate($value,1,false,false);return $value==="0"?"N/A":$value;}).add("isEmpty",function($value){return(!!$value);}).add("isEmptyObject",function($value){return((Object.keys($value).length===0&&$value.constructor===Object)||$value.length===0)}).add("activeDomainsCount",function($value){let result=[];if(Array.isArray($value)){result=$value.filter(function(node){return(node.verification&&node.certificateId);});}
+$value=abbreviate($value,0,false,false);return $value==="0"?"N/A":$value;}).add("isEmpty",function($value){return(!!$value);}).add("isEmptyObject",function($value){return((Object.keys($value).length===0&&$value.constructor===Object)||$value.length===0)}).add("activeDomainsCount",function($value){let result=[];if(Array.isArray($value)){result=$value.filter(function(node){return(node.verification&&node.certificateId);});}
return result.length;}).add("documentAction",function(container){let collection=container.get('project-collection');let document=container.get('project-document');if(collection&&document&&!document.$id){return'database.createDocument';}
return'database.updateDocument';}).add("documentSuccess",function(container){let document=container.get('project-document');if(document&&!document.$id){return',redirect';}
return'';}).add("firstElement",function($value){if($value&&$value[0]){return $value[0];}
@@ -356,7 +356,11 @@ list["filters-"+filter.key]=params[key][i];}}}}
return list;};let apply=function(params){let cached=container.get(name);cached=cached?cached.params:[];params=Object.assign(cached,params);container.set(name,{name:name,params:params,query:serialize(params),forward:parseInt(params.offset)+parseInt(params.limit),backward:parseInt(params.offset)-parseInt(params.limit),keys:flatten(params)},true,name);document.dispatchEvent(new CustomEvent(name+"-changed",{bubbles:false,cancelable:true}));};switch(element.tagName){case"INPUT":break;case"TEXTAREA":break;case"BUTTON":element.addEventListener("click",function(){apply(JSON.parse(expression.parse(element.dataset["params"]||"{}")));});break;case"FORM":element.addEventListener("input",function(){apply(form.toJson(element));});element.addEventListener("change",function(){apply(form.toJson(element));});element.addEventListener("reset",function(){setTimeout(function(){apply(form.toJson(element));},0);});events=events.trim().split(",");for(let y=0;y=distance)&&(distance>=0)){if(minLink){minLink.classList.remove('selected');}
-console.log('old',minLink);minDistance=distance;minElement=title;minLink=links[i];minLink.classList.add('selected');console.log('new',minLink);}}};window.addEventListener('scroll',check);check();}});})(window);(function(window){"use strict";window.ls.container.get("view").add({selector:"data-forms-password-meter",controller:function(element,window){var calc=function(password){var score=0;if(!password)return score;var letters=new window.Object();for(var i=0;i60)return(meter.className="password-meter strong");if(score>30)return(meter.className="password-meter medium");if(score>=0)return(meter.className="password-meter weak");};var meter=window.document.createElement("div");meter.className="password-meter";element.parentNode.insertBefore(meter,element.nextSibling);element.addEventListener("change",callback);element.addEventListener("keypress",callback);element.addEventListener("keyup",callback);element.addEventListener("keydown",callback);}});})(window);(function(window){"use strict";window.ls.container.get("view").add({selector:"data-forms-pell",controller:function(element,window,document,markdown,rtl){var div=document.createElement("div");element.className="pell hide";div.className="input pell";element.parentNode.insertBefore(div,element);element.tabIndex=-1;var turndownService=new TurndownService();turndownService.addRule("underline",{filter:["u"],replacement:function(content){return"__"+content+"__";}});var editor=window.pell.init({element:div,onChange:function onChange(html){alignText();element.value=turndownService.turndown(html);},defaultParagraphSeparator:"p",actions:[{name:"bold",icon:''},{name:"underline",icon:''},{name:"italic",icon:''},{name:"olist",icon:''},{name:"ulist",icon:''},{name:"link",icon:''}]});var clean=function(e){e.stopPropagation();e.preventDefault();var clipboardData=e.clipboardData||window.clipboardData;console.log(clipboardData.getData("Text"));window.pell.exec("insertText",clipboardData.getData("Text"));return true;};var alignText=function(){let paragraphs=editor.content.querySelectorAll('p,li');let last='';for(let paragraph of paragraphs){var content=paragraph.textContent;if(content.trim()===''){content=last.textContent;}
if(rtl.isRTL(content)){paragraph.style.direction='rtl';paragraph.style.textAlign='right';}
diff --git a/public/images/oauth2/apple.png b/public/images/oauth2/apple.png
index b0fdfd14f0..98086e8048 100644
Binary files a/public/images/oauth2/apple.png and b/public/images/oauth2/apple.png differ
diff --git a/public/scripts/init.js b/public/scripts/init.js
index 2e592dcfc9..b0659b67a7 100644
--- a/public/scripts/init.js
+++ b/public/scripts/init.js
@@ -2,7 +2,8 @@
window.ls.error = function() {
return function(error) {
- console.error("ERROR-APP", error);
+ window.console.error(error);
+ window.location = '/console';
};
};
diff --git a/public/scripts/views/forms/oauth-apple.js b/public/scripts/views/forms/oauth-apple.js
new file mode 100644
index 0000000000..358e9aae86
--- /dev/null
+++ b/public/scripts/views/forms/oauth-apple.js
@@ -0,0 +1,94 @@
+(function(window) {
+ "use strict";
+
+ window.ls.container.get("view").add({
+ selector: "data-forms-oauth-apple",
+ controller: function(element) {
+ let container = document.createElement("div");
+ let row = document.createElement("div");
+ let col1 = document.createElement("div");
+ let col2 = document.createElement("div");
+ let keyID = document.createElement("input");
+ let keyLabel = document.createElement("label");
+ let teamID = document.createElement("input");
+ let teamLabel = document.createElement("label");
+ let p8 = document.createElement("textarea");
+ let p8Label = document.createElement("label");
+
+ keyLabel.textContent = 'Key ID';
+ teamLabel.textContent = 'Team ID';
+ p8Label.textContent = 'P8 File';
+
+ row.classList.add('row');
+ row.classList.add('thin');
+ container.appendChild(row);
+ container.appendChild(p8Label);
+ container.appendChild(p8);
+
+ row.appendChild(col1);
+ row.appendChild(col2);
+
+ col1.classList.add('col');
+ col1.classList.add('span-6');
+ col1.appendChild(keyLabel);
+ col1.appendChild(keyID);
+
+ col2.classList.add('col');
+ col2.classList.add('span-6');
+ col2.appendChild(teamLabel);
+ col2.appendChild(teamID);
+
+ keyID.type = 'text';
+ keyID.placeholder = 'SHAB13ROFN';
+ teamID.type = 'text';
+ teamID.placeholder = 'ELA2CD3AED';
+ p8.accept = '.p8';
+ p8.classList.add('margin-bottom-no');
+
+ element.parentNode.insertBefore(container, element.nextSibling);
+
+ element.addEventListener('change', sync);
+ keyID.addEventListener('change', update);
+ teamID.addEventListener('change', update);
+ p8.addEventListener('change', update);
+
+ function update() {
+ let json = {};
+
+ json.keyID = keyID.value;
+ json.teamID = teamID.value;
+ json.p8 = p8.value;
+
+ element.value = JSON.stringify(json);
+ }
+
+ function sync() {
+ console.log('sync');
+ if(!element.value) {
+ return;
+ }
+
+ let json = {};
+
+ try {
+ json = JSON.parse(element.value);
+ } catch (error) {
+ console.error('Failed to parse secret key');
+ }
+
+ teamID.value = json.teamID || '';
+ keyID.value = json.keyID || '';
+ p8.value = json.p8 || '';
+ }
+
+ // function syncB() {
+ // picker.value = element.value;
+ // }
+
+ // element.parentNode.insertBefore(preview, element);
+
+ // update();
+ sync();
+ }
+ });
+})(window);
diff --git a/src/Appwrite/Auth/OAuth2/Apple.php b/src/Appwrite/Auth/OAuth2/Apple.php
index 427b78debb..411f8baf59 100644
--- a/src/Appwrite/Auth/OAuth2/Apple.php
+++ b/src/Appwrite/Auth/OAuth2/Apple.php
@@ -3,6 +3,7 @@
namespace Appwrite\Auth\OAuth2;
use Appwrite\Auth\OAuth2;
+use Exception;
// Reference Material
// https://developer.okta.com/blog/2019/06/04/what-the-heck-is-sign-in-with-apple
@@ -22,6 +23,11 @@ class Apple extends OAuth2
"email"
];
+ /**
+ * @var array
+ */
+ protected $claims = [];
+
/**
* @return string
*/
@@ -58,15 +64,18 @@ class Apple extends OAuth2
'https://appleid.apple.com/auth/token',
$headers,
http_build_query([
+ 'grant_type' => 'authorization_code',
'code' => $code,
'client_id' => $this->appID,
- 'client_secret' => $this->appSecret,
+ 'client_secret' => $this->getAppSecret(),
'redirect_uri' => $this->callback,
- 'grant_type' => 'authorization_code'
])
);
- $accessToken = json_decode($accessToken, true);
+ $accessToken = json_decode($accessToken, true);
+
+ $this->claims = (isset($accessToken['id_token'])) ? explode('.', $accessToken['id_token']) : [0 => '', 1 => ''];
+ $this->claims = (isset($this->claims[1])) ? json_decode(base64_decode($this->claims[1]), true) : [];
if (isset($accessToken['access_token'])) {
return $accessToken['access_token'];
@@ -82,10 +91,8 @@ class Apple extends OAuth2
*/
public function getUserID(string $accessToken): string
{
- $user = $this->getUser($accessToken);
-
- if (isset($user['account_id'])) {
- return $user['account_id'];
+ if (isset($this->claims['sub']) && !empty($this->claims['sub'])) {
+ return $this->claims['sub'];
}
return '';
@@ -98,10 +105,11 @@ class Apple extends OAuth2
*/
public function getUserEmail(string $accessToken): string
{
- $user = $this->getUser($accessToken);
-
- if (isset($user['email'])) {
- return $user['email'];
+ if (isset($this->claims['email']) &&
+ !empty($this->claims['email']) &&
+ isset($this->claims['email_verified']) &&
+ $this->claims['email_verified'] === 'true') {
+ return $this->claims['email'];
}
return '';
@@ -114,28 +122,111 @@ class Apple extends OAuth2
*/
public function getUserName(string $accessToken): string
{
- $user = $this->getUser($accessToken);
-
- if (isset($user['name'])) {
- return $user['name']['display_name'];
+ if (isset($this->claims['email']) &&
+ !empty($this->claims['email']) &&
+ isset($this->claims['email_verified']) &&
+ $this->claims['email_verified'] === 'true') {
+ return $this->claims['email'];
}
return '';
}
- /**
- * @param string $accessToken
- *
- * @return array
- */
- protected function getUser(string $accessToken): array
+ protected function getAppSecret():string
{
- if (empty($this->user)) {
- $headers[] = 'Authorization: Bearer '. urlencode($accessToken);
- $user = $this->request('POST', '', $headers);
- $this->user = json_decode($user, true);
+ try {
+ $secret = json_decode($this->appSecret, true);
+ } catch (\Throwable $th) {
+ throw new Exception('Invalid secret');
}
- return $this->user;
+ $keyfile = (isset($secret['p8'])) ? $secret['p8'] : ''; // Your p8 Key file
+ $keyID = (isset($secret['keyID'])) ? $secret['keyID'] : ''; // Your Key ID
+ $teamID = (isset($secret['teamID'])) ? $secret['teamID'] : ''; // Your Team ID (see Developer Portal)
+ $bundleID = $this->appID; // Your Bundle ID
+
+ $headers = [
+ 'alg' => 'ES256',
+ 'kid' => $keyID,
+ ];
+
+ $claims = [
+ 'iss' => $teamID,
+ 'iat' => time(),
+ 'exp' => time() + 86400*180,
+ 'aud' => 'https://appleid.apple.com',
+ 'sub' => $bundleID,
+ ];
+
+ $pkey = openssl_pkey_get_private($keyfile);
+
+ $payload = $this->encode(json_encode($headers)).'.'.$this->encode(json_encode($claims));
+
+ $signature = '';
+
+ $success = openssl_sign($payload, $signature, $pkey, OPENSSL_ALGO_SHA256);
+
+ if (!$success) return '';
+
+ return $payload.'.'.$this->encode($this->fromDER($signature, 64));
+ }
+
+ /**
+ * @param string $data
+ */
+ protected function encode($data)
+ {
+ return str_replace(['+', '/', '='], ['-', '_', ''], base64_encode($data));
+ }
+
+ /**
+ * @param string $data
+ */
+ protected function retrievePositiveInteger(string $data): string
+ {
+ while ('00' === mb_substr($data, 0, 2, '8bit') && mb_substr($data, 2, 2, '8bit') > '7f') {
+ $data = mb_substr($data, 2, null, '8bit');
+ }
+
+ return $data;
+ }
+
+ /**
+ * @param string $der
+ * @param int $partLength
+ */
+ protected function fromDER(string $der, int $partLength):string
+ {
+ $hex = \unpack('H*', $der)[1];
+
+ if ('30' !== \mb_substr($hex, 0, 2, '8bit')) { // SEQUENCE
+ throw new \RuntimeException();
+ }
+
+ if ('81' === \mb_substr($hex, 2, 2, '8bit')) { // LENGTH > 128
+ $hex = \mb_substr($hex, 6, null, '8bit');
+ }
+ else {
+ $hex = \mb_substr($hex, 4, null, '8bit');
+ }
+ if ('02' !== \mb_substr($hex, 0, 2, '8bit')) { // INTEGER
+ throw new \RuntimeException();
+ }
+
+ $Rl = \hexdec(\mb_substr($hex, 2, 2, '8bit'));
+ $R = $this->retrievePositiveInteger(\mb_substr($hex, 4, $Rl * 2, '8bit'));
+ $R = \str_pad($R, $partLength, '0', STR_PAD_LEFT);
+
+ $hex = \mb_substr($hex, 4 + $Rl * 2, null, '8bit');
+
+ if ('02' !== \mb_substr($hex, 0, 2, '8bit')) { // INTEGER
+ throw new \RuntimeException();
+ }
+
+ $Sl = \hexdec(\mb_substr($hex, 2, 2, '8bit'));
+ $S = $this->retrievePositiveInteger(\mb_substr($hex, 4, $Sl * 2, '8bit'));
+ $S = \str_pad($S, $partLength, '0', STR_PAD_LEFT);
+
+ return \pack('H*', $R.$S);
}
}