Remove internal_uid and set uid for each profile instead. But SimpleSamlphp...

Remove internal_uid and set uid for each profile instead. But SimpleSamlphp willl not release it. Also added prefix 'user' to uid value.

git-svn-id: https://svn.geant.net/GEANT/edugain_testidp_account_manager/trunk@116 047e039d-479c-447e-8a29-aa6bf4a09bab

templates/accountProfiles/alumni1.tt2

@@ -4,8 +4,7 @@
 [% SET account_profile = {
 	'type' => 'Alumni',
 	'comment' => 'Value "member" is not set for eduPersonAffiliation, contrary to current students.',
-  	'internal_uid' => "${account_id}",
-  	'uid' => "${account_id}",
+  	'uid' => "user${account_id}",
 	'eduPersonAffiliation' => ['alum'],
 	'eduPersonScopedAffiliation' => ["alum@${conf.idp_scope}"],
         'displayName' => 'Åsold Wahlstrøm',

templates/accountProfiles/employee1.tt2

@@ -4,8 +4,7 @@
 [% SET account_profile = {
 	'type' => 'Employee',
 	'comment' => 'There are conflicting definitions of "staff" and "employee" from country to country that make those values particularly unreliable in any international context. However in this example we set both values.',
-  	'internal_uid' => "${account_id}",
-  	'uid' => "${account_id}",
+  	'uid' => "user${account_id}",
 	'eduPersonAffiliation' => ['member','staff','employee'],
 	'eduPersonScopedAffiliation' => ["member@${conf.idp_scope}","staff@${conf.idp_scope}","employee@${conf.idp_scope}"],
         'displayName' => 'Linnéa Hsu',

templates/accountProfiles/generic1.tt2

@@ -4,7 +4,7 @@
 [% SET account_profile = {
 	'type' => 'Generic',
 	'comment' => 'This account provides a limited set of user attributes (eduPersonPrincipalName, mail and displayName).',
-  	'internal_uid' => "${account_id}",
+  	'uid' => "user${account_id}",
         'displayName' => '山崎 弘子樫野 陽子',
         'mail' => "forearartian@${conf.idp_scope}",
         'eduPersonPrincipalName' =>"${account_id}@${conf.idp_scope}",

templates/accountProfiles/librarywalkin1.tt2

@@ -4,8 +4,7 @@
 [% SET account_profile = {
 	'type' => 'Library walk-in',
 	'comment' => 'This term was created to cover the case where physical presence in a library facility grants someone access to electronic resources typically licensed for faculty, staff and students. In recent years the library walk-in provision has been extended to cover other cases such as library users on the campus network, or those using on-campus workstations. Licensed resource providers have often been willing to interpret their contracts with licensees to accept this broader definition of "library-walk-in," though specific terms may vary. For a more direct way of using eduPerson attributes to express library privilege information, see the eduPersonEntitlement value "urn:mace:dir:entitlement:common-lib-terms" as defined in the MACE-Dir Registry of eduPersonEntitlement values <a href="http://middleware.internet2.edu/urn-mace/urn-mace-dir-entitlement.html">http://middleware.internet2.edu/urn-mace/urn-mace-dir-entitlement.html</a>.',
-  	'internal_uid' => "${account_id}",
-  	'uid' => "${account_id}",
+  	'uid' => "user${account_id}",
 	'eduPersonAffiliation' => ['library-walk-in'],
 	'eduPersonScopedAffiliation' => ["library-walk-in@${conf.idp_scope}"],
         'displayName' => 'Ramón Núñez',

templates/accountProfiles/researcher1.tt2

@@ -4,8 +4,7 @@
 [% SET account_profile = {
 	'type' => 'Researcher',
 	'comment' => "No standard value for eduPersonAffiliation can be used to represent a researcher. Therefore you can't differenciate a teacher from a researcher.",
-  	'internal_uid' => "${account_id}",
-  	'uid' => "${account_id}",
+  	'uid' => "user${account_id}",
 	'eduPersonAffiliation' => ['member', 'faculty'],
 	'eduPersonScopedAffiliation' => ["member@${conf.idp_scope}", "faculty@${conf.idp_scope}"],
         'displayName' => 'Stéphane Larivière',

templates/accountProfiles/student1.tt2

@@ -4,8 +4,7 @@
 [% SET account_profile = {
 	'type' => 'Student',
 	'comment' => 'An active student has both "member" and "student" values set for eduPersonAffiliation.',
-  	'internal_uid' => "${account_id}",
-  	'uid' => "${account_id}",
+  	'uid' => "user${account_id}",
 	'eduPersonAffiliation' => ['member', 'student'],
 	'eduPersonScopedAffiliation' => ["member@${conf.idp_scope}","student@${conf.idp_scope}"],
         'displayName' => 'Ciarán MacCárthaigh',

templates/accountProfiles/student2.tt2

@@ -4,8 +4,7 @@
 [% SET account_profile = {
 	'type' => 'Student',
 	'comment' => 'A PhD student, having three values set for eduPersonAffiliation: "member" and "student" and "faculty".',
-  	'internal_uid' => "${account_id}",
-  	'uid' => "${account_id}",
+  	'uid' => "user${account_id}",
 	'eduPersonAffiliation' => ['member', 'student','faculty'],
 	'eduPersonScopedAffiliation' => ["member@${conf.idp_scope}","student@${conf.idp_scope}","faculty@${conf.idp_scope}"],
         'displayName' => 'Damiën Kuijper',

templates/accountProfiles/teacher1.tt2

@@ -4,8 +4,7 @@
 [% SET account_profile = {
 	'type' => 'Teacher',
 	'comment' => 'An active teacher has both "member" and "faculty" values set for eduPersonAffiliation.',
-  	'internal_uid' => "${account_id}",
-  	'uid' => "${account_id}",
+  	'uid' => "user${account_id}",
 	'eduPersonAffiliation' => ['member', 'faculty'],
 	'eduPersonScopedAffiliation' => ["member@${conf.idp_scope}", "faculty@${conf.idp_scope}"],
         'displayName' => 'Peter Müller',

templates/accountProfiles/teacher2.tt2

@@ -4,7 +4,7 @@
 [% SET account_profile = {
 	'type' => 'Teacher',
 	'comment' => 'This account provides a limited set of user attributes (eduPersonScopedAffiliation and eduPersonTargetedID).',
-  	'internal_uid' => "${account_id}",
+  	'uid' => "user${account_id}",
 	'eduPersonScopedAffiliation' => ["member@${conf.idp_scope}", "faculty@${conf.idp_scope}"],
 } %]
 

templates/web/validate_token.tt2.html

@@ -43,7 +43,7 @@
 			<table>
 				<caption>List of user attributes</caption>
             [% FOREACH attribute IN account_profile.pairs -%]
-              [% NEXT IF attribute.key.match('^(type|comment|internal_uid)$') %]
+              [% NEXT IF attribute.key.match('^(type|comment|uid)$') %]
               
               [% IF attribute.value.isa('SCALAR') -%]
 				<tr>